remove extension quick open & status bar widget

src/vs/workbench/parts/extensions/electron-browser/extensions.contribution.ts

@@ -7,8 +7,6 @@ import 'vs/css!./media/extensions';
 import { localize } from 'vs/nls';
 import { Registry } from 'vs/platform/platform';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
-import { IStatusbarRegistry, Extensions as StatusbarExtensions, StatusbarItemDescriptor, StatusbarAlignment } from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { ExtensionsStatusbarItem } from 'vs/workbench/parts/extensions/electron-browser/extensionsWidgets';
 import { IExtensionGalleryService, IExtensionTipsService, ExtensionsLabel, ExtensionsChannelId } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionGalleryService } from 'vs/platform/extensionManagement/node/extensionGalleryService';
 import { ExtensionTipsService } from 'vs/workbench/parts/extensions/electron-browser/extensionTipsService';
@@ -41,9 +39,6 @@ registerSingleton(IExtensionTipsService, ExtensionTipsService);
 Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
 	.registerWorkbenchContribution(ExtensionsWorkbenchExtension);
 
-Registry.as<IStatusbarRegistry>(StatusbarExtensions.Statusbar)
-	.registerStatusbarItem(new StatusbarItemDescriptor(ExtensionsStatusbarItem, StatusbarAlignment.LEFT,10000));
-
 Registry.as<IOutputChannelRegistry>(OutputExtensions.OutputChannels)
 	.registerChannel(ExtensionsChannelId, ExtensionsLabel);
 

src/vs/workbench/parts/extensions/electron-browser/extensionsWidgets.ts

-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-
-import * as nls from 'vs/nls';
-import Severity from 'vs/base/common/severity';
-import { ThrottledDelayer } from 'vs/base/common/async';
-import { TPromise } from 'vs/base/common/winjs.base';
-import { emmet as $, append, toggleClass } from 'vs/base/browser/dom';
-import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle';
-import { onUnexpectedPromiseError } from 'vs/base/common/errors';
-import { assign } from 'vs/base/common/objects';
-import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar';
-import { IOutputService } from 'vs/workbench/parts/output/common/output';
-import { IExtensionService, IMessage } from 'vs/platform/extensions/common/extensions';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { IExtensionManagementService, IExtensionGalleryService, ExtensionsLabel, ExtensionsChannelId, IExtension, IExtensionManifest } from 'vs/platform/extensionManagement/common/extensionManagement';
-import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService';
-import { getOutdatedExtensions } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
-import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
-
-interface IState {
-	errors: IMessage[];
-	installing: IExtensionManifest[];
-	outdated: IExtension[];
-}
-
-const InitialState: IState = {
-	errors: [],
-	installing: [],
-	outdated: []
-};
-
-function extensionEquals(one: IExtensionManifest, other: IExtensionManifest): boolean {
-	return one.publisher === other.publisher && one.name === other.name;
-}
-
-const OutdatedPeriod = 12 * 60 * 60 * 1000; // every 12 hours
-
-export class ExtensionsStatusbarItem implements IStatusbarItem {
-
-	private domNode: HTMLElement;
-	private state: IState = InitialState;
-	private outdatedDelayer = new ThrottledDelayer<void>(OutdatedPeriod);
-
-	constructor(
-		@IExtensionService private extensionService: IExtensionService,
-		@IOutputService private outputService: IOutputService,
-		@IExtensionManagementService protected extensionManagementService: IExtensionManagementService,
-		@IExtensionGalleryService protected extensionGalleryService: IExtensionGalleryService,
-		@IInstantiationService protected instantiationService: IInstantiationService,
-		@IQuickOpenService protected quickOpenService: IQuickOpenService,
-		@ITelemetryService protected telemetrService: ITelemetryService
-	) {}
-
-	render(container: HTMLElement): IDisposable {
-		this.domNode = append(container, $('a.extensions-statusbar'));
-		append(this.domNode, $('.icon'));
-		this.domNode.onclick = () => this.onClick();
-
-		this.checkErrors();
-		this.checkOutdated();
-
-		const disposables = [];
-		this.extensionManagementService.onInstallExtension(this.onInstallExtension, this, disposables);
-		this.extensionManagementService.onDidInstallExtension(this.onDidInstallExtension, this, disposables);
-		this.extensionManagementService.onDidUninstallExtension(this.onDidUninstallExtension, this, disposables);
-
-		return combinedDisposable(disposables);
-	}
-
-	private updateState(obj: any): void {
-		this.state = assign(this.state, obj);
-		this.onStateChange();
-	}
-
-	private get hasErrors() { return this.state.errors.length > 0; }
-	private get isInstalling() { return this.state.installing.length > 0; }
-	private get hasUpdates() { return this.state.outdated.length > 0; }
-
-	private onStateChange(): void {
-		toggleClass(this.domNode, 'has-errors', this.hasErrors);
-		toggleClass(this.domNode, 'is-installing', !this.hasErrors && this.isInstalling);
-		toggleClass(this.domNode, 'has-updates', !this.hasErrors && !this.isInstalling && this.hasUpdates);
-
-		if (this.hasErrors) {
-			const singular = nls.localize('oneIssue', "Extensions (1 issue)");
-			const plural = nls.localize('multipleIssues', "Extensions ({0} issues)", this.state.errors.length);
-			this.domNode.title = this.state.errors.length > 1 ? plural : singular;
-		} else if (this.isInstalling) {
-			this.domNode.title = nls.localize('extensionsInstalling', "Extensions ({0} installing...)", this.state.installing.length);
-		} else if (this.hasUpdates) {
-			const singular = nls.localize('oneUpdate', "Extensions (1 update available)");
-			const plural = nls.localize('multipleUpdates', "Extensions ({0} updates available)", this.state.outdated.length);
-			this.domNode.title = this.state.outdated.length > 1 ? plural : singular;
-		} else {
-			this.domNode.title = nls.localize('extensions', "Extensions");
-		}
-	}
-
-	private onClick(): void {
-		if (this.hasErrors) {
-			this.telemetrService.publicLog('extensionWidgetClick', {mode : 'hasErrors'});
-			this.showErrors(this.state.errors);
-			this.updateState({ errors: [] });
-		} else if (this.hasUpdates) {
-			this.telemetrService.publicLog('extensionWidgetClick', {mode : 'hasUpdate'});
-			this.quickOpenService.show(`ext update `);
-		} else {
-			this.telemetrService.publicLog('extensionWidgetClick', {mode : 'none'});
-			this.quickOpenService.show(`>${ExtensionsLabel}: `);
-		}
-	}
-
-	private showErrors(errors: IMessage[]): void {
-		const promise = onUnexpectedPromiseError(this.extensionManagementService.getInstalled());
-		promise.done(installed => {
-			errors.forEach(m => {
-				const extension = installed.filter(ext => ext.path === m.source).pop();
-				const name = extension && extension.name;
-				const message = name ? `${ name }: ${ m.message }` : m.message;
-
-				const outputChannel = this.outputService.getChannel(ExtensionsChannelId);
-				outputChannel.append(message);
-				outputChannel.show(true);
-			});
-		});
-	}
-
-	private onInstallExtension(manifest: IExtensionManifest): void {
-		const installing = [...this.state.installing, manifest];
-		this.updateState({ installing });
-	}
-
-	private onDidInstallExtension({ extension }: { extension: IExtension; }): void {
-		const installing = this.state.installing
-			.filter(e => !extensionEquals(extension, e));
-		this.updateState({ installing });
-		this.outdatedDelayer.trigger(() => this.checkOutdated(), 0);
-	}
-
-	private onDidUninstallExtension(): void {
-		this.outdatedDelayer.trigger(() => this.checkOutdated(), 0);
-	}
-
-	private checkErrors(): void {
-		const promise = onUnexpectedPromiseError(this.extensionService.onReady());
-		promise.done(() => {
-			const status = this.extensionService.getExtensionsStatus();
-			const errors = Object.keys(status)
-				.map(k => status[k].messages)
-				.reduce((r, m) => r.concat(m), [])
-				.filter(m => m.type > Severity.Info);
-
-			this.updateState({ errors });
-		});
-	}
-
-	private checkOutdated(): TPromise<void> {
-		return getOutdatedExtensions(this.extensionManagementService, this.extensionGalleryService)
-			.then(null, _ => []) // ignore errors
-			.then(outdated => {
-				this.updateState({ outdated });
-
-				// repeat this later
-				this.outdatedDelayer.trigger(() => this.checkOutdated());
-			});
-	}
-}
\ No newline at end of file

src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts

@@ -16,8 +16,7 @@ import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common
 import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
 import wbaregistry = require('vs/workbench/common/actionRegistry');
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { ListExtensionsAction, InstallExtensionAction, ListOutdatedExtensionsAction, ListSuggestedExtensionsAction } from './extensionsActions';
-import { IQuickOpenRegistry, Extensions, QuickOpenHandlerDescriptor } from 'vs/workbench/browser/quickopen';
+import { ListExtensionsAction } from './extensionsActions';
 import {ipcRenderer as ipc} from 'electron';
 
 interface IInstallExtensionsRequest {
@@ -44,53 +43,6 @@ export class ExtensionsWorkbenchExtension implements IWorkbenchContribution {
 
 		const actionRegistry = (<wbaregistry.IWorkbenchActionRegistry> platform.Registry.as(wbaregistry.Extensions.WorkbenchActions));
 		actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ListExtensionsAction, ListExtensionsAction.ID, ListExtensionsAction.LABEL), 'Extensions: Show Installed Extensions', ExtensionsLabel);
-
-		(<IQuickOpenRegistry>platform.Registry.as(Extensions.Quickopen)).registerQuickOpenHandler(
-			new QuickOpenHandlerDescriptor(
-				'vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen',
-				'LocalExtensionsHandler',
-				'ext ',
-				nls.localize('localExtensionsCommands', "Show Local Extensions")
-			)
-		);
-
-		if (galleryService.isEnabled()) {
-
-			actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(InstallExtensionAction, InstallExtensionAction.ID, InstallExtensionAction.LABEL), 'Extensions: Install Extension', ExtensionsLabel);
-
-			(<IQuickOpenRegistry>platform.Registry.as(Extensions.Quickopen)).registerQuickOpenHandler(
-				new QuickOpenHandlerDescriptor(
-					'vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen',
-					'GalleryExtensionsHandler',
-					'ext install ',
-					nls.localize('galleryExtensionsCommands', "Install Gallery Extensions"),
-					true
-				)
-			);
-
-			actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ListOutdatedExtensionsAction, ListOutdatedExtensionsAction.ID, ListOutdatedExtensionsAction.LABEL), 'Extensions: Show Outdated Extensions', ExtensionsLabel);
-
-			(<IQuickOpenRegistry>platform.Registry.as(Extensions.Quickopen)).registerQuickOpenHandler(
-				new QuickOpenHandlerDescriptor(
-					'vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen',
-					'OutdatedExtensionsHandler',
-					'ext update ',
-					nls.localize('outdatedExtensionsCommands', "Update Outdated Extensions")
-				)
-			);
-
-			// add extension tips services
-			actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ListSuggestedExtensionsAction, ListSuggestedExtensionsAction.ID, ListSuggestedExtensionsAction.LABEL), 'Extensions: Show Extension Recommendations', ExtensionsLabel);
-
-			(<IQuickOpenRegistry>platform.Registry.as(Extensions.Quickopen)).registerQuickOpenHandler(
-				new QuickOpenHandlerDescriptor(
-					'vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen',
-					'SuggestedExtensionHandler',
-					'ext recommend ',
-					nls.localize('suggestedExtensionsCommands', "Show Extension Recommendations")
-				)
-			);
-		}
 	}
 
 	private registerListeners(): void {

src/vs/workbench/workbench.main.ts

@@ -44,7 +44,6 @@ import 'vs/workbench/parts/markers/markers.contribution';
 import 'vs/workbench/parts/html/browser/html.contribution';
 
 import 'vs/workbench/parts/extensions/electron-browser/extensions.contribution';
-import 'vs/workbench/parts/extensions/electron-browser/extensionsQuickOpen';
 
 import 'vs/workbench/parts/output/browser/output.contribution';