Fix #78

Author: angelozerr

eclipse/ts.eclipse.ide.ui/icons/full/dlcl16/collapseall.gif

@@ -115,6 +115,10 @@ public class TypeScriptUIMessages extends NLS {
 	public static String TypeScriptBuilder_enable_Error_message;
 	public static String TypeScriptBuilder_disable_Error_message;
 
+	// Outline
+	public static String TypeScriptContentOutlinePage_CollapseAllAction_label;
+	public static String TypeScriptContentOutlinePage_CollapseAllAction_description;
+	public static String TypeScriptContentOutlinePage_CollapseAllAction_tooltip;
 
 	public static ResourceBundle getResourceBundle() {
 		try {

eclipse/ts.eclipse.ide.ui/icons/full/elcl16/collapseall.gif

@@ -87,4 +87,9 @@ TypeScriptSearchQuery_result= {0} matches - done in {1} ms.
 TypeScriptResources=TypeScript Resources
 DiscoverBuildPathDialog_title=Add TypeScript build paths
 DiscoverBuildPathDialog_message=Select folders to add to TypeScript build path. Build path folders are used to validate and compile *.ts(x) files.
-DiscoverBuildPathDialog_SearchBuildPathJob_name=Search tsconfig.json files job
+DiscoverBuildPathDialog_SearchBuildPathJob_name=Search tsconfig.json files job
+
+# Outline
+TypeScriptContentOutlinePage_CollapseAllAction_label=Collapse All
+TypeScriptContentOutlinePage_CollapseAllAction_tooltip=Collapse All
+TypeScriptContentOutlinePage_CollapseAllAction_description=Collapse All

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.java

@@ -44,22 +44,23 @@ public class TypeScriptUIImageResource {
 	private static final String URL_ELCL = "full/elcl16/";
 	private static final String URL_OBJ = "full/obj16/";
 	private static final String URL_OVR = "full/ovr16/";
-	
+
 	// General Object Images
 	public static final String IMG_LOGO = "logo";
 	public static final String IMG_TYPESCRIPT_RESOURCES = "tsresources_obj";
 
 	// Enabled/Disbaled
 	public static final String IMG_STOP_ENABLED = "stop_enabled";
 	public static final String IMG_STOP_DISABLED = "stop_disabled";
+	public static final String IMG_COLLAPSE_ALL_ENABLED = "collapseall_enabled";
+	public static final String IMG_COLLAPSE_ALL_DISABLED = "collapseall_disabled";
 
 	public static final String DESC_OVR_LIBRARY = "ovr_library";
-	
+
 	private static Map<ImageDescriptor, URL> fURLMap;
 	private static final File fTempDir;
-	private static int fImageCount;
-
 
+	private static int fImageCount;
 
 	static {
 		try {
@@ -150,7 +151,9 @@ protected static void initializeImageRegistry() {
 
 		registerImage(IMG_STOP_ENABLED, URL_ELCL + "launch_stop.gif");
 		registerImage(IMG_STOP_DISABLED, URL_DLCL + "launch_stop.gif");
-		
+		registerImage(IMG_COLLAPSE_ALL_ENABLED, URL_ELCL + "collapseall.gif");
+		registerImage(IMG_COLLAPSE_ALL_DISABLED, URL_DLCL + "collapseall.gif");
+
 		registerImage(DESC_OVR_LIBRARY, URL_OVR + "library_ovr.gif");
 	}
 

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.properties

@@ -1,8 +1,21 @@
+/**
+ *  Copyright (c) 2015-2016 Angelo ZERR.
+ *  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
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *  Angelo Zerr <[email protected]> - initial API and implementation
+ */
 package ts.eclipse.ide.ui.outline;
 
 import java.util.List;
 
 import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.viewers.IPostSelectionProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -11,25 +24,38 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.navigator.CommonViewer;
 import org.eclipse.ui.part.Page;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.eclipse.ui.views.navigator.ToggleLinkingAction;
 
 import ts.client.navbar.NavigationBarItem;
+import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
+import ts.eclipse.ide.ui.TypeScriptUIImageResource;
 import ts.eclipse.ide.ui.TypeScriptUIPlugin;
 import ts.resources.INavbarListener;
 import ts.resources.ITypeScriptFile;
 
-public class TypeScriptContentOutlinePage extends Page implements IContentOutlinePage, INavbarListener {
+/**
+ * TypeScript Outline.
+ *
+ */
+public class TypeScriptContentOutlinePage extends Page
+		implements IContentOutlinePage, IPostSelectionProvider, INavbarListener {
 
 	private static final String OUTLINE_COMMON_NAVIGATOR_ID = TypeScriptUIPlugin.PLUGIN_ID + ".outline"; //$NON-NLS-1$
 
+	private static final String EDITOR_SYNC_OUTLINE_ON_CURSOR_MOVE = "TypeScriptEditor.SyncOutlineOnCursorMove"; //$NON-NLS-1$
+
 	private CommonViewer fOutlineViewer;
 	private ITypeScriptFile tsFile;
 
 	private ListenerList fSelectionChangedListeners = new ListenerList(ListenerList.IDENTITY);
 	private ListenerList fPostSelectionChangedListeners = new ListenerList(ListenerList.IDENTITY);
 
+	private ToggleLinkingAction fToggleLinkingAction;
+
 	public TypeScriptContentOutlinePage() {
 	}
 
@@ -55,6 +81,10 @@ public void createControl(Composite parent) {
 		}
 
 		fOutlineViewer.setAutoExpandLevel(TreeViewer.ALL_LEVELS);
+		fOutlineViewer.setUseHashlookup(true);
+
+		IActionBars actionBars = getSite().getActionBars();
+		registerToolbarActions(actionBars);
 
 	}
 
@@ -94,62 +124,44 @@ public void run() {
 		}
 	}
 
-	/*
-	 * @see
-	 * ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener)
-	 */
+	@Override
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		if (fOutlineViewer != null)
 			fOutlineViewer.addSelectionChangedListener(listener);
 		else
 			fSelectionChangedListeners.add(listener);
 	}
 
-	/*
-	 * @see ISelectionProvider#removeSelectionChangedListener(
-	 * ISelectionChangedListener)
-	 */
+	@Override
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		if (fOutlineViewer != null)
 			fOutlineViewer.removeSelectionChangedListener(listener);
 		else
 			fSelectionChangedListeners.remove(listener);
 	}
 
-	/*
-	 * @see ISelectionProvider#setSelection(ISelection)
-	 */
+	@Override
 	public void setSelection(ISelection selection) {
 		if (fOutlineViewer != null)
 			fOutlineViewer.setSelection(selection);
 	}
 
-	/*
-	 * @see ISelectionProvider#getSelection()
-	 */
+	@Override
 	public ISelection getSelection() {
 		if (fOutlineViewer == null)
 			return StructuredSelection.EMPTY;
 		return fOutlineViewer.getSelection();
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPostSelectionProvider#
-	 * addPostSelectionChangedListener(org.eclipse.jface.viewers.
-	 * ISelectionChangedListener)
-	 */
+	@Override
 	public void addPostSelectionChangedListener(ISelectionChangedListener listener) {
 		if (fOutlineViewer != null)
 			fOutlineViewer.addPostSelectionChangedListener(listener);
 		else
 			fPostSelectionChangedListeners.add(listener);
 	}
 
-	/*
-	 * @see org.eclipse.jface.text.IPostSelectionProvider#
-	 * removePostSelectionChangedListener(org.eclipse.jface.viewers.
-	 * ISelectionChangedListener)
-	 */
+	@Override
 	public void removePostSelectionChangedListener(ISelectionChangedListener listener) {
 		if (fOutlineViewer != null)
 			fOutlineViewer.removePostSelectionChangedListener(listener);
@@ -169,4 +181,38 @@ public void dispose() {
 
 	}
 
+	/**
+	 * Register toolbar actions.
+	 * 
+	 * @param actionBars
+	 */
+	private void registerToolbarActions(IActionBars actionBars) {
+		IToolBarManager toolBarManager = actionBars.getToolBarManager();
+		toolBarManager.add(new CollapseAllAction(this.fOutlineViewer));
+	}
+
+	/**
+	 * Collapse all action
+	 *
+	 */
+	private class CollapseAllAction extends Action {
+
+		private final TreeViewer viewer;
+
+		CollapseAllAction(TreeViewer viewer) {
+			super(TypeScriptUIMessages.TypeScriptContentOutlinePage_CollapseAllAction_label);
+			setDescription(TypeScriptUIMessages.TypeScriptContentOutlinePage_CollapseAllAction_description);
+			setToolTipText(TypeScriptUIMessages.TypeScriptContentOutlinePage_CollapseAllAction_tooltip);
+			super.setImageDescriptor(
+					TypeScriptUIImageResource.getImageDescriptor(TypeScriptUIImageResource.IMG_COLLAPSE_ALL_ENABLED));
+			super.setDisabledImageDescriptor(
+					TypeScriptUIImageResource.getImageDescriptor(TypeScriptUIImageResource.IMG_COLLAPSE_ALL_DISABLED));
+			this.viewer = viewer;
+		}
+
+		public void run() {
+			this.viewer.collapseAll();
+		}
+	}
+
 }