Merge pull request #2576 from SteveSandersonMS/stevesa/initial-razor-support-updated

Initial Razor support

Author: Ravi Chande

.gitignore

@@ -5,6 +5,7 @@ out
 .omnisharp-*/
 .debugger
 .vscode-test
+.razor
 
 install.*
 

package-lock.json

@@ -73,6 +73,7 @@
     "http-proxy-agent": "2.1.0",
     "https-proxy-agent": "2.2.1",
     "jsonc-parser": "1.0.0",
+    "microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/273c49f3-fc9b-4140-bc65-b47b9ac61267/84c3319bc81e794e873cb931084cb6c8/microsoft.aspnetcore.razor.vscode-1.0.0-alpha1-20181003.5.tgz",
     "mkdirp": "0.5.1",
     "node-filter-async": "0.0.4",
     "open": "*",
@@ -84,7 +85,7 @@
     "tmp": "0.0.33",
     "vscode-debugprotocol": "1.6.1",
     "vscode-extension-telemetry": "0.0.15",
-    "yauzl": "2.9.1"
+    "yauzl": "2.10.0"
   },
   "devDependencies": {
     "@types/archiver": "2.1.1",
@@ -268,6 +269,56 @@
         "./vsdbg"
       ],
       "installTestPath": "./.debugger/vsdbg-ui"
+    },
+    {
+      "description": "Razor Language Server (Windows / x64)",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/273c49f3-fc9b-4140-bc65-b47b9ac61267/f14ac3d133fbd3ec940741c7e5ea270a/razorlanguageserver-win-x64-1.0.0-alpha1-20181003.5.zip",
+      "installPath": ".razor",
+      "platforms": [
+        "win32"
+      ],
+      "architectures": [
+        "x86_64"
+      ]
+    },
+    {
+      "description": "Razor Language Server (Windows / x86)",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/273c49f3-fc9b-4140-bc65-b47b9ac61267/2650922e18baf2470fa1e7eb3b7fcd6a/razorlanguageserver-win-x86-1.0.0-alpha1-20181003.5.zip",
+      "installPath": ".razor",
+      "platforms": [
+        "win32"
+      ],
+      "architectures": [
+        "x86"
+      ]
+    },
+    {
+      "description": "Razor Language Server (Linux / x64)",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/273c49f3-fc9b-4140-bc65-b47b9ac61267/90ec9047fa008298d85e3abc15866818/razorlanguageserver-linux-x64-1.0.0-alpha1-20181003.5.zip",
+      "installPath": ".razor",
+      "platforms": [
+        "linux"
+      ],
+      "architectures": [
+        "x86_64"
+      ],
+      "binaries": [
+        "./rzls"
+      ]
+    },
+    {
+      "description": "Razor Language Server (macOS / x64)",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/273c49f3-fc9b-4140-bc65-b47b9ac61267/ef4d3d9d01cd5cffd41095de48e466a8/razorlanguageserver-osx-x64-1.0.0-alpha1-20181003.5.zip",
+      "installPath": ".razor",
+      "platforms": [
+        "darwin"
+      ],
+      "architectures": [
+        "x86_64"
+      ],
+      "binaries": [
+        "./rzls"
+      ]
     }
   ],
   "engines": {
@@ -276,6 +327,7 @@
   "activationEvents": [
     "onDebug",
     "onLanguage:csharp",
+    "onLanguage:aspnetcorerazor",
     "onCommand:o.restart",
     "onCommand:o.pickProjectAndStart",
     "onCommand:o.showOutput",
@@ -602,6 +654,39 @@
           "type": "boolean",
           "default": false,
           "description": "Specifies whether notifications should be shown if OmniSharp encounters warnings or errors loading a project. Note that these warnings/errors are always emitted to the OmniSharp log"
+        },
+        "razor.disabled": {
+          "type": "boolean",
+          "default": false,
+          "description": "Specifies whether to disable Razor language features."
+        },
+        "razor.languageServer.directory": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "Overrides the path to the Razor Language Server directory."
+        },
+        "razor.languageServer.debug": {
+          "type": "boolean",
+          "default": false,
+          "description": "Specifies whether to wait for debug attach when launching the language server."
+        },
+        "razor.languageServer.trace": {
+          "type": "string",
+          "default": "Off",
+          "enum": [
+            "Off",
+            "Messages",
+            "Verbose"
+          ],
+          "enumDescriptions": [
+            "Does not log messages from Razor Language Server",
+            "Logs only some messages from Razor Language Server",
+            "Logs all messages from Razor Language Server"
+          ],
+          "description": "Specifies whether to output all messages [Verbose], some messages [Messages] or not at all [Off]."
         }
       }
     },
@@ -660,6 +745,16 @@
         "command": "csharp.reportIssue",
         "title": "Start authoring a new issue on GitHub",
         "category": "CSharp"
+      },
+      {
+        "command": "extension.showRazorCSharpWindow",
+        "title": "Show Razor CSharp",
+        "category": "Razor"
+      },
+      {
+        "command": "extension.showRazorHtmlWindow",
+        "title": "Show Razor Html",
+        "category": "Razor"
       }
     ],
     "keybindings": [
@@ -682,7 +777,8 @@
         "enableBreakpointsFor": {
           "languageIds": [
             "csharp",
-            "razor"
+            "razor",
+            "aspnetcorerazor"
           ]
         },
         "variables": {
@@ -1749,7 +1845,8 @@
         "enableBreakpointsFor": {
           "languageIds": [
             "csharp",
-            "razor"
+            "razor",
+            "aspnetcorerazor"
           ]
         },
         "variables": {
@@ -2712,6 +2809,37 @@
           }
         }
       }
-    ]
+    ],
+    "languages": [
+      {
+        "id": "aspnetcorerazor",
+        "extensions": [
+          ".cshtml"
+        ],
+        "mimetypes": [
+          "text/x-cshtml"
+        ],
+        "configuration": "./src/razor/language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "language": "aspnetcorerazor",
+        "scopeName": "text.aspnetcorerazor",
+        "path": "./src/razor/syntaxes/aspnetcorerazor.tmLanguage.json"
+      }
+    ],
+    "menus": {
+      "editor/title": [
+        {
+          "command": "extension.showRazorCSharpWindow",
+          "when": "resourceLangId == aspnetcorerazor"
+        },
+        {
+          "command": "extension.showRazorHtmlWindow",
+          "when": "resourceLangId == aspnetcorerazor"
+        }
+      ]
+    }
   }
 }

package.json

@@ -37,6 +37,7 @@ import { ShowOmniSharpConfigChangePrompt } from './observers/OptionChangeObserve
 import createOptionStream from './observables/CreateOptionStream';
 import { CSharpExtensionId } from './constants/CSharpExtensionId';
 import { OpenURLObserver } from './observers/OpenURLObserver';
+import { activateRazorExtension } from './razor/razor';
 
 export async function activate(context: vscode.ExtensionContext): Promise<CSharpExtensionExports> {
 
@@ -134,6 +135,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
         coreClrDebugPromise = coreclrdebug.activate(extension, context, platformInfo, eventStream);
     }
 
+    if (!optionProvider.GetLatestOptions().razorDisabled) {
+        await activateRazorExtension(context, extension.extensionPath, eventStream);
+    }
+
     return {
         initializationFinished: async () => {
             let omniSharp = await omniSharpPromise;

src/main.ts

@@ -23,7 +23,8 @@ export class Options {
         public minFindSymbolsFilterLength: number,
         public maxFindSymbolsItems: number,
         public defaultLaunchSolution?: string,
-        public monoPath?: string) { }
+        public monoPath?: string,
+        public razorDisabled?: boolean) { }
 
 
     public static Read(vscode: vscode): Options {
@@ -36,6 +37,7 @@ export class Options {
 
         const omnisharpConfig = vscode.workspace.getConfiguration('omnisharp');
         const csharpConfig = vscode.workspace.getConfiguration('csharp');
+        const razorConfig = vscode.workspace.getConfiguration('razor');
 
         const path = Options.readPathOption(csharpConfig, omnisharpConfig);
         const useGlobalMono = Options.readUseGlobalMonoOption(omnisharpConfig, csharpConfig);
@@ -68,6 +70,8 @@ export class Options {
         const minFindSymbolsFilterLength = omnisharpConfig.get<number>('minFindSymbolsFilterLength', 0);
         const maxFindSymbolsItems = omnisharpConfig.get<number>('maxFindSymbolsItems', 1000);   // The limit is applied only when this setting is set to a number greater than zero
 
+        const razorDisabled = !!razorConfig && razorConfig.get<boolean>('disabled', false);
+
         return new Options(
             path, 
             useGlobalMono, 
@@ -86,6 +90,7 @@ export class Options {
             maxFindSymbolsItems,
             defaultLaunchSolution,
             monoPath,
+            razorDisabled
         );
     }