Fixed review concerns for CS8345 code fix

src/Features/CSharp/Portable/CSharpFeaturesResources.Designer.cs

@@ -800,7 +800,7 @@ internal class CSharpFeaturesResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Make ref struct.
+        ///   Looks up a localized string similar to Make &apos;ref struct&apos;.
         /// </summary>
         internal static string Make_ref_struct {
             get {

src/Features/CSharp/Portable/CSharpFeaturesResources.resx

@@ -587,6 +587,7 @@
     <comment>{Locked="using"} "using" is a C# keyword and should not be localized.</comment>
   </data>
   <data name="Make_ref_struct" xml:space="preserve">
-    <value>Make ref struct</value>
+    <value>Make 'ref struct'</value>
+    <comment>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</comment>
   </data>
 </root>

src/Features/CSharp/Portable/MakeRefStruct/CSharpMakeRefStructCodeFixProvider.cs

@@ -34,27 +34,27 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
             var structDeclaration = FindContainingStruct(root, span);
 
             // CS8345 could be triggered when struct is already marked with `ref` but a property is static
-            if (structDeclaration != null && !structDeclaration.Modifiers.Any(m => m.IsKind(SyntaxKind.RefKeyword)))
+            if (structDeclaration != null && !structDeclaration.Modifiers.Any(SyntaxKind.RefKeyword))
             {
                 context.RegisterCodeFix(
-                    new MyCodeAction(
-                        CSharpFeaturesResources.Make_ref_struct,
-                        c => FixCodeAsync(context.Document, context.Span, c)),
+                    new MyCodeAction(c => FixCodeAsync(document, span, c)),
                     context.Diagnostics);
             }
         }
 
         public override FixAllProvider GetFixAllProvider()
         {
-            return WellKnownFixAllProviders.BatchFixer;
+            // The chance of needing fix-all in these cases is super low
+            return null;
         }
 
-        private async Task<Document> FixCodeAsync(Document document, TextSpan span, CancellationToken c)
+        private async Task<Document> FixCodeAsync(Document document, TextSpan span, CancellationToken cancellationToken)
         {
-            var root = await document.GetSyntaxRootAsync(c).ConfigureAwait(false);
+            var root = await document.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
+            var gen = SyntaxGenerator.GetGenerator(document);
 
             var structDeclaration = FindContainingStruct(root, span);
-            var newStruct = UpdateStructDeclaration(document, structDeclaration);
+            var newStruct = gen.WithModifiers(structDeclaration, gen.GetModifiers(structDeclaration).WithIsRef(true));
             var newRoot = root.ReplaceNode(structDeclaration, newStruct);
 
             return document.WithSyntaxRoot(newRoot);
@@ -68,16 +68,12 @@ private StructDeclarationSyntax FindContainingStruct(SyntaxNode root, TextSpan s
             return member.GetAncestor<TypeDeclarationSyntax>() as StructDeclarationSyntax;
         }
 
-        private SyntaxNode UpdateStructDeclaration(Document document, StructDeclarationSyntax decl)
-        {
-            var gen = SyntaxGenerator.GetGenerator(document);
-            return gen.WithModifiers(decl, gen.GetModifiers(decl).WithIsRef(true));
-        }
-
         private class MyCodeAction : CodeAction.DocumentChangeAction
         {
-            public MyCodeAction(string title, Func<CancellationToken, Task<Document>> createChangedDocument)
-                : base(title, createChangedDocument, title)
+            public MyCodeAction(Func<CancellationToken, Task<Document>> createChangedDocument)
+                : base(CSharpFeaturesResources.Make_ref_struct,
+                    createChangedDocument,
+                    CSharpFeaturesResources.Make_ref_struct)
             {
             }
         }

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.cs.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.de.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.es.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.fr.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.it.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.ja.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.ko.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.pl.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.pt-BR.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.ru.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.tr.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.zh-Hans.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>

src/Features/CSharp/Portable/xlf/CSharpFeaturesResources.zh-Hant.xlf

@@ -93,9 +93,9 @@
         <note />
       </trans-unit>
       <trans-unit id="Make_ref_struct">
-        <source>Make ref struct</source>
-        <target state="new">Make ref struct</target>
-        <note />
+        <source>Make 'ref struct'</source>
+        <target state="new">Make 'ref struct'</target>
+        <note>{Locked="ref"}{Locked="struct"} "ref" and "struct" are C# keywords and should not be localized.</note>
       </trans-unit>
       <trans-unit id="Remove_unnecessary_casts">
         <source>Remove unnecessary casts</source>