Enable LSP features in razor (.cshtml) files (II) (#278)

* tests/CSharpLanguageServer.Tests/Tooling.fs: make sure global.json is imported when running the tests

* src/CSharpLanguageServer/Types.fs: use 'razor' language id for '.cshtml' files

* src/CSharpLanguageServer/Handlers/References.fs: add logger

* Misc cleanups

* Update tests to use common fixtures

* Setup fixtures in a more constrained fashion (max ncpu at the time)

Also, fix a race in DiagnosticTests.fs:testPushDiagnosticsWork

* .github/workflows/test.yaml: change name of the job, build -> test

* Merge fixture data folders to increase sharing and reduce the number of test fixture files

* Make sure shared fixtures are not being modified

* Refactor how fixtures are acquired and shared

* tests/CSharpLanguageServer.Tests/DiagnosticTests.fs: attempt to shake out instability in testWorkspaceDiagnosticsWorkWithStreaming

* Directory.Packages.props: bump MSBuildPackageVersion

Author: razzmatazz

.github/workflows/test.yaml

@@ -6,7 +6,7 @@ on:
   pull_request:
 
 jobs:
-  build:
+  test:
     timeout-minutes: 10
     strategy:
       matrix:

Directory.Packages.props

@@ -5,7 +5,7 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <PropertyGroup>
-    <MSBuildPackageVersion>17.14.8</MSBuildPackageVersion>
+    <MSBuildPackageVersion>17.14.28</MSBuildPackageVersion>
     <RoslynPackageVersion>4.14.0</RoslynPackageVersion>
     <MSBuildLocatorPackageVersion>1.9.1</MSBuildLocatorPackageVersion>
   </PropertyGroup>

src/CSharpLanguageServer/Handlers/CodeAction.fs

@@ -313,8 +313,8 @@ module CodeAction =
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, CodeActionOptions> option =
         let literalSupport =
             clientCapabilities.TextDocument
-            |> Option.bind (fun x -> x.CodeAction)
-            |> Option.bind (fun x -> x.CodeActionLiteralSupport)
+            |> Option.bind _.CodeAction
+            |> Option.bind _.CodeActionLiteralSupport
 
         match literalSupport with
         | Some _ ->
@@ -341,8 +341,8 @@ module CodeAction =
 
                 let clientSupportsCodeActionEditResolveWithEditAndData =
                     context.ClientCapabilities.TextDocument
-                    |> Option.bind (fun x -> x.CodeAction)
-                    |> Option.bind (fun x -> x.ResolveSupport)
+                    |> Option.bind _.CodeAction
+                    |> Option.bind _.ResolveSupport
                     |> Option.map (fun resolveSupport -> resolveSupport.Properties |> Array.contains "edit")
                     |> Option.defaultValue false
 

src/CSharpLanguageServer/Handlers/Completion.fs

@@ -117,7 +117,7 @@ module Completion =
         member __.GetDescriptionAsync(doc, item, ct) =
             service.GetDescriptionAsync(doc, item, ct)
 
-    let provider (clientCapabilities: ClientCapabilities) : CompletionOptions option =
+    let provider (_cc: ClientCapabilities) : CompletionOptions option =
         Some
             { ResolveProvider = Some true
               TriggerCharacters = Some([| "."; "'" |])

src/CSharpLanguageServer/Handlers/DocumentSymbol.fs

@@ -288,8 +288,8 @@ module DocumentSymbol =
         async {
             let canEmitDocSymbolHierarchy =
                 context.ClientCapabilities.TextDocument
-                |> Option.bind (fun cc -> cc.DocumentSymbol)
-                |> Option.bind (fun cc -> cc.HierarchicalDocumentSymbolSupport)
+                |> Option.bind _.DocumentSymbol
+                |> Option.bind _.HierarchicalDocumentSymbolSupport
                 |> Option.defaultValue false
 
             match context.GetDocument p.TextDocument.Uri with

src/CSharpLanguageServer/Handlers/References.fs

@@ -5,9 +5,12 @@ open Ionide.LanguageServerProtocol.JsonRpc
 
 open CSharpLanguageServer.State
 open CSharpLanguageServer.Conversions
+open CSharpLanguageServer.Logging
 
 [<RequireQualifiedAccess>]
 module References =
+    let private logger = Logging.getLoggerByName "References"
+
     let provider (_: ClientCapabilities) : U2<bool, ReferenceOptions> option = Some(U2.C1 true)
 
     let handle (context: ServerRequestContext) (p: ReferenceParams) : AsyncLspResult<Location[] option> = async {

src/CSharpLanguageServer/Handlers/Rename.fs

@@ -71,8 +71,8 @@ module Rename =
 
     let private prepareSupport (clientCapabilities: ClientCapabilities) =
         clientCapabilities.TextDocument
-        |> Option.bind (fun x -> x.Rename)
-        |> Option.bind (fun x -> x.PrepareSupport)
+        |> Option.bind _.Rename
+        |> Option.bind _.PrepareSupport
         |> Option.defaultValue false
 
     let provider (clientCapabilities: ClientCapabilities) : U2<bool, RenameOptions> option =

src/CSharpLanguageServer/Handlers/Workspace.fs

@@ -26,8 +26,8 @@ module Workspace =
 
     let dynamicRegistrationForDidChangeWatchedFiles (clientCapabilities: ClientCapabilities) =
         clientCapabilities.Workspace
-        |> Option.bind (fun x -> x.DidChangeWatchedFiles)
-        |> Option.bind (fun x -> x.DynamicRegistration)
+        |> Option.bind _.DidChangeWatchedFiles
+        |> Option.bind _.DynamicRegistration
         |> Option.defaultValue false
 
     let didChangeWatchedFilesRegistration (clientCapabilities: ClientCapabilities) : Registration option =

src/CSharpLanguageServer/Types.fs

@@ -46,7 +46,7 @@ let csharpDocumentFilter: TextDocumentFilter =
       Pattern = Some "**/*.cs" }
 
 let razorCsharpDocumentFilter: TextDocumentFilter =
-    { Language = Some "razor-csharp"
+    { Language = Some "razor"
       Scheme = Some "file"
       Pattern = Some "**/*.cshtml" }
 

tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj

@@ -26,13 +26,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsUnit" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="NUnit" />
     <PackageReference Include="NUnit3TestAdapter" />
-    <PackageReference Include="coverlet.collector">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="coverlet.collector">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>