Fixed bugs item #1240435

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / php / PHPCodeScanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
index 8a50ffd..9ad50d5 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCodeScanner.java
@@ -22,8 +22,6 @@ import net.sourceforge.phpeclipse.phpeditor.util.PHPWhitespaceDetector;
 import net.sourceforge.phpeclipse.phpeditor.util.PHPWordDetector;
 
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.rules.EndOfLineRule;
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
@@ -37,7 +35,7 @@ import org.eclipse.jface.text.rules.WordRule;
  * PHP Code Scanner
  */
 public class PHPCodeScanner extends AbstractJavaScanner {
-  
+
   /**
    * Rule to detect java operators.
    * 
@@ -161,42 +159,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
     }
   }
 
-  protected class SingleQuoteStringRule implements IRule {
-
-    /** Token to return for this rule */
-    private final IToken fToken;
-
-    public SingleQuoteStringRule(IToken token) {
-      fToken = token;
-
-    }
-
-    /*
-     * @see org.eclipse.jface.text.rules.IRule#evaluate(org.eclipse.jface.text.rules.ICharacterScanner)
-     */
-    public IToken evaluate(ICharacterScanner scanner) {
-
-      int character = scanner.read();
 
-      if (character=='\'') {
-       
-        while (true) {
-          character = scanner.read();
-          if (character == '\\') {
-            character = scanner.read();
-          } else if (character == '\'') {
-            return fToken;
-          }
-        } 
-        
-      } else {
-        scanner.unread();
-        return Token.UNDEFINED;
-      }
-    }
-
-  }
-  
   protected class AccentStringRule implements IRule {
 
     /** Token to return for this rule */
@@ -214,53 +177,18 @@ public class PHPCodeScanner extends AbstractJavaScanner {
 
       int character = scanner.read();
 
-      if (character=='`') {
-       
-        while (true) {
+      if (character == '`') {
+
+        while (character != ICharacterScanner.EOF) {
           character = scanner.read();
           if (character == '\\') {
             character = scanner.read();
           } else if (character == '`') {
             return fToken;
           }
-        } 
-        
-      } else {
+        }
         scanner.unread();
         return Token.UNDEFINED;
-      }
-    }
-
-  }
-  
-  protected class DoubleQuoteStringRule implements IRule {
-
-    /** Token to return for this rule */
-    private final IToken fToken;
-
-    public DoubleQuoteStringRule(IToken token) {
-      fToken = token;
-
-    }
-
-    /*
-     * @see org.eclipse.jface.text.rules.IRule#evaluate(org.eclipse.jface.text.rules.ICharacterScanner)
-     */
-    public IToken evaluate(ICharacterScanner scanner) {
-
-      int character = scanner.read();
-
-      if (character=='"') {
-       
-        while (true) {
-          character = scanner.read();
-          if (character == '\\') {
-            character = scanner.read();
-          } else if (character == '"') {
-            return fToken;
-          }
-        } 
-        
       } else {
         scanner.unread();
         return Token.UNDEFINED;
@@ -268,7 +196,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
     }
 
   }
-  
+
   private class PHPWordRule extends WordRule {
     private StringBuffer fBuffer = new StringBuffer();
 
@@ -283,6 +211,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
     public IToken evaluate(ICharacterScanner scanner) {
       int c = scanner.read();
       boolean isVariable = false;
+      boolean isUnderscore = false;
       if (c == '<') {
         c = scanner.read();
         if (c != '?') {
@@ -291,7 +220,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
           return Token.UNDEFINED;
         } else {
           c = scanner.read();
-          if (c == '=') {  // <?=
+          if (c == '=') { // <?=
             return getToken(IPreferenceConstants.PHP_TAG);
           }
           if (c != 'p' && c != 'P') {
@@ -333,13 +262,21 @@ public class PHPCodeScanner extends AbstractJavaScanner {
         if (fColumn == UNDEFINED || (fColumn == scanner.getColumn() - 1)) {
 
           fBuffer.setLength(0);
-          do {
-            fBuffer.append((char) c);
+          fBuffer.append((char) c);
+          c = scanner.read();
+          if (c == '_') {
+            isUnderscore = true;
+          }
+          while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c)) {
+               fBuffer.append((char) c);
             c = scanner.read();
-          } while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c));
+          }
           scanner.unread();
 
           if (isVariable) {
+               if (isUnderscore) {
+                       return getToken(IPreferenceConstants.PHP_VARIABLE_DOLLAR);
+               }
             return getToken(IPreferenceConstants.PHP_VARIABLE);
           }
           IToken token = (IToken) fWords.get(fBuffer.toString());
@@ -367,6 +304,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
       IPreferenceConstants.PHP_KEYWORD,
       IPreferenceConstants.PHP_FUNCTIONNAME,
       IPreferenceConstants.PHP_VARIABLE,
+      IPreferenceConstants.PHP_VARIABLE_DOLLAR,
       IPreferenceConstants.PHP_STRING_DQ,
       IPreferenceConstants.PHP_STRING_SQ,
       IPreferenceConstants.PHP_TYPE,
@@ -399,13 +337,13 @@ public class PHPCodeScanner extends AbstractJavaScanner {
     List rules = new ArrayList();
     Token token = getToken(IPreferenceConstants.PHP_SINGLELINE_COMMENT);
     // Add rule for single line comments.
-    rules.add(new EndOfLineRule("//", token)); //$NON-NLS-1$
-    rules.add(new EndOfLineRule("#", token)); //$NON-NLS-1$
+    //    rules.add(new EndOfLineRule("//", token)); //$NON-NLS-1$
+    //    rules.add(new EndOfLineRule("#", token)); //$NON-NLS-1$
     // Add rule for strings and character constants.
-//    token = getToken(IPreferenceConstants.PHP_STRING_SQ);
-//    rules.add(new SingleQuoteStringRule(token));
-//    token = getToken(IPreferenceConstants.PHP_STRING_DQ);
-//    rules.add(new DoubleQuoteStringRule(token));
+    //    token = getToken(IPreferenceConstants.PHP_STRING_SQ);
+    //    rules.add(new SingleQuoteStringRule(token));
+    //    token = getToken(IPreferenceConstants.PHP_STRING_DQ);
+    //    rules.add(new DoubleQuoteStringRule(token));
     rules.add(new AccentStringRule(token));
 
     token = getToken(IPreferenceConstants.PHP_MULTILINE_COMMENT);