Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/server/extensions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const prebuiltExtensionsLocation = '.build/builtInExtensions';

export async function getScannedBuiltinExtensions(vsCodeDevLocation: string): Promise<IScannedBuiltinExtension[]> {
// use the build utility as to not duplicate the code
const extensionsUtil = await import(path.join(vsCodeDevLocation, 'build', 'lib', 'extensions.js'));
const extensionsUtil = await getExtensionsUtil(vsCodeDevLocation);

const localExtensions : IScannedBuiltinExtension[] = extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, 'extensions'));
const prebuiltExtensions : IScannedBuiltinExtension[] = extensionsUtil.scanBuiltinExtensions(path.join(vsCodeDevLocation, prebuiltExtensionsLocation));
Expand All @@ -84,3 +84,13 @@ export async function getScannedBuiltinExtensions(vsCodeDevLocation: string): Pr
}
return localExtensions.concat(prebuiltExtensions);
}

async function getExtensionsUtil(vsCodeDevLocation: string) {
const base = path.join(vsCodeDevLocation, 'build', 'lib');
try {
return await import(path.join(base, 'extensions.ts'));
} catch {
return await import(path.join(base, 'extensions.js'));
}
}