Merge in Feature/analyzers

.editorconfig

@@ -35,14 +35,14 @@ indent_size = 2
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first = true
 # Avoid "this." and "Me." if not necessary
-dotnet_style_qualification_for_field = false:suggestion
-dotnet_style_qualification_for_property = false:suggestion
-dotnet_style_qualification_for_method = false:suggestion
-dotnet_style_qualification_for_event = false:suggestion
+dotnet_style_qualification_for_field = false:error
+dotnet_style_qualification_for_property = false:error
+dotnet_style_qualification_for_method = false:error
+dotnet_style_qualification_for_event = false:error
 
 # Use language keywords instead of framework type names for type references
-dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
-dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:error
+dotnet_style_predefined_type_for_member_access = true:error
 
 # Suggest more modern language features when available
 dotnet_style_object_initializer = true:suggestion
@@ -131,25 +131,25 @@ csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left
 
 # Prefer "var" everywhere
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:error
+csharp_style_var_when_type_is_apparent = true:error
+csharp_style_var_elsewhere = true:error
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none
 csharp_style_expression_bodied_constructors = false:none
 csharp_style_expression_bodied_operators = false:none
 
 # Prefer property-like constructs to have an expression-body
-csharp_style_expression_bodied_properties = true:none
-csharp_style_expression_bodied_indexers = true:none
-csharp_style_expression_bodied_accessors = true:none
+csharp_style_expression_bodied_properties = true:error
+csharp_style_expression_bodied_indexers = true:error
+csharp_style_expression_bodied_accessors = true:error
 
 # Suggest more modern language features when available
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:error
+csharp_style_pattern_matching_over_as_with_null_check = true:error
 csharp_style_inlined_variable_declaration = true:suggestion
-csharp_style_throw_expression = true:suggestion
+csharp_style_throw_expression = true:error
 csharp_style_conditional_delegate_call = true:suggestion
 
 # Newline settings

.vscode/launch.json

@@ -40,6 +40,45 @@
       "console": "internalConsole",
       "stopAtEntry": false
     },
+    {
+      "name": "format format.sln --fix-style --check",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "publish",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/artifacts/bin/dotnet-format/Debug/netcoreapp2.1/publish/dotnet-format.dll",
+      "args": [
+        "format.sln",
+        "--fix-style",
+        "-v",
+        "diag",
+        "--check"
+      ],
+      "cwd": "${workspaceFolder}",
+      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+      "console": "internalConsole",
+      "stopAtEntry": false
+    },
+    {
+      "name": "format format.sln --fix-analyzers warn --check",
+      "type": "coreclr",
+      "request": "launch",
+      "preLaunchTask": "publish",
+      // If you have changed target frameworks, make sure to update the program path.
+      "program": "${workspaceFolder}/artifacts/bin/dotnet-format/Debug/netcoreapp2.1/publish/dotnet-format.dll",
+      "args": [
+        "format.sln",
+        "--fix-analyzers",
+        "warn",
+        "-v",
+        "diag",
+        "--check"
+      ],
+      "cwd": "${workspaceFolder}",
+      // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+      "console": "internalConsole",
+      "stopAtEntry": false
+    },
     {
       "name": ".NET Core Attach",
       "type": "coreclr",

.vscode/tasks.json

@@ -1,42 +1,44 @@
 {
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/src/dotnet-format.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/src/dotnet-format.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/src/dotnet-format.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        }
-    ]
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/src/dotnet-format.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "publish",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "publish",
+        "${workspaceFolder}/src/dotnet-format.csproj",
+        "-c",
+        "Debug",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "watch",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "watch",
+        "run",
+        "${workspaceFolder}/src/dotnet-format.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    }
+  ]
 }

azure-pipelines.yml

@@ -111,7 +111,9 @@ jobs:
     vmImage: 'vs2017-win2016'
   timeoutInMinutes: 5
   steps:
-    - script: dotnet run --project ./src/dotnet-format.csproj -- @validate.rsp
+    - script: dotnet publish ./src/dotnet-format.csproj -c Release
+      displayName: Publish dotnet-format
+    - script: dotnet ./artifacts/bin/dotnet-format/Release/netcoreapp2.1/publish/dotnet-format.dll @validate.rsp
       displayName: Run dotnet-format
     - task: PublishBuildArtifacts@1
       displayName: Publish Logs

eng/Versions.props

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <MajorVersion>4</MajorVersion>
-    <MinorVersion>1</MinorVersion>
+    <MajorVersion>5</MajorVersion>
+    <MinorVersion>0</MinorVersion>
     <!-- Build release-only package. -->
     <PreReleaseVersionLabel />
   </PropertyGroup>

perf/FormattedFiles.cs

@@ -34,6 +34,10 @@ public void FilesFormattedFolder()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,
@@ -50,6 +54,10 @@ public void FilesFormattedProject()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,
@@ -66,6 +74,10 @@ public void FilesFormattedSolution()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,

perf/NoFilesFormatted.cs

@@ -34,6 +34,10 @@ public void NoFilesFormattedFolder()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,
@@ -50,6 +54,10 @@ public void NoFilesFormattedProject()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,
@@ -66,6 +74,10 @@ public void NoFilesFormattedSolution()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,

perf/RealWorldSolution.cs

@@ -36,6 +36,10 @@ public void FilesFormattedSolution()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,
@@ -52,6 +56,10 @@ public void FilesFormattedFolder()
                 workspacePath,
                 workspaceType,
                 LogLevel.Error,
+                fixCodeStyle: false,
+                codeStyleSeverity: DiagnosticSeverity.Error,
+                fixAnalyzers: false,
+                analyerSeverity: DiagnosticSeverity.Error,
                 saveFormattedFiles: false,
                 changesAreErrors: false,
                 AllFileMatcher,

src/Analyzers/AnalyzerFinderHelpers.cs

@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the MIT license.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Microsoft.CodeAnalysis.CodeFixes;
+using Microsoft.CodeAnalysis.Diagnostics;
+
+namespace Microsoft.CodeAnalysis.Tools.Analyzers
+{
+    internal static class AnalyzerFinderHelpers
+    {
+        public static ImmutableArray<(DiagnosticAnalyzer Analyzer, CodeFixProvider? Fixer)> LoadAnalyzersAndFixers(IEnumerable<Assembly> assemblies)
+        {
+            var types = assemblies
+                .SelectMany(assembly => assembly.GetTypes()
+                .Where(type => !type.GetTypeInfo().IsInterface &&
+                            !type.GetTypeInfo().IsAbstract &&
+                            !type.GetTypeInfo().ContainsGenericParameters));
+
+            var codeFixProviders = types
+                .Where(t => typeof(CodeFixProvider).IsAssignableFrom(t))
+                .Select(type => type.TryCreateInstance<CodeFixProvider>(out var instance) ? instance : null)
+                .OfType<CodeFixProvider>()
+                .ToImmutableArray();
+
+            var diagnosticAnalyzers = types
+                .Where(t => typeof(DiagnosticAnalyzer).IsAssignableFrom(t))
+                .Select(type => type.TryCreateInstance<DiagnosticAnalyzer>(out var instance) ? instance : null)
+                .OfType<DiagnosticAnalyzer>()
+                .ToImmutableArray();
+
+            var builder = ImmutableArray.CreateBuilder<(DiagnosticAnalyzer Analyzer, CodeFixProvider? Fixer)>();
+            foreach (var diagnosticAnalyzer in diagnosticAnalyzers)
+            {
+                var diagnosticIds = diagnosticAnalyzer.SupportedDiagnostics.Select(diagnostic => diagnostic.Id).ToImmutableHashSet();
+                var codeFixProvider = codeFixProviders.FirstOrDefault(codeFixProvider => codeFixProvider.FixableDiagnosticIds.Any(id => diagnosticIds.Contains(id)));
+
+                if (codeFixProvider is null)
+                {
+                    continue;
+                }
+
+                builder.Add((diagnosticAnalyzer, codeFixProvider));
+            }
+
+            return builder.ToImmutableArray();
+        }
+
+        public static async Task<ImmutableDictionary<Project, ImmutableArray<DiagnosticAnalyzer>>> FilterBySeverityAsync(
+            IEnumerable<Project> projects,
+            ImmutableArray<DiagnosticAnalyzer> allAnalyzers,
+            ImmutableHashSet<string> formattablePaths,
+            DiagnosticSeverity minimumSeverity,
+            CancellationToken cancellationToken)
+        {
+            var projectAnalyzers = ImmutableDictionary.CreateBuilder<Project, ImmutableArray<DiagnosticAnalyzer>>();
+            foreach (var project in projects)
+            {
+                var analyzers = ImmutableArray.CreateBuilder<DiagnosticAnalyzer>();
+
+                foreach (var analyzer in allAnalyzers)
+                {
+                    var severity = await analyzer.GetSeverityAsync(project, formattablePaths, cancellationToken).ConfigureAwait(false);
+                    if (severity >= minimumSeverity)
+                    {
+                        analyzers.Add(analyzer);
+                    }
+                }
+
+                projectAnalyzers.Add(project, analyzers.ToImmutableArray());
+            }
+
+            return projectAnalyzers.ToImmutableDictionary();
+        }
+    }
+}