rename xamlDesignTools -> xamlTools

Author: dibarbet

.gitignore

@@ -4,7 +4,7 @@ node_modules
 out
 .roslyn/
 .roslynDevKit/
-.xamlDesignTools/
+.xamlTools/
 .omnisharp/
 .omnisharp-*/
 .vs/

package.json

@@ -42,7 +42,7 @@
     "razor": "7.0.0-preview.24178.4",
     "razorOmnisharp": "7.0.0-preview.23363.1",
     "razorTelemetry": "7.0.0-preview.24178.4",
-    "xamlDesignTools": "17.11.34811.206"
+    "xamlTools": "17.11.34811.206"
   },
   "main": "./dist/extension",
   "l10n": "./l10n",
@@ -1630,8 +1630,8 @@
                 "description": "%configuration.dotnet.server.componentPaths.roslynDevKit%",
                 "type": "string"
               },
-              "xamlDesignTools": {
-                "description": "%configuration.dotnet.server.componentPaths.xamlDesignTools%",
+              "xamlTools": {
+                "description": "%configuration.dotnet.server.componentPaths.xamlTools%",
                 "type": "string"
               }
             },
@@ -1682,11 +1682,11 @@
             "default": null,
             "description": "%configuration.dotnet.server.crashDumpPath%"
           },
-          "dotnet.server.enableXamlIntellisense": {
+          "dotnet.server.enableXamlTools": {
             "scope": "machine-overridable",
             "type": "boolean",
             "default": false,
-            "description": "%configuration.dotnet.server.enableXamlIntellisense%"
+            "description": "%configuration.dotnet.server.enableXamlTools%"
           },
           "dotnet.projects.binaryLogPath": {
             "scope": "machine-overridable",

package.nls.json

@@ -28,13 +28,13 @@
   "configuration.dotnet.server.path": "Specifies the absolute path to the server (LSP or O#) executable. When left empty the version pinned to the C# Extension is used. (Previously `omnisharp.path`)",
   "configuration.dotnet.server.componentPaths": "Allows overriding the folder path for built in components of the language server (for example, override the .roslynDevKit path in the extension directory to use locally built components)",
   "configuration.dotnet.server.componentPaths.roslynDevKit": "Overrides the folder path for the .roslynDevKit component of the language server",
-  "configuration.dotnet.server.componentPaths.xamlDesignTools": "Overrides the folder path for the .xamlDesignTools component of the language server",
+  "configuration.dotnet.server.componentPaths.xamlTools": "Overrides the folder path for the .xamlTools component of the language server",
   "configuration.dotnet.server.startTimeout": "Specifies a timeout (in ms) for the client to successfully start and connect to the language server.",
   "configuration.dotnet.server.waitForDebugger": "Passes the --debug flag when launching the server to allow a debugger to be attached. (Previously `omnisharp.waitForDebugger`)",
   "configuration.dotnet.server.trace": "Sets the logging level for the language server",
   "configuration.dotnet.server.extensionPaths": "Override for path to language server --extension arguments",
   "configuration.dotnet.server.crashDumpPath": "Sets a folder path where crash dumps are written to if the language server crashes.  Must be writeable by the user.",
-  "configuration.dotnet.server.enableXamlIntellisense": "[Experimental] Enables Intellisense for XAML files when using C# Dev Kit",
+  "configuration.dotnet.server.enableXamlTools": "[Experimental] Enables XAML tools when using C# Dev Kit",
   "configuration.dotnet.projects.enableAutomaticRestore": "Enables automatic NuGet restore if the extension detects assets are missing.",
   "configuration.dotnet.preferCSharpExtension": "Forces projects to load with the C# extension only.  This can be useful when using legacy project types that are not supported by C# Dev Kit. (Requires window reload)",
   "configuration.dotnet.implementType.insertionBehavior": "The insertion location of properties, events, and methods When implement interface or abstract class.",

src/lsptoolshost/builtInComponents.ts

@@ -19,9 +19,9 @@ export const componentInfo: { [key: string]: ComponentInfo } = {
         optionName: 'roslynDevKit',
         componentDllPaths: ['Microsoft.VisualStudio.LanguageServices.DevKit.dll'],
     },
-    xamlDesignTools: {
-        defaultFolderName: '.xamlDesignTools',
-        optionName: 'xamlDesignTools',
+    xamlTools: {
+        defaultFolderName: '.xamlTools',
+        optionName: 'xamlTools',
         componentDllPaths: [
             path.join('lib', 'netstandard2.0', 'Microsoft.VisualStudio.DesignTools.CodeAnalysis.dll'),
             path.join('lib', 'netstandard2.0', 'Microsoft.VisualStudio.DesignTools.CodeAnalysis.Diagnostics.dll'),

src/lsptoolshost/roslynLanguageServer.ts

@@ -820,8 +820,8 @@ export class RoslynLanguageServer {
         args.push('--sessionId', getSessionId());
 
         // Also include the Xaml Dev Kit extensions, if enabled.
-        if (languageServerOptions.enableXamlIntellisense) {
-            getComponentPaths('xamlDesignTools', languageServerOptions).forEach((path) =>
+        if (languageServerOptions.enableXamlTools) {
+            getComponentPaths('xamlTools', languageServerOptions).forEach((path) =>
                 additionalExtensionPaths.push(path)
             );
         }

src/shared/options.ts

@@ -78,7 +78,7 @@ export interface LanguageServerOptions {
     readonly analyzerDiagnosticScope: string;
     readonly compilerDiagnosticScope: string;
     readonly componentPaths: { [key: string]: string } | null;
-    readonly enableXamlIntellisense: boolean;
+    readonly enableXamlTools: boolean;
 }
 
 export interface RazorOptions {
@@ -402,8 +402,8 @@ class LanguageServerOptionsImpl implements LanguageServerOptions {
     public get componentPaths() {
         return readOption<{ [key: string]: string }>('dotnet.server.componentPaths', {});
     }
-    public get enableXamlIntellisense() {
-        return readOption<boolean>('dotnet.server.enableXamlIntellisense', false);
+    public get enableXamlTools() {
+        return readOption<boolean>('dotnet.server.enableXamlTools', false);
     }
 }
 
@@ -499,5 +499,5 @@ export const LanguageServerOptionsThatTriggerReload: ReadonlyArray<keyof Languag
     'documentSelector',
     'preferCSharpExtension',
     'componentPaths',
-    'enableXamlIntellisense',
+    'enableXamlTools',
 ];

tasks/offlinePackagingTasks.ts

@@ -24,7 +24,7 @@ import {
     nugetTempPath,
     rootPath,
     devKitDependenciesDirectory,
-    xamlDesignToolsDirectory,
+    xamlToolsDirectory,
 } from '../tasks/projectPaths';
 import { getPackageJSON } from '../tasks/packageJson';
 import { createPackageAsync } from '../tasks/vsceTasks';
@@ -78,11 +78,11 @@ export const nugetPackageInfo: { [key: string]: NugetPackageInfo } = {
         getPackageContentPath: (_platformInfo) => 'content',
         vsixOutputPath: devKitDependenciesDirectory,
     },
-    xamlDesignTools: {
+    xamlTools: {
         getPackageName: (_platformInfo) => 'Microsoft.VisualStudio.DesignToolsBase',
-        packageJsonName: 'xamlDesignTools',
+        packageJsonName: 'xamlTools',
         getPackageContentPath: (_platformInfo) => '',
-        vsixOutputPath: xamlDesignToolsDirectory,
+        vsixOutputPath: xamlToolsDirectory,
     },
 };
 

tasks/projectPaths.ts

@@ -17,7 +17,7 @@ export const packedVsixOutputRoot = commandLineOptions.outputFolder || path.join
 export const nugetTempPath = path.join(rootPath, 'out', '.nuget');
 export const languageServerDirectory = path.join(rootPath, '.roslyn');
 export const devKitDependenciesDirectory = path.join(rootPath, componentInfo.roslynDevKit.defaultFolderName);
-export const xamlDesignToolsDirectory = path.join(rootPath, componentInfo.xamlDesignTools.defaultFolderName);
+export const xamlToolsDirectory = path.join(rootPath, componentInfo.xamlTools.defaultFolderName);
 
 export const codeExtensionPath = commandLineOptions.codeExtensionPath || rootPath;