Skip to content

Commit 44a4b19

Browse files
authored
Merge pull request microsoft#131889 from microsoft/sandy081/fix131885
Fix microsoft#131885
2 parents 5541e0a + 52e9470 commit 44a4b19

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,9 @@ export class ExtensionManifestPropertiesService extends Disposable implements IE
232232

233233
let result = [...ALL_EXTENSION_KINDS];
234234

235-
// Extension pack defaults to workspace extensionKind
235+
// Extension pack defaults to workspace, web extensionKind
236236
if (isNonEmptyArray(manifest.extensionPack) || isNonEmptyArray(manifest.extensionDependencies)) {
237-
result = ['workspace'];
237+
result = ['workspace', 'web'];
238238
}
239239

240240
if (manifest.contributes) {

src/vs/workbench/services/extensions/test/common/extensionManifestPropertiesService.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ suite('ExtensionManifestPropertiesService - ExtensionKind', () => {
2020

2121
let testObject = new ExtensionManifestPropertiesService(TestProductService, new TestConfigurationService(), new TestWorkspaceTrustEnablementService(), new NullLogService());
2222

23-
test('declarative with extension dependencies => workspace', () => {
24-
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionDependencies: ['ext1'] }), ['workspace']);
23+
test('declarative with extension dependencies', () => {
24+
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionDependencies: ['ext1'] }), ['workspace', 'web']);
2525
});
2626

27-
test('declarative extension pack => workspace', () => {
28-
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionPack: ['ext1', 'ext2'] }), ['workspace']);
27+
test('declarative extension pack', () => {
28+
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionPack: ['ext1', 'ext2'] }), ['workspace', 'web']);
2929
});
3030

31-
test('declarative extension pack and extension dependencies => workspace', () => {
32-
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionPack: ['ext1', 'ext2'], extensionDependencies: ['ext1', 'ext2'] }), ['workspace']);
31+
test('declarative extension pack and extension dependencies', () => {
32+
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionPack: ['ext1', 'ext2'], extensionDependencies: ['ext1', 'ext2'] }), ['workspace', 'web']);
3333
});
3434

3535
test('declarative with unknown contribution point => workspace, web', () => {
3636
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ contributes: <any>{ 'unknownPoint': { something: true } } }), ['workspace', 'web']);
3737
});
3838

39-
test('declarative extension pack with unknown contribution point => workspace', () => {
40-
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionPack: ['ext1', 'ext2'], contributes: <any>{ 'unknownPoint': { something: true } } }), ['workspace']);
39+
test('declarative extension pack with unknown contribution point', () => {
40+
assert.deepStrictEqual(testObject.getExtensionKind(<IExtensionManifest>{ extensionPack: ['ext1', 'ext2'], contributes: <any>{ 'unknownPoint': { something: true } } }), ['workspace', 'web']);
4141
});
4242

4343
test('simple declarative => ui, workspace, web', () => {

0 commit comments

Comments
 (0)