Fix analyzer severity defaults

dotnet · Apr 30, 2021 · b3e8554 · b3e8554
1 parent 7b8deb3
commit b3e8554
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,23 @@
   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "format @validate.rsp",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "build",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/artifacts/bin/dotnet-format/Debug/netcoreapp2.1/dotnet-format.dll",
+      "args": [
+        "@validate.rsp",
+        "--check"
+      ],
+      "cwd": "${workspaceFolder}",
+      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+      "console": "internalConsole",
+      "stopAtEntry": false,
+      "justMyCode": false
+    },
     {
       "name": "format -f --check",
       "type": "coreclr",

diff --git a/src/FormatCommand.cs b/src/FormatCommand.cs
@@ -18,8 +18,8 @@ internal static class FormatCommand
             bool noRestore,
             bool folder,
             bool fixWhitespace,
-            string? fixStyle,
-            string? fixAnalyzers,
+            string fixStyle,
+            string fixAnalyzers,
             string[] diagnostics,
             string? verbosity,
             bool check,

diff --git a/src/Program.cs b/src/Program.cs
@@ -48,8 +48,8 @@ private static async Task<int> Main(string[] args)
             bool noRestore,
             bool folder,
             bool fixWhitespace,
-            string? fixStyle,
-            string? fixAnalyzers,
+            string fixStyle,
+            string fixAnalyzers,
             string[] diagnostics,
             string? verbosity,
             bool check,
@@ -173,8 +173,8 @@ private static async Task<int> Main(string[] args)
                     noRestore,
                     logLevel,
                     fixType,
-                    codeStyleSeverity: GetSeverity(fixStyle ?? FixSeverity.Error),
-                    analyzerSeverity: GetSeverity(fixAnalyzers ?? FixSeverity.Error),
+                    codeStyleSeverity: GetSeverity(fixStyle),
+                    analyzerSeverity: GetSeverity(fixAnalyzers),
                     diagnostics: diagnostics.ToImmutableHashSet(),
                     saveFormattedFiles: !check,
                     changesAreErrors: check,
@@ -312,6 +312,7 @@ internal static DiagnosticSeverity GetSeverity(string? severity)
         {
             return severity?.ToLowerInvariant() switch
             {
+                "" => DiagnosticSeverity.Error,
                 FixSeverity.Error => DiagnosticSeverity.Error,
                 FixSeverity.Warn => DiagnosticSeverity.Warning,
                 FixSeverity.Info => DiagnosticSeverity.Info,

diff --git a/tests/Analyzers/ThirdPartyAnalyzerFormatterTests.cs b/tests/Analyzers/ThirdPartyAnalyzerFormatterTests.cs
@@ -45,6 +45,8 @@ public async Task InitializeAsync()
                 MSBuildRegistrar.RegisterInstance();
                 var analyzerWorkspace = await MSBuildWorkspaceLoader.LockedLoadAsync(workspacePath, WorkspaceType.Project, binaryLogPath: null, logWorkspaceWarnings: true, logger, CancellationToken.None);
 
+                TestOutputHelper.WriteLine(logger.GetLog());
+
                 // From this project we can get valid AnalyzerReferences to add to our test project.
                 _analyzerReferencesProject = analyzerWorkspace.CurrentSolution.Projects.Single();
             }