Skip to content

Commit 97a3685

Browse files
committed
[server] user env service to locate built-in extensions
1 parent eaf680a commit 97a3685

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/vs/server/node/server.main.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,8 @@ export async function main(options: IServerOptions): Promise<void> {
356356
const fileService = new FileService(logService);
357357
const diskFileSystemProvider = new DiskFileSystemProvider(logService);
358358
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
359-
360359
const rootPath = FileAccess.asFileUri('', require).fsPath;
361-
const systemExtensionRoot = path.normalize(path.join(rootPath, '..', 'extensions'));
360+
362361
const extraDevSystemExtensionsRoot = path.normalize(path.join(rootPath, '..', '.build', 'builtInExtensions'));
363362
const logger = new Logger((severity, source, message) => {
364363
const msg = devMode && source ? `[${source}]: ${message}` : message;
@@ -415,7 +414,7 @@ export async function main(options: IServerOptions): Promise<void> {
415414
// see _scanInstalledExtensions in src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
416415
// TODO: read built nls file
417416
const translations = {};
418-
let pendingSystem = ExtensionScanner.scanExtensions(new ExtensionScannerInput(product.version, product.date, product.commit, args.language, devMode, systemExtensionRoot, true, false, translations), logger);
417+
let pendingSystem = ExtensionScanner.scanExtensions(new ExtensionScannerInput(product.version, product.date, product.commit, args.language, devMode, environmentService.builtinExtensionsPath, true, false, translations), logger);
419418
const builtInExtensions = product.builtInExtensions;
420419
if (devMode && builtInExtensions && builtInExtensions.length) {
421420
pendingSystem = ExtensionScanner.mergeBuiltinExtensions(pendingSystem, ExtensionScanner.scanExtensions(new ExtensionScannerInput(product.version, product.date, product.commit, args.language, devMode, extraDevSystemExtensionsRoot, true, false, translations), logger, {

0 commit comments

Comments
 (0)