fixed accelerator problem; slightly improved PHP Perspective

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPParserAction.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
index 37fae97..e9376f5 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -18,6 +18,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.phpeditor.phpparser.PHPParser;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.CoreException;
@@ -33,6 +35,7 @@ import org.eclipse.ui.texteditor.TextEditorAction;
 public class PHPParserAction extends TextEditorAction {
 
   private static PHPParserAction instance = new PHPParserAction();
+  private static String[] EXTENSIONS = { ".php", ".php3", ".php4", ".inc", ".phtml" };
 
   protected IFile fileToParse;
   protected List fVariables = new ArrayList(100);
@@ -53,6 +56,7 @@ public class PHPParserAction extends TextEditorAction {
    * Code called when the action is fired.
    */
   public void run() {
+    boolean phpFlag = false;
     try {
       fileToParse = getPHPFile();
       if (fileToParse == null) {
@@ -61,22 +65,30 @@ public class PHPParserAction extends TextEditorAction {
         // should throw an exception
         return;
       }
-      IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-      if (store.getBoolean(PHPeclipsePlugin.PHP_PARSER_DEFAULT)) {
-        // first delete all the previous markers
-        fileToParse.deleteMarkers(IMarker.PROBLEM, false, 0);
-
-        try {
-          InputStream iStream = fileToParse.getContents();
-          //        int c = iStream.read();
-          parse(iStream);
-          iStream.close();
-        } catch (IOException e) {
+      String name = fileToParse.getName();
+      for (int i = 0; i<EXTENSIONS.length; i++) {
+        if (name.endsWith(EXTENSIONS[i])) {
+          phpFlag = true;  // php file extension
+          break;
+        }
+      }
+      if (phpFlag) {
+        IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
+        if (store.getString(PHPeclipsePlugin.PHP_PARSER_DEFAULT).equals(PHPeclipsePlugin.PHP_INTERNAL_PARSER)) {
+          // first delete all the previous markers
+          fileToParse.deleteMarkers(IMarker.PROBLEM, false, 0);
+
+          try {
+            InputStream iStream = fileToParse.getContents();
+            //        int c = iStream.read();
+            parse(iStream);
+            iStream.close();
+          } catch (IOException e) {
+          }
+        } else {
+          PHPParser.phpExternalParse(fileToParse);
         }
-      } else {
-        PHPParser.phpExternalParse(fileToParse);
       }
-
     } catch (CoreException e) {
     }
 
@@ -153,6 +165,9 @@ public class PHPParserAction extends TextEditorAction {
     String input = buf.toString();
 
     PHPParser parser = new PHPParser(fileToParse);
-    parser.htmlParse(input);
+    try {
+      parser.parse(input);
+    } catch (CoreException e) {
+    }
   }
 }
\ No newline at end of file