Merge pull request #2925 from akshita31/dirname_false

Make razor work for the webpacked extension

Author: akshita31

.gitignore

@@ -8,6 +8,7 @@ out
 .vscode-test
 .razor
 dist/
+*.razor.json
 
 install.*
 

.vscode/launch.json

@@ -109,6 +109,31 @@
             ],
             "preLaunchTask": "buildDev"
         },
+        {
+            "name": "Launch Razor Tests",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/razorTests"
+            ],
+            "env": {
+                "CODE_WORKSPACE_ROOT": "${workspaceRoot}",
+                "CODE_TESTS_PATH": "${workspaceRoot}/out/test/razorTests",
+                "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
+                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+                "OSVC_SUITE": "BasicRazorApp2_1"
+            },
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/dist/*.js"
+            ],
+            "preLaunchTask": "buildDev"
+        },
         {
             "type": "node",
             "request": "launch",

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.18.0-beta10",
+  "version": "1.18.0-beta11",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",
@@ -25,7 +25,8 @@
     "multi-root ready"
   ],
   "defaults": {
-    "omniSharp": "1.32.11"
+    "omniSharp": "1.32.11",
+    "razor": "1.0.0-alpha2.1-20190322.5"
   },
   "main": "./dist/extension",
   "scripts": {
@@ -74,7 +75,7 @@
     "http-proxy-agent": "2.1.0",
     "https-proxy-agent": "2.2.1",
     "jsonc-parser": "2.0.3",
-    "microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/386a5dff35391e14f14e5945e7903f63/microsoft.aspnetcore.razor.vscode-1.0.0-alpha2-20181112.3.tgz",
+    "microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/d05e29c3f776b3b0f63641f5d93601c4/microsoft.aspnetcore.razor.vscode-1.0.0-alpha2.1-20190322.5.tgz",
     "mkdirp": "0.5.1",
     "node-filter-async": "1.1.1",
     "remove-bom-buffer": "3.0.0",
@@ -297,7 +298,8 @@
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/bbd021dbeab477395f37f1c4e39c31ad/razorlanguageserver-win-x64-1.0.0-alpha2-20181112.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/890063ec1dc258ca517d764c03b2d212/razorlanguageserver-win-x64-1.0.0-alpha2.1-20190322.5.zip",
+      "fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x64-1.0.0-alpha2.1-20190322.5.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
@@ -309,7 +311,8 @@
     {
       "id": "Razor",
       "description": "Razor Language Server (Windows / x86)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/d4196db447b32b655910532321f4bd6a/razorlanguageserver-win-x86-1.0.0-alpha2-20181112.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/e8568cd3b28f1d7b947da4d1252fbf89/razorlanguageserver-win-x86-1.0.0-alpha2.1-20190322.5.zip",
+      "fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-win-x86-1.0.0-alpha2.1-20190322.5.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
@@ -321,7 +324,8 @@
     {
       "id": "Razor",
       "description": "Razor Language Server (Linux / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/ad6d340d6d68e760bb1bb7a8073051f3/razorlanguageserver-linux-x64-1.0.0-alpha2-20181112.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/fe52ada3d813e9d5381af603346b9d7b/razorlanguageserver-linux-x64-1.0.0-alpha2.1-20190322.5.zip",
+      "fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-linux-x64-1.0.0-alpha2.1-20190322.5.zip",
       "installPath": ".razor",
       "platforms": [
         "linux"
@@ -336,7 +340,8 @@
     {
       "id": "Razor",
       "description": "Razor Language Server (macOS / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/3b0ae709-c067-48b4-a658-549ca972e437/e4808fd370ba60d528944a5a36543cf0/razorlanguageserver-osx-x64-1.0.0-alpha2-20181112.3.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/61ad46e2-f624-422c-accd-666d2967399e/de81e6e1d243d743e3c0b569ebdd372e/razorlanguageserver-osx-x64-1.0.0-alpha2.1-20190322.5.zip",
+      "fallbackUrl": "https://razorvscodetest.blob.core.windows.net/languageserver/RazorLanguageServer-osx-x64-1.0.0-alpha2.1-20190322.5.zip",
       "installPath": ".razor",
       "platforms": [
         "darwin"

package.json

@@ -4,9 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Advisor } from "./features/diagnosticsProvider";
+import { EventStream } from "./EventStream";
 
  export default interface CSharpExtensionExports {
     initializationFinished: () => Promise<void>;
-
     getAdvisor: () => Promise<Advisor>;
+    eventStream: EventStream;
  }

src/CSharpExtensionExports.ts

@@ -141,12 +141,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
         coreClrDebugPromise = coreclrdebug.activate(extension, context, platformInfo, eventStream);
     }
 
+    let razorPromise = Promise.resolve();
     if (!optionProvider.GetLatestOptions().razorDisabled) {
         const razorObserver = new RazorLoggerObserver(omnisharpChannel);
         eventStream.subscribe(razorObserver.post);
 
         if (!optionProvider.GetLatestOptions().razorDevMode) {
-            await activateRazorExtension(context, extension.extensionPath, eventStream);
+            razorPromise = activateRazorExtension(context, extension.extensionPath, eventStream);
         }
     }
 
@@ -155,11 +156,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
             let langService = await langServicePromise;
             await langService.server.waitForEmptyEventQueue();
             await coreClrDebugPromise;
+            await razorPromise;
         },
         getAdvisor: async () => {
             let langService = await langServicePromise;
             return langService.advisor;
-        }
+        },
+        eventStream
     };
 }