Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2241] trunk/org.rubypeople.rdt.ui
|
From: <caw...@us...> - 2007-03-29 23:19:26
|
Revision: 2241
http://svn.sourceforge.net/rubyeclipse/?rev=2241&view=rev
Author: cawilliams
Date: 2007-03-29 16:19:25 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
ok new fix for Ticket #249 along with test case. also tweaked code to avoid false positive tests (which this particular case presented)
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-03-29 16:08:20 UTC (rev 2240)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java 2007-03-29 23:19:25 UTC (rev 2241)
@@ -154,8 +154,7 @@
return lexerSource.getOffset() + origOffset;
}
- @Override
- public Token getToken(String key) {
+ private Token doGetToken(String key) {
if (key.equals(IRubyColorConstants.RUBY_SINGLE_LINE_COMMENT)) // if we know it's a comment, force it!
return super.getToken(key);
if (isInSymbol)
@@ -174,51 +173,51 @@
|| (i == Tokens.tPLUS) || (i == Tokens.tPIPE) || (i == Tokens.tCARET)
|| (i == Tokens.tLT) || (i == Tokens.tGT) || (i == Tokens.tAMPER)
|| (i == Tokens.tSTAR2) || (i == Tokens.tDIVIDE) || (i == Tokens.tPERCENT)
- || (i == Tokens.tBACK_REF2) || (i == Tokens.tTILDE) || (i == 10) /* Newline */
- || ( i >= 257 && i <= 303) /* keywords */) {
+ || (i == Tokens.tBACK_REF2) || (i == Tokens.tTILDE) || (i == Tokens.tCONSTANT)
+ || (i == 10) /* Newline */ || ( i >= 257 && i <= 303) /* keywords */) {
isInSymbol = false; // we're at the end of the symbol
if (i == 10) // newline ends it and is actually default, not symbol
- return getToken(IRubyColorConstants.RUBY_DEFAULT);
- return getToken(IRubyColorConstants.RUBY_SYMBOL);
+ return doGetToken(IRubyColorConstants.RUBY_DEFAULT);
+ return doGetToken(IRubyColorConstants.RUBY_SYMBOL);
}
if (i == Tokens.tASSOC || i == 44 /* ',' */) {
isInSymbol = false;
- return getToken(IRubyColorConstants.RUBY_DEFAULT);
+ return doGetToken(IRubyColorConstants.RUBY_DEFAULT);
}
}
if (i >= 257 && i <= 303)
- return getToken(IRubyColorConstants.RUBY_KEYWORD);
+ return doGetToken(IRubyColorConstants.RUBY_KEYWORD);
switch (i) {
case Tokens.tSYMBEG:
isInSymbol = true;
- return getToken(IRubyColorConstants.RUBY_SYMBOL);
+ return doGetToken(IRubyColorConstants.RUBY_SYMBOL);
case Tokens.tGVAR:
- return getToken(IRubyColorConstants.RUBY_GLOBAL);
+ return doGetToken(IRubyColorConstants.RUBY_GLOBAL);
case Tokens.tIVAR:
case Tokens.tCVAR: // FIXME Allow for unique coloring of class variables...
- return getToken(IRubyColorConstants.RUBY_INSTANCE_VARIABLE);
+ return doGetToken(IRubyColorConstants.RUBY_INSTANCE_VARIABLE);
case Tokens.tFLOAT:
case Tokens.tINTEGER:
// A character is marked as an integer, lets check for that special case...
if ((((oldOffset - origOffset) + 1) < contents.length()) && (contents.charAt((oldOffset - origOffset) + 1) == '?'))
- return getToken(IRubyColorConstants.RUBY_CHARACTER);
- return getToken(IRubyColorConstants.RUBY_FIXNUM);
+ return doGetToken(IRubyColorConstants.RUBY_CHARACTER);
+ return doGetToken(IRubyColorConstants.RUBY_FIXNUM);
case Tokens.tSTRING_CONTENT:
- return getToken(IRubyColorConstants.RUBY_STRING);
+ return doGetToken(IRubyColorConstants.RUBY_STRING);
case Tokens.tSTRING_BEG:
isInString = true;
- return getToken(IRubyColorConstants.RUBY_STRING);
+ return doGetToken(IRubyColorConstants.RUBY_STRING);
case Tokens.tSTRING_END:
isInString = false;
- return getToken(IRubyColorConstants.RUBY_STRING);
+ return doGetToken(IRubyColorConstants.RUBY_STRING);
case Tokens.tREGEXP_BEG:
isInRegexp = true;
- return getToken(IRubyColorConstants.RUBY_REGEXP);
+ return doGetToken(IRubyColorConstants.RUBY_REGEXP);
case Tokens.tREGEXP_END:
isInRegexp = false;
- return getToken(IRubyColorConstants.RUBY_REGEXP);
+ return doGetToken(IRubyColorConstants.RUBY_REGEXP);
default:
- return getToken(IRubyColorConstants.RUBY_DEFAULT);
+ return doGetToken(IRubyColorConstants.RUBY_DEFAULT);
}
}
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-03-29 16:08:20 UTC (rev 2240)
+++ trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/ruby/TC_RubyTokenScanner.java 2007-03-29 23:19:25 UTC (rev 2241)
@@ -32,7 +32,7 @@
IToken token = fScanner.nextToken();
assertEquals("Offsets don't match", offset, fScanner.getTokenOffset());
assertEquals("Lengths don't match", length, fScanner.getTokenLength());
- assertEquals("Colors don't match", fScanner.getToken(color), token);
+ assertEquals("Colors don't match", fScanner.getToken(color), token); // call getToken so we bypass the scanner's overriding in doGetToken
}
public void testSimpleClassDefinition() {
@@ -146,6 +146,17 @@
assertToken(IRubyColorConstants.RUBY_KEYWORD, 70, 5); // ' self'
}
+ public void testSymbolInsideParentheses() {
+ String code = "Object.const_defined?(:RedCloth)";
+ setUpScanner(code);
+ assertToken(IRubyColorConstants.RUBY_DEFAULT, 0, 6); // 'Object'
+ assertToken(IRubyColorConstants.RUBY_DEFAULT, 6, 1); // '.'
+ assertToken(IRubyColorConstants.RUBY_DEFAULT, 7, 14); // 'const_define?'
+ assertToken(IRubyColorConstants.RUBY_DEFAULT, 21, 1); // '('
+ assertToken(IRubyColorConstants.RUBY_SYMBOL, 22, 1); // ':'
+ assertToken(IRubyColorConstants.RUBY_SYMBOL, 23, 8); // 'RedCloth'
+ assertToken(IRubyColorConstants.RUBY_DEFAULT, 31, 1); // ')'
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
