ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix extension bugs from VS Code merge (#4563)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 17:22:56 -07:00
committed by GitHub
parent cb47cb7dbf
commit 50f63a2f72
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
// Until there's a gallery for SQL Ops Studio, skip retrieving the metadata from the gallery // Until there's a gallery for SQL Ops Studio, skip retrieving the metadata from the gallery
return this.installExtension({ zipPath, identifierWithVersion, metadata: null }, type, token) return this.installExtension({ zipPath, identifierWithVersion, metadata: null }, type, token)
.then( .then(
local => this._onDidInstallExtension.fire({ identifier, zipPath, local, operation: InstallOperation.Install }), local => { this._onDidInstallExtension.fire({ identifier, zipPath, local, operation: InstallOperation.Install }); return identifier; },
error => { this._onDidInstallExtension.fire({ identifier, zipPath, error, operation: InstallOperation.Install }); return Promise.reject(error); } error => { this._onDidInstallExtension.fire({ identifier, zipPath, error, operation: InstallOperation.Install }); return Promise.reject(error); }
); );
// return this.getMetadata(getGalleryExtensionId(manifest.publisher, manifest.name)) // return this.getMetadata(getGalleryExtensionId(manifest.publisher, manifest.name))

27
src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts
View File

@@ -260,7 +260,8 @@ export class UninstallAction extends ExtensionAction {
alert(localize('uninstallExtensionStart', "Uninstalling extension {0} started.", this.extension.displayName)); alert(localize('uninstallExtensionStart', "Uninstalling extension {0} started.", this.extension.displayName));
return this.extensionsWorkbenchService.uninstall(this.extension).then(() => { return this.extensionsWorkbenchService.uninstall(this.extension).then(() => {
alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName)); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
alert(localize('uninstallExtensionComplete', "Please reload Azure Data Studio to complete the uninstallation of the extension {0}.", this.extension.displayName));
}); });
} }
} }
@@ -1033,7 +1034,8 @@ export class ReloadAction extends ExtensionAction {
// Requires reload to run the updated extension // Requires reload to run the updated extension
this.enabled = true; this.enabled = true;
this.label = localize('reloadRequired', "Reload Required"); this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postUpdateTooltip', "Please reload Visual Studio Code to complete the updating of this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = localize('postUpdateTooltip', "Please reload Azure Data Studio to complete the updating of this extension.");
} }
return; return;
} }
@@ -1041,7 +1043,8 @@ export class ReloadAction extends ExtensionAction {
// Requires reload to disable the extension // Requires reload to disable the extension
this.enabled = true; this.enabled = true;
this.label = localize('reloadRequired', "Reload Required"); this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postDisableTooltip', "Please reload Visual Studio Code to complete the disabling of this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = localize('postDisableTooltip', "Please reload Azure Data Studio to complete the disabling of this extension.");
return; return;
} }
} else { } else {
@@ -1049,11 +1052,13 @@ export class ReloadAction extends ExtensionAction {
this.enabled = true; this.enabled = true;
if (isEnabled) { if (isEnabled) {
this.label = localize('reloadRequired', "Reload Required"); this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postEnableTooltip', "Please reload Visual Studio Code to complete the enabling of this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
this.tooltip = localize('postEnableTooltip', "Please reload Azure Data Studio to complete the enabling of this extension.");
} else { } else {
this.label = localize('reloadRequired', "Reload Required"); this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postInstallTooltip', "Please reload Visual Studio Code to complete the installation of this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
alert(localize('installExtensionComplete', "Installing extension {0} is completed. Please reload Visual Studio Code to enable it.", this.extension.displayName)); this.tooltip = localize('postInstallTooltip', "Please reload Azure Data Studio to complete the installation of this extension.");
alert(localize('installExtensionComplete', "Installing extension {0} is completed. Please reload Azure Data Studio to enable it.", this.extension.displayName));
} }
} }
} }
@@ -1064,8 +1069,9 @@ export class ReloadAction extends ExtensionAction {
// Requires reload to deactivate the extension // Requires reload to deactivate the extension
this.enabled = true; this.enabled = true;
this.label = localize('reloadRequired', "Reload Required"); this.label = localize('reloadRequired', "Reload Required");
this.tooltip = localize('postUninstallTooltip', "Please reload Visual Studio Code to complete the uninstallation of this extension."); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
alert(localize('uninstallExtensionComplete', "Please reload Visual Studio Code to complete the uninstallation of the extension {0}.", this.extension.displayName)); this.tooltip = localize('postUninstallTooltip', "Please reload Azure Data Studio to complete the uninstallation of this extension.");
alert(localize('uninstallExtensionComplete', "Please reload Azure Data Studio to complete the uninstallation of the extension {0}.", this.extension.displayName));
return; return;
} }
} }
@@ -2498,7 +2504,8 @@ export class ReinstallAction extends Action {
return this.extensionsWorkbenchService.reinstall(extension) return this.extensionsWorkbenchService.reinstall(extension)
.then(extension => { .then(extension => {
const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local))); const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Visual Studio Code to complete reinstalling the extension {0}.", extension.identifier.id) // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
const message = requireReload ? localize('ReinstallAction.successReload', "Please reload Azure Data Studio to complete reinstalling the extension {0}.", extension.identifier.id)
: localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id); : localize('ReinstallAction.success', "Reinstalling the extension {0} is completed.", extension.identifier.id);
const actions = requireReload ? [{ const actions = requireReload ? [{
label: localize('InstallVSIXAction.reloadNow', "Reload Now"), label: localize('InstallVSIXAction.reloadNow', "Reload Now"),
@@ -2583,7 +2590,7 @@ export class InstallSpecificVersionOfExtensionAction extends Action {
return this.extensionsWorkbenchService.installVersion(extension, version) return this.extensionsWorkbenchService.installVersion(extension, version)
.then(extension => { .then(extension => {
const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local))); const requireReload = !(extension.local && this.extensionService.canAddExtension(toExtensionDescription(extension.local)));
const message = requireReload ? localize('InstallAnotherVersionExtensionAction.successReload', "Please reload Visual Studio Code to complete installing the extension {0}.", extension.identifier.id) const message = requireReload ? localize('InstallAnotherVersionExtensionAction.successReload', "Please reload Azure Data Studio to complete installing the extension {0}.", extension.identifier.id)
: localize('InstallAnotherVersionExtensionAction.success', "Installing the extension {0} is completed.", extension.identifier.id); : localize('InstallAnotherVersionExtensionAction.success', "Installing the extension {0} is completed.", extension.identifier.id);
const actions = requireReload ? [{ const actions = requireReload ? [{
label: localize('InstallAnotherVersionExtensionAction.reloadNow', "Reload Now"), label: localize('InstallAnotherVersionExtensionAction.reloadNow', "Reload Now"),

18
src/vs/workbench/parts/extensions/test/electron-browser/extensionsActions.test.ts
View File

@@ -1091,7 +1091,8 @@ suite('ExtensionsActions Test', () => {
return new Promise(c => { return new Promise(c => {
testObject.onDidChange(() => { testObject.onDidChange(() => {
if (testObject.enabled && testObject.tooltip === 'Please reload Visual Studio Code to complete the installation of this extension.') { // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
if (testObject.enabled && testObject.tooltip === 'Please reload Azure Data Studio to complete the installation of this extension.') {
c(); c();
} }
}); });
@@ -1130,7 +1131,8 @@ suite('ExtensionsActions Test', () => {
return new Promise(c => { return new Promise(c => {
testObject.onDidChange(() => { testObject.onDidChange(() => {
if (testObject.enabled && testObject.tooltip === 'Please reload Visual Studio Code to complete the uninstallation of this extension.') { // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
if (testObject.enabled && testObject.tooltip === 'Please reload Azure Data Studio to complete the uninstallation of this extension.') {
c(); c();
} }
}); });
@@ -1172,7 +1174,8 @@ suite('ExtensionsActions Test', () => {
return new Promise(c => { return new Promise(c => {
testObject.onDidChange(() => { testObject.onDidChange(() => {
if (testObject.enabled && testObject.tooltip === 'Please reload Visual Studio Code to complete the updating of this extension.') { // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
if (testObject.enabled && testObject.tooltip === 'Please reload Azure Data Studio to complete the updating of this extension.') {
c(); c();
} }
}); });
@@ -1217,7 +1220,8 @@ suite('ExtensionsActions Test', () => {
.then(() => testObject.update()) .then(() => testObject.update())
.then(() => { .then(() => {
assert.ok(testObject.enabled); assert.ok(testObject.enabled);
assert.equal('Please reload Visual Studio Code to complete the disabling of this extension.', testObject.tooltip); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
assert.equal('Please reload Azure Data Studio to complete the disabling of this extension.', testObject.tooltip);
}); });
}); });
}); });
@@ -1254,7 +1258,8 @@ suite('ExtensionsActions Test', () => {
.then(() => testObject.update()) .then(() => testObject.update())
.then(() => { .then(() => {
assert.ok(testObject.enabled); assert.ok(testObject.enabled);
assert.equal('Please reload Visual Studio Code to complete the enabling of this extension.', testObject.tooltip); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
assert.equal('Please reload Azure Data Studio to complete the enabling of this extension.', testObject.tooltip);
}); });
}); });
}); });
@@ -1299,7 +1304,8 @@ suite('ExtensionsActions Test', () => {
.then(() => testObject.update()) .then(() => testObject.update())
.then(() => { .then(() => {
assert.ok(testObject.enabled); assert.ok(testObject.enabled);
assert.equal('Please reload Visual Studio Code to complete the enabling of this extension.', testObject.tooltip); // {{SQL CARBON EDIT}} - replace Visual Studio Code with Azure Data Studio
assert.equal('Please reload Azure Data Studio to complete the enabling of this extension.', testObject.tooltip);
}); });
}); });