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

[phpeclipse.git] / net.sourceforge.phpeclipse.ui / src / net / sourceforge / phpdt / ui / text / JavaTextTools.java

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
index 134da15..4431f9d 100644 (file)
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
@@ -25,8 +25,9 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
+//import org.eclipse.jface.text.rules.DefaultPartitioner;
+import org.eclipse.jface.text.rules.FastPartitioner;
+//import org.eclipse.jface.text.rules.RuleBasedScanner;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
@@ -297,9 +298,9 @@ public class JavaTextTools implements IPHPPartitions {
         * 
         * @return a Java source code scanner
         */
-       public RuleBasedScanner getCodeScanner() {
-               return fCodeScanner;
-       }
+//     public RuleBasedScanner getCodeScanner() {
+//             return fCodeScanner;
+//     }
 
        /**
         * Returns a scanner which is configured to scan Java multiline comments.
@@ -308,9 +309,9 @@ public class JavaTextTools implements IPHPPartitions {
         * 
         * @since 2.0
         */
-       public RuleBasedScanner getMultilineCommentScanner() {
-               return fMultilineCommentScanner;
-       }
+//     public RuleBasedScanner getMultilineCommentScanner() {
+//             return fMultilineCommentScanner;
+//     }
 
        /**
         * Returns a scanner which is configured to scan HTML code.
@@ -329,9 +330,9 @@ public class JavaTextTools implements IPHPPartitions {
         * 
         * @since 2.0
         */
-       public RuleBasedScanner getSmartyScanner() {
-               return fSmartyScanner;
-       }
+//     public RuleBasedScanner getSmartyScanner() {
+//             return fSmartyScanner;
+//     }
 
        /**
         * Returns a scanner which is configured to scan Smarty code.
@@ -340,9 +341,9 @@ public class JavaTextTools implements IPHPPartitions {
         * 
         * @since 2.0
         */
-       public RuleBasedScanner getSmartyDocScanner() {
-               return fSmartyDocScanner;
-       }
+//     public RuleBasedScanner getSmartyDocScanner() {
+//             return fSmartyDocScanner;
+//     }
 
        /**
         * Returns a scanner which is configured to scan Java singleline comments.
@@ -351,9 +352,9 @@ public class JavaTextTools implements IPHPPartitions {
         * 
         * @since 2.0
         */
-       public RuleBasedScanner getSinglelineCommentScanner() {
-               return fSinglelineCommentScanner;
-       }
+//     public RuleBasedScanner getSinglelineCommentScanner() {
+//             return fSinglelineCommentScanner;
+//     }
 
        /**
         * Returns a scanner which is configured to scan Java strings.
@@ -372,9 +373,9 @@ public class JavaTextTools implements IPHPPartitions {
         * 
         * @return a JavaDoc scanner
         */
-       public RuleBasedScanner getJavaDocScanner() {
-               return fPHPDocScanner;
-       }
+//     public RuleBasedScanner getJavaDocScanner() {
+//             return fPHPDocScanner;
+//     }
 
        /**
         * Returns a scanner which is configured to scan Java-specific partitions,
@@ -503,9 +504,9 @@ public class JavaTextTools implements IPHPPartitions {
         * @return the partition managing position categories or <code>null</code>
         *         if there is none
         */
-       public String[] getPartitionManagingPositionCategories() {
-               return new String[] { DefaultPartitioner.CONTENT_TYPES_CATEGORY };
-       }
+//     public String[] getPartitionManagingPositionCategories() {
+//             return new String[] { DefaultPartitioner.CONTENT_TYPES_CATEGORY };
+//     }
 
        /**
         * Determines whether the preference change encoded by the given event
@@ -580,7 +581,7 @@ public class JavaTextTools implements IPHPPartitions {
         */
        public IDocumentPartitioner createPHPPartitioner() {
                // return new DefaultPartitioner(getPHPPartitionScanner(), TYPES);
-               return new DefaultPartitioner(getPHPPartitionScanner(),
+               return new /*DefaultPartitioner*/FastPartitioner(getPHPPartitionScanner(),
                                LEGAL_CONTENT_TYPES);
        }
 
@@ -597,7 +598,7 @@ public class JavaTextTools implements IPHPPartitions {
        // return jspScriptScanner;
        // }
        private IDocumentPartitioner createSmartyPartitioner() {
-               return new DefaultPartitioner(getSmartyPartitionScanner(),
+               return new /*DefaultPartitioner*/FastPartitioner(getSmartyPartitionScanner(),
                                XMLTextTools.TYPES);
        }
 
@@ -730,7 +731,7 @@ public class JavaTextTools implements IPHPPartitions {
         * @return the core preference store
         * @since 3.0
         */
-       protected Preferences getCorePreferenceStore() {
-               return fCorePreferenceStore;
-       }
+//     protected Preferences getCorePreferenceStore() {
+//             return fCorePreferenceStore;
+//     }
 }
\ No newline at end of file