avoid NPE in BrowserView

[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 1b74a75..0e657f7 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
@@ -133,18 +133,18 @@ public class PHPCodeScanner extends AbstractJavaScanner {
           return Token.UNDEFINED;
         } else {
           c = scanner.read();
-          if (c != 'p') {
+          if (c != 'p' && c != 'P') {
             scanner.unread();
             return getToken(IPreferenceConstants.PHP_TAG);
           } else {
             c = scanner.read();
-            if (c != 'h') {
+            if (c != 'h' && c != 'H') {
               scanner.unread();
               scanner.unread();
               return getToken(IPreferenceConstants.PHP_TAG);
             } else {
               c = scanner.read();
-              if (c != 'p') {
+              if (c != 'p' && c != 'P') {
                 scanner.unread();
                 scanner.unread();
                 scanner.unread();
@@ -433,6 +433,7 @@ public class PHPCodeScanner extends AbstractJavaScanner {
        
     rules.add(wordRule);
     
+    setDefaultReturnToken(getToken(IPreferenceConstants.PHP_DEFAULT));
     return rules;
   }
 }