summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Laperle2012-01-24 13:06:49 (EST)
committer Benjamin Cabé2012-01-24 13:06:49 (EST)
commit992f54027cdbbe397a753f59b8f8a9f498ca4791 (patch)
treee290e5b645efff7a76ae278dd68dab47670153d3
parent1cc5e2f771d712099381d79dbea0ce1f124b5a5d (diff)
downloadorg.eclipse.koneki.ldt-992f54027cdbbe397a753f59b8f8a9f498ca4791.zip
org.eclipse.koneki.ldt-992f54027cdbbe397a753f59b8f8a9f498ca4791.tar.gz
org.eclipse.koneki.ldt-992f54027cdbbe397a753f59b8f8a9f498ca4791.tar.bz2
bug 369557: Add Quick outline
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.koneki.ldt.editor/plugin.xml6
-rw-r--r--[-rwxr-xr-x]plugins/org.eclipse.koneki.ldt.editor/src/org/eclipse/koneki/ldt/editor/internal/text/LuaSourceViewerConfiguration.java27
2 files changed, 8 insertions, 25 deletions
diff --git a/plugins/org.eclipse.koneki.ldt.editor/plugin.xml b/plugins/org.eclipse.koneki.ldt.editor/plugin.xml
index cf8a1ef..7089c47 100755..100644
--- a/plugins/org.eclipse.koneki.ldt.editor/plugin.xml
+++ b/plugins/org.eclipse.koneki.ldt.editor/plugin.xml
@@ -127,6 +127,12 @@
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M1+M2+F">
</key>
+ <key
+ commandId="org.eclipse.dltk.ui.edit.text.script.show.outline"
+ contextId="org.eclipse.ui.contexts.window"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+ sequence="M1+O">
+ </key>
</extension>
<extension
point="org.eclipse.dltk.ui.formatterFactory">
diff --git a/plugins/org.eclipse.koneki.ldt.editor/src/org/eclipse/koneki/ldt/editor/internal/text/LuaSourceViewerConfiguration.java b/plugins/org.eclipse.koneki.ldt.editor/src/org/eclipse/koneki/ldt/editor/internal/text/LuaSourceViewerConfiguration.java
index 5368727..1292d8b 100755..100644
--- a/plugins/org.eclipse.koneki.ldt.editor/src/org/eclipse/koneki/ldt/editor/internal/text/LuaSourceViewerConfiguration.java
+++ b/plugins/org.eclipse.koneki.ldt.editor/src/org/eclipse/koneki/ldt/editor/internal/text/LuaSourceViewerConfiguration.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2011 Sierra Wireless and others.
+ * Copyright (c) 2009, 2012 Sierra Wireless and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,11 +7,11 @@
*
* Contributors:
* Sierra Wireless - initial API and implementation
+ * Marc-André Laperle - bug 369557
*******************************************************************************/
package org.eclipse.koneki.ldt.editor.internal.text;
-import org.eclipse.dltk.internal.ui.typehierarchy.HierarchyInformationControl;
import org.eclipse.dltk.ui.text.AbstractScriptScanner;
import org.eclipse.dltk.ui.text.IColorManager;
import org.eclipse.dltk.ui.text.ScriptPresentationReconciler;
@@ -22,8 +22,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.DefaultIndentLineAutoEditStrategy;
import org.eclipse.jface.text.IAutoEditStrategy;
import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IInformationControl;
-import org.eclipse.jface.text.IInformationControlCreator;
import org.eclipse.jface.text.contentassist.ContentAssistant;
import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
import org.eclipse.jface.text.presentation.IPresentationReconciler;
@@ -33,7 +31,6 @@ import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.koneki.ldt.editor.completion.LuaCompletionProcessor;
import org.eclipse.koneki.ldt.parser.LuaConstants;
-import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.texteditor.ITextEditor;
public class LuaSourceViewerConfiguration extends ScriptSourceViewerConfiguration {
@@ -63,26 +60,6 @@ public class LuaSourceViewerConfiguration extends ScriptSourceViewerConfiguratio
return LuaContentAssistPreference.getDefault();
}
- @Override
- protected IInformationControlCreator getOutlinePresenterControlCreator(ISourceViewer sourceViewer, final String commandId) {
- return new IInformationControlCreator() {
-
- /**
- * Returns empty object
- */
- @Override
- public IInformationControl createInformationControl(Shell parent) {
- return new HierarchyInformationControl(parent, 0, 0) {
-
- @Override
- protected IPreferenceStore getPreferenceStore() {
- return null;
- }
- };
- }
- };
- }
-
public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) {
PresentationReconciler reconciler = new ScriptPresentationReconciler();
reconciler.setDocumentPartitioning(this.getConfiguredDocumentPartitioning(sourceViewer));