Codefixes cleanup - cleanup fixableDiagnosticIds, unify more CodeFix registration calls

vsintegration/src/FSharp.Editor/CodeFix/AddInstanceMemberParameter.fs

@@ -4,6 +4,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 
 open System.Composition
 open System.Threading.Tasks
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -12,10 +13,9 @@ open Microsoft.CodeAnalysis.CodeFixes
 type internal FSharpAddInstanceMemberParameterCodeFixProvider() =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS0673" ]
     static let title = SR.AddMissingInstanceMemberParameter()
 
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0673")
 
     override _.RegisterCodeFixesAsync context : Task =
         asyncMaybe {

vsintegration/src/FSharp.Editor/CodeFix/AddMissingEqualsToTypeDefinition.fs

@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 open System
 open System.Composition
 open System.Threading.Tasks
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -13,9 +14,8 @@ open Microsoft.CodeAnalysis.CodeFixes
 type internal FSharpAddMissingEqualsToTypeDefinitionCodeFixProvider() =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS3360" ]
     static let title = SR.AddMissingEqualsToTypeDefinition()
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS3360")
 
     override _.RegisterCodeFixesAsync context : Task =
         asyncMaybe {

vsintegration/src/FSharp.Editor/CodeFix/AddMissingFunKeyword.fs

@@ -4,6 +4,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 
 open System
 open System.Composition
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -16,9 +17,7 @@ type internal FSharpAddMissingFunKeywordCodeFixProvider [<ImportingConstructor>]
     inherit CodeFixProvider()
     static let title = SR.AddMissingFunKeyword()
 
-    let fixableDiagnosticIds = set [ "FS0010" ]
-
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0010")
 
     override _.RegisterCodeFixesAsync context =
         asyncMaybe {

vsintegration/src/FSharp.Editor/CodeFix/AddMissingRecToMutuallyRecFunctions.fs

@@ -16,38 +16,13 @@ open FSharp.Compiler.CodeAnalysis
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.CodeActions
 
-[<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "AddMissingRecToMutuallyRecFunctions"); Shared>]
+[<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = CodeFix.AddMissingRecToMutuallyRecFunctions); Shared>]
 type internal FSharpAddMissingRecToMutuallyRecFunctionsCodeFixProvider [<ImportingConstructor>] () =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS0576" ]
+    static let titleFormat = SR.MakeOuterBindingRecursive()
 
-    let createCodeFix
-        (
-            context: CodeFixContext,
-            symbolName: string,
-            titleFormat: string,
-            textChange: TextChange,
-            diagnostics: ImmutableArray<Diagnostic>
-        ) =
-        let title = String.Format(titleFormat, symbolName)
-
-        let codeAction =
-            CodeAction.Create(
-                title,
-                (fun (cancellationToken: CancellationToken) ->
-                    async {
-                        let cancellationToken = context.CancellationToken
-                        let! sourceText = context.Document.GetTextAsync(cancellationToken) |> Async.AwaitTask
-                        return context.Document.WithText(sourceText.WithChanges(textChange))
-                    }
-                    |> RoslynHelpers.StartAsyncAsTask(cancellationToken)),
-                title
-            )
-
-        context.RegisterCodeFix(codeAction, diagnostics)
-
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0576")
 
     override _.RegisterCodeFixesAsync context =
         asyncMaybe {
@@ -82,18 +57,12 @@ type internal FSharpAddMissingRecToMutuallyRecFunctionsCodeFixProvider [<Importi
             let! funcNameSpan = RoslynHelpers.TryFSharpRangeToTextSpan(sourceText, funcLexerSymbol.Range)
             let funcName = sourceText.GetSubText(funcNameSpan).ToString()
 
-            let diagnostics =
-                context.Diagnostics
-                |> Seq.filter (fun x -> fixableDiagnosticIds |> Set.contains x.Id)
-                |> Seq.toImmutableArray
-
-            createCodeFix (
-                context,
-                funcName,
-                SR.MakeOuterBindingRecursive(),
-                TextChange(TextSpan(context.Span.End, 0), " rec"),
-                diagnostics
-            )
+            do
+                context.RegisterFsharpFix(
+                    CodeFix.AddMissingRecToMutuallyRecFunctions,
+                    String.Format(titleFormat, funcName),
+                    [| TextChange(TextSpan(context.Span.End, 0), " rec") |]
+                )
         }
         |> Async.Ignore
         |> RoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)

vsintegration/src/FSharp.Editor/CodeFix/AddOpenCodeFixProvider.fs

@@ -6,6 +6,7 @@ open System
 open System.Composition
 open System.Threading
 open System.Threading.Tasks
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
@@ -21,35 +22,24 @@ open FSharp.Compiler.Text
 type internal FSharpAddOpenCodeFixProvider [<ImportingConstructor>] (assemblyContentProvider: AssemblyContentProvider) =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = [ "FS0039"; "FS0043" ]
-
     let fixUnderscoresInMenuText (text: string) = text.Replace("_", "__")
 
     let qualifySymbolFix (context: CodeFixContext) (fullName, qualifier) =
-        CodeFixHelpers.createTextChangeCodeFix (
-            CodeFix.AddOpen,
-            fixUnderscoresInMenuText fullName,
-            context,
-            [| TextChange(context.Span, qualifier) |]
-        )
-
-    let openNamespaceFix (context: CodeFixContext) ctx name ns multipleNames =
+        context.RegisterFsharpFix(CodeFix.AddOpen, fixUnderscoresInMenuText fullName, [| TextChange(context.Span, qualifier) |])
+
+    let openNamespaceFix (context: CodeFixContext) ctx name ns multipleNames sourceText =
         let displayText = "open " + ns + (if multipleNames then " (" + name + ")" else "")
+        let newText, _ = OpenDeclarationHelper.insertOpenDeclaration sourceText ctx ns
+        let changes = newText.GetTextChanges(sourceText)
 
-        CodeAction.Create(
-            fixUnderscoresInMenuText displayText,
-            (fun (cancellationToken: CancellationToken) ->
-                async {
-                    let! sourceText = context.Document.GetTextAsync(cancellationToken) |> Async.AwaitTask
-                    let changedText, _ = OpenDeclarationHelper.insertOpenDeclaration sourceText ctx ns
-                    return context.Document.WithText(changedText)
-                }
-                |> RoslynHelpers.StartAsyncAsTask(cancellationToken)),
-            displayText
-        )
+        context.RegisterFsharpFix(CodeFix.AddOpen, fixUnderscoresInMenuText displayText, changes)
 
-    let addSuggestionsAsCodeFixes (context: CodeFixContext) (candidates: (InsertionContextEntity * InsertionContext) list) =
-        let openNamespaceFixes =
+    let addSuggestionsAsCodeFixes
+        (context: CodeFixContext)
+        (sourceText: SourceText)
+        (candidates: (InsertionContextEntity * InsertionContext) list)
+        =
+        do
             candidates
             |> Seq.choose (fun (entity, ctx) -> entity.Namespace |> Option.map (fun ns -> ns, entity.FullDisplayName, ctx))
             |> Seq.groupBy (fun (ns, _, _) -> ns)
@@ -64,22 +54,17 @@ type internal FSharpAddOpenCodeFixProvider [<ImportingConstructor>] (assemblyCon
                 let multipleNames = names |> Array.length > 1
                 names |> Seq.map (fun (name, ctx) -> ns, name, ctx, multipleNames))
             |> Seq.concat
-            |> Seq.map (fun (ns, name, ctx, multipleNames) -> openNamespaceFix context ctx name ns multipleNames)
-            |> Seq.toList
+            |> Seq.iter (fun (ns, name, ctx, multipleNames) -> openNamespaceFix context ctx name ns multipleNames sourceText)
 
-        let qualifiedSymbolFixes =
+        do
             candidates
             |> Seq.filter (fun (entity, _) -> not (entity.LastIdent.StartsWith "op_")) // Don't include qualified operator names. The resultant codefix won't compile because it won't be an infix operator anymore.
             |> Seq.map (fun (entity, _) -> entity.FullRelativeName, entity.Qualifier)
             |> Seq.distinct
             |> Seq.sort
-            |> Seq.map (qualifySymbolFix context)
-            |> Seq.toList
-
-        for codeFix in openNamespaceFixes @ qualifiedSymbolFixes do
-            context.RegisterCodeFix(codeFix, context.Diagnostics)
+            |> Seq.iter (qualifySymbolFix context)
 
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0039", "FS0043")
 
     override _.RegisterCodeFixesAsync context : Task =
         asyncMaybe {
@@ -186,7 +171,7 @@ type internal FSharpAddOpenCodeFixProvider [<ImportingConstructor>] (assemblyCon
                 |> Seq.map createEntity
                 |> Seq.concat
                 |> Seq.toList
-                |> addSuggestionsAsCodeFixes context
+                |> addSuggestionsAsCodeFixes context sourceText
         }
         |> Async.Ignore
         |> RoslynHelpers.StartAsyncUnitAsTask(context.CancellationToken)

vsintegration/src/FSharp.Editor/CodeFix/AddTypeAnnotationToObjectOfIndeterminateType.fs

@@ -6,6 +6,7 @@ open System
 open System.Composition
 open System.Threading
 open System.Threading.Tasks
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -16,20 +17,16 @@ open FSharp.Compiler.Text
 open FSharp.Compiler.Symbols
 open Microsoft.CodeAnalysis.CodeActions
 
-[<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "AddTypeAnnotationToObjectOfIndeterminateType"); Shared>]
+[<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = CodeFix.AddTypeAnnotationToObjectOfIndeterminateType); Shared>]
 type internal FSharpAddTypeAnnotationToObjectOfIndeterminateTypeFixProvider [<ImportingConstructor>] () =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS0072"; "FS3245" ]
+    static let title = SR.AddTypeAnnotation()
 
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0072", "FS3245")
 
     override _.RegisterCodeFixesAsync context : Task =
         asyncMaybe {
-            let diagnostics =
-                context.Diagnostics
-                |> Seq.filter (fun x -> fixableDiagnosticIds |> Set.contains x.Id)
-                |> Seq.toImmutableArray
 
             let document = context.Document
             let position = context.Span.Start
@@ -95,29 +92,17 @@ type internal FSharpAddTypeAnnotationToObjectOfIndeterminateTypeFixProvider [<Im
                         let hasRightParen = rightLoop sourceText.[declSpan.End] declSpan.End
                         hasLeftParen && hasRightParen
 
-                    let getChangedText (sourceText: SourceText) =
-                        if alreadyWrappedInParens then
-                            sourceText.WithChanges(TextChange(TextSpan(declSpan.End, 0), ": " + typeString))
-                        else
-                            sourceText
-                                .WithChanges(TextChange(TextSpan(declSpan.Start, 0), "("))
-                                .WithChanges(TextChange(TextSpan(declSpan.End + 1, 0), ": " + typeString + ")"))
-
-                    let title = SR.AddTypeAnnotation()
-
-                    let codeAction =
-                        CodeAction.Create(
-                            title,
-                            (fun (cancellationToken: CancellationToken) ->
-                                async {
-                                    let! sourceText = context.Document.GetTextAsync(cancellationToken) |> Async.AwaitTask
-                                    return context.Document.WithText(getChangedText sourceText)
-                                }
-                                |> RoslynHelpers.StartAsyncAsTask(cancellationToken)),
-                            title
-                        )
-
-                    context.RegisterCodeFix(codeAction, diagnostics)
+                    let changes =
+                        [
+                            if alreadyWrappedInParens then
+                                TextChange(TextSpan(declSpan.End, 0), ": " + typeString)
+                            else
+                                TextChange(TextSpan(declSpan.Start, 0), "(")
+                                TextChange(TextSpan(declSpan.End + 1, 0), ": " + typeString + ")")
+                        ]
+
+                    context.RegisterFsharpFix(CodeFix.AddTypeAnnotationToObjectOfIndeterminateType, title, changes)
+
                 | _ -> ()
             | _ -> ()
         }

vsintegration/src/FSharp.Editor/CodeFix/ChangePrefixNegationToInfixSubtraction.fs

@@ -5,6 +5,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 open System
 open System.Composition
 open System.Threading.Tasks
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -13,10 +14,9 @@ open Microsoft.CodeAnalysis.CodeFixes
 type internal FSharpChangePrefixNegationToInfixSubtractionodeFixProvider() =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS0003" ]
     static let title = SR.ChangePrefixNegationToInfixSubtraction()
 
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0003")
 
     override _.RegisterCodeFixesAsync context : Task =
         asyncMaybe {

vsintegration/src/FSharp.Editor/CodeFix/ChangeRefCellDerefToNotExpression.fs

@@ -4,6 +4,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 
 open System.Composition
 open System.Threading.Tasks
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -12,10 +13,9 @@ open Microsoft.CodeAnalysis.CodeFixes
 type internal FSharpChangeRefCellDerefToNotExpressionCodeFixProvider [<ImportingConstructor>] () =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS0001" ]
     static let title = SR.UseNotForNegation()
 
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0001")
 
     override this.RegisterCodeFixesAsync context : Task =
         asyncMaybe {

vsintegration/src/FSharp.Editor/CodeFix/ChangeToUpcast.fs

@@ -4,6 +4,7 @@ namespace Microsoft.VisualStudio.FSharp.Editor
 
 open System.Composition
 open System.Threading.Tasks
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -12,9 +13,7 @@ open Microsoft.CodeAnalysis.CodeFixes
 type internal FSharpChangeToUpcastCodeFixProvider() =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS3198" ]
-
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS3198")
 
     override this.RegisterCodeFixesAsync context : Task =
         asyncMaybe {

vsintegration/src/FSharp.Editor/CodeFix/ConvertCSharpLambdaToFSharpLambda.fs

@@ -3,6 +3,7 @@
 namespace Microsoft.VisualStudio.FSharp.Editor
 
 open System.Composition
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
@@ -11,9 +12,9 @@ open Microsoft.CodeAnalysis.CodeFixes
 type internal FSharpConvertCSharpLambdaToFSharpLambdaCodeFixProvider [<ImportingConstructor>] () =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS0039"; "FS0043" ]
     static let title = SR.UseFSharpLambda()
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0039", "FS0043")
 
     override _.RegisterCodeFixesAsync context =
         asyncMaybe {

vsintegration/src/FSharp.Editor/CodeFix/ConvertCSharpUsingToFSharpOpen.fs

@@ -14,7 +14,6 @@ open Microsoft.CodeAnalysis.CodeFixes
 type internal FSharpConvertCSharpUsingToFSharpOpen [<ImportingConstructor>] () =
     inherit CodeFixProvider()
 
-    let fixableDiagnosticIds = set [ "FS0039"; "FS0201" ]
     static let title = SR.ConvertCSharpUsingToFSharpOpen()
     let usingLength = "using".Length
 
@@ -47,7 +46,7 @@ type internal FSharpConvertCSharpUsingToFSharpOpen [<ImportingConstructor>] () =
 
         do context.RegisterFsharpFix(CodeFix.ConvertCSharpUsingToFSharpOpen, title, [| replacement |])
 
-    override _.FixableDiagnosticIds = Seq.toImmutableArray fixableDiagnosticIds
+    override _.FixableDiagnosticIds = ImmutableArray.Create("FS0039", "FS0201")
 
     override _.RegisterCodeFixesAsync context =
         asyncMaybe {