Bug 574286: Fix restoring of size of popup of quick assist assistant
Change-Id: I9abd2e4ef1c2b3ae246deb0e0eb8877362722db3
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
index 6300b1f..1e405d0 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
@@ -14,6 +14,8 @@
package org.eclipse.statet.ltk.ui.sourceediting;
+import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
+
import static org.eclipse.statet.ltk.ui.LtkUI.BUNDLE_ID;
import java.util.ArrayList;
@@ -26,6 +28,7 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.internal.text.html.BrowserInformationControl;
import org.eclipse.jface.internal.text.html.HTMLTextPresenter;
@@ -58,6 +61,7 @@
import org.eclipse.jface.text.templates.TemplateContextType;
import org.eclipse.jface.text.templates.TemplateVariableResolver;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
import org.eclipse.ui.statushandlers.StatusManager;
@@ -415,7 +419,8 @@
if (getSourceEditor() != null) {
final ContentAssist assistant= new ContentAssist();
assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(null));
- assistant.setRestoreCompletionProposalSize(DialogUtils.getDialogSettings(LtkUIPlugin.getInstance(), "ContentAssist.Proposal.size")); //$NON-NLS-1$
+ assistant.setRestoreCompletionProposalSize(DialogUtils.getDialogSettings(
+ LtkUIPlugin.getInstance(), "ContentAssist.Proposal.size")); //$NON-NLS-1$
initContentAssist(assistant);
return assistant;
@@ -444,10 +449,13 @@
protected IQuickAssistAssistant createQuickAssistant(final ISourceViewer sourceViewer) {
final IQuickAssistProcessor processor= createQuickAssistProcessor();
if (processor != null) {
- final QuickAssistAssistant assistent= new QuickAssistAssistant();
- assistent.setQuickAssistProcessor(processor);
- assistent.enableColoredLabels(true);
- return assistent;
+ final QuickAssistAssistant assistant= new QuickAssistAssistant();
+ assistant.setQuickAssistProcessor(processor);
+ assistant.enableColoredLabels(true);
+ assistant.setRestoreCompletionProposalSize(DialogUtils.getDialogSettings(
+ nonNullAssert(Platform.getBundle(EditorsUI.PLUGIN_ID)),
+ "quick_assist_proposal_size" )); //$NON-NLS-1$
+ return assistant;
}
return super.getQuickAssistAssistant(sourceViewer);
}
