Convert tests

Author: Omar Tawfik

vsintegration/src/FSharp.Editor/AssemblyInfo.fs

@@ -6,6 +6,7 @@ open Microsoft.VisualStudio.Shell
 
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("FSharp.ProjectSystem.FSharp, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
 [<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
+[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("VisualFSharp.Salsa, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293")>]
 
 [<assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\FSharp.Editor.dll")>]
 

vsintegration/src/FSharp.Editor/DocumentDiagnosticAnalyzer.fs

@@ -24,7 +24,7 @@ open Microsoft.VisualStudio.FSharp.LanguageService
 type internal FSharpDocumentDiagnosticAnalyzer() =
     inherit DocumentDiagnosticAnalyzer()
 
-    let fSharpErrorToRoslynDiagnostic(document: Document, sourceText: SourceText, error: FSharpErrorInfo) =
+    static member ConvertError(filePath: string, sourceText: SourceText, error: FSharpErrorInfo) =
         let id = "FS" + error.ErrorNumber.ToString()
         let emptyString = LocalizableString.op_Implicit("")
         let description = LocalizableString.op_Implicit(error.Message)
@@ -33,10 +33,24 @@ type internal FSharpDocumentDiagnosticAnalyzer() =
 
         let linePositionSpan = LinePositionSpan(LinePosition(error.StartLineAlternate - 1, error.StartColumn), LinePosition(error.EndLineAlternate - 1, error.EndColumn))
         let textSpan = sourceText.Lines.GetTextSpan(linePositionSpan)
-        let correctedTextSpan = if textSpan.End < sourceText.Length then textSpan else TextSpan.FromBounds(sourceText.Length - 1, sourceText.Length)
 
         // F# compiler report errors at end of file if parsing fails. It should be corrected to match Roslyn boundaries
-        Diagnostic.Create(descriptor, Location.Create(document.FilePath, correctedTextSpan , linePositionSpan))
+        let correctedTextSpan = if textSpan.End < sourceText.Length then textSpan else TextSpan.FromBounds(sourceText.Length - 1, sourceText.Length)
+
+        Diagnostic.Create(descriptor, Location.Create(filePath, correctedTextSpan , linePositionSpan))
+
+    static member GetDiagnostics(filePath: string, sourceText: SourceText, options: FSharpProjectOptions, addSemanticErrors: bool) =
+        let parseResults = FSharpChecker.Instance.ParseFileInProject(filePath, sourceText.ToString(), options) |> Async.RunSynchronously
+        let errors =
+            if addSemanticErrors then
+                let checkResultsAnswer = FSharpChecker.Instance.CheckFileInProject(parseResults, filePath, 0, sourceText.ToString(), options) |> Async.RunSynchronously
+                match checkResultsAnswer with
+                | FSharpCheckFileAnswer.Aborted -> failwith "Compilation isn't complete yet"
+                | FSharpCheckFileAnswer.Succeeded(results) -> results.Errors
+            else
+                parseResults.Errors
+            
+        (errors |> Seq.map(fun (error) -> FSharpDocumentDiagnosticAnalyzer.ConvertError(filePath, sourceText, error))).ToImmutableArray()
 
 
     // We are constructing our own descriptors at run-time. Compiler service is already doing error formatting and localization.
@@ -50,9 +64,7 @@ type internal FSharpDocumentDiagnosticAnalyzer() =
         let computation = async {
             let! sourceText = document.GetTextAsync(cancellationToken) |> Async.AwaitTask
             let options = CommonRoslynHelpers.GetFSharpProjectOptionsForRoslynProject(document.Project)
-            let! parseResults = FSharpChecker.Instance.ParseFileInProject(document.Name, sourceText.ToString(), options)
-
-            return (parseResults.Errors |> Seq.map(fun (error) -> fSharpErrorToRoslynDiagnostic(document, sourceText, error))).ToImmutableArray()
+            return FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(document.FilePath, sourceText, options, false)
         }
 
         Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken)
@@ -63,14 +75,7 @@ type internal FSharpDocumentDiagnosticAnalyzer() =
         let computation = async {
             let! sourceText = document.GetTextAsync(cancellationToken) |> Async.AwaitTask
             let options = CommonRoslynHelpers.GetFSharpProjectOptionsForRoslynProject(document.Project)
-            let! parseResults = FSharpChecker.Instance.ParseFileInProject(document.Name, sourceText.ToString(), options)
-            let! checkResultsAnswer = FSharpChecker.Instance.CheckFileInProject(parseResults, document.Name, 0, sourceText.ToString(), options)
-
-            let errors = match checkResultsAnswer with
-                         | FSharpCheckFileAnswer.Aborted -> failwith "Compilation isn't complete yet"
-                         | FSharpCheckFileAnswer.Succeeded(results) -> results.Errors
-
-            return (errors |> Seq.map(fun (error) -> fSharpErrorToRoslynDiagnostic(document, sourceText, error))).ToImmutableArray()
+            return FSharpDocumentDiagnosticAnalyzer.GetDiagnostics(document.FilePath, sourceText, options, true)
         }
 
         Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken)

vsintegration/tests/Salsa/FSharpLanguageServiceTestable.fs

@@ -17,6 +17,7 @@ open Microsoft.VisualStudio.OLE.Interop
 open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.SourceCodeServices
 open Microsoft.VisualStudio.FSharp.LanguageService
+open Microsoft.VisualStudio.FSharp.Editor
 
 type internal FSharpLanguageServiceTestable() as this =
     static let colorizerGuid = new Guid("{A2976312-7D71-4BB4-A5F8-66A08EBF46C8}") // Guid for colorized user data on IVsTextBuffer

vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj

@@ -110,6 +110,11 @@
       <Project>{a437a6ec-5323-47c2-8f86-e2cac54ff152}</Project>
       <Private>True</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\src\FSharp.Editor\FSharp.Editor.fsproj">
+      <Name>FSharp.Editor</Name>
+      <Project>{65e0e82a-eace-4787-8994-888674c2fe87}</Project>
+      <Private>True</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj">
       <Name>FSharp.LanguageService.Base</Name>
       <Project>{1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef}</Project>