Merge from vscode 2f984aad710215f4e4684a035bb02f55d1a9e2cc (#9819)

This commit is contained in:
Anthony Dresser
2020-04-01 00:44:39 -07:00
committed by GitHub
parent 0e27aaa61f
commit 0bfbdc62ed
247 changed files with 5402 additions and 3311 deletions

View File

@@ -130,7 +130,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = paged.firstPage[0];
assert.ok(!testObject.enabled);
assert.equal('Install', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
});
});
@@ -148,7 +148,7 @@ suite('ExtensionsActions Test', () => {
assert.ok(!testObject.enabled);
assert.equal('Installing', testObject.label);
assert.equal('extension-action install installing', testObject.class);
assert.equal('extension-action label install installing', testObject.class);
});
});
@@ -215,7 +215,7 @@ suite('ExtensionsActions Test', () => {
uninstallEvent.fire(local.identifier);
assert.ok(!testObject.enabled);
assert.equal('Uninstalling', testObject.label);
assert.equal('extension-action uninstall uninstalling', testObject.class);
assert.equal('extension-action label uninstall uninstalling', testObject.class);
});
});
@@ -230,7 +230,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Uninstall', testObject.label);
assert.equal('extension-action uninstall', testObject.class);
assert.equal('extension-action label uninstall', testObject.class);
});
});
@@ -245,7 +245,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(!testObject.enabled);
assert.equal('Uninstall', testObject.label);
assert.equal('extension-action uninstall', testObject.class);
assert.equal('extension-action label uninstall', testObject.class);
});
});
@@ -281,7 +281,7 @@ suite('ExtensionsActions Test', () => {
assert.ok(testObject.enabled);
assert.equal('Uninstall', testObject.label);
assert.equal('extension-action uninstall', testObject.class);
assert.equal('extension-action label uninstall', testObject.class);
});
});
@@ -290,7 +290,7 @@ suite('ExtensionsActions Test', () => {
instantiationService.createInstance(ExtensionContainers, [testObject]);
assert.ok(!testObject.enabled);
assert.equal('extension-action prominent install no-extension', testObject.class);
assert.equal('extension-action label prominent install no-extension', testObject.class);
});
test('Test CombinedInstallAction when extension is system extension', () => {
@@ -303,7 +303,7 @@ suite('ExtensionsActions Test', () => {
.then(extensions => {
testObject.extension = extensions[0];
assert.ok(!testObject.enabled);
assert.equal('extension-action prominent install no-extension', testObject.class);
assert.equal('extension-action label prominent install no-extension', testObject.class);
});
});
@@ -319,7 +319,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = paged.firstPage[0];
assert.ok(testObject.enabled);
assert.equal('Install', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
});
@@ -334,7 +334,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Uninstall', testObject.label);
assert.equal('extension-action uninstall', testObject.class);
assert.equal('extension-action label uninstall', testObject.class);
});
});
@@ -351,7 +351,7 @@ suite('ExtensionsActions Test', () => {
assert.ok(!testObject.enabled);
assert.equal('Installing', testObject.label);
assert.equal('extension-action install installing', testObject.class);
assert.equal('extension-action label install installing', testObject.class);
});
});
@@ -370,7 +370,7 @@ suite('ExtensionsActions Test', () => {
installEvent.fire({ identifier: gallery.identifier, gallery });
assert.ok(!testObject.enabled);
assert.equal('Installing', testObject.label);
assert.equal('extension-action install installing', testObject.class);
assert.equal('extension-action label install installing', testObject.class);
});
});
@@ -386,7 +386,7 @@ suite('ExtensionsActions Test', () => {
uninstallEvent.fire(local.identifier);
assert.ok(!testObject.enabled);
assert.equal('Uninstalling', testObject.label);
assert.equal('extension-action uninstall uninstalling', testObject.class);
assert.equal('extension-action label uninstall uninstalling', testObject.class);
});
});
@@ -498,7 +498,7 @@ suite('ExtensionsActions Test', () => {
.then(extensions => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('extension-action manage codicon-gear', testObject.class);
assert.equal('extension-action icon manage codicon-gear', testObject.class);
assert.equal('', testObject.tooltip);
});
});
@@ -513,7 +513,7 @@ suite('ExtensionsActions Test', () => {
.then(page => {
testObject.extension = page.firstPage[0];
assert.ok(!testObject.enabled);
assert.equal('extension-action manage codicon-gear hide', testObject.class);
assert.equal('extension-action icon manage codicon-gear hide', testObject.class);
assert.equal('', testObject.tooltip);
});
});
@@ -530,7 +530,7 @@ suite('ExtensionsActions Test', () => {
installEvent.fire({ identifier: gallery.identifier, gallery });
assert.ok(!testObject.enabled);
assert.equal('extension-action manage codicon-gear hide', testObject.class);
assert.equal('extension-action icon manage codicon-gear hide', testObject.class);
assert.equal('', testObject.tooltip);
});
});
@@ -548,7 +548,7 @@ suite('ExtensionsActions Test', () => {
didInstallEvent.fire({ identifier: gallery.identifier, gallery, operation: InstallOperation.Install, local: aLocalExtension('a', gallery, gallery) });
assert.ok(testObject.enabled);
assert.equal('extension-action manage codicon-gear', testObject.class);
assert.equal('extension-action icon manage codicon-gear', testObject.class);
assert.equal('', testObject.tooltip);
});
});
@@ -563,7 +563,7 @@ suite('ExtensionsActions Test', () => {
.then(extensions => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('extension-action manage codicon-gear', testObject.class);
assert.equal('extension-action icon manage codicon-gear', testObject.class);
assert.equal('', testObject.tooltip);
});
});
@@ -580,7 +580,7 @@ suite('ExtensionsActions Test', () => {
uninstallEvent.fire(local.identifier);
assert.ok(!testObject.enabled);
assert.equal('extension-action manage codicon-gear', testObject.class);
assert.equal('extension-action icon manage codicon-gear', testObject.class);
assert.equal('Uninstalling', testObject.tooltip);
});
});
@@ -1549,7 +1549,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install in remote', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
test('Test remote install action when installing local workspace extension', async () => {
@@ -1575,12 +1575,12 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install in remote', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
onInstallExtension.fire({ identifier: localWorkspaceExtension.identifier, gallery });
assert.ok(testObject.enabled);
assert.equal('Installing', testObject.label);
assert.equal('extension-action install installing', testObject.class);
assert.equal('extension-action label install installing', testObject.class);
});
test('Test remote install action when installing local workspace extension is finished', async () => {
@@ -1608,12 +1608,12 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install in remote', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
onInstallExtension.fire({ identifier: localWorkspaceExtension.identifier, gallery });
assert.ok(testObject.enabled);
assert.equal('Installing', testObject.label);
assert.equal('extension-action install installing', testObject.class);
assert.equal('extension-action label install installing', testObject.class);
const installedExtension = aLocalExtension('a', { extensionKind: ['workspace'] }, { location: URI.file(`pub.a`).with({ scheme: Schemas.vscodeRemote }) });
onDidInstallEvent.fire({ identifier: installedExtension.identifier, local: installedExtension, operation: InstallOperation.Install });
@@ -1639,7 +1639,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install in remote', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
test('Test remote install action is disabled when extension is not set', async () => {
@@ -1856,7 +1856,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install in remote', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
test('Test remote install action is disabled if local language pack extension is uninstalled', async () => {
@@ -1902,7 +1902,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install Locally', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
test('Test local install action when installing remote ui extension', async () => {
@@ -1928,12 +1928,12 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install Locally', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
onInstallExtension.fire({ identifier: remoteUIExtension.identifier, gallery });
assert.ok(testObject.enabled);
assert.equal('Installing', testObject.label);
assert.equal('extension-action install installing', testObject.class);
assert.equal('extension-action label install installing', testObject.class);
});
test('Test local install action when installing remote ui extension is finished', async () => {
@@ -1961,12 +1961,12 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install Locally', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
onInstallExtension.fire({ identifier: remoteUIExtension.identifier, gallery });
assert.ok(testObject.enabled);
assert.equal('Installing', testObject.label);
assert.equal('extension-action install installing', testObject.class);
assert.equal('extension-action label install installing', testObject.class);
const installedExtension = aLocalExtension('a', { extensionKind: ['ui'] }, { location: URI.file(`pub.a`) });
onDidInstallEvent.fire({ identifier: installedExtension.identifier, local: installedExtension, operation: InstallOperation.Install });
@@ -1992,7 +1992,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install Locally', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
test('Test local install action is disabled when extension is not set', async () => {
@@ -2212,7 +2212,7 @@ suite('ExtensionsActions Test', () => {
testObject.extension = extensions[0];
assert.ok(testObject.enabled);
assert.equal('Install Locally', testObject.label);
assert.equal('extension-action prominent install', testObject.class);
assert.equal('extension-action label prominent install', testObject.class);
});
test('Test local install action is disabled if remote language pack extension is uninstalled', async () => {