Skip to content

Commit 8db630a

Browse files
akosyakovjeanp413
authored andcommitted
[server] user env service to locate built-in extensions
1 parent 59707e6 commit 8db630a

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
@@ -358,9 +358,8 @@ export async function main(options: IServerOptions): Promise<void> {
358358
const fileService = new FileService(logService);
359359
const diskFileSystemProvider = new DiskFileSystemProvider(logService);
360360
fileService.registerProvider(Schemas.file, diskFileSystemProvider);
361-
362361
const rootPath = FileAccess.asFileUri('', require).fsPath;
363-
const systemExtensionRoot = path.normalize(path.join(rootPath, '..', 'extensions'));
362+
364363
const extraDevSystemExtensionsRoot = path.normalize(path.join(rootPath, '..', '.build', 'builtInExtensions'));
365364
const logger = new Logger((severity, source, message) => {
366365
const msg = devMode && source ? `[${source}]: ${message}` : message;
@@ -417,7 +416,7 @@ export async function main(options: IServerOptions): Promise<void> {
417416
// see _scanInstalledExtensions in src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
418417
// TODO: read built nls file
419418
const translations = {};
420-
let pendingSystem = ExtensionScanner.scanExtensions(new ExtensionScannerInput(product.version, product.date, product.commit, args.language, devMode, systemExtensionRoot, true, false, translations), logger);
419+
let pendingSystem = ExtensionScanner.scanExtensions(new ExtensionScannerInput(product.version, product.date, product.commit, args.language, devMode, environmentService.builtinExtensionsPath, true, false, translations), logger);
421420
const builtInExtensions = product.builtInExtensions;
422421
if (devMode && builtInExtensions && builtInExtensions.length) {
423422
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)