Merge pull request #74539 from CyrusNajmabadi/moveImplementAbstractCl…

…assToShared
dotnet · Jul 25, 2024 · ed5fa5e · ed5fa5e
2 parents 5998125 + d915982
commit ed5fa5e
Show file tree

Hide file tree

Showing 139 changed files with 1,217 additions and 1,140 deletions.
diff --git a/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems b/src/Analyzers/CSharp/CodeFixes/CSharpCodeFixes.projitems
@@ -48,6 +48,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)GenerateConstructor\GenerateConstructorDiagnosticIds.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HideBase\HideBaseCodeFixProvider.AddNewKeywordAction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HideBase\HideBaseCodeFixProvider.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ImplementAbstractClass\CSharpImplementAbstractClassCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Iterator\CSharpAddYieldCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Iterator\CSharpChangeToIEnumerableCodeFixProvider.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MakeAnonymousFunctionStatic\CSharpMakeAnonymousFunctionStaticCodeFixProvider.cs" />

diff --git a/...pImplementAbstractClassCodeFixProvider.cs → ...pImplementAbstractClassCodeFixProvider.cs b/...pImplementAbstractClassCodeFixProvider.cs → ...pImplementAbstractClassCodeFixProvider.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.CSharp.ImplementAbstractClass;
 
 [ExportCodeFixProvider(LanguageNames.CSharp, Name = PredefinedCodeFixProviderNames.ImplementAbstractClass), Shared]
 [ExtensionOrder(After = PredefinedCodeFixProviderNames.GenerateType)]
-internal class CSharpImplementAbstractClassCodeFixProvider :
+internal sealed class CSharpImplementAbstractClassCodeFixProvider :
     AbstractImplementAbstractClassCodeFixProvider<TypeDeclarationSyntax>
 {
     private const string CS0534 = nameof(CS0534); // 'Program' does not implement inherited abstract member 'Goo.bar()'

diff --git a/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems b/src/Analyzers/CSharp/Tests/CSharpAnalyzers.UnitTests.projitems
@@ -34,6 +34,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)ForEachCast\ForEachCastTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Formatting\FormattingAnalyzerTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)HideBase\HideBaseTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ImplementAbstractClass\ImplementAbstractClassTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ImplementAbstractClass\ImplementAbstractClassTests_FixAllTests.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ImplementAbstractClass\ImplementAbstractClassTests_ThroughMember.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Iterator\AddYieldTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Iterator\ChangeToIEnumerableTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MakeAnonymousFunctionStatic\MakeAnonymousFunctionStaticTests.cs" />

diff --git a/...tractClass/ImplementAbstractClassTests.cs → ...tractClass/ImplementAbstractClassTests.cs b/...tractClass/ImplementAbstractClassTests.cs → ...tractClass/ImplementAbstractClassTests.cs
diff --git a/...mplementAbstractClassTests_FixAllTests.cs → ...mplementAbstractClassTests_FixAllTests.cs b/...mplementAbstractClassTests_FixAllTests.cs → ...mplementAbstractClassTests_FixAllTests.cs
diff --git a/...lementAbstractClassTests_ThroughMember.cs → ...lementAbstractClassTests_ThroughMember.cs b/...lementAbstractClassTests_ThroughMember.cs → ...lementAbstractClassTests_ThroughMember.cs
@@ -72,7 +72,7 @@ abstract class Base
             class [|Derived|] : Base
             {
             }
-            """, [FeaturesResources.Implement_abstract_class]);
+            """, [AnalyzersResources.Implement_abstract_class]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -93,7 +93,7 @@ abstract class Middle : Base
             class [|Derived|] : Base
             {
             }
-            """, [FeaturesResources.Implement_abstract_class]);
+            """, [AnalyzersResources.Implement_abstract_class]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -126,7 +126,7 @@ public override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact]
@@ -159,7 +159,7 @@ public override void Method(int a, ref int b, in int c, ref readonly int d, out
                     inner.Method(a, ref b, c, in d, out e);
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact]
@@ -189,7 +189,7 @@ class Derived : Base
 
                 public override int this[int a, in int b, ref readonly int c, out int d] => inner[a, b, in c, out d];
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -224,7 +224,7 @@ public override void Method1()
                     inner.Method1();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -247,7 +247,7 @@ public override void Method1()
                     inner.Method1();
                 }
             }
-            """, new string[] { FeaturesResources.Implement_abstract_class });
+            """, new string[] { AnalyzersResources.Implement_abstract_class });
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -288,7 +288,7 @@ public override void Method()
             class DerivedAgain : Derived
             {
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -321,7 +321,7 @@ public override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -347,9 +347,9 @@ class [|Derived|] : Base, IInterface
             }
             """,
             [
-                FeaturesResources.Implement_abstract_class,
-                string.Format(FeaturesResources.Implement_through_0, "Inner"),
-                string.Format(FeaturesResources.Implement_through_0, "IInterface.Inner"),
+                AnalyzersResources.Implement_abstract_class,
+                string.Format(AnalyzersResources.Implement_through_0, "Inner"),
+                string.Format(AnalyzersResources.Implement_through_0, "IInterface.Inner"),
             ]);
     }
 
@@ -367,7 +367,7 @@ class [|Derived|] : Base
             {
                 dynamic inner;
             }
-            """, [FeaturesResources.Implement_abstract_class]);
+            """, [AnalyzersResources.Implement_abstract_class]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -400,7 +400,7 @@ public override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -430,7 +430,7 @@ class Derived : Base
 
                 public override int Property { get => inner.Property; set => inner.Property = value; }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -505,7 +505,7 @@ class Derived : Base
 
                 public override int SetOnly { set => inner.SetOnly = value; }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -596,7 +596,7 @@ public override event Action Event
                     }
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -633,7 +633,7 @@ public override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -650,7 +650,7 @@ class [|Derived|] : Base
             {
                 Base inner;
             }
-            """, [FeaturesResources.Implement_abstract_class]);
+            """, [AnalyzersResources.Implement_abstract_class]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -683,7 +683,7 @@ protected override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -716,7 +716,7 @@ protected internal override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -749,7 +749,7 @@ internal override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -766,7 +766,7 @@ class [|Derived|] : Base
             {
                 Base inner;
             }
-            """, [FeaturesResources.Implement_abstract_class]);
+            """, [AnalyzersResources.Implement_abstract_class]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -799,7 +799,7 @@ private protected override void Method()
                     inner.Method();
                 }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41420")]
@@ -832,7 +832,7 @@ class Derived : Base
                 public override int InternalGet { internal get => inner.InternalGet; set => inner.InternalGet = value; }
                 public override int InternalSet { get => inner.InternalSet; internal set => inner.InternalSet = value; }
             }
-            """, index: 1, title: string.Format(FeaturesResources.Implement_through_0, "inner"));
+            """, index: 1, title: string.Format(AnalyzersResources.Implement_through_0, "inner"));
     }
 
     [Fact]
@@ -935,7 +935,7 @@ class [|Program|](Base base1) : Base
             {
                 private Base _base = base1;
             }
-            """, [FeaturesResources.Implement_abstract_class, string.Format(FeaturesResources.Implement_through_0, "_base")]);
+            """, [AnalyzersResources.Implement_abstract_class, string.Format(AnalyzersResources.Implement_through_0, "_base")]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/69177")]
@@ -953,7 +953,7 @@ class [|Program|](Base base1) : Base
             {
                 private Base _base = (base1);
             }
-            """, [FeaturesResources.Implement_abstract_class, string.Format(FeaturesResources.Implement_through_0, "_base")]);
+            """, [AnalyzersResources.Implement_abstract_class, string.Format(AnalyzersResources.Implement_through_0, "_base")]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/69177")]
@@ -971,7 +971,7 @@ class [|Program|](Base base1) : Base
             {
                 private Base B { get; } = base1;
             }
-            """, [FeaturesResources.Implement_abstract_class, string.Format(FeaturesResources.Implement_through_0, "B")]);
+            """, [AnalyzersResources.Implement_abstract_class, string.Format(AnalyzersResources.Implement_through_0, "B")]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/69177")]
@@ -989,7 +989,7 @@ class [|Program|](Base base1) : Base
             {
                 private Base B { get; } = (base1);
             }
-            """, [FeaturesResources.Implement_abstract_class, string.Format(FeaturesResources.Implement_through_0, "B")]);
+            """, [AnalyzersResources.Implement_abstract_class, string.Format(AnalyzersResources.Implement_through_0, "B")]);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/69177")]

diff --git a/src/Analyzers/Core/Analyzers/AnalyzersResources.resx b/src/Analyzers/Core/Analyzers/AnalyzersResources.resx
@@ -397,4 +397,13 @@
   <data name="Simplify_check" xml:space="preserve">
     <value>Simplify check</value>
   </data>
-</root>
+  <data name="Base_classes_contain_inaccessible_unimplemented_members" xml:space="preserve">
+    <value>Base classes contain inaccessible unimplemented members</value>
+  </data>
+  <data name="Implement_abstract_class" xml:space="preserve">
+    <value>Implement abstract class</value>
+  </data>
+  <data name="Implement_through_0" xml:space="preserve">
+    <value>Implement through '{0}'</value>
+  </data>
+</root>
diff --git a/src/Analyzers/Core/Analyzers/xlf/AnalyzersResources.cs.xlf b/src/Analyzers/Core/Analyzers/xlf/AnalyzersResources.cs.xlf
diff --git a/src/Analyzers/Core/Analyzers/xlf/AnalyzersResources.de.xlf b/src/Analyzers/Core/Analyzers/xlf/AnalyzersResources.de.xlf
diff --git a/src/Analyzers/Core/Analyzers/xlf/AnalyzersResources.es.xlf b/src/Analyzers/Core/Analyzers/xlf/AnalyzersResources.es.xlf