Merge pull request #1677 from filipw/feature/codefixproviders-discover

Do not discover abstract types as candidates for code fix providers
OmniSharp · Jan 8, 2020 · 6754728 · 6754728
2 parents 1e93b07 + d5aedd8
commit 6754728
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/CachingCodeFixProviderForProjects.cs b/src/OmniSharp.Roslyn.CSharp/Services/Refactoring/V2/CachingCodeFixProviderForProjects.cs
@@ -61,26 +61,29 @@ private ImmutableArray<CodeFixProvider> LoadFrom(Project project)
             var codeFixes = project.AnalyzerReferences
                 .OfType<AnalyzerFileReference>()
                 .SelectMany(analyzerFileReference => analyzerFileReference.GetAssembly().DefinedTypes)
-                .Where(x => x.IsSubclassOf(typeof(CodeFixProvider)))
+                .Where(x => !x.IsAbstract && x.IsSubclassOf(typeof(CodeFixProvider)))
                 .Select(x =>
                 {
                     try
                     {
                         var attribute = x.GetCustomAttribute<ExportCodeFixProviderAttribute>();
-
-                        if (attribute?.Languages != null && attribute.Languages.Contains(project.Language))
+                        if (attribute == null)
                         {
-                            return x.AsType().CreateInstance<CodeFixProvider>();
+                            _logger.LogTrace($"Skipping code fix provider '{x.AsType()}' because it is missing the ExportCodeFixProviderAttribute.");
+                            return null;
                         }
 
-                        _logger.LogInformation($"Skipping code fix provider '{x.AsType()}' because its language doesn't match '{project.Language}'.");
+                        if (attribute.Languages == null || !attribute.Languages.Contains(project.Language))
+                        {
+                            _logger.LogInformation($"Skipping code fix provider '{x.AsType()}' because its language '{attribute.Languages?.FirstOrDefault()}' doesn't match '{project.Language}'.");
+                            return null;
+                        }
 
-                        return null;
+                        return x.AsType().CreateInstance<CodeFixProvider>();
                     }
                     catch (Exception ex)
                     {
                         _logger.LogError($"Creating instance of code fix provider '{x.AsType()}' failed, error: {ex}");
-
                         return null;
                     }
                 })