X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
index 401ca2c..5ecde70 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
@@ -18,6 +18,7 @@ import net.sourceforge.phpdt.internal.ui.text.ContentAssistPreference;
 import net.sourceforge.phpdt.internal.ui.text.HTMLTextPresenter;
 import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 import net.sourceforge.phpdt.internal.ui.text.JavaAnnotationHover;
+import net.sourceforge.phpdt.internal.ui.text.JavaCompositeReconcilingStrategy;
 import net.sourceforge.phpdt.internal.ui.text.JavaElementProvider;
 import net.sourceforge.phpdt.internal.ui.text.JavaOutlineInformationControl;
 import net.sourceforge.phpdt.internal.ui.text.JavaPresentationReconciler;
@@ -307,16 +308,34 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
 	/*
 	 * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
 	 */
+	/*
+	 * @see SourceViewerConfiguration#getReconciler(ISourceViewer)
+	 */
 	public IReconciler getReconciler(ISourceViewer sourceViewer) {
-		if (getEditor() != null && getEditor().isEditable()) {
-			JavaReconciler reconciler = new JavaReconciler(getEditor(),
-					new JavaReconcilingStrategy(getEditor()), false);
+
+		final ITextEditor editor= getEditor();
+		if (editor != null && editor.isEditable()) {
+			
+			JavaCompositeReconcilingStrategy strategy= new JavaCompositeReconcilingStrategy(editor, getConfiguredDocumentPartitioning(sourceViewer));
+			JavaReconciler reconciler= new JavaReconciler(editor, strategy, false);
+			reconciler.setIsIncrementalReconciler(false);
 			reconciler.setProgressMonitor(new NullProgressMonitor());
 			reconciler.setDelay(500);
+
 			return reconciler;
 		}
 		return null;
 	}
+//	public IReconciler getReconciler(ISourceViewer sourceViewer) {
+//		if (getEditor() != null && getEditor().isEditable()) {
+//			JavaReconciler reconciler = new JavaReconciler(getEditor(),
+//					new JavaReconcilingStrategy(getEditor()), false);
+//			reconciler.setProgressMonitor(new NullProgressMonitor());
+//			reconciler.setDelay(500);
+//			return reconciler;
+//		}
+//		return null;
+//	}
 	/*
 	 * @see SourceViewerConfiguration#getConfiguredTextHoverStateMasks(ISourceViewer,
 	 *      String)