X-Git-Url: http://secure.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 9ba7e1a..fbef0f3 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -31,7 +31,7 @@ import test.PHPParserSuperclass;
 import test.PHPParserManager;
 
 /**
- * Class that defines the action for parsing the current PHP file
+ * ClassDeclaration that defines the action for parsing the current PHP file
  */
 public class PHPParserAction extends TextEditorAction {
 
@@ -58,43 +58,53 @@ public class PHPParserAction extends TextEditorAction {
    */
   public void run() {
     boolean phpFlag = false;
-    try {
+		
+  //  try {
       fileToParse = getPHPFile();
-      if (fileToParse == null) {
-        // should never happen
-        System.err.println("Error : no file in the editor");
-        // should throw an exception
-        return;
-      }
-      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 {
-          PHPParserSuperclass.phpExternalParse(fileToParse);
-        }
-      }
-    } catch (CoreException e) {
-    }
-
+			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) {
+			}
+
+		}
   /**
    * Finds the file that's currently opened in the PHP Text Editor
    */
@@ -138,7 +148,7 @@ public class PHPParserAction extends TextEditorAction {
   //    identifier.append((char) c);
   //    try {
   //      while ((c = iStream.read()) != (-1)) {
-  //        if (Character.isJavaIdentifierPart((char) c)) {
+  //        if (Scanner.isPHPIdentifierPart((char) c)) {
   //          identifier.append((char) c);
   //          //        } else if ((i == 0) && (c == '$')) {
   //          //          identifier.append((char)c);
@@ -152,7 +162,7 @@ public class PHPParserAction extends TextEditorAction {
   //    return identifier.toString();
   //  }
 
-  protected void parse(InputStream iStream) {
+  protected static void parse(IFile fileToParse, InputStream iStream) {
 
     StringBuffer buf = new StringBuffer();
     int c0;