maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #38930

Browse source
This commit is contained in:
Sandeep Somavarapu 2017-11-22 09:23:34 +01:00
parent 9ca78d114f
commit 3afa3348c5
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vs/workbench/services/extensions/electron-browser/extensionService.ts
View file

@ -315,7 +315,7 @@ export class ExtensionService implements IExtensionService {
// Migrate enablement service to use identifiers
this._extensionEnablementService.migrateToIdentifiers(installedExtensions);
return this._getDisabledExtensions()
return this._getDisabledExtensions(installedExtensions)
.then(disabledExtensions => {
/* __GDPR__
"extensionsScanned" : {
@ -357,18 +357,18 @@ export class ExtensionService implements IExtensionService {
});
}
private _getDisabledExtensions(): TPromise<IExtensionIdentifier[]> {
private _getDisabledExtensions(installedExtensions: IExtensionIdentifier[]): TPromise<IExtensionIdentifier[]> {
return this._extensionEnablementService.getDisabledExtensions()
.then(disabledExtensions => {
const betterMergeExtensionIdentifier: IExtensionIdentifier = { id: BetterMergeId };
if (disabledExtensions.some(d => d.id === betterMergeExtensionIdentifier.id)) {
return disabledExtensions;
if (disabledExtensions.every(disabled => disabled.id !== BetterMergeId) && installedExtensions.some(d => d.id === BetterMergeId)) {
return this._extensionEnablementService.setEnablement(betterMergeExtensionIdentifier, EnablementState.Disabled)
.then(() => {
this._storageService.store(BetterMergeDisabledNowKey, true);
return [...disabledExtensions, betterMergeExtensionIdentifier];
});
}
return this._extensionEnablementService.setEnablement(betterMergeExtensionIdentifier, EnablementState.Disabled)
.then(() => {
this._storageService.store(BetterMergeDisabledNowKey, true);
return [...disabledExtensions, betterMergeExtensionIdentifier];
});
return disabledExtensions;
});
}