implement pull diagnostics for cshtml

Author: razzmatazz

src/CSharpLanguageServer/Handlers/Diagnostic.fs

@@ -12,7 +12,7 @@ open CSharpLanguageServer.Types
 [<RequireQualifiedAccess>]
 module Diagnostic =
     let provider
-        (clientCapabilities: ClientCapabilities)
+        (_cc: ClientCapabilities)
         : U2<DiagnosticOptions, DiagnosticRegistrationOptions> option =
         let registrationOptions: DiagnosticRegistrationOptions =
             { DocumentSelector = Some defaultDocumentSelector
@@ -35,24 +35,18 @@ module Diagnostic =
                   Items = [||]
                   RelatedDocuments = None }
 
-            match context.GetDocument p.TextDocument.Uri with
-            | None -> return emptyReport |> U2.C1 |> LspResult.success
+            let! semanticModel = context.GetSemanticModel p.TextDocument.Uri
 
-            | Some doc ->
-                let! ct = Async.CancellationToken
-                let! semanticModelMaybe = doc.GetSemanticModelAsync(ct) |> Async.AwaitTask
-
-                match semanticModelMaybe |> Option.ofObj with
+            let diagnostics =
+                match semanticModel with
+                | None -> [||]
                 | Some semanticModel ->
-                    let diagnostics =
-                        semanticModel.GetDiagnostics()
-                        |> Seq.map Diagnostic.fromRoslynDiagnostic
-                        |> Seq.map fst
-                        |> Array.ofSeq
-
-                    return { emptyReport with Items = diagnostics } |> U2.C1 |> LspResult.success
+                    semanticModel.GetDiagnostics()
+                    |> Seq.map Diagnostic.fromRoslynDiagnostic
+                    |> Seq.map fst
+                    |> Array.ofSeq
 
-                | None -> return emptyReport |> U2.C1 |> LspResult.success
+            return { emptyReport with Items = diagnostics } |> U2.C1 |> LspResult.success
         }
 
     let private getWorkspaceDiagnosticReports

src/CSharpLanguageServer/State/ServerRequestContext.fs

@@ -138,6 +138,21 @@ type ServerRequestContext(requestId: int, state: ServerState, emitServerEvent) =
             return aggregatedLspLocations
         }
 
+    member this.GetSemanticModel (uri: DocumentUri) : Async<SemanticModel option> = async {
+        if uri.EndsWith(".cshtml") then
+            match! getRazorDocumentForUri state.Solution.Value uri with
+            | None -> return None
+            | Some(project, compilation, cshtmlPath, cshtmlTree) ->
+                return compilation.GetSemanticModel(cshtmlTree) |> Option.ofObj
+        else
+            match this.GetDocument uri with
+            | None -> return None
+            | Some doc ->
+                let! ct = Async.CancellationToken
+                let! semanticModel = doc.GetSemanticModelAsync() |> Async.AwaitTask
+                return semanticModel |> Option.ofObj
+    }
+
     member this.FindSymbol' (uri: DocumentUri) (pos: Position) : Async<(ISymbol * Project * Document option) option> = async {
         if uri.EndsWith(".cshtml") then
             match! getRazorDocumentForUri state.Solution.Value uri with

tests/CSharpLanguageServer.Tests/DiagnosticTests.fs

@@ -116,7 +116,37 @@ let testPullDiagnosticsWork () =
         Assert.AreEqual(0, report.Items.Length)
     | _ -> failwith "U2.C1 is expected"
 
-    ()
+
+[<Test>]
+let testPullDiagnosticsWorkForRazorFiles () =
+    use client = activateFixture "aspnetProject"
+    use cshtmlFile = client.Open("Project/Views/Test/Index.cshtml")
+
+    let diagnosticParams: DocumentDiagnosticParams =
+        { WorkDoneToken = None
+          PartialResultToken = None
+          TextDocument = { Uri = cshtmlFile.Uri }
+          Identifier = None
+          PreviousResultId = None }
+
+    let report0: DocumentDiagnosticReport option =
+        client.Request("textDocument/diagnostic", diagnosticParams)
+
+    match report0 with
+    | Some(U2.C1 report) ->
+        Assert.AreEqual("full", report.Kind)
+        Assert.AreEqual(None, report.ResultId)
+        Assert.AreEqual(7, report.Items.Length)
+
+        let reportItems = report.Items |> Array.sortBy _.Range
+
+        let diagnostic0 = reportItems[0]
+        Assert.AreEqual(7, diagnostic0.Range.Start.Line)
+        Assert.AreEqual(4, diagnostic0.Range.Start.Character)
+        Assert.AreEqual(Some DiagnosticSeverity.Warning, diagnostic0.Severity)
+        Assert.AreEqual("Unnecessary using directive.", diagnostic0.Message)
+
+    | _ -> failwith "U2.C1 is expected"
 
 
 [<Test>]