From 857411d10851c73776216bfddee950ddf862df74 Mon Sep 17 00:00:00 2001 From: Pine Wu Date: Wed, 19 Oct 2016 09:14:21 -0700 Subject: [PATCH] Make naming consistent --- src/vs/workbench/api/node/mainThreadTreeExplorers.ts | 4 ++-- .../explorers/browser/treeExplorerViewlet.contribution.ts | 4 ++-- ...treeExplorerService.ts => treeExplorerViewletService.ts} | 6 +++--- .../parts/explorers/browser/views/treeExplorerView.ts | 4 ++-- .../parts/explorers/browser/views/treeExplorerViewer.ts | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) rename src/vs/workbench/parts/explorers/browser/{treeExplorerService.ts => treeExplorerViewletService.ts} (92%) diff --git a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts index 9853af80b34..a2de571cbbd 100644 --- a/src/vs/workbench/api/node/mainThreadTreeExplorers.ts +++ b/src/vs/workbench/api/node/mainThreadTreeExplorers.ts @@ -7,7 +7,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IThreadService } from 'vs/workbench/services/thread/common/threadService'; import { ExtHostContext, MainThreadTreeExplorersShape, ExtHostTreeExplorersShape } from './extHost.protocol'; -import { ITreeExplorerService } from 'vs/workbench/parts/explorers/browser/treeExplorerService'; +import { ITreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService'; import { InternalTreeExplorerNode } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel'; export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape { @@ -17,7 +17,7 @@ export class MainThreadTreeExplorers extends MainThreadTreeExplorersShape { constructor( @IThreadService threadService: IThreadService, - @ITreeExplorerService private treeExplorerService: ITreeExplorerService + @ITreeExplorerViewletService private treeExplorerService: ITreeExplorerViewletService ) { super(); diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorerViewlet.contribution.ts b/src/vs/workbench/parts/explorers/browser/treeExplorerViewlet.contribution.ts index 858e2f47e3f..7f61735dd4a 100644 --- a/src/vs/workbench/parts/explorers/browser/treeExplorerViewlet.contribution.ts +++ b/src/vs/workbench/parts/explorers/browser/treeExplorerViewlet.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { ITreeExplorerService, TreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerService'; +import { ITreeExplorerViewletService, TreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; -registerSingleton(ITreeExplorerService, TreeExplorerViewletService); +registerSingleton(ITreeExplorerViewletService, TreeExplorerViewletService); diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorerService.ts b/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts similarity index 92% rename from src/vs/workbench/parts/explorers/browser/treeExplorerService.ts rename to src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts index b60941de482..33827b60785 100644 --- a/src/vs/workbench/parts/explorers/browser/treeExplorerService.ts +++ b/src/vs/workbench/parts/explorers/browser/treeExplorerViewletService.ts @@ -8,9 +8,9 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { InternalTreeExplorerNode, InternalTreeExplorerNodeProvider } from 'vs/workbench/parts/explorers/common/treeExplorerViewModel'; -export const ITreeExplorerService = createDecorator('customViewletService'); +export const ITreeExplorerViewletService = createDecorator('customViewletService'); -export interface ITreeExplorerService { +export interface ITreeExplorerViewletService { _serviceBrand: any; registerTreeContentProvider(providerId: string, provider: InternalTreeExplorerNodeProvider): void; @@ -19,7 +19,7 @@ export interface ITreeExplorerService { resolveCommand(providerId: string, node: InternalTreeExplorerNode): TPromise; } -export class TreeExplorerViewletService implements ITreeExplorerService { +export class TreeExplorerViewletService implements ITreeExplorerViewletService { public _serviceBrand: any; private _treeContentProviders: { [providerId: string]: InternalTreeExplorerNodeProvider }; diff --git a/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts b/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts index f793a68a04d..6e08d5b5c6a 100644 --- a/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts +++ b/src/vs/workbench/parts/explorers/browser/views/treeExplorerView.ts @@ -18,7 +18,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; -import { ITreeExplorerService } from 'vs/workbench/parts/explorers/browser/treeExplorerService'; +import { ITreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { TreeExplorerViewletState, TreeDataSource, TreeRenderer, TreeController } from 'vs/workbench/parts/explorers/browser/views/treeExplorerViewer'; @@ -42,7 +42,7 @@ export class TreeExplorerView extends CollapsibleViewletView { @IInstantiationService private instantiationService: IInstantiationService, @IWorkbenchEditorService private editorService: IWorkbenchEditorService, @IEditorGroupService private editorGroupService: IEditorGroupService, - @ITreeExplorerService private treeExplorerViewletService: ITreeExplorerService + @ITreeExplorerViewletService private treeExplorerViewletService: ITreeExplorerViewletService ) { super(actionRunner, false, nls.localize('treeExplorerViewletTree', "Tree Explorer Section"), messageService, keybindingService, contextMenuService, headerSize); diff --git a/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts b/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts index 6b350ca6dde..f15bc3bf256 100644 --- a/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts +++ b/src/vs/workbench/parts/explorers/browser/views/treeExplorerViewer.ts @@ -16,12 +16,12 @@ import { ContributableActionProvider } from 'vs/workbench/browser/actionBarRegis import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IExtensionService } from 'vs/platform/extensions/common/extensions'; import { IModeService } from 'vs/editor/common/services/modeService'; -import { ITreeExplorerService } from 'vs/workbench/parts/explorers/browser/treeExplorerService'; +import { ITreeExplorerViewletService } from 'vs/workbench/parts/explorers/browser/treeExplorerViewletService'; export class TreeDataSource implements IDataSource { constructor( private treeNodeProviderId: string, - @ITreeExplorerService private treeExplorerViewletService: ITreeExplorerService + @ITreeExplorerViewletService private treeExplorerViewletService: ITreeExplorerViewletService ) { } @@ -82,7 +82,7 @@ export class TreeController extends DefaultController { constructor( private treeNodeProviderId: string, - @ITreeExplorerService private treeExplorerViewletService: ITreeExplorerService + @ITreeExplorerViewletService private treeExplorerViewletService: ITreeExplorerViewletService ) { super({ clickBehavior: ClickBehavior.ON_MOUSE_UP /* do not change to not break DND */ }); }