e= fStrategies.values().iterator();
+ while (e.hasNext()) {
+ IReconcilingStrategy strategy= e.next();
+ if (strategy instanceof ITextViewerLifecycle) {
+ ((ITextViewerLifecycle) strategy).uninstall();
+ }
+ }
+ }
+ super.uninstall();
+ }
+
@Override
public void setProgressMonitor(IProgressMonitor monitor) {
super.setProgressMonitor(monitor);
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
index 85395bd7b..8a171acc9 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/source/SourceViewer.java
@@ -17,7 +17,9 @@
*******************************************************************************/
package org.eclipse.jface.text.source;
+import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import java.util.Stack;
import org.eclipse.swt.SWT;
@@ -40,6 +42,7 @@
import org.eclipse.jface.text.BlockTextSelection;
import org.eclipse.jface.text.DocumentRewriteSession;
import org.eclipse.jface.text.DocumentRewriteSessionType;
+import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.IBlockTextSelection;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IDocumentExtension4;
@@ -51,6 +54,7 @@
import org.eclipse.jface.text.ISynchronizable;
import org.eclipse.jface.text.ITextSelection;
import org.eclipse.jface.text.ITextViewerExtension2;
+import org.eclipse.jface.text.ITextViewerLifecycle;
import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TextViewer;
@@ -89,8 +93,8 @@
*
* Clients may subclass this class but should expect some breakage by future releases.
*/
-public class SourceViewer extends TextViewer implements ISourceViewer, ISourceViewerExtension, ISourceViewerExtension2, ISourceViewerExtension3, ISourceViewerExtension4, ISourceViewerExtension5 {
-
+public class SourceViewer extends TextViewer
+ implements ISourceViewer, ISourceViewerExtension, ISourceViewerExtension2, ISourceViewerExtension3, ISourceViewerExtension4, ISourceViewerExtension5 {
/**
* Layout of a source viewer. Vertical ruler, text widget, and overview ruler are shown side by side.
@@ -389,6 +393,8 @@ private int[] computeScrollArrowHeights(StyledText textWidget, int bottomOffset)
*/
private CodeMiningManager fCodeMiningManager;
+ private final Set lifecycles;
+
/**
* Constructs a new source viewer. The vertical ruler is initially visible.
* The viewer has not yet been initialized with a source viewer configuration.
@@ -422,7 +428,7 @@ public SourceViewer(Composite parent, IVerticalRuler verticalRuler, IOverviewRul
fIsVerticalRulerVisible= (verticalRuler != null);
fOverviewRuler= overviewRuler;
fIsOverviewRulerVisible= (showAnnotationsOverview && overviewRuler != null);
-
+ this.lifecycles= new HashSet<>();
createControl(parent, styles);
}
@@ -490,16 +496,14 @@ public void configure(SourceViewerConfiguration configuration) {
// install content type independent plug-ins
fPresentationReconciler= configuration.getPresentationReconciler(this);
- if (fPresentationReconciler != null)
- fPresentationReconciler.install(this);
+ addTextViewerLifecycle(fPresentationReconciler);
fReconciler= configuration.getReconciler(this);
- if (fReconciler != null)
- fReconciler.install(this);
+ addTextViewerLifecycle(fReconciler);
fContentAssistant= configuration.getContentAssistant(this);
+ addTextViewerLifecycle(fContentAssistant);
if (fContentAssistant != null) {
- fContentAssistant.install(this);
if (fContentAssistant instanceof IContentAssistantExtension2 && fContentAssistant instanceof IContentAssistantExtension4)
fContentAssistantFacade= new ContentAssistantFacade(fContentAssistant);
fContentAssistantInstalled= true;
@@ -514,8 +518,7 @@ public void configure(SourceViewerConfiguration configuration) {
fContentFormatter= configuration.getContentFormatter(this);
fInformationPresenter= configuration.getInformationPresenter(this);
- if (fInformationPresenter != null)
- fInformationPresenter.install(this);
+ addTextViewerLifecycle(fInformationPresenter);
setUndoManager(configuration.getUndoManager(this));
@@ -535,7 +538,7 @@ public void configure(SourceViewerConfiguration configuration) {
String[] types= configuration.getConfiguredContentTypes(this);
for (String t : types) {
- setAutoEditStrategies(configuration.getAutoEditStrategies(this, t), t);
+ doSetAutoEditStrategies(configuration.getAutoEditStrategies(this, t), t);
setTextDoubleClickStrategy(configuration.getDoubleClickStrategy(this, t), t);
int[] stateMasks= configuration.getConfiguredTextHoverStateMasks(this, t);
@@ -556,10 +559,21 @@ public void configure(SourceViewerConfiguration configuration) {
setDefaultPrefixes(prefixes, t);
}
setCodeMiningProviders(configuration.getCodeMiningProviders(this));
-
+ installTextViewer();
activatePlugins();
}
+ private void doSetAutoEditStrategies(IAutoEditStrategy[] strategies, String contentType) {
+ super.setAutoEditStrategies(strategies, contentType);
+ if (strategies != null) {
+ for (IAutoEditStrategy strategy : strategies) {
+ if (strategy instanceof ITextViewerLifecycle) {
+ addTextViewerLifecycle((ITextViewerLifecycle) strategy);
+ }
+ }
+ }
+ }
+
/**
* After this method has been executed the caller knows that any installed annotation hover has been installed.
*/
@@ -710,18 +724,11 @@ public IAnnotationModel getVisualAnnotationModel() {
public void unconfigure() {
clearRememberedSelection();
- if (fPresentationReconciler != null) {
- fPresentationReconciler.uninstall();
- fPresentationReconciler= null;
- }
-
- if (fReconciler != null) {
- fReconciler.uninstall();
- fReconciler= null;
- }
+ uninstallTextViewer();
+ fPresentationReconciler= null;
+ fReconciler= null;
if (fContentAssistant != null) {
- fContentAssistant.uninstall();
fContentAssistantInstalled= false;
fContentAssistant= null;
if (fContentAssistantFacade != null)
@@ -1320,4 +1327,23 @@ public void setCodeMiningAnnotationPainter(AnnotationPainter painter) {
ensureCodeMiningManagerInstalled();
}
+ private void addTextViewerLifecycle(ITextViewerLifecycle lifecycle) {
+ if (lifecycle != null) {
+ lifecycles.add(lifecycle);
+ }
+ }
+
+ private void installTextViewer() {
+ for (ITextViewerLifecycle lifecycle : lifecycles) {
+ lifecycle.install(this);
+ }
+ }
+
+ private void uninstallTextViewer() {
+ for (ITextViewerLifecycle lifecycle : lifecycles) {
+ lifecycle.uninstall();
+ }
+ lifecycles.clear();
+ }
+
}
diff --git a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java
index bdd731c35..2c50ac3ad 100644
--- a/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java
+++ b/org.eclipse.ui.genericeditor/src/org/eclipse/ui/internal/genericeditor/CompositeReconcilerStrategy.java
@@ -18,52 +18,74 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.ITextViewerLifecycle;
import org.eclipse.jface.text.reconciler.DirtyRegion;
import org.eclipse.jface.text.reconciler.IReconcilingStrategy;
import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension;
-public class CompositeReconcilerStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension{
+public class CompositeReconcilerStrategy
+ implements IReconcilingStrategy, IReconcilingStrategyExtension, ITextViewerLifecycle {
private List fReconcilingStrategies;
public CompositeReconcilerStrategy(List strategies) {
this.fReconcilingStrategies = strategies;
}
+
@Override
public void setProgressMonitor(IProgressMonitor monitor) {
- for (IReconcilingStrategy iReconcilingStrategy : fReconcilingStrategies) {
- if (iReconcilingStrategy instanceof IReconcilingStrategyExtension) {
- ((IReconcilingStrategyExtension) iReconcilingStrategy).setProgressMonitor(monitor);
+ for (IReconcilingStrategy strategy : fReconcilingStrategies) {
+ if (strategy instanceof IReconcilingStrategyExtension) {
+ ((IReconcilingStrategyExtension) strategy).setProgressMonitor(monitor);
}
}
}
@Override
public void initialReconcile() {
- for (IReconcilingStrategy iReconcilingStrategy : fReconcilingStrategies) {
- if (iReconcilingStrategy instanceof IReconcilingStrategyExtension) {
- ((IReconcilingStrategyExtension) iReconcilingStrategy).initialReconcile();
+ for (IReconcilingStrategy strategy : fReconcilingStrategies) {
+ if (strategy instanceof IReconcilingStrategyExtension) {
+ ((IReconcilingStrategyExtension) strategy).initialReconcile();
}
}
}
@Override
public void setDocument(IDocument document) {
- for (IReconcilingStrategy iReconcilingStrategy : fReconcilingStrategies) {
- iReconcilingStrategy.setDocument(document);
+ for (IReconcilingStrategy strategy : fReconcilingStrategies) {
+ strategy.setDocument(document);
}
}
@Override
public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) {
- for (IReconcilingStrategy iReconcilingStrategy : fReconcilingStrategies) {
- iReconcilingStrategy.reconcile(dirtyRegion, subRegion);
+ for (IReconcilingStrategy strategy : fReconcilingStrategies) {
+ strategy.reconcile(dirtyRegion, subRegion);
}
}
@Override
public void reconcile(IRegion partition) {
- for (IReconcilingStrategy iReconcilingStrategy : fReconcilingStrategies) {
- iReconcilingStrategy.reconcile(partition);
+ for (IReconcilingStrategy strategy : fReconcilingStrategies) {
+ strategy.reconcile(partition);
+ }
+ }
+
+ @Override
+ public void install(ITextViewer textViewer) {
+ for (IReconcilingStrategy strategy : fReconcilingStrategies) {
+ if (strategy instanceof ITextViewerLifecycle) {
+ ((ITextViewerLifecycle) strategy).install(textViewer);
+ }
+ }
+ }
+
+ @Override
+ public void uninstall() {
+ for (IReconcilingStrategy strategy : fReconcilingStrategies) {
+ if (strategy instanceof ITextViewerLifecycle) {
+ ((ITextViewerLifecycle) strategy).uninstall();
+ }
}
}