File tree Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Expand file tree Collapse file tree 1 file changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -902,7 +902,7 @@ export async function activateRoslynLanguageServer(
902
902
return languageServer ;
903
903
904
904
function scanExtensionPlugins ( ) : string [ ] {
905
- return vscode . extensions . all . flatMap ( ( extension ) => {
905
+ const extensionsFromPackageJson = vscode . extensions . all . flatMap ( ( extension ) => {
906
906
let loadPaths = extension . packageJSON . contributes ?. [ 'csharpExtensionLoadPaths' ] ;
907
907
if ( loadPaths === undefined || loadPaths === null ) {
908
908
_traceChannel . appendLine ( `Extension ${ extension . id } does not contribute csharpExtensionLoadPaths` ) ;
@@ -920,6 +920,8 @@ export async function activateRoslynLanguageServer(
920
920
_traceChannel . appendLine ( `Extension ${ extension . id } contributes csharpExtensionLoadPaths: ${ loadPaths } ` ) ;
921
921
return loadPaths ;
922
922
} ) ;
923
+ const extensionsFromOptions = languageServerOptions . extensionsPaths ?? [ ] ;
924
+ return extensionsFromPackageJson . concat ( extensionsFromOptions ) ;
923
925
}
924
926
}
925
927
You can’t perform that action at this time.
0 commit comments