Replace FSComp invocations in VS tooling with an FCS API (#6904)

Author: cartermp

src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj

@@ -575,6 +575,12 @@
     <Compile Include="..\service\IncrementalBuild.fs">
       <Link>Service/IncrementalBuild.fs</Link>
     </Compile>
+    <Compile Include="..\service\ServiceCompilerDiagnostics.fsi">
+      <Link>Service/ServiceCompilerDiagnostics.fsi</Link>
+    </Compile>
+    <Compile Include="..\service\ServiceCompilerDiagnostics.fs">
+      <Link>Service/ServiceCompilerDiagnostics.fs</Link>
+    </Compile>
     <Compile Include="..\service\ServiceConstants.fs">
       <Link>Service/ServiceConstants.fs</Link>
     </Compile>

src/fsharp/service/ServiceCompilerDiagnostics.fs

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Compiler.SourceCodeServices
+
+type DiagnosticKind =
+    | AddIndexerDot
+    | ReplaceWithSuggestion of suggestion:string
+
+[<RequireQualifiedAccess>]
+module CompilerDiagnostics =
+    let getErrorMessage diagnosticKind =
+        match diagnosticKind with
+        | AddIndexerDot -> FSComp.SR.addIndexerDot()
+        | ReplaceWithSuggestion s -> FSComp.SR.replaceWithSuggestion(s)

src/fsharp/service/ServiceCompilerDiagnostics.fsi

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information.
+
+namespace FSharp.Compiler.SourceCodeServices
+
+/// Supported kinds of diagnostics by this service.
+type DiagnosticKind =
+    | AddIndexerDot
+    | ReplaceWithSuggestion of suggestion:string
+
+/// Exposes compiler diagnostic error messages.
+module CompilerDiagnostics =
+    /// Given a DiagnosticKind, returns the string representing the error message for that diagnostic.
+    val getErrorMessage: diagnosticKind: DiagnosticKind -> string

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

@@ -2,15 +2,13 @@
 
 namespace Microsoft.VisualStudio.FSharp.Editor
 
-open System
 open System.Composition
 open System.Collections.Immutable
 open System.Threading.Tasks
 
-open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
-open SymbolHelpers
+open FSharp.Compiler.SourceCodeServices
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "FixIndexerAccess"); Shared>]
 type internal FSharpFixIndexerAccessCodeFixProvider() =
@@ -50,7 +48,7 @@ type internal FSharpFixIndexerAccessCodeFixProvider() =
 
                     let codefix = 
                         CodeFixHelpers.createTextChangeCodeFix(
-                            FSComp.SR.addIndexerDot(), 
+                            CompilerDiagnostics.getErrorMessage AddIndexerDot, 
                             context,
                             (fun () -> asyncMaybe.Return [| TextChange(span, replacement.TrimEnd() + ".") |]))
 

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

@@ -6,6 +6,7 @@ open System.Composition
 open System.Threading.Tasks
 open Microsoft.CodeAnalysis.CodeFixes
 open Microsoft.CodeAnalysis.CodeActions
+open FSharp.Compiler.SourceCodeServices
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "ProposeUpperCaseLabel"); Shared>]
 type internal FSharpProposeUpperCaseLabelCodeFixProvider
@@ -24,7 +25,7 @@ type internal FSharpProposeUpperCaseLabelCodeFixProvider
         asyncMaybe {
             let textChanger (originalText: string) = originalText.[0].ToString().ToUpper() + originalText.Substring(1)
             let! solutionChanger, originalText = SymbolHelpers.changeAllSymbolReferences(context.Document, context.Span, textChanger, projectInfoManager, checkerProvider.Checker, userOpName)
-            let title = FSComp.SR.replaceWithSuggestion (textChanger originalText)
+            let title = CompilerDiagnostics.getErrorMessage (ReplaceWithSuggestion <| textChanger originalText)
             context.RegisterCodeFix(
                 CodeAction.Create(title, solutionChanger, title),
                 context.Diagnostics |> Seq.filter (fun x -> fixableDiagnosticIds |> List.contains x.Id) |> Seq.toImmutableArray)

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

@@ -6,7 +6,6 @@ open System.Composition
 open System.Threading
 open System.Threading.Tasks
 
-open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Diagnostics
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes

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

@@ -2,16 +2,13 @@
 
 namespace Microsoft.VisualStudio.FSharp.Editor
 
-open System
 open System.Collections.Immutable
 open System.Composition
 open System.Threading.Tasks
 
-open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 
-open FSharp.Compiler
 open FSharp.Compiler.SourceCodeServices
 open Microsoft.VisualStudio.FSharp.Editor.SymbolHelpers
 open FSharp.Compiler.SourceCodeServices.Keywords
@@ -57,7 +54,7 @@ type internal FSharpRenameParamToMatchSignature
                                                 yield TextChange(textSpan, replacement) |]
                                 return changes 
                             }
-                        let title = FSComp.SR.replaceWithSuggestion suggestion
+                        let title = CompilerDiagnostics.getErrorMessage (ReplaceWithSuggestion suggestion)
                         let codefix = CodeFixHelpers.createTextChangeCodeFix(title, context, computeChanges)
                         context.RegisterCodeFix(codefix, diagnostics)
             | _ -> ()

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

@@ -59,9 +59,9 @@ type internal FSharpReplaceWithSuggestionCodeFixProvider
 
                 for suggestion in suggestions do
                     let replacement = Keywords.QuoteIdentifierIfNeeded suggestion
-                    let codeFix = 
+                    let codeFix =
                         CodeFixHelpers.createTextChangeCodeFix(
-                            FSComp.SR.replaceWithSuggestion suggestion,
+                            CompilerDiagnostics.getErrorMessage (ReplaceWithSuggestion suggestion),
                             context,
                             (fun () -> asyncMaybe.Return [| TextChange(context.Span, replacement) |]))