From d48e1ca3fae767dd2a0460c66358656387b63f21 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Wed, 23 May 2007 11:46:55 +0000 Subject: [PATCH] Enable reconciler for all editor input types --- .../ui/text/CSourceViewerConfiguration.java | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java index 1dd0827933c..d6b1daaee7b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java @@ -87,7 +87,6 @@ import org.eclipse.cdt.internal.ui.text.contentassist.CContentAssistProcessor; import org.eclipse.cdt.internal.ui.text.contentassist.ContentAssistPreference; import org.eclipse.cdt.internal.ui.typehierarchy.THInformationControl; import org.eclipse.cdt.internal.ui.typehierarchy.THInformationProvider; -import org.eclipse.cdt.internal.ui.util.ExternalEditorInput; /** @@ -149,26 +148,6 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { initializeScanners(); } - /** - * Creates a new C source viewer configuration for viewers in the given editor using - * the given C tools collection. - * - * @param tools the C text tools collection to be used - * @param editor the editor in which the configured viewer will reside - * - * @deprecated Use {@link #CSourceViewerConfiguration(IColorManager colorManager, IPreferenceStore preferenceStore, ITextEditor editor, String partitioning)} instead. - */ - public CSourceViewerConfiguration(CTextTools tools, ITextEditor editor) { - super(CUIPlugin.getDefault().getCombinedPreferenceStore()); - fTextTools= tools; - fColorManager= tools.getColorManager(); - fTextEditor= editor; - fDocumentPartitioning= fTextTools.getDocumentPartitioning(); - fMultilineCommentScanner= (AbstractCScanner) fTextTools.getMultilineCommentScanner(); - fSinglelineCommentScanner= (AbstractCScanner) fTextTools.getSinglelineCommentScanner(); - fStringScanner= (AbstractCScanner) fTextTools.getStringScanner(); - } - /** * Returns the C multi-line comment scanner for this configuration. * @@ -421,7 +400,7 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration { * @see org.eclipse.ui.editors.text.TextSourceViewerConfiguration#getReconciler(org.eclipse.jface.text.source.ISourceViewer) */ public IReconciler getReconciler(ISourceViewer sourceViewer) { - if (fTextEditor != null && (fTextEditor.isEditable() || fTextEditor.getEditorInput() instanceof ExternalEditorInput)) { + if (fTextEditor != null) { //Delay changed and non-incremental reconciler used due to //PR 130089 MonoReconciler reconciler= new CReconciler(fTextEditor, new CReconcilingStrategy(fTextEditor));