Merge branch 'master' into rajkumar42/wsl/changelog

Author: DustinCampbell

.vscode/tasks.json

@@ -1,16 +1,27 @@
 {
 	"version": "0.1.0",
-	"command": "gulp",
-	"isShellCommand": true,
 	"tasks": [
+		{
+			"taskName": "build",
+			"command": "npm",
+			"isShellCommand": true,
+			"args": ["run", "compile"],
+			"showOutput": "always",
+			"isBuildCommand": true
+		},
 		{
 			"taskName": "test",
+			"command": "echo",
 			"showOutput": "always",
+			"isShellCommand": true,
+			"args": ["Run tests in VS Code by launching the debugg with the 'Launch Tests' configuration."],
 			"isTestCommand": true
 		},
 		{
 			"taskName": "tslint",
-			"args": [],
+			"command": "gulp",
+			"isShellCommand": true,
+			"args": ["tslint"],
 			"problemMatcher": {
 				"owner": "tslint",
 				"fileLocation": [

CHANGELOG.md

@@ -8,21 +8,30 @@
 ### Project Support
 
 * Updated with the latest changes for .NET Core .csproj projects. ([omnisharp-roslyn#738](https://github.com/OmniSharp/omnisharp-roslyn/pull/738))
-* Properly handle .csproj projects in .sln files that were added via .NET CLI commands. ([omnisharp-roslyn#741](https://github.com/OmniSharp/omnisharp-roslyn/pull/741))
-* Respect `nowarn` in project.json projects ([omnisharp#734](https://github.com/OmniSharp/omnisharp-roslyn/pull/734)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Automatic package restore and out-of-date notifications implemented for .NET Core .csproj projects. ([#770](https://github.com/OmniSharp/omnisharp-vscode/issues/770))
 * Correctly update project when dotnet restore is performed on a .NET Core .csproj project. ([#1114](https://github.com/OmniSharp/omnisharp-vscode/issues/1114))
+* Properly handle .csproj projects in .sln files that were added via .NET CLI commands. ([omnisharp-roslyn#741](https://github.com/OmniSharp/omnisharp-roslyn/pull/741))
+* Fix `dotnet restore` Visual Studio Code command to execute for .csproj .NET Core projects. ([#1175](https://github.com/OmniSharp/omnisharp-vscode/issues/1175))
+* Respect `nowarn` in project.json projects. ([omnisharp#734](https://github.com/OmniSharp/omnisharp-roslyn/pull/734)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Fix problem with project.json projects that wrap assemblies. ([#424](https://github.com/OmniSharp/omnisharp-vscode/issues/424))
 
 ### Debugging
 
-* Enable debugger support for Zorin OS 12 ([#1160](https://github.com/OmniSharp/omnisharp-vscode/issues/1160)) _(Contributed by [@mkaziz](https://github.com/mkaziz))_
+* Enable debugger support for Zorin OS 12. ([#1160](https://github.com/OmniSharp/omnisharp-vscode/issues/1160)) _(Contributed by [@mkaziz](https://github.com/mkaziz))_
 * Added off-road support for [Windows Subsystem for Linux](https://blogs.msdn.microsoft.com/wsl/2016/04/22/windows-subsystem-for-linux-overview/) (NOTE: requires newer version of Windows than have been publicly released yet)
 * Fixed issue with debugger pause and multithreaded call stacks ([#1107](https://github.com/OmniSharp/omnisharp-vscode/issues/1107) and [#1105](https://github.com/OmniSharp/omnisharp-vscode/issues/1105))
 
-
 ### C# Scripting
 
-* Support resolving `#r` references from the GAC ([omnisharp-roslyn#721](https://github.com/OmniSharp/omnisharp-roslyn/pull/721)) _(Contributed by [@filipw](https://github.com/filipw))_
-* Include System.ValueTuple in C# scripts implicitly ([omnisharp-roslyn#722](https://github.com/OmniSharp/omnisharp-roslyn/pull/722)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Support resolving `#r` references from the GAC. ([omnisharp-roslyn#721](https://github.com/OmniSharp/omnisharp-roslyn/pull/721)) _(Contributed by [@filipw](https://github.com/filipw))_
+* Include System.ValueTuple in C# scripts implicitly. ([omnisharp-roslyn#722](https://github.com/OmniSharp/omnisharp-roslyn/pull/722)) _(Contributed by [@filipw](https://github.com/filipw))_
+
+### Code Actions
+
+* Fixed code actions that add files, such as "Move Type to File". ([#975](https://github.com/OmniSharp/omnisharp-vscode/issues/975))
+* Properly surface code actions that have "nested code actions". This allows "generate type" to work properly. ([#302](https://github.com/OmniSharp/omnisharp-vscode/issues/302))
+* Don't display the Remove Unnecessary Usings code action unless it is relevant. ([omnisharp-roslyn#742](https://github.com/OmniSharp/omnisharp-roslyn/issues/742))
+* Don't show the Extract Interface refactoring as it requires a dialog that does not exist in VS Code. ([#925](https://github.com/OmniSharp/omnisharp-vscode/issues/925))
 
 ### Completion List
 
@@ -32,17 +41,18 @@
 ### Other Updates and Fixes
 
 * Add schema validation for omnisharp.json files. ([#1082](https://github.com/OmniSharp/omnisharp-vscode/pull/1082)) _(Contributed by [@Thaina](https://github.com/Thaina))_
+* Add support for auto-closing and surrounding characters. ([#749](https://github.com/OmniSharp/omnisharp-vscode/issues/749), [#842](https://github.com/OmniSharp/omnisharp-vscode/issues/842)) _(Contributed by [@filipw](https://github.com/filipw))_
 * Fix running and debugging of tests defined in nested classes. ([#743](https://github.com/OmniSharp/omnisharp-vscode/issues/743), [#1151](https://github.com/OmniSharp/omnisharp-vscode/issues/1151))
 * Fix error when 'tasks.json' does not contain a 'tasks' node, or contains os-specific 'tasks' nodes. ([#1140](https://github.com/OmniSharp/omnisharp-vscode/issues/1140))
 * Better detection of Windows architecture (x86 or x64) when determining extension dependencies to download. The detection logic now uses well-known environment variables rather than launching 'wmic'. ([#1110](https://github.com/OmniSharp/omnisharp-vscode/issues/1110), [#1125](https://github.com/OmniSharp/omnisharp-vscode/issues/1125))
 * Improvements to the OmniSharp Log ([#1155](https://github.com/OmniSharp/omnisharp-vscode/pull/1155))
 * Add new values to the `omnisharp.logginglevel` option to allow more granualar control of OmniSharp logging. ([#993](https://github.com/OmniSharp/omnisharp-vscode/issues/993)) _(Contributed by [@filipw](https://github.com/filipw))_
-* Fix `dotnet restore` Visual Studio Code command to handle .csproj .NET Core projects. ([#1175](https://github.com/OmniSharp/omnisharp-vscode/issues/1175))
+* Don't display the "some projects have trouble loading" message if projects only contain warnings. ([#707](https://github.com/OmniSharp/omnisharp-vscode/issues/707))
+* Update Mono detection logic to succeed even if another shell is set as the default (e.g. zsh). ([#1031](https://github.com/OmniSharp/omnisharp-vscode/issues/1031))
 
 ### Known Issues
 
 * Running and debugging of tests are not supported in .csproj-based .NET Core projects. However, there will still be clickable "run test" and "debug test" indicators above test methods. ([#1100](https://github.com/OmniSharp/omnisharp-vscode/issues/1100))
-* Auto-restore for NuGet packages is not yet implemented. If you change a project file and need to restore packages, you should do so by running `dotnet restore` with the .NET CLI. Once packages are restored, you can force the C# extension to "see" the new references by restarting OmniSharp with the `OmniSharp: Restart OmniSharp` command. ([#770](https://github.com/OmniSharp/omnisharp-vscode/issues/770))
 * When opening a .csproj-based .NET Core project in VS Code, the C# extension will not activate until a C# file is opened in the editor. ([#1150](https://github.com/OmniSharp/omnisharp-vscode/issues/1150))
 
 ## 1.6.2 (December 24, 2016)

csharp.configuration.json

@@ -1,11 +1,27 @@
 {
-	"comments": {
-		"lineComment": "//",
-		"blockComment": ["/*", "*/"]
-	},
-	"brackets": [
-		["{", "}"],
-		["[", "]"],
-		["(", ")"]
-	]
+    "comments": {
+        "lineComment": "//",
+        "blockComment": ["/*", "*/"]
+    },
+    "brackets": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"]
+    ],
+    "autoClosingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        { "open": "'", "close": "'", "notIn": ["string", "comment"] },
+        { "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
+        { "open": "/*", "close": " */", "notIn": ["string"] }
+    ],
+    "surroundingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["<", ">"],
+        ["'", "'"],
+        ["\"", "\""]
+    ]
 }

gulpfile.js

@@ -145,18 +145,6 @@ gulp.task('package:offline', ['clean'], () => {
     return promise;
 });
 
-/// Test Task
-gulp.task('test', () => {
-    gulp.src('out/test/**/*.tests.js')
-        .pipe(mocha({ ui: "tdd" }))
-        .once('error', () => {
-            process.exit(1);
-        })
-        .once('end', () => {
-            process.exit();
-        });
-});
-
 /// Misc Tasks
 const allTypeScript = [
     'src/**/*.ts',

package.json

@@ -1,7 +1,7 @@
 {
   "name": "csharp",
   "publisher": "ms-vscode",
-  "version": "1.7.0-beta3",
+  "version": "1.7.0-beta4",
   "description": "C# for Visual Studio Code (powered by OmniSharp).",
   "displayName": "C#",
   "author": "Microsoft Corporation",
@@ -117,7 +117,7 @@
     },
     {
       "description": "OmniSharp (.NET 4.6 / x86)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.9-beta24.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x86-1.9-beta25.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "win32"
@@ -128,7 +128,7 @@
     },
     {
       "description": "OmniSharp (.NET 4.6 / x64)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.9-beta24.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-win-x64-1.9-beta25.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "win32"
@@ -139,7 +139,7 @@
     },
     {
       "description": "OmniSharp (Mono 4.6)",
-      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.9-beta24.zip",
+      "url": "https://omnisharpdownload.blob.core.windows.net/ext/omnisharp-mono-1.9-beta25.zip",
       "installPath": "./bin/omnisharp",
       "platforms": [
         "darwin",

src/features/commands.ts

@@ -143,14 +143,16 @@ export function dotnetRestoreForProject(server: OmniSharpServer, fileName: strin
 
     return serverUtils.requestWorkspaceInformation(server).then(info => {
 
-        if (!info.DotNet || info.DotNet.Projects.length < 1) {
+        let projectDescriptors = protocol.getDotNetCoreProjectDescriptors(info);
+
+        if (projectDescriptors.length === 0) {
             return Promise.reject("No .NET Core projects found");
         }
 
         let directory = path.dirname(fileName);
 
-        for (let project of info.DotNet.Projects) {
-            if (project.Path === directory) {
+        for (let projectDescriptor of projectDescriptors) {
+            if (projectDescriptor.Path === fileName) {
                 return dotnetRestore(directory, fileName);
             }
         }

src/features/status.ts

@@ -241,7 +241,10 @@ export function reportServerStatus(server: OmniSharpServer): vscode.Disposable{
             message.Errors.forEach(error => asErrorMessage);
             message.Warnings.forEach(warning => asWarningMessage);
             appendLine();
-            showMessageSoon();
+
+            if (message.Errors.length > 0) {
+                showMessageSoon();
+            }
         }
     });
 

syntaxes/csharp.tmLanguage

@@ -1324,6 +1324,10 @@
             <key>include</key>
             <string>#punctuation-comma</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#preprocessor</string>
+          </dict>
         </array>
       </dict>
       <key>generic-constraints</key>
@@ -2246,7 +2250,7 @@
           </dict>
         </dict>
         <key>end</key>
-        <string>(?=[,\);}])</string>
+        <string>(?=[,\)\];}])</string>
         <key>patterns</key>
         <array>
           <dict>
@@ -4869,7 +4873,7 @@
               </dict>
               <dict>
                 <key>match</key>
-                <string>\s+([_[:alpha:]][_[:alnum:]]*)\s*(?=[,\]])</string>
+                <string>\s+([_[:alpha:]][_[:alnum:]]*)\s*(?=[=,\]])</string>
                 <key>captures</key>
                 <dict>
                   <key>1</key>
@@ -4935,7 +4939,7 @@
           </dict>
           <dict>
             <key>match</key>
-            <string>\s+([_[:alpha:]][_[:alnum:]]*)\s*(?=[,)])</string>
+            <string>\b([_[:alpha:]][_[:alnum:]]*)\s*(?=[=,)])</string>
             <key>captures</key>
             <dict>
               <key>1</key>
@@ -5532,7 +5536,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=\)|;)</string>
+            <string>(?=\)|;|})</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -5575,7 +5579,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=\)|;)</string>
+            <string>(?=\)|;|})</string>
             <key>patterns</key>
             <array>
               <dict>
@@ -5607,7 +5611,7 @@
               </dict>
             </dict>
             <key>end</key>
-            <string>(?=\)|;)</string>
+            <string>(?=\)|;|})</string>
             <key>patterns</key>
             <array>
               <dict>