Use builtInComponent

Author: Andrew Hall

src/lsptoolshost/extensions/builtInComponents.ts

@@ -32,6 +32,11 @@ export const componentInfo: { [key: string]: ComponentInfo } = {
         optionName: 'razorDevKit',
         componentDllPaths: ['Microsoft.VisualStudio.DevKit.Razor.dll'],
     },
+    razorExtension: {
+        defaultFolderName: '.razorExtension',
+        optionName: 'razorExtension',
+        componentDllPaths: ['Microsoft.VisualStudioCode.RazorExtension.dll'],
+    },
 };
 
 export function getComponentPaths(componentName: string, options: LanguageServerOptions | undefined): string[] {

src/lsptoolshost/server/roslynLanguageServer.ts

@@ -615,12 +615,9 @@ export class RoslynLanguageServer {
             path.join(razorPath, 'Targets', 'Microsoft.NET.Sdk.Razor.DesignTime.targets')
         );
 
-        const razorExtensionPath =
-            razorOptions.razorExtensionPath === ''
-                ? path.join(context.extension.extensionPath, '.razorExtension')
-                : razorOptions.razorExtensionPath;
-
-        additionalExtensionPaths.push(path.join(razorExtensionPath, 'Microsoft.VisualStudioCode.RazorExtension.dll'));
+        getComponentPaths('razorExtension', languageServerOptions).forEach((path) =>
+            additionalExtensionPaths.push(path)
+        );
 
         // Get the brokered service pipe name from C# Dev Kit (if installed).
         // We explicitly call this in the LSP server start action instead of awaiting it
@@ -969,6 +966,7 @@ export class RoslynLanguageServer {
                 additionalExtensionPaths.push(path)
             );
         }
+
         return args;
     }
 

src/shared/options.ts

@@ -88,9 +88,6 @@ export interface RazorOptions {
     readonly razorDevMode: boolean;
     readonly razorPluginPath: string;
     readonly razorServerPath: string;
-
-    // Folder that contains Microsoft.VisualStudioCode.RazorExtension.dll
-    readonly razorExtensionPath: string;
 }
 
 class CommonOptionsImpl implements CommonOptions {
@@ -433,9 +430,6 @@ class RazorOptionsImpl implements RazorOptions {
     public get razorServerPath() {
         return readOption<string>('razor.languageServer.directory', '');
     }
-    public get razorExtensionPath() {
-        return readOption<string>('razor.extension.path', '');
-    }
 }
 
 export const commonOptions: CommonOptions = new CommonOptionsImpl();

tasks/projectPaths.ts

@@ -20,7 +20,7 @@ export const devKitDependenciesDirectory = path.join(rootPath, componentInfo.ros
 export const xamlToolsDirectory = path.join(rootPath, componentInfo.xamlTools.defaultFolderName);
 export const razorLanguageServerDirectory = path.join(rootPath, '.razor');
 export const razorDevKitDirectory = path.join(rootPath, componentInfo.razorDevKit.defaultFolderName);
-export const razorExtensionDirectory = path.join(rootPath, '.razorExtension');
+export const razorExtensionDirectory = path.join(rootPath, componentInfo.razorExtension.defaultFolderName);
 
 export const codeExtensionPath = commandLineOptions.codeExtensionPath || rootPath;