ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-28 09:35:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 8df646d3c5477b02737fc10343fa7cf0cc3f606b

Browse Source
This commit is contained in:
ADS Merger
2020-03-25 06:20:54 +00:00
parent 6e5fbc9012
commit d810da9d87
114 changed files with 2036 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vs/platform/extensionManagement/node/extensionManagementService.ts
View File

@@ -86,7 +86,7 @@ function readManifest(extensionPath: string): Promise<{ manifest: IExtensionMani
.then(raw => JSON.parse(raw))
];
return Promise.all<any>(promises).then(([{ manifest, metadata }, translations]) => {
return Promise.all(promises).then(([{ manifest, metadata }, translations]) => {
return {
manifest: localizeManifest(manifest, translations),
metadata
@@ -348,7 +348,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
this.downloadInstallableExtension(extension, operation)
.then(installableExtension => this.installExtension(installableExtension, ExtensionType.User, cancellationToken)
.then(local => pfs.rimraf(installableExtension.zipPath).finally(() => null).then(() => local)))
.then(local => pfs.rimraf(installableExtension.zipPath).finally(() => { }).then(() => local)))
.then(local => this.installDependenciesAndPackExtensions(local, existingExtension)
.then(() => local, error => this.uninstall(local, true).then(() => Promise.reject(error), () => Promise.reject(error))))
.then(
@@ -503,7 +503,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
() => this.logService.info('Renamed to', renamePath),
e => {
this.logService.info('Rename failed. Deleting from extracted location', extractPath);
return pfs.rimraf(extractPath).finally(() => null).then(() => Promise.reject(e));
return pfs.rimraf(extractPath).finally(() => { }).then(() => Promise.reject(e));
}));
}
@@ -514,7 +514,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
() => extract(zipPath, extractPath, { sourcePath: 'extension', overwrite: true }, token)
.then(
() => this.logService.info(`Extracted extension to ${extractPath}:`, identifier.id),
e => pfs.rimraf(extractPath).finally(() => null)
e => pfs.rimraf(extractPath).finally(() => { })
.then(() => Promise.reject(new ExtensionManagementError(e.message, e instanceof ExtractError && e.type ? e.type : INSTALL_ERROR_EXTRACTING)))),
e => Promise.reject(new ExtensionManagementError(this.joinErrors(e).message, INSTALL_ERROR_DELETING)));
}