Merge pull request #49824 from jnm2/debuggerdisplay_static_class

Stop offering to add DebuggerDisplay on static types
dotnet · Dec 7, 2020 · 1afc0cf · 1afc0cf
2 parents abe0db9 + 2d900a6
commit 1afc0cf
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/src/EditorFeatures/CSharpTest/AddDebuggerDisplay/AddDebuggerDisplayTests.cs b/src/EditorFeatures/CSharpTest/AddDebuggerDisplay/AddDebuggerDisplayTests.cs
@@ -38,6 +38,23 @@ private string GetDebuggerDisplay()
 }");
         }
 
+        [Fact]
+        public async Task OfferedOnEmptyRecord()
+        {
+            await TestInRegularAndScriptAsync(@"
+[||]record C;", @"
+using System.Diagnostics;
+
+[DebuggerDisplay(""{"" + nameof(GetDebuggerDisplay) + ""(),nq}"")]
+record C
+{
+    private string GetDebuggerDisplay()
+    {
+        return ToString();
+    }
+}");
+        }
+
         [Fact]
         public async Task OfferedOnEmptyStruct()
         {
@@ -57,6 +74,15 @@ private string GetDebuggerDisplay()
 }");
         }
 
+        [Fact]
+        public async Task NotOfferedOnStaticClass()
+        {
+            await TestMissingInRegularAndScriptAsync(@"
+[||]static class Foo
+{
+}");
+        }
+
         [Fact]
         public async Task NotOfferedOnInterfaceWithToString()
         {

diff --git a/src/EditorFeatures/VisualBasicTest/AddDebuggerDisplay/AddDebuggerDisplayTests.vb b/src/EditorFeatures/VisualBasicTest/AddDebuggerDisplay/AddDebuggerDisplayTests.vb
@@ -46,6 +46,13 @@ Structure Foo
 End Structure")
         End Function
 
+        <Fact>
+        Public Async Function NotOfferedOnModule() As Task
+            Await TestMissingInRegularAndScriptAsync("
+[||]Module Foo
+End Module")
+        End Function
+
         <Fact>
         Public Async Function NotOfferedOnInterfaceWithToString() As Task
             Await TestMissingInRegularAndScriptAsync("

diff --git a/...res/Core/Portable/AddDebuggerDisplay/AbstractAddDebuggerDisplayCodeRefactoringProvider.cs b/...res/Core/Portable/AddDebuggerDisplay/AbstractAddDebuggerDisplayCodeRefactoringProvider.cs
@@ -48,7 +48,7 @@ await GetRelevantTypeFromHeaderAsync(context).ConfigureAwait(false) ??
 
             var typeSymbol = (INamedTypeSymbol)semanticModel.GetRequiredDeclaredSymbol(type, context.CancellationToken);
 
-            if (!IsClassOrStruct(typeSymbol))
+            if (typeSymbol.IsStatic || !IsClassOrStruct(typeSymbol))
                 return;
 
             if (HasDebuggerDisplayAttribute(typeSymbol, compilation))