Merge branch 'master' into master

Author: JoeRobich

debugger-launchjson.md

@@ -259,6 +259,7 @@ The `symbolOptions` element allows customization of how the debugger searches fo
             "https://my-companies-symbols-server"
         ],
         "searchMicrosoftSymbolServer": true,
+        "searchNuGetOrgSymbolServer": true,
         "cachePath": "/symcache",
         "moduleFilter": {
             "mode": "loadAllButExcluded",
@@ -273,6 +274,8 @@ The `symbolOptions` element allows customization of how the debugger searches fo
 
 **searchMicrosoftSymbolServer**: If `true` the Microsoft Symbol server (https://msdl.microsoft.com/download/symbols) is added to the symbols search path. If unspecified, this option defaults to `false`.
 
+**searchNuGetOrgSymbolServer**: If `true` the Nuget.org Symbol server (https://symbols.nuget.org/download/symbols) is added to the symbols search path. If unspecified, this option defaults to `false`.
+
 **cachePath**": Directory where symbols downloaded from symbol servers should be cached. If unspecified, on Windows the debugger will default to %TEMP%\\SymbolCache, and on Linux and macOS the debugger will default to ~/.dotnet/symbolcache.
 
 **moduleFilter.mode**: This value is either `"loadAllButExcluded"` or `"loadOnlyIncluded"`. In `"loadAllButExcluded"` mode, the debugger loads symbols for all modules unless the module is in the 'excludedModules' array. In `"loadOnlyIncluded"` mode, the debugger will not attempt to load symbols for ANY module unless it is in the 'includedModules' array, or it is included through the 'includeSymbolsNextToModules' setting.

package.json

@@ -3759,6 +3759,38 @@
       {
         "id": "xmlDocCommentText",
         "description": ""
+      },
+      {
+        "id": "regexComment",
+        "description": ""
+      },
+      {
+        "id": "regexCharacterClass",
+        "description": ""
+      },
+      {
+        "id": "regexAnchor",
+        "description": ""
+      },
+      {
+        "id": "regexQuantifier",
+        "description": ""
+      },
+      {
+        "id": "regexGrouping",
+        "description": ""
+      },
+      {
+        "id": "regexAlternation",
+        "description": ""
+      },
+      {
+        "id": "regexSelfEscapedCharacter",
+        "description": ""
+      },
+      {
+        "id": "regexOtherEscape",
+        "description": ""
       }
     ],
     "semanticTokenModifiers": [],
@@ -3896,6 +3928,40 @@
           ],
           "xmlDocCommentText": [
             "comment.documentation.cs"
+          ],
+          "regexComment": [
+            "string.regexp.comment.cs"
+          ],
+          "regexCharacterClass": [
+            "constant.character.character-class.regexp.cs",
+            "constant.other.character-class.set.regexp.cs",
+            "constant.other.character-class.regexp.cs",
+            "constant.character.set.regexp.cs"
+          ],
+          "regexAnchor": [
+            "keyword.control.anchor.regexp.cs"
+          ],
+          "regexQuantifier": [
+            "keyword.operator.quantifier.regexp.cs"
+          ],
+          "regexGrouping": [
+            "punctuation.definition.group.regexp.cs",
+            "punctuation.definition.group.assertion.regexp.cs",
+            "punctuation.definition.character-class.regexp.cs",
+            "punctuation.character.set.begin.regexp.cs",
+            "punctuation.character.set.end.regexp.cs",
+            "keyword.operator.negation.regexp.cs",
+            "support.other.parenthesis.regexp.cs"
+          ],
+          "regexAlternation": [
+            "keyword.operator.or.regexp.cs",
+            "keyword.control.anchor.regexp.cs"
+          ],
+          "regexSelfEscapedCharacter": [
+            "string.regexp.self-escaped-character.cs"
+          ],
+          "regexOtherEscape": [
+            "string.regexp.other-escape.cs"
           ]
         }
       }

snippets/csharp.json

@@ -253,6 +253,13 @@
         "body": ["namespace ${1:Name}", "{", "\t$0", "}"],
         "description": "Namespace"
     },
+    "FileScopedNamespace": {
+        "prefix": "fsnamespace",
+        "body": [
+            "namespace ${1:Name};"
+        ],
+        "description": "File-scoped namespace"
+    },
     "#if": {
         "prefix": "ifd",
         "body": ["#if ${1:true}", "\t ${TM_SELECTED_TEXT}$0", "#endif"],

src/assets.ts

@@ -267,7 +267,14 @@ export class AssetGenerator {
     private createWatchTaskDescription(): tasks.TaskDescription {
         let commandArgs = ['watch', 'run'];
 
-        this.AddAdditionalCommandArgs(commandArgs);
+        const buildProject = this.getBuildProjectPath();
+        if (buildProject) {
+            commandArgs.push('--project');
+            commandArgs.push(buildProject);
+        }
+
+        // NOTE: Don't add any additional args, or this will disable hot reload. See:
+        // https://github.com/dotnet/sdk/blob/957ae5ca599fdeaee425d23928d42da711373a5e/src/BuiltInTools/dotnet-watch/Program.cs#L247-L256
 
         return {
             label: 'watch',
@@ -279,17 +286,26 @@ export class AssetGenerator {
     }
 
     private AddAdditionalCommandArgs(commandArgs: string[]) {
+        const buildProject = this.getBuildProjectPath();
+        if (buildProject) {
+            commandArgs.push(buildProject);
+        }
+
+        commandArgs.push("/property:GenerateFullPaths=true");
+        commandArgs.push("/consoleloggerparameters:NoSummary");
+    }
+
+    private getBuildProjectPath() : string|null {
         let buildProject = this.startupProject;
         if (!buildProject) {
             buildProject = this.fallbackBuildProject;
         }
         if (buildProject) {
             const buildPath = path.join('${workspaceFolder}', path.relative(this.workspaceFolder.uri.fsPath, buildProject.Path));
-            commandArgs.push(util.convertNativePathToPosix(buildPath));
+            return util.convertNativePathToPosix(buildPath);
         }
 
-        commandArgs.push("/property:GenerateFullPaths=true");
-        commandArgs.push("/consoleloggerparameters:NoSummary");
+        return null;
     }
 
     public createTasksConfiguration(): tasks.TaskConfiguration {

src/features/semanticTokensProvider.ts

@@ -64,6 +64,14 @@ enum CustomTokenType {
     xmlDocCommentName,
     xmlDocCommentProcessingInstruction,
     xmlDocCommentText,
+    regexComment,
+    regexCharacterClass,
+    regexAnchor,
+    regexQuantifier,
+    regexGrouping,
+    regexAlternation,
+    regexSelfEscapedCharacter,
+    regexOtherEscape,
 }
 
 // The default TokenModifiers defined by VS Code https://github.com/microsoft/vscode/blob/master/src/vs/platform/theme/common/tokenClassificationRegistry.ts#L393
@@ -281,6 +289,14 @@ tokenTypes[CustomTokenType.xmlDocCommentEntityReference] = "xmlDocCommentEntityR
 tokenTypes[CustomTokenType.xmlDocCommentName] = "xmlDocCommentName";
 tokenTypes[CustomTokenType.xmlDocCommentProcessingInstruction] = "xmlDocCommentProcessingInstruction";
 tokenTypes[CustomTokenType.xmlDocCommentText] = "xmlDocCommentText";
+tokenTypes[CustomTokenType.regexComment] = "regexComment";
+tokenTypes[CustomTokenType.regexCharacterClass] = "regexCharacterClass";
+tokenTypes[CustomTokenType.regexAnchor] = "regexAnchor";
+tokenTypes[CustomTokenType.regexQuantifier] = "regexQuantifier";
+tokenTypes[CustomTokenType.regexGrouping] = "regexGrouping";
+tokenTypes[CustomTokenType.regexAlternation] = "regexAlternation";
+tokenTypes[CustomTokenType.regexSelfEscapedCharacter] = "regexSelfEscapedCharacter";
+tokenTypes[CustomTokenType.regexOtherEscape] = "regexOtherEscape";
 
 const tokenModifiers: string[] = [];
 tokenModifiers[DefaultTokenModifier.declaration] = 'declaration';
@@ -348,15 +364,15 @@ tokenTypeMap[SemanticHighlightClassification.XmlLiteralEntityReference] = undefi
 tokenTypeMap[SemanticHighlightClassification.XmlLiteralName] = undefined;
 tokenTypeMap[SemanticHighlightClassification.XmlLiteralProcessingInstruction] = undefined;
 tokenTypeMap[SemanticHighlightClassification.XmlLiteralText] = undefined;
-tokenTypeMap[SemanticHighlightClassification.RegexComment] = DefaultTokenType.regexp;
-tokenTypeMap[SemanticHighlightClassification.RegexCharacterClass] = DefaultTokenType.regexp;
-tokenTypeMap[SemanticHighlightClassification.RegexAnchor] = DefaultTokenType.regexp;
-tokenTypeMap[SemanticHighlightClassification.RegexQuantifier] = DefaultTokenType.regexp;
-tokenTypeMap[SemanticHighlightClassification.RegexGrouping] = DefaultTokenType.regexp;
-tokenTypeMap[SemanticHighlightClassification.RegexAlternation] = DefaultTokenType.regexp;
+tokenTypeMap[SemanticHighlightClassification.RegexComment] = CustomTokenType.regexComment;
+tokenTypeMap[SemanticHighlightClassification.RegexCharacterClass] = CustomTokenType.regexCharacterClass;
+tokenTypeMap[SemanticHighlightClassification.RegexAnchor] = CustomTokenType.regexAnchor;
+tokenTypeMap[SemanticHighlightClassification.RegexQuantifier] = CustomTokenType.regexQuantifier;
+tokenTypeMap[SemanticHighlightClassification.RegexGrouping] = CustomTokenType.regexGrouping;
+tokenTypeMap[SemanticHighlightClassification.RegexAlternation] = CustomTokenType.regexAlternation;
 tokenTypeMap[SemanticHighlightClassification.RegexText] = DefaultTokenType.regexp;
-tokenTypeMap[SemanticHighlightClassification.RegexSelfEscapedCharacter] = DefaultTokenType.regexp;
-tokenTypeMap[SemanticHighlightClassification.RegexOtherEscape] = DefaultTokenType.regexp;
+tokenTypeMap[SemanticHighlightClassification.RegexSelfEscapedCharacter] = CustomTokenType.regexSelfEscapedCharacter;
+tokenTypeMap[SemanticHighlightClassification.RegexOtherEscape] = CustomTokenType.regexOtherEscape;
 
 const tokenModifierMap: number[] = [];
 tokenModifierMap[SemanticHighlightModifier.Static] = 2 ** DefaultTokenModifier.static;

src/omnisharp/OmniSharpDotnetResolver.ts

@@ -34,11 +34,28 @@ export class OmniSharpDotnetResolver implements IHostExecutableResolver {
             throw new Error(`Unable to read dotnet version information. Error ${result.stderr}`);
         }
 
-        const segments = result.stdout.split('.').map(str => Number.parseInt(str));
-        if (segments.length != 3) {
+        const segments: number[] = [];
+        const stdoutSplit = result.stdout.split('.');
+        if (stdoutSplit.length != 3) {
             throw new Error(`Unknown result output from 'dotnet --version'. Received ${result.stdout}`);
         }
 
+        let isPrerelease = false;
+
+        for (let i = 0; i < 3; i++) {
+            let segment = stdoutSplit[i];
+            if (i === 2) {
+                const dashIndex = segment.indexOf('-');
+                if (dashIndex !== -1) {
+                    isPrerelease = true;
+                    segment = segment.substring(0, dashIndex);
+                }
+            }
+
+            segments.push(Number.parseInt(segment));
+        }
+
+
         if (this.versionPartIsGreaterThanMinimum(segments[0], minimumDotnetMajor, result.stdout)
             || this.versionPartIsGreaterThanMinimum(segments[1], minimumDotnetMinor, result.stdout)) {
             return {
@@ -48,7 +65,9 @@ export class OmniSharpDotnetResolver implements IHostExecutableResolver {
             };
         }
 
-        this.versionPartIsGreaterThanMinimum(segments[2], minimumDotnetPatch, result.stdout);
+        // If the found SDK is a pre-release version of .NET, then we need to ensure that it's a _higher_ patch version than the required
+        // minimum, not a prerelease version of the required minimum.
+        this.versionPartIsGreaterThanMinimum(segments[2], minimumDotnetPatch, result.stdout, /*disallowExactMatch*/ isPrerelease);
 
         return {
             version: result.stdout,
@@ -57,8 +76,8 @@ export class OmniSharpDotnetResolver implements IHostExecutableResolver {
         };
     }
 
-    private versionPartIsGreaterThanMinimum(actualVersion: number, minimumRequired: number, foundVersion: string): boolean {
-        if (actualVersion < minimumRequired) {
+    private versionPartIsGreaterThanMinimum(actualVersion: number, minimumRequired: number, foundVersion: string, disallowExactMatch: boolean = false): boolean {
+        if (actualVersion < minimumRequired || (disallowExactMatch && actualVersion === minimumRequired)) {
             throw new Error(`Found dotnet version ${foundVersion}. Minimum required version is ${minimumDotnetMajor}.${minimumDotnetMinor}.${minimumDotnetPatch}.`);
         }
 

src/omnisharp/launcher.ts

@@ -340,15 +340,24 @@ function getConfigurationValue(globalConfig: vscode.WorkspaceConfiguration, csha
 
 async function launchDotnet(launchInfo: LaunchInfo, cwd: string, args: string[], platformInfo: PlatformInformation, options: Options, dotnetResolver: IHostExecutableResolver): Promise<LaunchResult> {
     const dotnetInfo = await dotnetResolver.getHostExecutableInfo(options);
-    const dotnet = platformInfo.isWindows() ? 'dotnet.exe' : 'dotnet';
+    let command: string;
     const argsCopy = args.slice(0);
-    argsCopy.unshift(launchInfo.DotnetLaunchPath);
 
-    const process = spawn(dotnet, argsCopy, { detached: false, cwd, env: dotnetInfo.env });
+
+    if (launchInfo.LaunchPath && !launchInfo.LaunchPath.endsWith('.dll')) {
+        // If we're not being asked to launch a dll, assume whatever we're given is an executable
+        command = launchInfo.LaunchPath;
+    }
+    else {
+        command = platformInfo.isWindows() ? 'dotnet.exe' : 'dotnet';
+        argsCopy.unshift(launchInfo.DotnetLaunchPath ?? launchInfo.LaunchPath);
+    }
+
+    const process = spawn(command, argsCopy, { detached: false, cwd, env: dotnetInfo.env });
 
     return {
         process,
-        command: launchInfo.DotnetLaunchPath,
+        command: launchInfo.DotnetLaunchPath ?? launchInfo.LaunchPath,
         hostVersion: dotnetInfo.version,
         hostPath: dotnetInfo.path,
         hostIsMono: false,

test/integrationTests/advisor.integration.test.ts

@@ -31,19 +31,21 @@ suite(`Advisor ${testAssetWorkspace.description}`, function () {
             this.skip();
         }
 
-        let activationResult = await activateCSharpExtension();
+        const activation = await activateCSharpExtension();
         await testAssetWorkspace.restore();
 
-        if (!activationResult) {
+        if (!activation) {
             throw new Error('Cannot activate extension.');
         } else {
-            advisor = activationResult.advisor;
+            advisor = activation.advisor;
         }
 
         let fileName = 'completion.cs';
         let dir = testAssetWorkspace.projects[0].projectDirectoryPath;
         let fileUri = vscode.Uri.file(path.join(dir, fileName));
         await vscode.commands.executeCommand('vscode.open', fileUri);
+
+        await testAssetWorkspace.waitForIdle(activation.eventStream);
     });
 
     suiteTeardown(async () => {

test/integrationTests/codeActionRename.integration.test.ts

@@ -25,8 +25,8 @@ suite(`Code Action Rename ${testAssetWorkspace.description}`, function () {
             this.skip();
         }
 
-        await activateCSharpExtension();
-        await testAssetWorkspace.restore();
+        const activation = await activateCSharpExtension();
+        await testAssetWorkspace.restoreAndWait(activation);
 
         let fileName = 'A.cs';
         let projectDirectory = testAssetWorkspace.projects[0].projectDirectoryPath;

test/integrationTests/codeLensProvider.integration.test.ts

@@ -23,7 +23,7 @@ suite(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {
         }
 
         should();
-        await activateCSharpExtension();
+        const activation = await activateCSharpExtension();
         await testAssetWorkspace.restore();
 
         let fileName = 'Program.cs';
@@ -36,6 +36,8 @@ suite(`CodeLensProvider: ${testAssetWorkspace.description}`, function () {
         await csharpConfig.update('testsCodeLens.enabled', true);
 
         await vscode.commands.executeCommand("vscode.open", fileUri);
+
+        await testAssetWorkspace.waitForIdle(activation.eventStream);
     });
 
     suiteTeardown(async () => {
@@ -75,8 +77,8 @@ suite(`CodeLensProvider options: ${testAssetWorkspace.description}`, function ()
             this.skip();
         }
         else {
-            await activateCSharpExtension();
-            await testAssetWorkspace.restore();
+            const activation = await activateCSharpExtension();
+            await testAssetWorkspace.restoreAndWait(activation);
 
             let fileName = 'UnitTest1.cs';
             let projectDirectory = testAssetWorkspace.projects[2].projectDirectoryPath;