Skip to content

Commit 040964a

Browse files
authored
Take into account resolved extensions and external extensions on all extension hosts (not just the remote extension host) (microsoft#167826)
Fixes microsoft#166857: Take into account resolved extensions and external extensions on all extension hosts (not just the remote extension host)
1 parent 9433821 commit 040964a

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/vs/workbench/api/common/extHostExtensionService.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,16 +163,12 @@ export abstract class AbstractExtHostExtensionService extends Disposable impleme
163163
[IExtHostSecretState, this._secretState]
164164
));
165165

166-
let resolvedExtensions: ExtensionIdentifier[] = [];
167-
let hostExtensions: ExtensionIdentifier[] = [];
168-
if (this._initData.remote.isRemote) {
169-
resolvedExtensions = this._initData.allExtensions.filter(extension => !extension.main && !extension.browser).map(extension => extension.identifier);
170-
hostExtensions = (
171-
this._initData.allExtensions
172-
.filter(extension => !myExtensionsSet.has(ExtensionIdentifier.toKey(extension.identifier.value)))
173-
.filter(extension => (extension.main || extension.browser) && extension.api === 'none').map(extension => extension.identifier)
174-
);
175-
}
166+
const resolvedExtensions = this._initData.allExtensions.filter(extension => !extension.main && !extension.browser).map(extension => extension.identifier);
167+
const hostExtensions = (
168+
this._initData.allExtensions
169+
.filter(extension => !myExtensionsSet.has(ExtensionIdentifier.toKey(extension.identifier.value)))
170+
.filter(extension => (extension.main || extension.browser) && extension.api === 'none').map(extension => extension.identifier)
171+
);
176172
const hostExtensionsSet = extensionIdentifiersArrayToSet(hostExtensions);
177173

178174
this._activator = this._register(new ExtensionsActivator(

0 commit comments

Comments
 (0)