Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-26 03:29:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Proposals for Collapse, CollapseAll, Expand APIs and implementation"

Browse Source 
This reverts commit 677234a7c2.
This commit is contained in:
Sandeep Somavarapu
2018-10-24 12:25:51 +02:00
parent 677234a7c2
commit 4e65cab609
7 changed files with 4 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/api/node/extHost.api.impl.ts
View File

@@ -463,7 +463,7 @@ export function createApiFactory(
registerTreeDataProvider(viewId: string, treeDataProvider: vscode.TreeDataProvider<any>): vscode.Disposable {
return extHostTreeViews.registerTreeDataProvider(viewId, treeDataProvider);
},
createTreeView(viewId: string, options: { treeDataProvider: vscode.TreeDataProvider<any> }): vscode.TreeView2<any> {
createTreeView(viewId: string, options: { treeDataProvider: vscode.TreeDataProvider<any> }): vscode.TreeView<any> {
return extHostTreeViews.createTreeView(viewId, options);
},
registerWebviewPanelSerializer: (viewType: string, serializer: vscode.WebviewPanelSerializer) => {

2
src/vs/workbench/api/node/extHost.protocol.ts
View File

@@ -212,8 +212,6 @@ export interface MainThreadTextEditorsShape extends IDisposable {
export interface MainThreadTreeViewsShape extends IDisposable {
$registerTreeViewDataProvider(treeViewId: string): void;
$refresh(treeViewId: string, itemsToRefresh?: { [treeItemHandle: string]: ITreeItem }): Thenable<void>;
$collapse(treeViewId: string, handles: undefined | string[], recursive?: boolean): Thenable<void>;
$expand(treeViewId: string, handles: string[], recursive?: boolean): Thenable<void>;
$reveal(treeViewId: string, treeItem: ITreeItem, parentChain: ITreeItem[], options: { select: boolean, focus: boolean }): Thenable<void>;
}

47
src/vs/workbench/api/node/extHostTreeViews.ts
View File

@@ -64,7 +64,7 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
return { dispose: () => treeView.dispose() };
}
createTreeView<T>(viewId: string, options: { treeDataProvider: vscode.TreeDataProvider<T> }): vscode.TreeView2<T> {
createTreeView<T>(viewId: string, options: { treeDataProvider: vscode.TreeDataProvider<T> }): vscode.TreeView<T> {
if (!options || !options.treeDataProvider) {
throw new Error('Options with treeDataProvider is mandatory');
}
@@ -76,15 +76,6 @@ export class ExtHostTreeViews implements ExtHostTreeViewsShape {
get onDidChangeSelection() { return treeView.onDidChangeSelection; },
get visible() { return treeView.visible; },
get onDidChangeVisibility() { return treeView.onDidChangeVisibility; },
collapse(elementOrElements: T | T[], recursive?: boolean): Thenable<void> {
return treeView.collapse(elementOrElements, recursive);
},
collapseAll(): Thenable<void> {
return treeView.collapse();
},
expand(elementOrElements: T | T[], recursive?: boolean): Thenable<void> {
return treeView.expand(elementOrElements, recursive);
},
reveal: (element: T, options?: { select?: boolean, focus?: boolean }): Thenable<void> => {
return treeView.reveal(element, options);
},
@@ -224,42 +215,6 @@ class ExtHostTreeView<T> extends Disposable {
.then(treeNode => this.proxy.$reveal(this.viewId, treeNode.item, parentChain.map(p => p.item), { select, focus })), error => this.logService.error(error));
}
collapse(elementOrElements?: T | T[], recursive?: boolean): Thenable<void> {
const handles: TreeItemHandle[] = elementOrElements ? [] : void 0;
if (elementOrElements) {
const elements = Array.isArray(elementOrElements) ? elementOrElements : [elementOrElements];
for (const element of elements) {
const node = this.nodes.get(element);
if (node) {
handles.push(node.item.handle);
} else {
console.error('Not found: ', element);
}
}
if (elements.length === 0) {
return Promise.resolve();
}
}
return this.proxy.$collapse(this.viewId, handles, recursive);
}
expand(elementOrElements: T | T[], recursive?: boolean): Thenable<void> {
const handles: TreeItemHandle[] = [];
const elements = Array.isArray(elementOrElements) ? elementOrElements : [elementOrElements];
for (const element of elements) {
const node = this.nodes.get(element);
if (node) {
handles.push(node.item.handle);
} else {
console.error('Not found: ', element);
}
}
if (elements.length) {
return this.proxy.$expand(this.viewId, handles, recursive);
}
return Promise.resolve();
}
setExpanded(treeItemHandle: TreeItemHandle, expanded: boolean): void {
const element = this.getExtensionElement(treeItemHandle);
if (element) {