Skip to content

Commit

Permalink
Merge pull request #132041 from microsoft/sandy081/fix132034
Browse files Browse the repository at this point in the history
remove web extension kind
  • Loading branch information
sandy081 authored Sep 1, 2021
2 parents b6a7847 + 2f97f57 commit e7d7e9a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "code-oss-dev",
"version": "1.60.0",
"distro": "a60fae6331fa2ff607b18e7b1b20ef0db02430d2",
"distro": "0ea9111ff3b92a2070f03c531e3af26435112451",
"author": {
"name": "Microsoft Corporation"
},
Expand Down
6 changes: 2 additions & 4 deletions src/vs/workbench/contrib/remote/common/remote.contribution.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,11 @@ const extensionKindSchema: IJSONSchema = {
type: 'string',
enum: [
'ui',
'workspace',
'web'
'workspace'
],
enumDescriptions: [
localize('ui', "UI extension kind. In a remote window, such extensions are enabled only when available on the local machine."),
localize('workspace', "Workspace extension kind. In a remote window, such extensions are enabled only when available on the remote."),
localize('web', "Web worker extension kind. Such an extension can execute in a web worker extension host.")
localize('workspace', "Workspace extension kind. In a remote window, such extensions are enabled only when available on the remote.")
],
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ export class ExtensionManifestPropertiesService extends Disposable implements IE
result = manifest.extensionKind;
if (typeof result !== 'undefined') {
result = this.toArray(result);
return result.filter(r => ALL_EXTENSION_KINDS.includes(r));
return result.filter(r => ['ui', 'workspace'].includes(r));
}

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,11 @@ const extensionKindSchema: IJSONSchema = {
type: 'string',
enum: [
'ui',
'workspace',
'web'
'workspace'
],
enumDescriptions: [
nls.localize('ui', "UI extension kind. In a remote window, such extensions are enabled only when available on the local machine."),
nls.localize('workspace', "Workspace extension kind. In a remote window, such extensions are enabled only when available on the remote."),
nls.localize('web', "Web worker extension kind. Such an extension can execute in a web worker extension host.")
],
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ suite('ExtensionManifestPropertiesService - ExtensionKind', () => {
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ main: 'main.js', browser: 'main.browser.js', extensionKind: ['workspace'] }), ['workspace', 'web']);
});

test('only browser entry point with out extensionKind => web', () => {
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ browser: 'main.browser.js' }), ['web']);
});

test('simple descriptive with workspace, ui extensionKind => workspace, ui, web', () => {
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionKind: ['workspace', 'ui'] }), ['workspace', 'ui', 'web']);
});
Expand All @@ -77,6 +81,14 @@ suite('ExtensionManifestPropertiesService - ExtensionKind', () => {
test('extension cannot opt out from web', () => {
assert.deepStrictEqual(testObject.getExtensionKind(<any>{ browser: 'main.browser.js', extensionKind: ['-web'] }), ['web']);
});

test('extension cannot opt into web', () => {
assert.deepStrictEqual(testObject.getExtensionKind(<any>{ main: 'main.js', extensionKind: ['web', 'workspace', 'ui'] }), ['workspace', 'ui']);
});

test('extension cannot opt into web only', () => {
assert.deepStrictEqual(testObject.getExtensionKind(<any>{ main: 'main.js', extensionKind: ['web'] }), []);
});
});


Expand Down

0 comments on commit e7d7e9a

Please sign in to comment.