misc preferences improvements

[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 f5cbca0..940d68b 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -12,23 +12,26 @@ Contributors:
     Klaus Hartlage - www.eclipseproject.de
 **********************************************************************/
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 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.resources.IMarker;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.TextEditorAction;
-import test.PHPParserSuperclass;
-import test.PHPParserManager;
+
+//import test.PHPParserManager;
 
 /**
  * ClassDeclaration that defines the action for parsing the current PHP file
@@ -66,14 +69,15 @@ public class PHPParserAction extends TextEditorAction {
 
   public static void parseFile(IFile fileToParse) {
     boolean phpFlag = false;
-    try {
+//    try {
 
       if (fileToParse == null) {
-        // should never happen
+        // TODO should never happen => should throw an exception
         System.err.println("Error : no file in the editor");
-        // should throw an exception
+
         return;
       }
+      // TODO use isPHPFile()
       String name = fileToParse.getName().toLowerCase();
       for (int i = 0; i < EXTENSIONS.length; i++) {
         if (name.endsWith(EXTENSIONS[i])) {
@@ -83,27 +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);
-
-          try {
-            InputStream iStream = fileToParse.getContents();
-            //        int c = iStream.read();
-            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
@@ -123,62 +114,26 @@ 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, InputStream iStream) {
-
-    StringBuffer buf = new StringBuffer();
-    int c0;
-    try {
-      while ((c0 = iStream.read()) != (-1)) {
-        buf.append((char) c0);
-      }
-    } catch (IOException e) {
-      return;
-    }
-    String input = buf.toString();
+  
 
-    PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse);
+  
+  protected static void parse(IFile fileToParse) {
+    InputStream stream = null;
+    char[] charArray;
     try {
-      parser.parse(input);
+      stream = new BufferedInputStream(fileToParse.getContents());
+      charArray = Util.getInputStreamAsCharArray(stream, -1, null);
+      ExternalPHPParser parser = new ExternalPHPParser(fileToParse);
+      parser.phpExternalParse();
     } catch (CoreException e) {
+    } catch (IOException e) {
+    } finally {
+      try {
+       if (stream!=null) {
+          stream.close();
+       }
+      } catch (IOException e) {
+      }
     }
   }
 }
\ No newline at end of file