#34685 Collapse search results one level at a time

src/vs/base/parts/tree/browser/tree.ts

@@ -101,6 +101,13 @@ export interface ITree extends Events.IEventEmitter {
 	 */
 	collapseAll(elements?: any[], recursive?: boolean): WinJS.Promise;
 
+	/**
+	 * Collapses several elements.
+	 * Collapses all elements at the greatest tree depth that has expanded elements.
+	 * The returned promise returns a boolean for whether the elements were collapsed or not.
+	 */
+	collapseDeepestExpandedLevel(): WinJS.Promise;
+
 	/**
 	 * Toggles an element's expansion state.
 	 */

src/vs/base/parts/tree/browser/treeImpl.ts

@@ -186,6 +186,10 @@ export class Tree extends Events.EventEmitter implements _.ITree {
 		return this.model.collapseAll(elements, recursive);
 	}
 
+	public collapseDeepestExpandedLevel(): WinJS.Promise {
+		return this.model.collapseDeepestExpandedLevel();
+	}
+
 	public toggleExpansion(element: any, recursive: boolean = false): WinJS.Promise {
 		return this.model.toggleExpansion(element, recursive);
 	}

src/vs/base/parts/tree/browser/treeModel.ts

@@ -486,6 +486,17 @@ export class Item extends Events.EventEmitter {
 		return result;
 	}
 
+	public getChildren(): Item[] {
+		var child = this.firstChild;
+		var results = [];
+		while (child) {
+			results.push(child);
+			child = child.next;
+		}
+
+		return results;
+	}
+
 	private isAncestorOf(item: Item): boolean {
 		while (item) {
 			if (item.id === this.id) {
@@ -894,6 +905,27 @@ export class TreeModel extends Events.EventEmitter {
 		return WinJS.Promise.join(promises);
 	}
 
+	public collapseDeepestExpandedLevel(): WinJS.Promise {
+		var levelToCollapse = this.findDeepestExpandedLevel(this.input, 0);
+
+		var items = [this.input];
+		for (var i = 0; i < levelToCollapse; i++) {
+			items = arrays.flatten(items.map(node => node.getChildren()));
+		}
+
+		var promises = items.map(child => this.collapse(child, false));
+		return WinJS.Promise.join(promises);
+	}
+
+	private findDeepestExpandedLevel(item: Item, currentLevel: number): number {
+		var expandedChildren = item.getChildren().filter(child => child.isExpanded());
+		if (!expandedChildren.length) {
+			return currentLevel;
+		}
+
+		return Math.max(...expandedChildren.map(child => this.findDeepestExpandedLevel(child, currentLevel + 1)));
+	}
+
 	public toggleExpansion(element: any, recursive: boolean = false): WinJS.Promise {
 		return this.isExpanded(element) ? this.collapse(element, recursive) : this.expand(element);
 	}

src/vs/base/parts/tree/test/browser/treeModel.test.ts

@@ -635,6 +635,24 @@ suite('TreeModel - Expansion', () => {
 		});
 	});
 
+	test('collapseDeepestExpandedLevel', (done) => {
+		model.setInput(SAMPLE.DEEP2).done(() => {
+			model.expand(SAMPLE.DEEP2.children[0]).done(() => {
+				model.expand(SAMPLE.DEEP2.children[0].children[0]).done(() => {
+
+					assert(model.isExpanded(SAMPLE.DEEP2.children[0]));
+					assert(model.isExpanded(SAMPLE.DEEP2.children[0].children[0]));
+
+					model.collapseDeepestExpandedLevel().done(() => {
+						assert(model.isExpanded(SAMPLE.DEEP2.children[0]));
+						assert(!model.isExpanded(SAMPLE.DEEP2.children[0].children[0]));
+						done();
+					});
+				});
+			});
+		});
+	});
+
 	test('auto expand single child folders', (done) => {
 		model.setInput(SAMPLE.DEEP).done(() => {
 			model.expand(SAMPLE.DEEP.children[0]).done(() => {

src/vs/workbench/parts/search/browser/searchActions.ts

@@ -18,7 +18,6 @@ import { SearchViewlet } from 'vs/workbench/parts/search/browser/searchViewlet';
 import { Match, FileMatch, FileMatchOrMatch, FolderMatch, RenderableMatch } from 'vs/workbench/parts/search/common/searchModel';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
 import * as Constants from 'vs/workbench/parts/search/common/constants';
-import { CollapseAllAction as TreeCollapseAction } from 'vs/base/parts/tree/browser/treeDefaults';
 import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { ResolvedKeybinding, createKeybinding } from 'vs/base/common/keyCodes';
@@ -431,12 +430,28 @@ export class RefreshAction extends Action {
 	}
 }
 
-export class CollapseAllAction extends TreeCollapseAction {
+export class CollapseDeepestExpandedLevelAction extends Action {
+	private viewer: ITree;
 
-	constructor(viewlet: SearchViewlet) {
-		super(viewlet.getControl(), false);
+	constructor(viewlet: SearchViewlet, enabled: boolean = false) {
+		super('vs.tree.collapse', nls.localize('collapse', "Collapse"), 'monaco-tree-action collapse-all', enabled);
+		this.viewer = viewlet.getControl();
 		this.class = 'search-action collapse';
 	}
+
+	public run(context?: any): TPromise<any> {
+		if (this.viewer.getHighlight()) {
+			return TPromise.as(null); // Global action disabled if user is in edit mode from another action
+		}
+
+		this.viewer.collapseDeepestExpandedLevel();
+		this.viewer.clearSelection();
+		this.viewer.clearFocus();
+		this.viewer.DOMFocus();
+		this.viewer.focusFirst();
+
+		return TPromise.as(null);
+	}
 }
 
 export class ClearSearchResultsAction extends Action {

src/vs/workbench/parts/search/browser/searchViewlet.ts

@@ -48,7 +48,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { PatternInputWidget, ExcludePatternInputWidget } from 'vs/workbench/parts/search/browser/patternInputWidget';
 import { SearchRenderer, SearchDataSource, SearchSorter, SearchAccessibilityProvider, SearchFilter } from 'vs/workbench/parts/search/browser/searchResultsView';
 import { SearchWidget, ISearchWidgetOptions } from 'vs/workbench/parts/search/browser/searchWidget';
-import { RefreshAction, CollapseAllAction, ClearSearchResultsAction } from 'vs/workbench/parts/search/browser/searchActions';
+import { RefreshAction, CollapseDeepestExpandedLevelAction, ClearSearchResultsAction } from 'vs/workbench/parts/search/browser/searchActions';
 import { IReplaceService } from 'vs/workbench/parts/search/common/replace';
 import Severity from 'vs/base/common/severity';
 import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
@@ -255,7 +255,7 @@ export class SearchViewlet extends Viewlet {
 		this.createSearchResultsView(builder);
 
 		this.actionRegistry = <any>{};
-		let actions: Action[] = [new CollapseAllAction(this), new RefreshAction(this), new ClearSearchResultsAction(this)];
+		let actions: Action[] = [new CollapseDeepestExpandedLevelAction(this), new RefreshAction(this), new ClearSearchResultsAction(this)];
 		actions.forEach((action) => {
 			this.actionRegistry[action.id] = action;
 		});