diff --git a/src/vs/workbench/api/node/extHostTreeExplorers.ts b/src/vs/workbench/api/node/extHostTreeExplorers.ts index 5c216171d73..22a6af7a136 100644 --- a/src/vs/workbench/api/node/extHostTreeExplorers.ts +++ b/src/vs/workbench/api/node/extHostTreeExplorers.ts @@ -81,7 +81,7 @@ export class ExtHostTreeExplorers extends ExtHostTreeExplorersShape { return internalChild; }); }, err => { - const errMessage = localize('extHostTreeExplorers.ts.failedToResolveChildren', 'TreeExplorerNodeProvider \'{0}\' failed to resolveChildren.', providerId); + const errMessage = localize('treeExplorer.failedToResolveChildren', 'TreeExplorerNodeProvider \'{0}\' failed to resolveChildren.', providerId); return TPromise.wrapError(errMessage); }); } diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index d3b5abab171..6602620942e 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -52,8 +52,8 @@ export class ActivitybarPart extends Part implements IActivityService { // Deactivate viewlet action on close this.toUnbind.push(this.viewletService.onDidViewletClose(viewlet => this.onCompositeClosed(viewlet))); - // Update viewlet switcher when extension viewlets become ready - this.toUnbind.push(this.viewletService.onDidExtensionViewletsLoad(() => this.refreshViewletSwitcher())); + // Update viewlet switcher when external viewlets become ready + this.toUnbind.push(this.viewletService.onDidExtViewletsLoad(() => this.refreshViewletSwitcher())); // Update viewlet switcher on toggling of a viewlet this.toUnbind.push(this.viewletService.onDidViewletToggle(() => this.refreshViewletSwitcher())); @@ -109,16 +109,17 @@ export class ActivitybarPart extends Part implements IActivityService { this.fillViewletSwitcher(this.viewletService.getAllViewletsToDisplay()); } - private fillViewletSwitcher(newViewlets: ViewletDescriptor[]) { + private fillViewletSwitcher(viewlets: ViewletDescriptor[]) { // Pull out viewlets no longer needed - const newViewletIds = newViewlets.map(v => v.id); - Object.keys(this.compositeIdToActions).forEach(viewletId => { + const newViewletIds = viewlets.map(v => v.id); + const existingViewletIds = Object.keys(this.compositeIdToActions); + existingViewletIds.forEach(viewletId => { if (newViewletIds.indexOf(viewletId) === -1) { this.pullViewlet(viewletId); } }); - const actionsToPush = newViewlets + const actionsToPush = viewlets .filter(viewlet => !this.compositeIdToActions[viewlet.id]) .map(viewlet => this.toAction(viewlet)); diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index 1c25ad84f16..511418ee269 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -153,10 +153,10 @@ export abstract class ViewerViewlet extends Viewlet { */ export class ViewletDescriptor extends CompositeDescriptor { - constructor(moduleId: string, ctorName: string, id: string, name: string, cssClass?: string, order?: number, public isExtension: boolean = false) { + constructor(moduleId: string, ctorName: string, id: string, name: string, cssClass?: string, order?: number, public isExternal: boolean = false) { super(moduleId, ctorName, id, name, cssClass, order); - if (isExtension) { - // Pass viewletId to extension viewlet, which doesn't know its id until runtime. + if (isExternal) { + // Pass viewletId to external viewlet, which doesn't know its id until runtime. this.appendStaticArguments([id]); } } diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 27a00689412..278adf85590 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -248,9 +248,9 @@ export class Workbench implements IPartService { if (this.shouldRestoreSidebar() && !this.sideBarHidden) { const lastOpenedViewlet = this.storageService.get(SidebarPart.activeViewletSettingsKey, StorageScope.WORKSPACE); - // If last viewlet is extension viewlet, delay its restoration until extension viewlets loaded + // If last viewlet is external viewlet, delay its restoration until external viewlets loaded if (!viewletRegistry.getViewlet(lastOpenedViewlet)) { - this.viewletService.onDidExtensionViewletsLoad(() => { + this.viewletService.onDidExtViewletsLoad(() => { this.sidebarPart.openViewlet(lastOpenedViewlet, false).done(); }); } diff --git a/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts b/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts index 4d249455590..5b999c8dd73 100644 --- a/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts +++ b/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.ts @@ -76,7 +76,7 @@ export class ExplorerContribtion implements IWorkbenchContribution { toCustomExplorerViewletId(treeExplorerNodeProviderId), treeLabel, toCustomExplorerViewletCSSClass(treeExplorerNodeProviderId), - -1, // Extension viewlets are ordered by enabling sequence, so order here doesn't matter. + -1, // External viewlets are ordered by enabling sequence, so order here doesn't matter. true )); } diff --git a/src/vs/workbench/parts/explorers/common/treeExplorer.ts b/src/vs/workbench/parts/explorers/common/treeExplorer.ts index 35a7199d636..ed1ed85e5e0 100644 --- a/src/vs/workbench/parts/explorers/common/treeExplorer.ts +++ b/src/vs/workbench/parts/explorers/common/treeExplorer.ts @@ -19,4 +19,4 @@ export function toCustomExplorerViewletCSSClass(viewletId: string): string { export function isValidViewletId(viewletId: string): boolean { // Only allow alphanumeric letters, `_` and `-`. return /^[a-z0-9_-]+$/i.test(viewletId); -} \ No newline at end of file +} diff --git a/src/vs/workbench/parts/explorers/common/treeExplorerActions.contribution.ts b/src/vs/workbench/parts/explorers/common/treeExplorerActions.contribution.ts index bbf79d5db6d..70f36803b4d 100644 --- a/src/vs/workbench/parts/explorers/common/treeExplorerActions.contribution.ts +++ b/src/vs/workbench/parts/explorers/common/treeExplorerActions.contribution.ts @@ -17,7 +17,7 @@ import { toCustomExplorerViewletActionId } from 'vs/workbench/parts/explorers/co const registry = Registry.as(ActionExtensions.WorkbenchActions); -export class ToggleExtViewletAction extends Action { +export class ToggleExternalViewletAction extends Action { public static ID = toCustomExplorerViewletActionId('toggle'); public static LABEL = localize('treeExplorer.toggle', 'Toggle Custom Explorer'); @@ -31,7 +31,7 @@ export class ToggleExtViewletAction extends Action { } run(): TPromise { - const extViewlets = this.viewletService.getAllViewlets().filter(viewlet => viewlet.isExtension); + const extViewlets = this.viewletService.getAllViewlets().filter(viewlet => viewlet.isExternal); const picks: IPickOpenEntry[] = []; @@ -63,7 +63,7 @@ export class ToggleExtViewletAction extends Action { } registry.registerWorkbenchAction( - new SyncActionDescriptor(ToggleExtViewletAction, ToggleExtViewletAction.ID, ToggleExtViewletAction.LABEL), + new SyncActionDescriptor(ToggleExternalViewletAction, ToggleExternalViewletAction.ID, ToggleExternalViewletAction.LABEL), 'View: Toggle Custom Explorer', localize('view', "View") ); diff --git a/src/vs/workbench/services/viewlet/browser/viewletService.ts b/src/vs/workbench/services/viewlet/browser/viewletService.ts index 33ba3566243..a28a231c2dc 100644 --- a/src/vs/workbench/services/viewlet/browser/viewletService.ts +++ b/src/vs/workbench/services/viewlet/browser/viewletService.ts @@ -23,12 +23,12 @@ export class ViewletService implements IViewletService { private sidebarPart: ISidebar; private enabledExtViewletIds: string[]; private extViewlets: ViewletDescriptor[]; - private _onDidExtensionViewletsLoad = new Emitter(); + private _onDidExtViewletsLoad = new Emitter(); private _onDidViewletToggle = new Emitter(); public get onDidViewletOpen(): Event { return this.sidebarPart.onDidViewletOpen; }; public get onDidViewletClose(): Event { return this.sidebarPart.onDidViewletClose; }; - public get onDidExtensionViewletsLoad(): Event { return this._onDidExtensionViewletsLoad.event; }; + public get onDidExtViewletsLoad(): Event { return this._onDidExtViewletsLoad.event; }; public get onDidViewletToggle(): Event { return this._onDidViewletToggle.event; }; constructor( @@ -50,12 +50,12 @@ export class ViewletService implements IViewletService { private onExtensionServiceReady(): void { const viewlets = (Registry.as(ViewletExtensions.Viewlets)).getViewlets(); viewlets.forEach(v => { - if (v.isExtension) { + if (v.isExternal) { this.extViewlets.push(v); } }); - this._onDidExtensionViewletsLoad.fire(); + this._onDidExtViewletsLoad.fire(); } public openViewlet(id: string, focus?: boolean): TPromise { @@ -102,7 +102,7 @@ export class ViewletService implements IViewletService { private getStockViewlets(): ViewletDescriptor[] { return (Registry.as(ViewletExtensions.Viewlets)) .getViewlets() - .filter(viewlet => !viewlet.isExtension) + .filter(viewlet => !viewlet.isExternal) .sort((v1, v2) => v1.order - v2.order); } diff --git a/src/vs/workbench/services/viewlet/common/viewletService.ts b/src/vs/workbench/services/viewlet/common/viewletService.ts index d52b94601dd..0186de9ce1a 100644 --- a/src/vs/workbench/services/viewlet/common/viewletService.ts +++ b/src/vs/workbench/services/viewlet/common/viewletService.ts @@ -17,7 +17,7 @@ export interface IViewletService { onDidViewletOpen: Event; onDidViewletClose: Event; - onDidExtensionViewletsLoad: Event; + onDidExtViewletsLoad: Event; onDidViewletToggle: Event; /** @@ -43,7 +43,7 @@ export interface IViewletService { /** * Returns all viewlets that should be displayed, ordered by: * - Stock Viewlets: order attribute - * - Extension Viewlets: enabling sequence + * - External Viewlets: enabling sequence */ getAllViewletsToDisplay(): ViewletDescriptor[]; diff --git a/src/vs/workbench/test/browser/services.test.ts b/src/vs/workbench/test/browser/services.test.ts index bc1da1ce009..b7d63f3cfb9 100644 --- a/src/vs/workbench/test/browser/services.test.ts +++ b/src/vs/workbench/test/browser/services.test.ts @@ -102,12 +102,12 @@ class TestViewletService implements IViewletService { onDidViewletOpenEmitter = new Emitter(); onDidViewletCloseEmitter = new Emitter(); - onDidExtensionViewletsLoadEmitter = new Emitter(); + onDidExtletsLoadEmitter = new Emitter(); onDidViewletToggleEmitter = new Emitter(); onDidViewletOpen = this.onDidViewletOpenEmitter.event; onDidViewletClose = this.onDidViewletCloseEmitter.event; - onDidExtensionViewletsLoad = this.onDidExtensionViewletsLoadEmitter.event; + onDidExtViewletsLoad = this.onDidExtletsLoadEmitter.event; onDidViewletToggle = this.onDidViewletToggleEmitter.event; public openViewlet(id: string, focus?: boolean): TPromise {