Remove extension from disabled list after uninstall

sandy081 · sandy081 · commit 37c04d7ddfc8 · 2016-10-19T18:26:11.000+02:00
diff --git a/src/vs/platform/extensions/common/extensions.ts b/src/vs/platform/extensions/common/extensions.ts
@@ -90,5 +90,5 @@ export interface IExtensionsRuntimeService {
 	 *
 	 * Throws error if enablement is requested for workspace and there is no workspace
 	 */
-	setEnablement(identifier: string, enable: boolean, displayName: string, workspace?: boolean): TPromise<boolean>;
+	setEnablement(identifier: string, enable: boolean, workspace?: boolean): TPromise<boolean>;
 }
diff --git a/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/electron-browser/extensionsWorkbenchService.ts
@@ -481,7 +481,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 	}
 
 	setEnablement(extension: IExtension, enable: boolean, workspace: boolean = false): TPromise<any> {
-		return this.extensionsRuntimeService.setEnablement(extension.identifier, enable, extension.displayName, workspace).then(restart => {
+		return this.extensionsRuntimeService.setEnablement(extension.identifier, enable, workspace).then(restart => {
 			(<Extension>extension).needsReload = restart;
 			this.telemetryService.publicLog(enable ? 'extension:enable' : 'extension:disable', extension.telemetryData);
 			this._onChange.fire();
@@ -585,6 +585,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 
 	private onDidUninstallExtension({id, error}: DidUninstallExtensionEvent): void {
 		if (!error) {
+			this.newlyInstalled = this.newlyInstalled.filter(e => e.local.id !== id);
 			this.installed = this.installed.filter(e => e.local.id !== id);
 		}
 
@@ -596,9 +597,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {
 
 		if (!error) {
 			this.unInstalled.push(uninstalling.extension);
+			this.extensionsRuntimeService.setEnablement(uninstalling.extension.identifier, true);
 			uninstalling.extension.needsReload = true;
 			this.reportTelemetry(uninstalling, true);
 		}
+
 		this._onChange.fire();
 	}
 
diff --git a/src/vs/workbench/services/extensions/electron-browser/extensions.ts b/src/vs/workbench/services/extensions/electron-browser/extensions.ts
@@ -56,7 +56,7 @@ export class ExtensionsRuntimeService implements IExtensionsRuntimeService {
 		});
 	}
 
-	public setEnablement(identifier: string, enable: boolean, displayName: string, workspace: boolean = false): TPromise<boolean> {
+	public setEnablement(identifier: string, enable: boolean, workspace: boolean = false): TPromise<boolean> {
 		const disabled = this.getDisabledExtensionsFromStorage().indexOf(identifier) !== -1;
 
 		if (!enable === disabled) {

Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,5 @@ export interface IExtensionsRuntimeService {`
`90`	`90`	`*`
`91`	`91`	`* Throws error if enablement is requested for workspace and there is no workspace`
`92`	`92`	`*/`
`93`		`- setEnablement(identifier: string, enable: boolean, displayName: string, workspace?: boolean): TPromise<boolean>;`
	`93`	`+ setEnablement(identifier: string, enable: boolean, workspace?: boolean): TPromise<boolean>;`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`setEnablement(extension: IExtension, enable: boolean, workspace: boolean = false): TPromise<any> {`
`484`		`- return this.extensionsRuntimeService.setEnablement(extension.identifier, enable, extension.displayName, workspace).then(restart => {`
	`484`	`+ return this.extensionsRuntimeService.setEnablement(extension.identifier, enable, workspace).then(restart => {`
`485`	`485`	`(<Extension>extension).needsReload = restart;`
`486`	`486`	`this.telemetryService.publicLog(enable ? 'extension:enable' : 'extension:disable', extension.telemetryData);`
`487`	`487`	`this._onChange.fire();`
`@@ -585,6 +585,7 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {`
`585`	`585`
`586`	`586`	`private onDidUninstallExtension({id, error}: DidUninstallExtensionEvent): void {`
`587`	`587`	`if (!error) {`
	`588`	`+ this.newlyInstalled = this.newlyInstalled.filter(e => e.local.id !== id);`
`588`	`589`	`this.installed = this.installed.filter(e => e.local.id !== id);`
`589`	`590`	`}`
`590`	`591`
`@@ -596,9 +597,11 @@ export class ExtensionsWorkbenchService implements IExtensionsWorkbenchService {`
`596`	`597`
`597`	`598`	`if (!error) {`
`598`	`599`	`this.unInstalled.push(uninstalling.extension);`
	`600`	`+ this.extensionsRuntimeService.setEnablement(uninstalling.extension.identifier, true);`
`599`	`601`	`uninstalling.extension.needsReload = true;`
`600`	`602`	`this.reportTelemetry(uninstalling, true);`
`601`	`603`	`}`
	`604`	`+`
`602`	`605`	`this._onChange.fire();`
`603`	`606`	`}`
`604`	`607`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ export class ExtensionsRuntimeService implements IExtensionsRuntimeService {`
`56`	`56`	`});`
`57`	`57`	`}`
`58`	`58`
`59`		`- public setEnablement(identifier: string, enable: boolean, displayName: string, workspace: boolean = false): TPromise<boolean> {`
	`59`	`+ public setEnablement(identifier: string, enable: boolean, workspace: boolean = false): TPromise<boolean> {`
`60`	`60`	`const disabled = this.getDisabledExtensionsFromStorage().indexOf(identifier) !== -1;`
`61`	`61`
`62`	`62`	`if (!enable === disabled) {`