Cleaned up PHP Prefs (Code Assist, Typing)

[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 1fdfc76..ee74a43 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -21,6 +21,7 @@ import java.util.List;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
 import net.sourceforge.phpdt.internal.core.builder.PHPBuilder;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.actions.ExternalPHPParser;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
@@ -30,8 +31,7 @@ import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.TextEditorAction;
 
-import test.PHPParserManager;
-import test.PHPParserSuperclass;
+//import test.PHPParserManager;
 
 /**
  * ClassDeclaration that defines the action for parsing the current PHP file
@@ -39,7 +39,7 @@ import test.PHPParserSuperclass;
 public class PHPParserAction extends TextEditorAction {
 
   private static PHPParserAction instance = new PHPParserAction();
-  private static String[] EXTENSIONS = { ".php", ".php3", ".php4", ".inc", ".phtml" };
+  private static String[] EXTENSIONS = { ".php", ".php3", ".php4", ".php5", ".inc", ".phtml" };
 
   protected IFile fileToParse;
   protected List fVariables = new ArrayList(100);
@@ -87,26 +87,14 @@ public class PHPParserAction extends TextEditorAction {
       }
       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);
-//          
-//          //the tasks are removed here
-//          fileToParse.deleteMarkers(IMarker.TASK, false, 0);
-                                       PHPBuilder.removeProblemsAndTasksFor(fileToParse);
-          //                    try {
-          //                      InputStream iStream = fileToParse.getContents();
-          parse(fileToParse); //, iStream);
-          //                      iStream.close();
-          //                    } catch (IOException e) {
-          //                    }
-        } else {
-          PHPParserSuperclass.phpExternalParse(fileToParse);
-        }
+//        if (store.getString(PHPeclipsePlugin.PHP_PARSER_DEFAULT).equals(PHPeclipsePlugin.PHP_INTERNAL_PARSER)) {
+//          PHPBuilder.removeProblemsAndTasksFor(fileToParse);
+//          parse(fileToParse); //, iStream);
+//        } else {
+          ExternalPHPParser parser = new ExternalPHPParser(fileToParse);
+          parser.phpExternalParse();
+//        }
       }
-//    } catch (CoreException e) {
-//    }
-
   }
   /**
    * Finds the file that's currently opened in the PHP Text Editor
@@ -126,65 +114,17 @@ public class PHPParserAction extends TextEditorAction {
     return null;
   }
 
-  /**
-   * Create marker for the parse error
-   */
-  //  protected void setMarker(String message, int lineNumber) throws CoreException {
-  //
-  //    Hashtable attributes = new Hashtable();
-  //    MarkerUtilities.setMessage(attributes, message);
-  //    if (message.startsWith(ERROR))
-  //      attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
-  //    else if (message.startsWith(WARNING))
-  //      attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_WARNING));
-  //    else
-  //      attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
-  //    MarkerUtilities.setLineNumber(attributes, lineNumber);
-  //    MarkerUtilities.createMarker(fileToParse, attributes, IMarker.PROBLEM);
-  //  }
-
-  //  private String getIdentifier(InputStream iStream, int c) {
-  //    //    int i = 0;
-  //    // char c;
-  //    //  int textLength = text.length();
-  //    StringBuffer identifier = new StringBuffer();
-  //    identifier.append((char) c);
-  //    try {
-  //      while ((c = iStream.read()) != (-1)) {
-  //        if (Scanner.isPHPIdentifierPart((char) c)) {
-  //          identifier.append((char) c);
-  //          //        } else if ((i == 0) && (c == '$')) {
-  //          //          identifier.append((char)c);
-  //        } else {
-  //          return identifier.toString();
-  //        }
-  //        //        i++;
-  //      }
-  //    } catch (IOException e) {
-  //    }
-  //    return identifier.toString();
-  //  }
+  
 
+  
   protected static void parse(IFile fileToParse) {
-
-    //    StringBuffer buf = new StringBuffer();
-    //    int c0;
-    //    try {
-    //      while ((c0 = iStream.read()) != (-1)) {
-    //        buf.append((char) c0);
-    //      }
-    //    } catch (IOException e) {
-    //      return;
-    //    }
-    //    String input = buf.toString();
-
     InputStream stream = null;
     char[] charArray;
     try {
       stream = new BufferedInputStream(fileToParse.getContents());
       charArray = Util.getInputStreamAsCharArray(stream, -1, null);
-      PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse);
-      parser.parse(new String(charArray));
+      ExternalPHPParser parser = new ExternalPHPParser(fileToParse);
+      parser.phpExternalParse();
     } catch (CoreException e) {
     } catch (IOException e) {
     } finally {