improved PHP parser

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / ui / text / spelling / SpellReconcileStrategy.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/spelling/SpellReconcileStrategy.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/spelling/SpellReconcileStrategy.java
index b77b767..81d4b19 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/spelling/SpellReconcileStrategy.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/spelling/SpellReconcileStrategy.java
@@ -17,11 +17,13 @@ import java.util.Locale;
 import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.ui.PHPUIMessages;
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellCheckEngine;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellCheckPreferenceKeys;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellChecker;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellEvent;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellEventListener;
+import net.sourceforge.phpeclipse.phpeditor.php.PHPDocumentPartitioner;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -80,7 +82,7 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#getArguments()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#getArguments()
                 */
                public String[] getArguments() {
 
@@ -101,14 +103,14 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#getID()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#getID()
                 */
                public int getID() {
                        return Spelling;
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#getMessage()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#getMessage()
                 */
                public String getMessage() {
 
@@ -119,28 +121,28 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#getOriginatingFileName()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#getOriginatingFileName()
                 */
                public char[] getOriginatingFileName() {
                        return fEditor.getEditorInput().getName().toCharArray();
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#getSourceEnd()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#getSourceEnd()
                 */
                public final int getSourceEnd() {
                        return fEnd;
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#getSourceLineNumber()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#getSourceLineNumber()
                 */
                public final int getSourceLineNumber() {
                        return fLine;
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#getSourceStart()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#getSourceStart()
                 */
                public final int getSourceStart() {
                        return fStart;
@@ -157,7 +159,7 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#isError()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#isError()
                 */
                public final boolean isError() {
                        return false;
@@ -174,7 +176,7 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#isWarning()
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#isWarning()
                 */
                public final boolean isWarning() {
                        return true;
@@ -203,28 +205,28 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#setSourceEnd(int)
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#setSourceEnd(int)
                 */
                public final void setSourceEnd(final int end) {
                        fEnd= end;
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#setSourceLineNumber(int)
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#setSourceLineNumber(int)
                 */
                public final void setSourceLineNumber(final int line) {
                        fLine= line;
                }
 
                /*
-                * @see org.eclipse.jdt.core.compiler.IProblem#setSourceStart(int)
+                * @see net.sourceforge.phpdt.core.compiler.IProblem#setSourceStart(int)
                 */
                public final void setSourceStart(final int start) {
                        fStart= start;
                }
        }
 
-       /** The document to operate on */
+       /** The document to operate on */ 
        private IDocument fDocument= null;
 
        /** The text editor to operate on */
@@ -257,7 +259,7 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                fPartitioning= partitioning;
                fPreferences= store;
 
-               updateProblemRequestor();
+               updateProblemRequestor(); 
        }
 
        /**
@@ -278,7 +280,7 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
        }
 
        /*
-        * @see org.eclipse.jdt.internal.ui.text.spelling.engine.ISpellEventListener#handle(org.eclipse.jdt.internal.ui.text.spelling.engine.ISpellEvent)
+        * @see net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellEventListener#handle(net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellEvent)
         */
        public void handle(final ISpellEvent event) {
                
@@ -338,7 +340,8 @@ public class SpellReconcileStrategy implements IReconcilingStrategy, IReconcilin
                                                
                                                for (int index= 0; index < partitions.length; index++) {
                                                        partition= partitions[index];
-                                                       if (!partition.getType().equals(IDocument.DEFAULT_CONTENT_TYPE))
+                                                       if (!partition.getType().equals(IDocument.DEFAULT_CONTENT_TYPE) &&
+                                                           !partition.getType().equals(PHPDocumentPartitioner.PHP_SCRIPT_CODE))
                                                                checker.execute(new SpellCheckIterator(fDocument, partition, locale));
                                                }