Update textDocument/definition tests (#203)

* tests/CSharpLanguageServer.Tests/ReferenceTests.fs: update

* tests/CSharpLanguageServer.Tests/DefinitionTests.fs: update definition tests to actually test things

* tests/CSharpLanguageServer.Tests/Tooling.fs: move Request() to ClientController

Author: razzmatazz

tests/CSharpLanguageServer.Tests/CodeActionTests.fs

@@ -26,7 +26,9 @@ let testCodeActionOnMethodNameWorks() =
           PartialResultToken = None
         }
 
-    let caResult0 : TextDocumentCodeActionResult option = classFile.Request("textDocument/codeAction", caParams0)
+    let caResult0 : TextDocumentCodeActionResult option =
+      client.Request("textDocument/codeAction", caParams0)
+
     Assert.IsTrue(caResult0.IsSome)
 
     match caResult0 with

tests/CSharpLanguageServer.Tests/DefinitionTests.fs

@@ -4,11 +4,11 @@ open NUnit.Framework
 open Ionide.LanguageServerProtocol.Types
 
 open CSharpLanguageServer.Tests.Tooling
-open System
 
 [<TestCase>]
 let testDefinitionWorks () =
-    use client = setupServerClient defaultClientProfile "TestData/testDefinitionWorks"
+    use client = setupServerClient defaultClientProfile
+                                   "TestData/testDefinitionWorks"
     client.StartAndWaitForSolutionLoad()
 
     use classFile = client.Open("Project/Class.cs")
@@ -20,7 +20,9 @@ let testDefinitionWorks () =
           PartialResultToken = None
         }
 
-    let declaration0: Declaration option = classFile.Request("textDocument/definition", definitionParams0)
+    let declaration0: Declaration option =
+        client.Request("textDocument/definition", definitionParams0)
+
     Assert.IsTrue(declaration0.IsNone)
 
     let definitionParams1: DefinitionParams =
@@ -30,7 +32,8 @@ let testDefinitionWorks () =
           PartialResultToken = None
         }
 
-    let declaration1: Declaration option = classFile.Request("textDocument/definition", definitionParams1)
+    let declaration1: Declaration option =
+        client.Request("textDocument/definition", definitionParams1)
 
     match declaration1.Value with
     | U2.C1 _ -> failwith "Location[] was expected"
@@ -45,32 +48,35 @@ let testDefinitionWorks () =
 
         Assert.AreEqual(expectedLocations1, declaration1Locations)
 
+
 [<TestCase>]
 let testDefinitionWorksInAspNetProject () =
     use client = setupServerClient defaultClientProfile
                                    "TestData/testDefinitionWorksInAspNetProject"
     client.StartAndWaitForSolutionLoad()
 
-    use indexCsHtmlCs = client.Open("Project/Pages/Index.cshtml.cs")
+    use testIndexViewModelCsFile = client.Open("Project/Models/Test/IndexViewModel.cs")
+    use testControllerCsFile = client.Open("Project/Controllers/TestController.cs")
 
-    let definitionParams1: DefinitionParams =
-        { TextDocument = { Uri = indexCsHtmlCs.Uri }
-          Position = { Line = 7u; Character = 8u }
+    let definitionParams0: DefinitionParams =
+        { TextDocument = { Uri = testControllerCsFile.Uri }
+          Position = { Line = 11u; Character = 12u }
           WorkDoneToken = None
           PartialResultToken = None
         }
 
-    let declaration1: Declaration option = indexCsHtmlCs.Request("textDocument/definition", definitionParams1)
-
-    match declaration1.Value with
-    | U2.C1 _ -> failwith "Location[] was expected"
-    | U2.C2 declaration1Locations ->
-        let expectedLocations1: Location array =
-            [|
-              { Uri = indexCsHtmlCs.Uri
-                Range = { Start = { Line = 4u; Character = 19u }
-                          End = { Line = 4u; Character = 24u } }
-              }
-            |]
-
-        Assert.AreEqual(expectedLocations1, declaration1Locations)
+    let definition0: Declaration option =
+        client.Request("textDocument/definition", definitionParams0)
+
+    let expectedLocations0: Location array =
+        [|
+            { Uri = testIndexViewModelCsFile.Uri
+              Range = { Start = { Line = 3u; Character = 19u }
+                        End = { Line = 3u; Character = 25u } }
+            }
+        |]
+
+    match definition0 with
+    | Some (U2.C2 definition0Locations) ->
+        Assert.AreEqual(expectedLocations0, definition0Locations)
+    | _ -> failwithf "Some Location[] was expected but %s received" (string definition0)

tests/CSharpLanguageServer.Tests/DiagnosticTests.fs

@@ -75,7 +75,8 @@ let testPullDiagnosticsWork () =
           Identifier = None
           PreviousResultId = None }
 
-    let report0: DocumentDiagnosticReport option = classFile.Request("textDocument/diagnostic", diagnosticParams)
+    let report0: DocumentDiagnosticReport option =
+        client.Request("textDocument/diagnostic", diagnosticParams)
 
     match report0 with
     | Some (U2.C1 report) ->
@@ -106,7 +107,8 @@ let testPullDiagnosticsWork () =
     //
     classFile.DidChange("")
 
-    let report1: DocumentDiagnosticReport option = classFile.Request("textDocument/diagnostic", diagnosticParams)
+    let report1: DocumentDiagnosticReport option =
+        client.Request("textDocument/diagnostic", diagnosticParams)
 
     match report1 with
     | Some (U2.C1 report) ->

tests/CSharpLanguageServer.Tests/HoverTests.fs

@@ -22,7 +22,9 @@ let testHoverWorks() =
           WorkDoneToken = None
         }
 
-    let hover0: Hover option = classFile.Request("textDocument/hover", hover0Params)
+    let hover0: Hover option =
+        client.Request("textDocument/hover", hover0Params)
+
     Assert.IsTrue(hover0.IsSome)
 
     match hover0 with
@@ -46,5 +48,7 @@ let testHoverWorks() =
           WorkDoneToken = None
         }
 
-    let hover1: Hover option = classFile.Request("textDocument/hover", hover1Params)
+    let hover1: Hover option =
+        client.Request("textDocument/hover", hover1Params)
+
     Assert.IsTrue(hover1.IsNone)

tests/CSharpLanguageServer.Tests/ReferenceTests.fs

@@ -25,7 +25,7 @@ let testReferenceWorks() =
         }
 
     let locations0: Location[] option =
-      classFile.Request("textDocument/references", referenceParams0)
+        client.Request("textDocument/references", referenceParams0)
 
     Assert.IsTrue(locations0.IsNone)
 
@@ -41,7 +41,7 @@ let testReferenceWorks() =
         }
 
     let locations1: Location[] option =
-      classFile.Request("textDocument/references", referenceParams1)
+        client.Request("textDocument/references", referenceParams1)
 
     let expectedLocations1: Location array =
         [|
@@ -68,7 +68,7 @@ let testReferenceWorks() =
         }
 
     let locations2: Location[] option =
-      classFile.Request("textDocument/references", referenceParams2)
+        client.Request("textDocument/references", referenceParams2)
 
     let expectedLocations2: Location array =
         [|
@@ -97,6 +97,8 @@ let testReferenceWorksToAspNetRazorPageReferencedValue() =
     client.StartAndWaitForSolutionLoad()
 
     use testIndexViewModelCsFile = client.Open("Project/Models/Test/IndexViewModel.cs")
+    use testControllerCsFile = client.Open("Project/Controllers/TestController.cs")
+    use viewsTestIndexCshtmlFile = client.Open("Project/Views/Test/Index.cshtml")
 
     let referenceParams0: ReferenceParams =
         { TextDocument = { Uri = testIndexViewModelCsFile.Uri }
@@ -107,14 +109,11 @@ let testReferenceWorksToAspNetRazorPageReferencedValue() =
         }
 
     let locations0: Location[] option =
-      testIndexViewModelCsFile.Request("textDocument/references", referenceParams0)
+        client.Request("textDocument/references", referenceParams0)
 
     Assert.IsTrue(locations0.IsSome)
     Assert.AreEqual(2, locations0.Value.Length)
 
-    use testControllerCsFile = client.Open("Project/Controllers/TestController.cs")
-    use viewsTestIndexCshtmlFile = client.Open("Project/Views/Test/Index.cshtml")
-
     let expectedLocations0: Location array =
       [|
         { Uri = testControllerCsFile.Uri
@@ -142,7 +141,7 @@ let testReferenceWorksToAspNetRazorPageReferencedValue() =
         }
 
     let locations1: Location[] option =
-      testIndexViewModelCsFile.Request("textDocument/references", referenceParams1)
+        client.Request("textDocument/references", referenceParams1)
 
     Assert.IsTrue(locations1.IsSome)
     Assert.AreEqual(5, locations1.Value.Length)

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Controllers/TestController.cs

@@ -0,0 +1,17 @@
+using Microsoft.AspNetCore.Mvc;
+using Project.Models.Test;
+
+namespace Printlog.Web.ClientPart.Controllers;
+
+public class TestController : Controller
+{
+    public IActionResult Index()
+    {
+        var model = new IndexViewModel()
+        {
+            Output = "test"
+        };
+
+        return View(model);
+    }
+}

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Models/Test/IndexViewModel.cs

@@ -0,0 +1,5 @@
+namespace Project.Models.Test;
+public class IndexViewModel
+{
+    public string? Output { get; set; }
+}

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Pages/Index.cshtml

@@ -1,7 +1,20 @@
-var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddRazorPages();
-
-var app = builder.Build();
-app.UseRouting();
-app.MapRazorPages();
-app.Run();
+using Microsoft.AspNetCore;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+
+namespace Project;
+
+public class Program
+{
+    public static async Task Main(string[] args)
+    {
+        await BuildWebHost(args).RunAsync();
+    }
+
+    public static IWebHost BuildWebHost(string[] args)
+    {
+        var builder = WebHost.CreateDefaultBuilder(args);
+        builder = builder.UseKestrel().UseStartup<Startup>();
+        return builder.Build();
+    }
+}

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Pages/Index.cshtml.cs

@@ -2,7 +2,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <RootNamespace>test_csharp_web</RootNamespace>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.11" />
+  </ItemGroup>
 </Project>

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Pages/_ViewImports.cshtml

@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Project;
+
+public class Startup
+{
+    public Startup(IConfiguration configuration, IWebHostEnvironment env)
+    {
+    }
+
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.AddOptions();
+    }
+
+    public void Configure(
+        IApplicationBuilder app,
+        IWebHostEnvironment env)
+    {
+        app.UseAuthentication();
+        app.UseAuthorization();
+
+        app.UseEndpoints(endpoints => {
+                endpoints.MapControllers();
+            });
+    }
+}

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Program.cs

@@ -0,0 +1,2 @@
+@model Project.Models.Test.IndexViewModel
+@Model.Output

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Project.csproj

@@ -0,0 +1 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Startup.cs

@@ -0,0 +1,3 @@
+@{
+    Layout = "_Layout";
+}

tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Views/Test/Index.cshtml

@@ -500,16 +500,6 @@ type FileController (client: MailboxProcessor<ClientEvent>, filename: string, ur
             client.Post(SendServerRpcNotification ("textDocument/didClose", serialize didCloseParams))
             ()
 
-    member __.Request<'Request, 'Response>(method: string, request: 'Request): 'Response =
-        let requestJObject = request |> serialize
-        let responseJToken = client.PostAndReply<Result<JToken, JToken>>(fun rc -> SendServerRpcRequest (method, requestJObject, Some rc))
-        match responseJToken with
-        | Ok resultJToken ->
-            resultJToken |> deserialize<'Response>
-        | Error errorJToken ->
-            failwithf "request to method \"%s\" has failed with error: %s" method (string errorJToken)
-
-
     member __.DidChange(text: string) =
         let didChangeParams: DidChangeTextDocumentParams =
             {
@@ -646,6 +636,15 @@ type ClientController (client: MailboxProcessor<ClientEvent>, testDataDir: Direc
                                 && (m.Message.["id"] |> string) = (invocation.Message.["id"] |> string)
                                 && (m.Message.["method"] |> string) = rpcMethod)
 
+    member __.Request<'Request, 'Response>(method: string, request: 'Request): 'Response =
+        let requestJObject = request |> serialize
+        let responseJToken = client.PostAndReply<Result<JToken, JToken>>(fun rc -> SendServerRpcRequest (method, requestJObject, Some rc))
+        match responseJToken with
+        | Ok resultJToken ->
+            resultJToken |> deserialize<'Response>
+        | Error errorJToken ->
+            failwithf "request to method \"%s\" has failed with error: %s" method (string errorJToken)
+
     member __.Open(filename: string): FileController =
         let uri =
             match System.Environment.OSVersion.Platform with