Code fix provider for localization: when fixing "property is not static" error, also fix it being too restrictive

Author: Yusyuriv

Flow.Launcher.Analyzers/AnalyzerDiagnostics.cs

@@ -16,7 +16,7 @@ public static class AnalyzerDiagnostics
         public static readonly DiagnosticDescriptor ContextIsAField = new DiagnosticDescriptor(
             "FLAN0002",
             "Plugin context is a field",
-            "Plugin context must be a static property instead",
+            "Plugin context must be at least internal static property",
             "Localization",
             DiagnosticSeverity.Error,
             isEnabledByDefault: true
@@ -25,7 +25,7 @@ public static class AnalyzerDiagnostics
         public static readonly DiagnosticDescriptor ContextIsNotStatic = new DiagnosticDescriptor(
             "FLAN0003",
             "Plugin context is not static",
-            "Plugin context must be a static property",
+            "Plugin context must be at least internal static property",
             "Localization",
             DiagnosticSeverity.Error,
             isEnabledByDefault: true
@@ -34,7 +34,7 @@ public static class AnalyzerDiagnostics
         public static readonly DiagnosticDescriptor ContextAccessIsTooRestrictive = new DiagnosticDescriptor(
             "FLAN0004",
             "Plugin context property access modifier is too restrictive",
-            "Plugin context property must be internal or public",
+            "Plugin context property must be at least internal static property",
             "Localization",
             DiagnosticSeverity.Error,
             isEnabledByDefault: true
@@ -43,7 +43,7 @@ public static class AnalyzerDiagnostics
         public static readonly DiagnosticDescriptor ContextIsNotDeclared = new DiagnosticDescriptor(
             "FLAN0005",
             "Plugin context is not declared",
-            "Plugin context must be a static property of type `PluginInitContext`",
+            "Plugin context must be at least internal static property of type `PluginInitContext`",
             "Localization",
             DiagnosticSeverity.Error,
             isEnabledByDefault: true

Flow.Launcher.Analyzers/Localize/ContextAvailabilityAnalyzerCodeFixProvider.cs

@@ -123,7 +123,7 @@ private static Document FixContextIsNotStaticError(CodeFixContext context, Synta
             var propertyDeclaration = GetDeclarationSyntax<PropertyDeclarationSyntax>(root, diagnosticSpan);
             if (propertyDeclaration is null) return context.Document;
 
-            var newPropertyDeclaration = propertyDeclaration.AddModifiers(SyntaxFactory.Token(SyntaxKind.StaticKeyword));
+            var newPropertyDeclaration = FixRestrictivePropertyModifiers(propertyDeclaration).AddModifiers(SyntaxFactory.Token(SyntaxKind.StaticKeyword));
 
             var newRoot = root.ReplaceNode(propertyDeclaration, newPropertyDeclaration);
             return context.Document.WithSyntaxRoot(newRoot);
@@ -134,20 +134,7 @@ private static Document FixContextIsTooRestricted(CodeFixContext context, Syntax
             var propertyDeclaration = GetDeclarationSyntax<PropertyDeclarationSyntax>(root, diagnosticSpan);
             if (propertyDeclaration is null) return context.Document;
 
-            var newModifiers = SyntaxFactory.TokenList();
-            foreach (var modifier in propertyDeclaration.Modifiers)
-            {
-                if (modifier.IsKind(SyntaxKind.PrivateKeyword) || modifier.IsKind(SyntaxKind.ProtectedKeyword))
-                {
-                    newModifiers = newModifiers.Add(SyntaxFactory.Token(SyntaxKind.InternalKeyword));
-                }
-                else
-                {
-                    newModifiers = newModifiers.Add(modifier);
-                }
-            }
-
-            var newPropertyDeclaration = propertyDeclaration.WithModifiers(newModifiers);
+            var newPropertyDeclaration = FixRestrictivePropertyModifiers(propertyDeclaration);
 
             var newRoot = root.ReplaceNode(propertyDeclaration, newPropertyDeclaration);
             return context.Document.WithSyntaxRoot(newRoot);
@@ -172,6 +159,24 @@ private static Document FixContextIsAFieldError(CodeFixContext context, SyntaxNo
             return GetFormattedDocument(context, newRoot);
         }
 
+        private static PropertyDeclarationSyntax FixRestrictivePropertyModifiers(PropertyDeclarationSyntax propertyDeclaration)
+        {
+            var newModifiers = SyntaxFactory.TokenList();
+            foreach (var modifier in propertyDeclaration.Modifiers)
+            {
+                if (modifier.IsKind(SyntaxKind.PrivateKeyword) || modifier.IsKind(SyntaxKind.ProtectedKeyword))
+                {
+                    newModifiers = newModifiers.Add(SyntaxFactory.Token(SyntaxKind.InternalKeyword));
+                }
+                else
+                {
+                    newModifiers = newModifiers.Add(modifier);
+                }
+            }
+
+            return propertyDeclaration.WithModifiers(newModifiers);
+        }
+
         private static T GetDeclarationSyntax<T>(SyntaxNode root, TextSpan diagnosticSpan) where T : SyntaxNode =>
             root
                 .FindToken(diagnosticSpan.Start)