X-Git-Url: http://git.phpeclipse.com

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 fbef0f3..8134b38 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -12,12 +12,15 @@ 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.phpeclipse.PHPeclipsePlugin;
+import net.sourceforge.phpeclipse.builder.PHPBuilder;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -27,8 +30,9 @@ 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.PHPParserSuperclass;
 
 /**
  * ClassDeclaration that defines the action for parsing the current PHP file
@@ -58,53 +62,53 @@ public class PHPParserAction extends TextEditorAction {
    */
   public void run() {
     boolean phpFlag = false;
-		
-  //  try {
-      fileToParse = getPHPFile();
-			parseFile(fileToParse);
+
+    //  try {
+    fileToParse = getPHPFile();
+    parseFile(fileToParse);
   }
 
-	public static void parseFile(IFile fileToParse) {
-			boolean phpFlag = false;
-			try {
-				
-				if (fileToParse == null) {
-					// should never happen
-					System.err.println("Error : no file in the editor");
-					// should throw an exception
-					return;
-				}
-				String name = fileToParse.getName().toLowerCase();
-				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);
-
-						//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);
-					}
-				}
-			} catch (CoreException e) {
-			}
-
-		}
+  public static void parseFile(IFile fileToParse) {
+    boolean phpFlag = false;
+//    try {
+
+      if (fileToParse == null) {
+        // TODO should never happen => should throw an exception
+        System.err.println("Error : no file in the editor");
+
+        return;
+      }
+      // TODO use isPHPFile()
+      String name = fileToParse.getName().toLowerCase();
+      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);
+//          
+//          //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);
+        }
+      }
+//    } catch (CoreException e) {
+//    }
+
+  }
   /**
    * Finds the file that's currently opened in the PHP Text Editor
    */
@@ -162,23 +166,35 @@ public class PHPParserAction extends TextEditorAction {
   //    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) {
+
+    //    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 {
-      parser.parse(input);
+      stream = new BufferedInputStream(fileToParse.getContents());
+      charArray = Util.getInputStreamAsCharArray(stream, -1, null);
+      PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse);
+      parser.parse(new String(charArray));
     } catch (CoreException e) {
+    } catch (IOException e) {
+    } finally {
+      try {
+      	if (stream!=null) {
+          stream.close();
+      	}
+      } catch (IOException e) {
+      }
     }
   }
 }
\ No newline at end of file