1) Fixed issue #764: Ignore strings when looking for single line comments.

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSyntaxRdr.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSyntaxRdr.java
index bea41d8..421eaf9 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSyntaxRdr.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSyntaxRdr.java
@@ -68,7 +68,7 @@ public class PHPSyntaxRdr {
 
        private static IPreferenceStore store;
 
-       private static boolean hasXMLFileBeenRead = true;
+       //private static boolean hasXMLFileBeenRead = true;
 
        // The following variable is used to hold the syntax from
        // the suers custom file - if that file should be changed,
@@ -86,29 +86,29 @@ public class PHPSyntaxRdr {
 
        public static void readInSyntax() {
                try {
-                       hasXMLFileBeenRead = true;
+//                     hasXMLFileBeenRead = true;
                        /*
                         * Attempt to read the syntax file from the metadata if this does
                         * not work, create metadata from default
                         */
-                       File syntaxFile = getSyntaxFile();
+                       /*File syntaxFile = getSyntaxFile();
                        if (syntaxFile.exists()) {
                                readFromFile(syntaxFile);
-                       } else {
+                       } else {*/
                                readFromStream(PHPSyntaxRdr.class
                                                .getResourceAsStream(PHPSYNTAX_FILE));
-                               saveToFile(syntaxFile);
-                       }
+                               //saveToFile(syntaxFile);
+                       /*}*/
                        /* Read the user-defined syntax file if it exists */
                        // String buffer = new
                        // String(store.getString(PHPeclipsePlugin.PHP_USERDEF_XMLFILE));
-                       if (store == null)
+                       /*if (store == null)
                                store = PHPeclipsePlugin.getDefault().getPreferenceStore();
                        String buffer = new String(store
                                        .getString(IPreferenceConstants.PHP_USERDEF_XMLFILE));
                        if (!(buffer.equals("") || buffer == null)) {
                                readFromFile(buffer);
-                       }
+                       }*/
                } catch (CoreException ce) {
                        ce.printStackTrace();
                }