Merge branch 'master' into update_package

Author: akshita31

.gitignore

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

CHANGELOG.md

@@ -1,22 +1,27 @@
 ## Known Issues in 1.17.0
 
-* Known limitations with the preview Razor (cshtml) language service:
+* Known limitations with the preview Razor (cshtml) language service to be addressed in a future release:
+  * Only ASP.NET Core projects are supported (no support for ASP.NET projects)
   * Support for tag helpers and formatting not yet implemented
   * Limited support for colorization
   * Loss of HTML completions following C# less than (`<`) operator
   * Error squiggles misaligned for expressions near the start of a new line
   * Leaving Razor files open for a significant period of time results in loss of Razor C# tooling on macOS
+  * Incorrect errors in Blazor projects for event bindings
 * There currently is no completion support for package references in csproj files. ([#1156](https://github.com/OmniSharp/omnisharp-vscode/issues/1156))
   * As an alternative, consider installing the [MSBuild Project Tools](https://marketplace.visualstudio.com/items?itemName=tintoy.msbuild-project-tools) extension by @tintoy.
 
 ## 1.17.0 (Not yet released)
 
-* Added preview Razor (cshtml) language service with support for C# completions and diagnostics. Please report issues with the preview Razor tooling on the [aspnet/Razor.VSCode](https://github.com/aspnet/Razor.VSCode/issues) repo. To disable the preview Razor tooling set the "razor.disabled" setting to `true`. (PR: [2554](https://github.com/OmniSharp/omnisharp-vscode/pull/2554))
-
+* Added preview Razor (cshtml) language service with support for C# completions and diagnostics in ASP.NET Core projects. Please report issues with the preview Razor tooling on the [aspnet/Razor.VSCode](https://github.com/aspnet/Razor.VSCode/issues) repo. To disable the preview Razor tooling set the "razor.disabled" setting to `true`. (PR: [2554](https://github.com/OmniSharp/omnisharp-vscode/pull/2554))
 * Added omnisharp.minFindSymbolsFilterLength setting to configure the number of characters a user must type in for "Go to Symbol in Workspace" command to return any results (default is 0 to preserve existing behavior). Additionally added omnisharp.maxFindSymbolsItems for configuring maximum number of items returned by "Go to Symbol in Workspace" command. The default is 1000. (PR: [#2487](https://github.com/OmniSharp/omnisharp-vscode/pull/2487))
-
 * Added a command - "CSharp: Start authoring a new issue on GitHub" to enable the users to file issues on github from within the extension with helpful config information from their system.(PR: [#2503](https://github.com/OmniSharp/omnisharp-vscode/pull/2503))
 
+#### Debugger
+* Fixed crash at the end of debug sessions on Linux ([#2439](https://github.com/OmniSharp/omnisharp-vscode/issues/2439))
+* Fixed searching for PDBs in original built location ([#2483](https://github.com/OmniSharp/omnisharp-vscode/issues/2483))
+* Fixed launching the web browser against an ASP.NET project that uses wildcard ('*') bindings ([#2528](https://github.com/OmniSharp/omnisharp-vscode/issues/2528))
+
 ## 1.16.2 (October 3, 2018)
 * Update extension to handle upcoming breaking change to launch.json configurations in VS Code 1.28. (PR: [#2558](https://github.com/OmniSharp/omnisharp-vscode/pull/2558))
 * Fixed a bug where OmniSharp flame was red in spite of OmniSharp loading the projects without any errors. (PR: [#2450](https://github.com/OmniSharp/omnisharp-vscode/pull/2540))

README.md

@@ -20,6 +20,11 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar
 * [Documentation](https://code.visualstudio.com/docs/languages/csharp)
 * [Video Tutorial compiling with .NET Core](https://channel9.msdn.com/Blogs/dotnet/Get-started-VSCode-Csharp-NET-Core-Windows)
 
+### What's new in 1.17.0
+* Added preview Razor (cshtml) language service with support for C# completions and diagnostics.
+* Added omnisharp.minFindSymbolsFilterLength setting to configure the number of characters a user must type in for "Go to Symbol in Workspace" command to return any results
+* Added a command - "CSharp: Start authoring a new issue on GitHub" to enable the users to file issues on github from within the extension with helpful config information from their system
+
 ### What's New in 1.16.2
 * Update extension to handle upcoming breaking change to launch.json configurations in VS Code 1.28.
 * Fixed launch.json `envFile` option on Windows
@@ -37,7 +42,7 @@ The C# extension is powered by [OmniSharp](https://github.com/OmniSharp/omnishar
 * Added `monoPath` option to use the mono installation at the specified path when the `useGlobalMono` is set to "always" or "auto".
 * Many other bug fixes!
 
-See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/v1.16.0/CHANGELOG.md) for more detail.
+See our [change log](https://github.com/OmniSharp/omnisharp-vscode/blob/v1.17.0/CHANGELOG.md) for more detail.
 
 ### Supported Operating Systems for Debugging
 

package-lock.json

@@ -73,12 +73,12 @@
     "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/eee89386-9a82-4b4c-b30a-5857138f2eff/b0583648506c8fffe1ed9ff202702387/microsoft.aspnetcore.razor.vscode-1.0.0-alpha1-20181006.7.tgz",
+    "microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/da8ed554-fba5-4a26-858d-3d73425c2c9e/2775a951ae6431047ab6e3c51192585c/microsoft.aspnetcore.razor.vscode-1.0.0-alpha1-20181019.5.tgz",
     "mkdirp": "0.5.1",
     "node-filter-async": "0.0.4",
     "open": "*",
     "remove-bom-buffer": "3.0.0",
-    "request-light": "0.2.2",
+    "request-light": "0.2.4",
     "rxjs": "5.5.6",
     "semver": "*",
     "strip-bom": "3.0.0",
@@ -225,8 +225,8 @@
     },
     {
       "description": ".NET Core Debugger (Windows / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/b04322ea-547b-42b1-86d9-8489befa85cb/78cc7fe92df55ec751fa04231fe4a76f/coreclr-debug-win7-x64.zip",
-      "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-16-0/coreclr-debug-win7-x64.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/90e2038c-960d-4018-924e-30f520f887ab/117523c7024fbf6ffef530b707d7253a/coreclr-debug-win7-x64.zip",
+      "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-17-1/coreclr-debug-win7-x64.zip",
       "installPath": ".debugger",
       "platforms": [
         "win32"
@@ -238,8 +238,8 @@
     },
     {
       "description": ".NET Core Debugger (macOS / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/b04322ea-547b-42b1-86d9-8489befa85cb/2aa44d6a3b45199178833506704024c8/coreclr-debug-osx-x64.zip",
-      "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-16-0/coreclr-debug-osx-x64.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/90e2038c-960d-4018-924e-30f520f887ab/2d53db027d1e67b899a7f083800b2bd4/coreclr-debug-osx-x64.zip",
+      "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-17-1/coreclr-debug-osx-x64.zip",
       "installPath": ".debugger",
       "platforms": [
         "darwin"
@@ -255,8 +255,8 @@
     },
     {
       "description": ".NET Core Debugger (linux / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/b04322ea-547b-42b1-86d9-8489befa85cb/8a007d22a9733f620f86c87d5b2d66d4/coreclr-debug-linux-x64.zip",
-      "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-16-0/coreclr-debug-linux-x64.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/90e2038c-960d-4018-924e-30f520f887ab/090d7ebd63a3d44b31cb23568b53833d/coreclr-debug-linux-x64.zip",
+      "fallbackUrl": "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-17-1/coreclr-debug-linux-x64.zip",
       "installPath": ".debugger",
       "platforms": [
         "linux"
@@ -272,7 +272,7 @@
     },
     {
       "description": "Razor Language Server (Windows / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/eee89386-9a82-4b4c-b30a-5857138f2eff/3b812e4b415e128f291db79779a22fa6/razorlanguageserver-win-x64-1.0.0-alpha1-20181006.7.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/da8ed554-fba5-4a26-858d-3d73425c2c9e/d7df9363c14be268a9f7011f3116ed9f/razorlanguageserver-win-x64-1.0.0-alpha1-20181019.5.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
@@ -283,7 +283,7 @@
     },
     {
       "description": "Razor Language Server (Windows / x86)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/eee89386-9a82-4b4c-b30a-5857138f2eff/f21dc63eb40ce1c0a4c4a374f9ba2552/razorlanguageserver-win-x86-1.0.0-alpha1-20181006.7.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/da8ed554-fba5-4a26-858d-3d73425c2c9e/2a8db9c750e55928277a381b73755e60/razorlanguageserver-win-x86-1.0.0-alpha1-20181019.5.zip",
       "installPath": ".razor",
       "platforms": [
         "win32"
@@ -294,7 +294,7 @@
     },
     {
       "description": "Razor Language Server (Linux / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/eee89386-9a82-4b4c-b30a-5857138f2eff/e207d758ad5afc02c7866eba018a772e/razorlanguageserver-linux-x64-1.0.0-alpha1-20181006.7.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/da8ed554-fba5-4a26-858d-3d73425c2c9e/ee35c63e530362e1f86d1f2c834d1921/razorlanguageserver-linux-x64-1.0.0-alpha1-20181019.5.zip",
       "installPath": ".razor",
       "platforms": [
         "linux"
@@ -308,7 +308,7 @@
     },
     {
       "description": "Razor Language Server (macOS / x64)",
-      "url": "https://download.visualstudio.microsoft.com/download/pr/eee89386-9a82-4b4c-b30a-5857138f2eff/797f57ed228c8a2fa48b0bbafd69b120/razorlanguageserver-osx-x64-1.0.0-alpha1-20181006.7.zip",
+      "url": "https://download.visualstudio.microsoft.com/download/pr/da8ed554-fba5-4a26-858d-3d73425c2c9e/8efc7d28ce70069ddcad88c95dcb075f/razorlanguageserver-osx-x64-1.0.0-alpha1-20181019.5.zip",
       "installPath": ".razor",
       "platforms": [
         "darwin"
@@ -655,6 +655,19 @@
           "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.plugin.path": {
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": null,
+          "description": "Overrides the path to the Razor plugin dll."
+        },
+        "razor.devmode": {
+          "type": "boolean",
+          "default": false,
+          "description": "Forces the omnisharp-vscode extension to run in a mode that enables local Razor.VSCode deving."
+        },
         "razor.disabled": {
           "type": "boolean",
           "default": false,
@@ -673,7 +686,7 @@
           "default": false,
           "description": "Specifies whether to wait for debug attach when launching the language server."
         },
-        "razor.languageServer.trace": {
+        "razor.trace": {
           "type": "string",
           "default": "Off",
           "enum": [
@@ -682,9 +695,9 @@
             "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"
+            "Does not log messages from the Razor extension",
+            "Logs only some messages from the Razor extension",
+            "Logs all messages from the Razor extension"
           ],
           "description": "Specifies whether to output all messages [Verbose], some messages [Messages] or not at all [Off]."
         }

package.json

@@ -38,6 +38,7 @@ import createOptionStream from './observables/CreateOptionStream';
 import { CSharpExtensionId } from './constants/CSharpExtensionId';
 import { OpenURLObserver } from './observers/OpenURLObserver';
 import { activateRazorExtension } from './razor/razor';
+import { RazorLoggerObserver } from './observers/RazorLoggerObserver';
 
 export async function activate(context: vscode.ExtensionContext): Promise<CSharpExtensionExports> {
 
@@ -136,7 +137,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<CSharp
     }
 
     if (!optionProvider.GetLatestOptions().razorDisabled) {
-        await activateRazorExtension(context, extension.extensionPath, eventStream);
+        const razorObserver = new RazorLoggerObserver(omnisharpChannel);
+        eventStream.subscribe(razorObserver.post);
+
+        if (!optionProvider.GetLatestOptions().razorDevMode) {
+            await activateRazorExtension(context, extension.extensionPath, eventStream);
+        }
     }
 
     return {

src/main.ts

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { BaseLoggerObserver } from "./BaseLoggerObserver";
+import { RazorPluginPathSpecified, BaseEvent, RazorPluginPathDoesNotExist, RazorDevModeActive } from "../omnisharp/loggingEvents";
+
+export class RazorLoggerObserver extends BaseLoggerObserver {
+    public post = (event: BaseEvent) => {
+        switch (event.constructor.name) {
+            case RazorPluginPathSpecified.name:
+                this.handleRazorPluginPathSpecifiedMessage(<RazorPluginPathSpecified>event);
+                break;
+            case RazorPluginPathDoesNotExist.name:
+                this.handleRazorPluginPathDoesNotExistMessage(<RazorPluginPathDoesNotExist>event);
+                break;
+            case RazorDevModeActive.name:
+                this.handleRazorDevMode();
+                break;
+        }
+    }
+
+    private handleRazorPluginPathSpecifiedMessage(event: RazorPluginPathSpecified) {
+        this.logger.appendLine('Razor Plugin Path Specified');
+        this.logger.increaseIndent();
+        this.logger.appendLine(`Path: ${event.path}`);
+        this.logger.decreaseIndent();
+        this.logger.appendLine();
+    }
+
+    private handleRazorPluginPathDoesNotExistMessage(event: RazorPluginPathSpecified) {
+        this.logger.appendLine(`[error]: Razor plugin path was specified as '${event.path}' but does not exist on disk.`);
+    }
+
+    private handleRazorDevMode() {
+        this.logger.appendLine('Razor dev mode active. Suppressing built-in OmniSharp Razor support.');
+        this.logger.appendLine();
+    }
+}