[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2283] trunk/org.rubypeople.rdt.ui

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

Revision: 2283
          http://svn.sourceforge.net/rubyeclipse/?rev=2283&view=rev
Author:   cawilliams
Date:     2007-04-05 06:12:55 -0700 (Thu, 05 Apr 2007)

Log Message:
-----------
the millionth patch to try and fix Ticket #249

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

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-04-04 18:49:43 UTC (rev 2282)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java	2007-04-05 13:12:55 UTC (rev 2283)
@@ -177,9 +177,9 @@
 			if (isSymbolTerminator(i)) {
 				isInSymbol = false; // we're at the end of the symbol
 				if (shouldReturnDefault(i))
-					return doGetToken(IRubyColorConstants.RUBY_DEFAULT);
-				return doGetToken(IRubyColorConstants.RUBY_SYMBOL);
+					return doGetToken(IRubyColorConstants.RUBY_DEFAULT);				
 			}
+			return doGetToken(IRubyColorConstants.RUBY_SYMBOL);
 		}
 		// The next two conditionals work around a JRuby parsing bug
 		// JRuby returns the number for ':' on second symbol's beginning in alias calls
@@ -232,6 +232,7 @@
 		case NEWLINE:
 		case COMMA:
 		case Tokens.tASSOC:
+		case Tokens.tRPAREN:
 			return true;
 		default:
 			return false;
@@ -260,7 +261,10 @@
 		case Tokens.tASET:
 		case Tokens.tIDENTIFIER: 
 		case Tokens.tIVAR:
+		case Tokens.tGVAR:
 		case Tokens.tASSOC:
+		case Tokens.tLSHFT:
+		case Tokens.tRPAREN:
 		case COMMA:
 		case NEWLINE:
 			return true;

Modified: trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/ruby/TC_RubyTokenScanner.java
===================================================================
--- trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/ruby/TC_RubyTokenScanner.java	2007-04-04 18:49:43 UTC (rev 2282)
+++ trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/ruby/TC_RubyTokenScanner.java	2007-04-05 13:12:55 UTC (rev 2283)
@@ -209,4 +209,23 @@
 		assertToken(IRubyColorConstants.RUBY_FIXNUM, 27, 2);  // ' 0'
 	}    
 
+	public void testAppendSymbol() {
+		String code = "puts(:<<)";
+		setUpScanner(code);
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 0, 4);  // 'puts'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 4, 1);  // '('
+		assertToken(IRubyColorConstants.RUBY_SYMBOL, 5, 1);  // ':'
+		assertToken(IRubyColorConstants.RUBY_SYMBOL, 6, 2);  // '<<'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 8, 1);  // ')'
+	}    
+	
+	public void testDollarDollarSymbol() {
+		String code = "puts(:$$)";
+		setUpScanner(code);
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 0, 4);  // 'puts'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 4, 1);  // '('
+		assertToken(IRubyColorConstants.RUBY_SYMBOL, 5, 1);  // ':'
+		assertToken(IRubyColorConstants.RUBY_SYMBOL, 6, 2);  // '$$'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 8, 1);  // ')'
+	} 
 }


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