misc parser changes

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
index b0ba0b8..de0473e 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPCompletionProcessor.java
@@ -224,8 +224,8 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
           case ITerminalSymbols.TokenNameMINUS_GREATER :
             // dereferencing operator '->' found
             lastSignificantToken = ITerminalSymbols.TokenNameMINUS_GREATER;
-            if (beforeLastToken == ITerminalSymbols.TokenNamethis) {
-              lastSignificantToken = ITerminalSymbols.TokenNamethis;
+            if (beforeLastToken == ITerminalSymbols.TokenNameVariable) {
+              lastSignificantToken = ITerminalSymbols.TokenNameVariable;
             }
             break;
           case ITerminalSymbols.TokenNamenew :
@@ -270,7 +270,7 @@ public class PHPCompletionProcessor implements IContentAssistProcessor {
     int lastSignificantToken = getLastToken(viewer, offset, context);
     boolean useClassMembers =
       (lastSignificantToken == ITerminalSymbols.TokenNameMINUS_GREATER) || 
-      (lastSignificantToken == ITerminalSymbols.TokenNamethis) ||
+      (lastSignificantToken == ITerminalSymbols.TokenNameVariable) ||
                  (lastSignificantToken == ITerminalSymbols.TokenNamenew);
     boolean emptyPrefix = prefix == null || prefix.equals("");