Skip to content

V
vscode

xxadev / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 65894b11 编写于 作者: J Joao Moreno
浏览文件
操作

wip: install action

上级 a0e74e3b
显示空白变更内容
内联 并排
Showing with 263 addition and 224 deletion
src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
浏览文件 @ 65894b11
...@@ -4,219 +4,229 @@ ...@@ -4,219 +4,229 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import nls = require('vs/nls'); import nls = require('vs/nls');
import { Promise, TPromise } from 'vs/base/common/winjs.base'; import { TPromise } from 'vs/base/common/winjs.base';
import { Action } from 'vs/base/common/actions'; import { Action } from 'vs/base/common/actions';
import { assign } from 'vs/base/common/objects'; // import { assign } from 'vs/base/common/objects';
import Severity from 'vs/base/common/severity'; // import Severity from 'vs/base/common/severity';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; // import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IMessageService } from 'vs/platform/message/common/message'; // import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions'; // import { IMessageService } from 'vs/platform/message/common/message';
import { IExtensionManagementService, ILocalExtension, IGalleryExtension } from 'vs/platform/extensionManagement/common/extensionManagement'; // import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions';
import { extensionEquals, getTelemetryData } from 'vs/platform/extensionManagement/node/extensionManagementUtil'; import { IExtension, ExtensionsModel, ExtensionState } from './extensionsModel';
import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService'; // import { extensionEquals, getTelemetryData } from 'vs/platform/extensionManagement/node/extensionManagementUtil';
// import { IQuickOpenService } from 'vs/workbench/services/quickopen/common/quickOpenService';
const CloseAction = new Action('action.close', nls.localize('close', "Close"));
// const CloseAction = new Action('action.close', nls.localize('close', "Close"));
export class ListExtensionsAction extends Action {
// export class ListExtensionsAction extends Action {
static ID = 'workbench.extensions.action.listExtensions';
static LABEL = nls.localize('showInstalledExtensions', "Show Installed Extensions"); // static ID = 'workbench.extensions.action.listExtensions';
// static LABEL = nls.localize('showInstalledExtensions', "Show Installed Extensions");
constructor(
id: string, // constructor(
label: string, // id: string,
@IExtensionManagementService private extensionManagementService: IExtensionManagementService, // label: string,
@IQuickOpenService private quickOpenService: IQuickOpenService // @IExtensionManagementService private extensionManagementService: IExtensionManagementService,
) { // @IQuickOpenService private quickOpenService: IQuickOpenService
super(id, label, null, true); // ) {
} // super(id, label, null, true);
// }
run(): Promise {
return this.quickOpenService.show('ext '); // run(): Promise {
} // return this.quickOpenService.show('ext ');
// }
protected isEnabled(): boolean {
return true; // protected isEnabled(): boolean {
} // return true;
} // }
// }
export class InstallExtensionAction extends Action {
// export class InstallExtensionAction extends Action {
static ID = 'workbench.extensions.action.installExtension';
static LABEL = nls.localize('installExtension', "Install Extension"); // static ID = 'workbench.extensions.action.installExtension';
// static LABEL = nls.localize('installExtension', "Install Extension");
constructor(
id: string, // constructor(
label: string, // id: string,
@IExtensionManagementService private extensionManagementService: IExtensionManagementService, // label: string,
@IQuickOpenService private quickOpenService: IQuickOpenService // @IExtensionManagementService private extensionManagementService: IExtensionManagementService,
) { // @IQuickOpenService private quickOpenService: IQuickOpenService
super(id, label, null, true); // ) {
} // super(id, label, null, true);
// }
run(): Promise {
return this.quickOpenService.show('ext install '); // run(): Promise {
} // return this.quickOpenService.show('ext install ');
// }
protected isEnabled(): boolean {
return true; // protected isEnabled(): boolean {
} // return true;
} // }
// }
export class ListOutdatedExtensionsAction extends Action {
// export class ListOutdatedExtensionsAction extends Action {
static ID = 'workbench.extensions.action.listOutdatedExtensions';
static LABEL = nls.localize('showOutdatedExtensions', "Show Outdated Extensions"); // static ID = 'workbench.extensions.action.listOutdatedExtensions';
// static LABEL = nls.localize('showOutdatedExtensions', "Show Outdated Extensions");
constructor(
id: string, // constructor(
label: string, // id: string,
@IExtensionManagementService private extensionManagementService: IExtensionManagementService, // label: string,
@IQuickOpenService private quickOpenService: IQuickOpenService // @IExtensionManagementService private extensionManagementService: IExtensionManagementService,
) { // @IQuickOpenService private quickOpenService: IQuickOpenService
super(id, label, null, true); // ) {
} // super(id, label, null, true);
// }
run(): Promise {
return this.quickOpenService.show('ext update '); // run(): Promise {
} // return this.quickOpenService.show('ext update ');
// }
protected isEnabled(): boolean {
return true; // protected isEnabled(): boolean {
} // return true;
} // }
// }
export class ListSuggestedExtensionsAction extends Action {
// export class ListSuggestedExtensionsAction extends Action {
static ID = 'workbench.extensions.action.listSuggestedExtensions';
static LABEL = nls.localize('showExtensionRecommendations', "Show Extension Recommendations"); // static ID = 'workbench.extensions.action.listSuggestedExtensions';
// static LABEL = nls.localize('showExtensionRecommendations', "Show Extension Recommendations");
constructor(
id: string, // constructor(
label: string, // id: string,
@IExtensionManagementService private extensionManagementService: IExtensionManagementService, // label: string,
@IQuickOpenService private quickOpenService: IQuickOpenService // @IExtensionManagementService private extensionManagementService: IExtensionManagementService,
) { // @IQuickOpenService private quickOpenService: IQuickOpenService
super(id, label, null, true); // ) {
} // super(id, label, null, true);
// }
run(): Promise {
return this.quickOpenService.show('ext recommend '); // run(): Promise {
} // return this.quickOpenService.show('ext recommend ');
// }
protected isEnabled(): boolean {
return true; // protected isEnabled(): boolean {
} // return true;
} // }
// }
export class InstallAction extends Action { export class InstallAction extends Action {
constructor( private disposables: IDisposable[] = [];
label: string,
@IQuickOpenService protected quickOpenService: IQuickOpenService,
@IExtensionManagementService protected extensionManagementService: IExtensionManagementService,
@IMessageService protected messageService: IMessageService,
@ITelemetryService protected telemetryService: ITelemetryService,
@IInstantiationService protected instantiationService: IInstantiationService
) {
super('extensions.install', label, 'octicon octicon-cloud-download', true);
}
run(extension: IGalleryExtension): TPromise<any> {
this.enabled = false;
return this.extensionManagementService.getInstalled()
.then(installed => installed.some(({ manifest }) => extensionEquals(manifest, extension)))
.then(isUpdate => {
return this.extensionManagementService
.install(extension)
.then(() => this.onSuccess(extension, isUpdate), err => this.onError(err, extension, isUpdate))
.then(() => this.enabled = true)
.then(() => null);
});
}
private onSuccess(extension: IGalleryExtension, isUpdate: boolean) {
this.reportTelemetry(extension, isUpdate, true);
this.messageService.show(Severity.Info, {
message: nls.localize('success-installed', "'{0}' was successfully installed. Restart to enable it.", extension.displayName || extension.name),
actions: [
CloseAction,
this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, nls.localize('restartNow', "Restart Now"))
]
});
}
private onError(err: Error, extension: IGalleryExtension, isUpdate: boolean) {
this.reportTelemetry(extension, isUpdate, false);
this.messageService.show(Severity.Error, err);
}
private reportTelemetry(extension: IGalleryExtension, isUpdate: boolean, success: boolean) {
const event = isUpdate ? 'extensionGallery:update' : 'extensionGallery:install';
const data = assign(getTelemetryData(extension), { success });
this.telemetryService.publicLog(event, data);
}
}
export class UninstallAction extends Action { constructor(private model: ExtensionsModel, private extension: IExtension) {
super('extensions.install', nls.localize('installAction', "Install"), 'octicon octicon-cloud-download', false);
constructor( this.disposables.push(this.model.onChange(() => this.updateEnablement()));
@IQuickOpenService protected quickOpenService: IQuickOpenService, this.updateEnablement();
@IExtensionManagementService protected extensionManagementService: IExtensionManagementService,
@IMessageService protected messageService: IMessageService,
@ITelemetryService protected telemetryService: ITelemetryService,
@IInstantiationService protected instantiationService: IInstantiationService
) {
super('extensions.uninstall', nls.localize('uninstall', "Uninstall Extension"), 'octicon octicon-x', true);
} }
run(extension: ILocalExtension): TPromise<any> { private updateEnablement(): void {
const name = extension.manifest.displayName || extension.manifest.name; this.enabled = this.extension.state === ExtensionState.Uninstalled;
if (!window.confirm(nls.localize('deleteSure', "Are you sure you want to uninstall '{0}'?", name))) {
return TPromise.as(null);
} }
this.enabled = false; run(): TPromise<any> {
return this.model.install(this.extension);
return this.extensionManagementService.getInstalled().then(localExtensions => { // this.enabled = false;
const [local] = localExtensions.filter(local => extensionEquals(local.manifest, extension.manifest));
if (!local) { // return this.extensionManagementService.getInstalled()
return TPromise.wrapError(nls.localize('notFound', "Extension '{0}' not installed.", name)); // .then(installed => installed.some(({ manifest }) => extensionEquals(manifest, extension)))
// .then(isUpdate => {
// return this.extensionManagementService
// .install(extension)
// .then(() => this.onSuccess(extension, isUpdate), err => this.onError(err, extension, isUpdate))
// .then(() => this.enabled = true)
// .then(() => null);
// });
} }
return this.extensionManagementService.uninstall(local) // private onSuccess(extension: IGalleryExtension, isUpdate: boolean) {
.then(() => this.onSuccess(local), err => this.onError(err, local)) // this.reportTelemetry(extension, isUpdate, true);
.then(() => this.enabled = true) // this.messageService.show(Severity.Info, {
.then(() => null); // message: nls.localize('success-installed', "'{0}' was successfully installed. Restart to enable it.", extension.displayName || extension.name),
}); // actions: [
} // CloseAction,
// this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, nls.localize('restartNow', "Restart Now"))
// ]
// });
// }
private onSuccess(extension: ILocalExtension) { // private onError(err: Error, extension: IGalleryExtension, isUpdate: boolean) {
const name = extension.manifest.displayName || extension.manifest.name; // this.reportTelemetry(extension, isUpdate, false);
this.reportTelemetry(extension, true); // this.messageService.show(Severity.Error, err);
// }
this.messageService.show(Severity.Info, {
message: nls.localize('success-uninstalled', "'{0}' was successfully uninstalled. Restart to deactivate it.", name),
actions: [
CloseAction,
this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, nls.localize('restartNow2', "Restart Now"))
]
});
}
private onError(err: Error, extension: ILocalExtension) { // private reportTelemetry(extension: IGalleryExtension, isUpdate: boolean, success: boolean) {
this.reportTelemetry(extension, false); // const event = isUpdate ? 'extensionGallery:update' : 'extensionGallery:install';
this.messageService.show(Severity.Error, err); // const data = assign(getTelemetryData(extension), { success });
}
private reportTelemetry(extension: ILocalExtension, success: boolean) { // this.telemetryService.publicLog(event, data);
const data = assign(getTelemetryData(extension), { success }); // }
this.telemetryService.publicLog('extensionGallery:uninstall', data); dispose(): void {
super.dispose();
this.disposables = dispose(this.disposables);
} }
} }
// export class UninstallAction extends Action {
// constructor(
// @IQuickOpenService protected quickOpenService: IQuickOpenService,
// @IExtensionManagementService protected extensionManagementService: IExtensionManagementService,
// @IMessageService protected messageService: IMessageService,
// @ITelemetryService protected telemetryService: ITelemetryService,
// @IInstantiationService protected instantiationService: IInstantiationService
// ) {
// super('extensions.uninstall', nls.localize('uninstall', "Uninstall Extension"), 'octicon octicon-x', true);
// }
// run(extension: ILocalExtension): TPromise<any> {
// const name = extension.manifest.displayName || extension.manifest.name;
// if (!window.confirm(nls.localize('deleteSure', "Are you sure you want to uninstall '{0}'?", name))) {
// return TPromise.as(null);
// }
// this.enabled = false;
// return this.extensionManagementService.getInstalled().then(localExtensions => {
// const [local] = localExtensions.filter(local => extensionEquals(local.manifest, extension.manifest));
// if (!local) {
// return TPromise.wrapError(nls.localize('notFound', "Extension '{0}' not installed.", name));
// }
// return this.extensionManagementService.uninstall(local)
// .then(() => this.onSuccess(local), err => this.onError(err, local))
// .then(() => this.enabled = true)
// .then(() => null);
// });
// }
// private onSuccess(extension: ILocalExtension) {
// const name = extension.manifest.displayName || extension.manifest.name;
// this.reportTelemetry(extension, true);
// this.messageService.show(Severity.Info, {
// message: nls.localize('success-uninstalled', "'{0}' was successfully uninstalled. Restart to deactivate it.", name),
// actions: [
// CloseAction,
// this.instantiationService.createInstance(ReloadWindowAction, ReloadWindowAction.ID, nls.localize('restartNow2', "Restart Now"))
// ]
// });
// }
// private onError(err: Error, extension: ILocalExtension) {
// this.reportTelemetry(extension, false);
// this.messageService.show(Severity.Error, err);
// }
// private reportTelemetry(extension: ILocalExtension, success: boolean) {
// const data = assign(getTelemetryData(extension), { success });
// this.telemetryService.publicLog('extensionGallery:uninstall', data);
// }
// }
src/vs/workbench/parts/extensions/electron-browser/extensionsList.ts
浏览文件 @ 65894b11
...@@ -6,10 +6,13 @@ ...@@ -6,10 +6,13 @@
'use strict'; 'use strict';
import { append, emmet as $, addClass, removeClass } from 'vs/base/browser/dom'; import { append, emmet as $, addClass, removeClass } from 'vs/base/browser/dom';
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IDelegate } from 'vs/base/browser/ui/list/list'; import { IDelegate } from 'vs/base/browser/ui/list/list';
import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging'; import { IPagedRenderer } from 'vs/base/browser/ui/list/listPaging';
import { IExtension } from './extensionsModel'; import { IExtension, ExtensionsModel } from './extensionsModel';
import { InstallAction } from './extensionsActions';
export interface ITemplateData { export interface ITemplateData {
extension: IExtension; extension: IExtension;
...@@ -19,6 +22,8 @@ export interface ITemplateData { ...@@ -19,6 +22,8 @@ export interface ITemplateData {
version: HTMLElement; version: HTMLElement;
author: HTMLElement; author: HTMLElement;
description: HTMLElement; description: HTMLElement;
actionbar: ActionBar;
disposables: IDisposable[];
} }
export class Delegate implements IDelegate<IExtension> { export class Delegate implements IDelegate<IExtension> {
...@@ -32,6 +37,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> { ...@@ -32,6 +37,7 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
get templates(): ITemplateData[] { return this._templates; } get templates(): ITemplateData[] { return this._templates; }
constructor( constructor(
private model: ExtensionsModel,
@IInstantiationService private instantiationService: IInstantiationService @IInstantiationService private instantiationService: IInstantiationService
) { ) {
this._templates = []; this._templates = [];
...@@ -48,13 +54,17 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> { ...@@ -48,13 +54,17 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
const version = append(header, $('span.version.ellipsis')); const version = append(header, $('span.version.ellipsis'));
const author = append(header, $('span.author.ellipsis')); const author = append(header, $('span.author.ellipsis'));
const description = append(details, $('.description.ellipsis')); const description = append(details, $('.description.ellipsis'));
const result = { extension: null, element, icon, name, version, author, description }; const actionbar = new ActionBar(details);
const disposables = [];
const result = { extension: null, element, icon, name, version, author, description, actionbar, disposables };
this._templates.push(result); this._templates.push(result);
return result; return result;
} }
renderPlaceholder(index: number, data: ITemplateData): void { renderPlaceholder(index: number, data: ITemplateData): void {
data.disposables = dispose(data.disposables);
addClass(data.element, 'loading'); addClass(data.element, 'loading');
data.extension = null; data.extension = null;
data.icon.src = ''; data.icon.src = '';
...@@ -62,17 +72,21 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> { ...@@ -62,17 +72,21 @@ export class Renderer implements IPagedRenderer<IExtension, ITemplateData> {
data.version.textContent = ''; data.version.textContent = '';
data.author.textContent = ''; data.author.textContent = '';
data.description.textContent = ''; data.description.textContent = '';
data.actionbar.clear();
} }
renderElement(extension: IExtension, index: number, data: ITemplateData): void { renderElement(extension: IExtension, index: number, data: ITemplateData): void {
data.extension = extension; data.disposables = dispose(data.disposables);
removeClass(data.element, 'loading');
removeClass(data.element, 'loading');
data.extension = extension;
data.icon.src = extension.iconUrl; data.icon.src = extension.iconUrl;
data.name.textContent = extension.displayName; data.name.textContent = extension.displayName;
data.version.textContent = extension.version; data.version.textContent = extension.version;
data.author.textContent = extension.publisherDisplayName; data.author.textContent = extension.publisherDisplayName;
data.description.textContent = extension.description; data.description.textContent = extension.description;
data.actionbar.clear();
data.actionbar.push(new InstallAction(this.model, extension));
} }
disposeTemplate(data: ITemplateData): void { disposeTemplate(data: ITemplateData): void {
......
src/vs/workbench/parts/extensions/electron-browser/extensionsModel.ts
浏览文件 @ 65894b11
...@@ -21,6 +21,7 @@ export enum ExtensionState { ...@@ -21,6 +21,7 @@ export enum ExtensionState {
} }
export interface IExtension { export interface IExtension {
state: ExtensionState;
name: string; name: string;
displayName: string; displayName: string;
publisher: string; publisher: string;
...@@ -30,14 +31,17 @@ export interface IExtension { ...@@ -30,14 +31,17 @@ export interface IExtension {
iconUrl: string; iconUrl: string;
} }
interface IExtensionStateProvider {
(extension: Extension): ExtensionState;
}
class Extension implements IExtension { class Extension implements IExtension {
constructor( constructor(
private stateProvider: IExtensionStateProvider,
public local: ILocalExtension, public local: ILocalExtension,
public gallery: IGalleryExtension = null public gallery: IGalleryExtension = null
) { ) {}
}
get name(): string { get name(): string {
return this.local ? this.local.manifest.name : this.gallery.name; return this.local ? this.local.manifest.name : this.gallery.name;
...@@ -86,22 +90,28 @@ class Extension implements IExtension { ...@@ -86,22 +90,28 @@ class Extension implements IExtension {
return require.toUrl('./media/defaultIcon.png'); return require.toUrl('./media/defaultIcon.png');
} }
get state(): ExtensionState {
return this.stateProvider(this);
}
} }
export class ExtensionsModel { export class ExtensionsModel {
private disposables: IDisposable[] = []; private disposables: IDisposable[] = [];
private installing: { id: string; extension: Extension; }[]; private stateProvider: IExtensionStateProvider;
private installing: { id: string; extension: Extension; }[] = [];
private installed: Extension[] = []; private installed: Extension[] = [];
private _onChange: Emitter<void>; private _onChange: Emitter<void> = new Emitter<void>();
get onChange(): Event<void> { return this._onChange.event; } get onChange(): Event<void> { return this._onChange.event; }
constructor( constructor(
@IExtensionManagementService private extensionService: IExtensionManagementService, @IExtensionManagementService private extensionService: IExtensionManagementService,
@IExtensionGalleryService private galleryService: IExtensionGalleryService @IExtensionGalleryService private galleryService: IExtensionGalleryService
) { ) {
this.stateProvider = ext => this.getExtensionState(ext);
this.disposables.push(extensionService.onInstallExtension(({ id, gallery }) => this.onInstallExtension(id, gallery))); this.disposables.push(extensionService.onInstallExtension(({ id, gallery }) => this.onInstallExtension(id, gallery)));
this.disposables.push(extensionService.onDidInstallExtension(({ id, local, error }) => this.onDidInstallExtension(id, local, error))); this.disposables.push(extensionService.onDidInstallExtension(({ id, local, error }) => this.onDidInstallExtension(id, local, error)));
} }
...@@ -112,7 +122,7 @@ export class ExtensionsModel { ...@@ -112,7 +122,7 @@ export class ExtensionsModel {
this.installed = result.map(local => { this.installed = result.map(local => {
const id = local.path; const id = local.path;
const extension = installedById[id] || new Extension(local); const extension = installedById[id] || new Extension(this.stateProvider, local);
extension.local = local; extension.local = local;
return extension; return extension;
}); });
...@@ -134,27 +144,24 @@ export class ExtensionsModel { ...@@ -134,27 +144,24 @@ export class ExtensionsModel {
return installed; return installed;
} }
return new Extension(null, gallery); return new Extension(this.stateProvider, null, gallery);
}); });
}); });
} }
getState(extension: IExtension): ExtensionState { install(extension: IExtension): TPromise<void> {
if (!(extension instanceof Extension)) { if (!(extension instanceof Extension)) {
return; return;
} }
const ext = extension as Extension; const ext = extension as Extension;
const gallery = ext.gallery;
if (this.installed.indexOf(ext) > -1) { if (!gallery) {
return ExtensionState.Installed; return TPromise.wrapError<void>(new Error('Missing gallery'));
}
if (this.installing.some(e => e.extension === ext)) {
return ExtensionState.Installing;
} }
return ExtensionState.Uninstalled; return this.extensionService.install(gallery);
} }
private onInstallExtension(id: string, gallery: IGalleryExtension): void { private onInstallExtension(id: string, gallery: IGalleryExtension): void {
...@@ -165,7 +172,7 @@ export class ExtensionsModel { ...@@ -165,7 +172,7 @@ export class ExtensionsModel {
let extension = this.installed.filter(e => (e.local.metadata && e.local.metadata.id) === gallery.id)[0]; let extension = this.installed.filter(e => (e.local.metadata && e.local.metadata.id) === gallery.id)[0];
if (!extension) { if (!extension) {
extension = new Extension(null, gallery); extension = new Extension(this.stateProvider, null, gallery);
} }
extension.gallery = gallery; extension.gallery = gallery;
...@@ -190,6 +197,18 @@ export class ExtensionsModel { ...@@ -190,6 +197,18 @@ export class ExtensionsModel {
this._onChange.fire(); this._onChange.fire();
} }
private getExtensionState(extension: Extension): ExtensionState {
if (this.installed.indexOf(extension) > -1) {
return ExtensionState.Installed;
}
if (this.installing.some(e => e.extension === extension)) {
return ExtensionState.Installing;
}
return ExtensionState.Uninstalled;
}
dispose(): void { dispose(): void {
this.disposables = dispose(this.disposables); this.disposables = dispose(this.disposables);
} }
......
src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts
浏览文件 @ 65894b11
...@@ -62,7 +62,7 @@ export class ExtensionsViewlet extends Viewlet { ...@@ -62,7 +62,7 @@ export class ExtensionsViewlet extends Viewlet {
this.extensionsBox = append(this.root, $('.extensions')); this.extensionsBox = append(this.root, $('.extensions'));
const delegate = new Delegate(); const delegate = new Delegate();
const renderer = this.instantiationService.createInstance(Renderer); const renderer = this.instantiationService.createInstance(Renderer, this.model);
this.list = new PagedList(this.extensionsBox, delegate, [renderer]); this.list = new PagedList(this.extensionsBox, delegate, [renderer]);
this.searchBox.oninput = () => this.triggerSearch(this.searchBox.value); this.searchBox.oninput = () => this.triggerSearch(this.searchBox.value);
......
src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchExtension.ts
浏览文件 @ 65894b11
...@@ -5,18 +5,14 @@ ...@@ -5,18 +5,14 @@
import nls = require('vs/nls'); import nls = require('vs/nls');
import errors = require('vs/base/common/errors'); import errors = require('vs/base/common/errors');
import platform = require('vs/platform/platform');
import { Promise } from 'vs/base/common/winjs.base'; import { Promise } from 'vs/base/common/winjs.base';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, ExtensionsLabel } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService } from 'vs/platform/extensionManagement/common/extensionManagement';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IMessageService } from 'vs/platform/message/common/message'; import { IMessageService } from 'vs/platform/message/common/message';
import Severity from 'vs/base/common/severity'; import Severity from 'vs/base/common/severity';
import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common/contextService'; import { IWorkspaceContextService } from 'vs/workbench/services/workspace/common/contextService';
import { ReloadWindowAction } from 'vs/workbench/electron-browser/actions'; 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 } from './extensionsActions';
import {ipcRenderer as ipc} from 'electron'; import {ipcRenderer as ipc} from 'electron';
interface IInstallExtensionsRequest { interface IInstallExtensionsRequest {
...@@ -41,8 +37,8 @@ export class ExtensionsWorkbenchExtension implements IWorkbenchContribution { ...@@ -41,8 +37,8 @@ export class ExtensionsWorkbenchExtension implements IWorkbenchContribution {
this.install(options.extensionsToInstall).done(null, errors.onUnexpectedError); this.install(options.extensionsToInstall).done(null, errors.onUnexpectedError);
} }
const actionRegistry = (<wbaregistry.IWorkbenchActionRegistry> platform.Registry.as(wbaregistry.Extensions.WorkbenchActions)); // const actionRegistry = (<wbaregistry.IWorkbenchActionRegistry> platform.Registry.as(wbaregistry.Extensions.WorkbenchActions));
actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ListExtensionsAction, ListExtensionsAction.ID, ListExtensionsAction.LABEL), 'Extensions: Show Installed Extensions', ExtensionsLabel); // actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ListExtensionsAction, ListExtensionsAction.ID, ListExtensionsAction.LABEL), 'Extensions: Show Installed Extensions', ExtensionsLabel);
} }
private registerListeners(): void { private registerListeners(): void {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或