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

Make nodeProvider generic and add contentProvider

Browse Source
This commit is contained in:
Pine Wu
2016-10-13 10:38:18 -07:00
parent 30e3be2c43
commit b8ce9ad768
5 changed files with 32 additions and 25 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

@@ -335,7 +335,7 @@ export function createApiFactory(threadService: IThreadService, extensionService
onWillSaveTextDocument: (listener, thisArgs?, disposables?) => {
return extHostDocumentSaveParticipant.onWillSaveTextDocumentEvent(listener, thisArgs, disposables);
},
registerTreeExplorerNodeProvider(providerId: string, provider: vscode.TreeExplorerNodeProvider) {
registerTreeExplorerNodeProvider(providerId: string, provider: vscode.TreeExplorerNodeProvider<any>) {
return extHostExplorers.registerTreeContentProvider(providerId, provider);
},
onDidChangeConfiguration: (listener: () => any, thisArgs?: any, disposables?: extHostTypes.Disposable[]) => {

19
src/vs/workbench/api/node/extHostTreeExplorers.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TreeExplorerNode, TreeExplorerNodeProvider } from 'vscode';
import { TreeExplorerNodeContent, TreeExplorerNodeProvider } from 'vscode';
import { TPromise } from 'vs/base/common/winjs.base';
import { Disposable } from 'vs/workbench/api/node/extHostTypes';
import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
@@ -15,9 +15,8 @@ import { ExtHostCommands } from 'vs/workbench/api/node/extHostCommands';
export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape {
private _proxy: MainThreadTreeExplorersShape;
private _treeExplorerNodeProviders: { [providerId: string]: TreeExplorerNodeProvider };
private _externalNodeMaps: { [providerId: string]: { [id: number]: TreeExplorerNode }};
private _treeExplorerNodeProviders: { [providerId: string]: TreeExplorerNodeProvider<any> };
private _externalNodeMaps: { [providerId: string]: { [id: number]: TreeExplorerNodeContent }};
constructor(
threadService: IThreadService,
@@ -31,7 +30,7 @@ export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape {
this._externalNodeMaps = Object.create(null);
}
registerTreeContentProvider(providerId: string, provider: TreeExplorerNodeProvider): Disposable {
registerTreeContentProvider(providerId: string, provider: TreeExplorerNodeProvider<any>): Disposable {
this._proxy.$registerTreeContentProvider(providerId);
this._treeExplorerNodeProviders[providerId] = provider;
@@ -52,7 +51,8 @@ export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape {
const treeNodeMap = Object.create(null);
this._externalNodeMaps[providerId] = treeNodeMap;
const internalRootNode = new InternalTreeExplorerNode(externalRootNode);
const externalNodeContent = provider.contentProvider.provideNodeContent(externalRootNode);
const internalRootNode = new InternalTreeExplorerNode(externalNodeContent);
this._externalNodeMaps[providerId][internalRootNode.id] = externalRootNode;
return internalRootNode;
}));
@@ -69,7 +69,8 @@ export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape {
return TPromise.wrap(provider.resolveChildren(externalNode).then(children => {
return children.map(externalChild => {
const internalChild = new InternalTreeExplorerNode(externalChild);
const externalChildContent = provider.contentProvider.provideNodeContent(externalChild);
const internalChild = new InternalTreeExplorerNode(externalChildContent);
externalNodeMap[internalChild.id] = externalChild;
return internalChild;
});
@@ -83,8 +84,8 @@ export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape {
}
if (mainThreadNode.onClickCommand) {
return TPromise.wrap(this.commands.executeCommand(mainThreadNode.onClickCommand, this._externalNodeMaps[providerId][mainThreadNode.id]).then(() => {
// Todo: error handling
const externalNode = this._externalNodeMaps[providerId][mainThreadNode.id];
return TPromise.wrap(this.commands.executeCommand(mainThreadNode.onClickCommand, externalNode).then(() => {
return null;
}));
}

6
src/vs/workbench/api/node/mainThreadTreeExplorers.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import { TreeExplorerNode } from 'vscode';
import { TreeExplorerNodeContent } from 'vscode';
import { TPromise } from 'vs/base/common/winjs.base';
import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
import { ExtHostContext, MainThreadTreeExplorersShape, ExtHostTreeExplorersShape } from './extHost.protocol';
@@ -18,7 +18,7 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape {
constructor(
@IThreadService threadService: IThreadService,
@ITreeExplorerService private treeExplorerViewletService: ITreeExplorerService
@ITreeExplorerService private treeExplorerService: ITreeExplorerService
) {
super();
@@ -27,7 +27,7 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape {
}
$registerTreeContentProvider(providerId: string): void {
this.treeExplorerViewletService.registerTreeContentProvider(providerId, {
this.treeExplorerService.registerTreeContentProvider(providerId, {
provideRootNode: (): TPromise<InternalTreeExplorerNode> => {
return this._proxy.$provideRootNode(providerId).then(treeContent => {
this._treeContents[providerId] = treeContent;