1) Fixed issue #347: Syntax highlight doesn't like apostrophe in heredoc.

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
index 9ea94bc..606ec56 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPDocumentProvider.java
@@ -36,7 +36,9 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.jobs.ISchedulingRule;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DefaultLineTracker;
 import org.eclipse.jface.text.Document;
@@ -53,7 +55,9 @@ import org.eclipse.jface.text.source.IAnnotationModelListenerExtension;
 import org.eclipse.jface.text.source.IAnnotationPresentation;
 import org.eclipse.jface.text.source.ImageUtilities;
 import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.ListenerList;
+//incastrix
+//import org.eclipse.jface.util.ListenerList;
+import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
@@ -556,7 +560,7 @@ public class PHPDocumentProvider extends TextFileDocumentProvider implements
 
                private Image fImage;
 
-               private boolean fQuickFixImagesInitialized = false;
+               //private boolean fQuickFixImagesInitialized = false;
 
                private int fLayer = IAnnotationAccessExtension.DEFAULT_LAYER;
 
@@ -612,10 +616,10 @@ public class PHPDocumentProvider extends TextFileDocumentProvider implements
                        // }
                }
 
-               private boolean indicateQuixFixableProblems() {
-                       return PreferenceConstants.getPreferenceStore().getBoolean(
-                                       PreferenceConstants.EDITOR_CORRECTION_INDICATION);
-               }
+//             private boolean indicateQuixFixableProblems() {
+//                     return PreferenceConstants.getPreferenceStore().getBoolean(
+//                                     PreferenceConstants.EDITOR_CORRECTION_INDICATION);
+//             }
 
                /*
                 * @see Annotation#paint