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

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

Revision: 2776
          http://svn.sourceforge.net/rubyeclipse/?rev=2776&view=rev
Author:   cawilliams
Date:     2007-07-18 08:37:42 -0700 (Wed, 18 Jul 2007)

Log Message:
-----------
fix looksLikeTertiaryConditional to handle bad offsets

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/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-07-18 15:37:12 UTC (rev 2775)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/RubyTokenScanner.java	2007-07-18 15:37:42 UTC (rev 2776)
@@ -169,8 +169,14 @@
 
 	private boolean looksLikeTertiaryConditionalWithNoSpaces() {
 		if (fTokenLength > 1) return false;
-		char c = fContents.charAt((fOffset - origOffset) - 1);
-		return !Character.isWhitespace(c) && Character.isUnicodeIdentifierPart(c);
+		int index = (fOffset - origOffset) - 1;
+		if (index < 0) return false;
+		try {
+			char c = fContents.charAt(index);
+			return !Character.isWhitespace(c) && Character.isUnicodeIdentifierPart(c);
+		} catch (RuntimeException e) {
+			return false;
+		}
 	}
 
 	private boolean shouldReturnDefault(int i) {


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