Skip to content

Commit e59cfbb

Browse files
committed
Read extension paths option
1 parent 021df2d commit e59cfbb

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/lsptoolshost/roslynLanguageServer.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ export async function activateRoslynLanguageServer(
902902
return languageServer;
903903

904904
function scanExtensionPlugins(): string[] {
905-
return vscode.extensions.all.flatMap((extension) => {
905+
const extensionsFromPackageJson = vscode.extensions.all.flatMap((extension) => {
906906
let loadPaths = extension.packageJSON.contributes?.['csharpExtensionLoadPaths'];
907907
if (loadPaths === undefined || loadPaths === null) {
908908
_traceChannel.appendLine(`Extension ${extension.id} does not contribute csharpExtensionLoadPaths`);
@@ -920,6 +920,8 @@ export async function activateRoslynLanguageServer(
920920
_traceChannel.appendLine(`Extension ${extension.id} contributes csharpExtensionLoadPaths: ${loadPaths}`);
921921
return loadPaths;
922922
});
923+
const extensionsFromOptions = languageServerOptions.extensionsPaths ?? [];
924+
return extensionsFromPackageJson.concat(extensionsFromOptions);
923925
}
924926
}
925927

0 commit comments

Comments
 (0)