Fixup

Author: CyrusNajmabadi

src/Analyzers/CSharp/Tests/UseAutoProperty/UseAutoPropertyTests.cs

@@ -3233,7 +3233,7 @@ public Test()
             """
             public sealed class Test
             {
-                public static Test Instance { get; private set; }
+                public static Test Instance { get => field!; private set; }
 
                 public Test()
                 {
@@ -3260,7 +3260,7 @@ static Test()
             """
             public sealed class Test
             {
-                public static Test Instance { get; } = new Test();
+                public static Test Instance => field!;
             }
             """);
 
@@ -3286,7 +3286,11 @@ public Test()
             """
             public sealed class Test
             {
-                public static Test Instance { get; set; }
+                public static Test Instance
+                {
+                    get => field!;
+                    set;
+                }
 
                 public Test()
                 {

src/Analyzers/Core/CodeFixes/UseAutoProperty/AbstractUseAutoPropertyCodeFixProvider.cs

@@ -484,12 +484,12 @@ private async Task<SyntaxNode> FormatAsync(
         CancellationToken cancellationToken)
     {
         var isWrittenOutsideConstructor = false;
-        // Only include constructors that match the static-ness of the field.
-        // For a static field, only static constructors are relevant.
-        // For an instance field, only instance constructors are relevant.
+
+        // Only include constructors that match the static-ness of the field. For a static field, only static
+        // constructors are relevant. For an instance field, only instance constructors are relevant.
         var constructorSpans = field.ContainingType
             .GetMembers()
-            .Where(m => m.IsConstructor() && m.IsStatic == field.IsStatic)
+            .Where(m => field.IsStatic ? m.IsStaticConstructor() : m.IsConstructor())
             .SelectMany(c => c.DeclaringSyntaxReferences)
             .Select(s => s.GetSyntax(cancellationToken))
             .Select(n => n.FirstAncestorOrSelf<TConstructorDeclaration>())