rubyeclipse-commit Mailing List for Ruby Development Tool (Page 39)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2272
          http://svn.sourceforge.net/rubyeclipse/?rev=2272&view=rev
Author:   cawilliams
Date:     2007-04-04 07:25:31 -0700 (Wed, 04 Apr 2007)

Log Message:
-----------
add tests for false positive symbols, add fix, also clean up token scanner a bit

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 14:02:18 UTC (rev 2271)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java	2007-04-04 14:25:31 UTC (rev 2272)
@@ -25,6 +25,12 @@
 
 public class RubyTokenScanner extends AbstractRubyTokenScanner {
 
+	private static final int MIN_KEYWORD = 257;
+	private static final int MAX_KEYWORD = 303;
+	private static final int COMMA = 44;
+	private static final int COLON = 58;
+	private static final int NEWLINE = 10;
+
 	protected String[] keywords;
 
 	private static String[] fgTokenProperties = { IRubyColorConstants.RUBY_KEYWORD, IRubyColorConstants.RUBY_DEFAULT, 
@@ -54,6 +60,7 @@
 	private int fSavedLength = -1;
 	private int fSavedOffset = -1;
 	private boolean lastWasComment;
+	private boolean inAlias;
 
 	public RubyTokenScanner(IColorManager manager, IPreferenceStore store) {
 		super(manager, store);
@@ -165,31 +172,29 @@
 		return super.getToken(key);
 	}
 
-	private IToken token(int i) {
+	private IToken token(int i) {		
 		if (isInSymbol) {
-			if ((i == Tokens.tAREF) || (i == Tokens.tASET) || (i == Tokens.tIDENTIFIER) 
-					|| (i == Tokens.tIVAR) || (i == Tokens.tCVAR) || (i == Tokens.tMINUS)
-					|| (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 == Tokens.tCONSTANT) 
-					|| (i == Tokens.tFID) || (i == 10) /* Newline */ 
-					|| ( i >= 257 && i <= 303) /* keywords */) {
+			if (isSymbolTerminator(i)) {
 				isInSymbol = false; // we're at the end of the symbol
-				if (i == 10) // newline ends it and is actually default, not symbol
+				if (shouldReturnDefault(i))
 					return doGetToken(IRubyColorConstants.RUBY_DEFAULT);
 				return doGetToken(IRubyColorConstants.RUBY_SYMBOL);
 			}
-			if (i == Tokens.tASSOC || i == 44 /* ',' */) {
-				isInSymbol = false;
-				return doGetToken(IRubyColorConstants.RUBY_DEFAULT);
-			}
 		}
-		if (i >= 257 && i <= 303)
+		// The next two conditionals work around a JRuby parsing bug
+		// JRuby returns the number for ':' on second symbol's beginning in alias calls
+		if (i == Tokens.kALIAS) {
+			inAlias = true;
+		}
+		if (i == COLON && inAlias) {
+			isInSymbol = true;
+			inAlias = false;
+			return doGetToken(IRubyColorConstants.RUBY_SYMBOL);
+		} // end JRuby parsing hack for alias
+		if (isKeyword(i))
 			return doGetToken(IRubyColorConstants.RUBY_KEYWORD);
 		switch (i) {
-		case Tokens.tSYMBEG:
-		case 58: // ':' FIXME JRuby returns the number for ':' on second symbol's beginning in alias calls
+		case Tokens.tSYMBEG:		
 			isInSymbol = true;
 			return doGetToken(IRubyColorConstants.RUBY_SYMBOL);
 		case Tokens.tGVAR:
@@ -222,6 +227,52 @@
 		}
 	}
 
+	private boolean shouldReturnDefault(int i) {
+		switch (i) {
+		case NEWLINE:
+		case COMMA:
+		case Tokens.tASSOC:
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	private boolean isSymbolTerminator(int i) {
+		if (isKeyword(i)) return true;
+		switch (i) {
+		case Tokens.tAREF:
+		case Tokens.tCVAR:
+		case Tokens.tMINUS:
+		case Tokens.tPLUS:
+		case Tokens.tPIPE:
+		case Tokens.tCARET:
+		case Tokens.tLT:
+		case Tokens.tGT:
+		case Tokens.tAMPER:
+		case Tokens.tSTAR2:
+		case Tokens.tDIVIDE:
+		case Tokens.tPERCENT:
+		case Tokens.tBACK_REF2:
+		case Tokens.tTILDE:
+		case Tokens.tCONSTANT: 
+		case Tokens.tFID:
+		case Tokens.tASET:
+		case Tokens.tIDENTIFIER: 
+		case Tokens.tIVAR:
+		case Tokens.tASSOC:
+		case COMMA:
+		case NEWLINE:
+			return true;
+		default:
+			return false;
+		}
+	}
+
+	private boolean isKeyword(int i) {
+		return (i >= MIN_KEYWORD && i <= MAX_KEYWORD);
+	}
+
 	public void setRange(IDocument document, int offset, int length) {
 		lexer.reset();
 		lexer.setState(LexState.EXPR_BEG);

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 14:02:18 UTC (rev 2271)
+++ trunk/org.rubypeople.rdt.ui.tests/src/org/rubypeople/rdt/internal/ui/text/ruby/TC_RubyTokenScanner.java	2007-04-04 14:25:31 UTC (rev 2272)
@@ -179,6 +179,34 @@
 		assertToken(IRubyColorConstants.RUBY_SYMBOL, 20, 10);  // 'repository'
 		assertToken(IRubyColorConstants.RUBY_DEFAULT, 30, 1);  // ']'
 	}
+	
+	public void testTertiaryConditional() {
+		String code = "multiparameter_name = true ? value.method : value";
+		setUpScanner(code);
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 0, 19);  // 'multiparameter_name'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 19, 2);  // ' ='
+		assertToken(IRubyColorConstants.RUBY_KEYWORD, 21, 5);  // ' true'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 26, 2);  // ' ?'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 28, 6);  // ' value'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 34, 1);  // '.'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 35, 6);  // 'method'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 41, 2);  // ' :'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 43, 6);  // ' value'
+	}    
+	
+	public void testWhen() {
+		String code = "case value\n" +
+					"when FalseClass: 0\n" +
+					"else value\n" +
+					"end";
+		setUpScanner(code);
+		assertToken(IRubyColorConstants.RUBY_KEYWORD, 0, 4);  // 'case'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 4, 6);  // ' value'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 10, 1);  // '\n'
+		assertToken(IRubyColorConstants.RUBY_KEYWORD, 11, 4);  // 'when'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 15, 11);  // ' FalseClass'
+		assertToken(IRubyColorConstants.RUBY_DEFAULT, 26, 1);  // ':'
+		assertToken(IRubyColorConstants.RUBY_FIXNUM, 27, 2);  // ' 0'
+	}    
 
-    
 }


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




2005	Jan	Feb	Mar (41)	Apr (9)	May	Jun	Jul (39)	Aug (38)	Sep (135)	Oct (220)	Nov (75)	Dec (74)
2006	Jan (44)	Feb (160)	Mar (49)	Apr (69)	May (40)	Jun (52)	Jul (47)	Aug (51)	Sep (19)	Oct (22)	Nov (36)	Dec (76)
2007	Jan (154)	Feb (165)	Mar (186)	Apr (143)	May (175)	Jun (133)	Jul (203)	Aug (177)	Sep (136)	Oct	Nov	Dec

rubyeclipse-commit Mailing List for Ruby Development Tool (Page 39)

rubyeclipse-commit — Every CVS commit creates a post to this list.