@@ -358,9 +358,8 @@ export async function main(options: IServerOptions): Promise<void> {
358
358
const fileService = new FileService ( logService ) ;
359
359
const diskFileSystemProvider = new DiskFileSystemProvider ( logService ) ;
360
360
fileService . registerProvider ( Schemas . file , diskFileSystemProvider ) ;
361
-
362
361
const rootPath = FileAccess . asFileUri ( '' , require ) . fsPath ;
363
- const systemExtensionRoot = path . normalize ( path . join ( rootPath , '..' , 'extensions' ) ) ;
362
+
364
363
const extraDevSystemExtensionsRoot = path . normalize ( path . join ( rootPath , '..' , '.build' , 'builtInExtensions' ) ) ;
365
364
const logger = new Logger ( ( severity , source , message ) => {
366
365
const msg = devMode && source ? `[${ source } ]: ${ message } ` : message ;
@@ -417,7 +416,7 @@ export async function main(options: IServerOptions): Promise<void> {
417
416
// see _scanInstalledExtensions in src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
418
417
// TODO: read built nls file
419
418
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 ) ;
421
420
const builtInExtensions = product . builtInExtensions ;
422
421
if ( devMode && builtInExtensions && builtInExtensions . length ) {
423
422
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