Skip to content

Commit 68b2129

Browse files
author
Andrew Hall
committed
WIP
1 parent 3d3dbc6 commit 68b2129

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

src/lsptoolshost/server/roslynLanguageServer.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,13 @@ export class RoslynLanguageServer {
615615
path.join(razorPath, 'Targets', 'Microsoft.NET.Sdk.Razor.DesignTime.targets')
616616
);
617617

618+
const razorExtensionPath =
619+
razorOptions.razorExtensionPath === ''
620+
? path.join(context.extension.extensionPath, '.razorExtension')
621+
: razorOptions.razorExtensionPath;
622+
623+
additionalExtensionPaths.push(path.join(razorExtensionPath, 'Microsoft.VisualStudioCode.RazorExtension.dll'));
624+
618625
// Get the brokered service pipe name from C# Dev Kit (if installed).
619626
// We explicitly call this in the LSP server start action instead of awaiting it
620627
// in our activation because C# Dev Kit depends on C# activation completing.

src/shared/options.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,9 @@ export interface RazorOptions {
8888
readonly razorDevMode: boolean;
8989
readonly razorPluginPath: string;
9090
readonly razorServerPath: string;
91+
92+
// Folder that contains Microsoft.VisualStudioCode.RazorExtension.dll
93+
readonly razorExtensionPath: string;
9194
}
9295

9396
class CommonOptionsImpl implements CommonOptions {
@@ -430,6 +433,9 @@ class RazorOptionsImpl implements RazorOptions {
430433
public get razorServerPath() {
431434
return readOption<string>('razor.languageServer.directory', '');
432435
}
436+
public get razorExtensionPath() {
437+
return readOption<string>('razor.extension.path', '');
438+
}
433439
}
434440

435441
export const commonOptions: CommonOptions = new CommonOptionsImpl();

0 commit comments

Comments
 (0)