提交 613ea9ef 编写于 作者: R RMacfarlane 提交者: Alex Dima

Tweak cli output

上级 ca988745
...@@ -112,6 +112,10 @@ export class Main { ...@@ -112,6 +112,10 @@ export class Main {
private async installExtensions(extensions: string[], force: boolean): Promise<void> { private async installExtensions(extensions: string[], force: boolean): Promise<void> {
const failed: string[] = []; const failed: string[] = [];
const installedExtensionsManifests: IExtensionManifest[] = []; const installedExtensionsManifests: IExtensionManifest[] = [];
if (extensions.length) {
console.log(localize('installingExtensions', "Installing extensions..."));
}
for (const extension of extensions) { for (const extension of extensions) {
try { try {
const manifest = await this.installExtension(extension, force); const manifest = await this.installExtension(extension, force);
...@@ -142,11 +146,11 @@ export class Main { ...@@ -142,11 +146,11 @@ export class Main {
if (valid) { if (valid) {
return this.extensionManagementService.install(URI.file(extension)).then(id => { return this.extensionManagementService.install(URI.file(extension)).then(id => {
console.log(localize('successVsixInstall', "Extension '{0}' was successfully installed!", getBaseLabel(extension))); console.log(localize('successVsixInstall', "Extension '{0}' was successfully installed.", getBaseLabel(extension)));
return manifest; return manifest;
}, error => { }, error => {
if (isPromiseCanceledError(error)) { if (isPromiseCanceledError(error)) {
console.log(localize('cancelVsixInstall', "Cancelled installing Extension '{0}'.", getBaseLabel(extension))); console.log(localize('cancelVsixInstall', "Cancelled installing extension '{0}'.", getBaseLabel(extension)));
return null; return null;
} else { } else {
return Promise.reject(error); return Promise.reject(error);
...@@ -191,9 +195,7 @@ export class Main { ...@@ -191,9 +195,7 @@ export class Main {
console.log(localize('forceUpdate', "Extension '{0}' v{1} is already installed, but a newer version {2} is available in the marketplace. Use '--force' option to update to newer version.", id, installedExtension.manifest.version, extension.version)); console.log(localize('forceUpdate', "Extension '{0}' v{1} is already installed, but a newer version {2} is available in the marketplace. Use '--force' option to update to newer version.", id, installedExtension.manifest.version, extension.version));
return Promise.resolve(null); return Promise.resolve(null);
} }
console.log(localize('updateMessage', "Updating the Extension '{0}' to the version {1}", id, extension.version)); console.log(localize('updateMessage', "Updating the extension '{0}' to the version {1}", id, extension.version));
} else {
console.log(localize('foundExtension', "Found '{0}' in the marketplace.", id));
} }
await this.installFromGallery(id, extension); await this.installFromGallery(id, extension);
return manifest; return manifest;
...@@ -210,7 +212,7 @@ export class Main { ...@@ -210,7 +212,7 @@ export class Main {
const newer = installedExtensions.filter(local => areSameExtensions(extensionIdentifier, local.identifier) && semver.gt(local.manifest.version, manifest.version))[0]; const newer = installedExtensions.filter(local => areSameExtensions(extensionIdentifier, local.identifier) && semver.gt(local.manifest.version, manifest.version))[0];
if (newer && !force) { if (newer && !force) {
console.log(localize('forceDowngrade', "A newer version of this extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.identifier.id, newer.manifest.version, manifest.version)); console.log(localize('forceDowngrade', "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.", newer.identifier.id, newer.manifest.version, manifest.version));
return false; return false;
} }
...@@ -218,14 +220,14 @@ export class Main { ...@@ -218,14 +220,14 @@ export class Main {
} }
private async installFromGallery(id: string, extension: IGalleryExtension): Promise<void> { private async installFromGallery(id: string, extension: IGalleryExtension): Promise<void> {
console.log(localize('installing', "Installing...")); console.log(localize('installing', "Installing extension '{0}' v{1}...", id, extension.version));
try { try {
await this.extensionManagementService.installFromGallery(extension); await this.extensionManagementService.installFromGallery(extension);
console.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed!", id, extension.version)); console.log(localize('successInstall', "Extension '{0}' v{1} was successfully installed.", id, extension.version));
} catch (error) { } catch (error) {
if (isPromiseCanceledError(error)) { if (isPromiseCanceledError(error)) {
console.log(localize('cancelVsixInstall', "Cancelled installing Extension '{0}'.", id)); console.log(localize('cancelVsixInstall', "Cancelled installing extension '{0}'.", id));
} else { } else {
throw error; throw error;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册