[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2164] trunk/org.rubypeople.rdt.ui/src/org/ rubypeople/rdt/internal/ui/text

[<caw...@us...>]

Revision: 2164
          http://svn.sourceforge.net/rubyeclipse/?rev=2164&view=rev
Author:   cawilliams
Date:     2007-03-14 08:45:09 -0700 (Wed, 14 Mar 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScanner.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java

Removed Paths:
-------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/NumberSignDetector.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/GlobalDetector.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/IdentifierDetector.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/InstanceVariableDetector.java

Deleted: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/NumberSignDetector.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/NumberSignDetector.java	2007-03-14 14:58:09 UTC (rev 2163)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/NumberSignDetector.java	2007-03-14 15:45:09 UTC (rev 2164)
@@ -1,18 +0,0 @@
-package org.rubypeople.rdt.internal.ui.text;
-
-import org.eclipse.jface.text.rules.IWordDetector;
-
-public class NumberSignDetector implements IWordDetector {
-
-	public NumberSignDetector() {
-		super();
-	}
-
-	public boolean isWordStart(char c) {
-		return isWordPart(c) ;
-	}
-
-	public boolean isWordPart(char c) {
-		return '#' == c;
-	}
-}

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScanner.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScanner.java	2007-03-14 14:58:09 UTC (rev 2163)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/RubyPartitionScanner.java	2007-03-14 15:45:09 UTC (rev 2164)
@@ -5,7 +5,6 @@
 
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
-import org.eclipse.jface.text.rules.EndOfLineRule;
 import org.eclipse.jface.text.rules.IPartitionTokenScanner;
 import org.eclipse.jface.text.rules.IPredicateRule;
 import org.eclipse.jface.text.rules.IRule;

Deleted: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/GlobalDetector.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/GlobalDetector.java	2007-03-14 14:58:09 UTC (rev 2163)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/GlobalDetector.java	2007-03-14 15:45:09 UTC (rev 2164)
@@ -1,9 +0,0 @@
-package org.rubypeople.rdt.internal.ui.text.ruby;
-
-public class GlobalDetector extends IdentifierDetector {
-
-    public boolean isWordStart(char c) {
-        return c == '$';
-    }
-
-}

Deleted: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/IdentifierDetector.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/IdentifierDetector.java	2007-03-14 14:58:09 UTC (rev 2163)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/IdentifierDetector.java	2007-03-14 15:45:09 UTC (rev 2164)
@@ -1,20 +0,0 @@
-package org.rubypeople.rdt.internal.ui.text.ruby;
-
-import org.eclipse.jface.text.rules.IWordDetector;
-
-
-public class IdentifierDetector implements IWordDetector {
-
-    public boolean isWordStart(char c) {
-        if (c == '_') return true;
-        return Character.isLetter(c);
-    }
-
-    public boolean isWordPart(char c) {
-        if (c == '_') return true;
-        if (Character.isWhitespace(c)) return false;
-        if (Character.isDigit(c)) return true;
-        return Character.isLetter(c);
-    }
-
-}

Deleted: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/InstanceVariableDetector.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/InstanceVariableDetector.java	2007-03-14 14:58:09 UTC (rev 2163)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/InstanceVariableDetector.java	2007-03-14 15:45:09 UTC (rev 2164)
@@ -1,9 +0,0 @@
-package org.rubypeople.rdt.internal.ui.text.ruby;
-
-public class InstanceVariableDetector extends IdentifierDetector {
-
-    public boolean isWordStart(char c) {
-        return c == '@';
-    }
-
-}

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java	2007-03-14 14:58:09 UTC (rev 2163)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java	2007-03-14 15:45:09 UTC (rev 2164)
@@ -112,8 +112,9 @@
 				CommentNode comment = (CommentNode) comments.remove(comments.size() - 1); // Grab last comment
 				tokenLength = comment.getContent().length() + 1;
 				fSavedToken = returnValue;
-				fSavedOffset = comment.getPosition().getEndOffset();
-				fSavedLength = lexerSource.getOffset() - fSavedOffset;			
+				fSavedOffset = oldOffset + tokenLength;
+				if (!isEOF) fSavedLength = getOffset() - fSavedOffset;
+				else fSavedLength = 0;
 				lastWasComment = true;
 				return getToken(IRubyColorConstants.RUBY_SINGLE_LINE_COMMENT);
 			}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.