Merge branch 'topic/pylsp' into 'master'

Improve pylsp test helpers

See merge request eng/ide/ada_language_server!1850

Author: eliericha

testsuite/ada_lsp/called_by_dispatching/test.py

@@ -4,8 +4,6 @@
     URI,
     ALSLanguageClient,
     assertLocationsList,
-    callHierarchyIncomingCallsParams,
-    callHierarchyPrepareParams,
     didOpenTextDocumentParams,
     test,
 )
@@ -19,18 +17,14 @@ async def test_called_by(lsp: ALSLanguageClient):
     lsp.text_document_did_open(open_params)
 
     # Send a textDocument/prepareCallHierarchy request
-    result1 = await lsp.text_document_prepare_call_hierarchy_async(
-        callHierarchyPrepareParams(main_adb_uri, 7, 4)
-    )
+    result1 = await lsp.prepareCallHierarchy(main_adb_uri, 7, 4)
     assert result1
 
     # Expect these locations
     assertLocationsList(result1, [("root.ads", 5)])
 
     # Now send the callHierarchy/incomingCalls request
-    result2 = await lsp.call_hierarchy_incoming_calls_async(
-        callHierarchyIncomingCallsParams(root_ads_uri, 5, 14)
-    )
+    result2 = await lsp.callHierarchyIncomingCalls(root_ads_uri, 5, 14)
     assert result2
 
     # Expect these locations

testsuite/ada_lsp/config_base/test.py

@@ -38,7 +38,6 @@
     ALSLanguageClient,
     ALSSettings,
     assertEqual,
-    awaitIndexingEnd,
     test,
 )
 
@@ -68,18 +67,18 @@ async def test1(lsp: ALSLanguageClient) -> None:
     )
     # Because no project file was set, we need a didOpen to load the project
     lsp.didOpenVirtual()
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "value-from-init")
 
     # Now let's change the settings
     lsp.didChangeConfig({"scenarioVariables": {"Var": "new-value"}})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "new-value")
 
     # Now we send a null value to revert to the base config which should be the config
     # file, not the initialize request.
     lsp.didChangeConfig({"scenarioVariables": None})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "value-from-config-file")
 
 
@@ -99,17 +98,17 @@ async def test2(lsp: ALSLanguageClient) -> None:
     )
     # Because no project file was set, we need a didOpen to load the project
     lsp.didOpenVirtual()
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "value-from-init")
 
     # Now let's change the settings and revert back to see if we revert to the right
     # value.
     lsp.didChangeConfig({"scenarioVariables": {"Var": "new-value"}})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "new-value")
 
     lsp.didChangeConfig({"scenarioVariables": None})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "value-from-init")
 
 
@@ -130,19 +129,19 @@ async def test3(lsp: ALSLanguageClient) -> None:
     )
     # Because no project file was set, we need a didOpen to load the project
     lsp.didOpenVirtual()
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     # No value was provided for the scenario variable, so we should get the default
     # value defined in the project.
     assertEqual(await lsp.getObjDirBasename(), "value-from-prj")
 
     # Now let's change the settings and revert back to see if we revert to the right
     # value.
     lsp.didChangeConfig({"scenarioVariables": {"Var": "new-value"}})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "new-value")
 
     lsp.didChangeConfig({"scenarioVariables": None})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "value-from-prj")
 
 
@@ -158,7 +157,7 @@ async def test4(lsp: ALSLanguageClient) -> None:
     )
     # Because no project file was set, we need a didOpen to load the project
     lsp.didOpenVirtual()
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     # No value was provided for the scenario variable, so we should get the default
     # value defined in the project.
     assertEqual(await lsp.getObjDirBasename(), "value-from-prj")
@@ -168,14 +167,14 @@ async def test4(lsp: ALSLanguageClient) -> None:
     lsp.didChangeConfig(
         {"scenarioVariables": {"Var": "value-from-first-config-change"}}
     )
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "value-from-first-config-change")
 
     # Now we change to another value, and revert with a null value.
     lsp.didChangeConfig({"scenarioVariables": {"Var": "new-value"}})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "new-value")
 
     lsp.didChangeConfig({"scenarioVariables": None})
-    await awaitIndexingEnd(lsp)
+    await lsp.awaitIndexingEnd()
     assertEqual(await lsp.getObjDirBasename(), "value-from-first-config-change")

testsuite/ada_lsp/config_cli/test.py

@@ -17,9 +17,8 @@
 from drivers.pylsp import (
     URI,
     ALSClientServerConfig,
-    LanguageClient,
+    ALSLanguageClient,
     assertEqual,
-    getCurrentProject,
     test,
 )
 
@@ -29,7 +28,7 @@
         [os.environ.get("ALS", "ada_language_server"), "--config", "my_config.json"]
     )
 )
-async def test_func(lsp: LanguageClient) -> None:
-    response = await lsp.workspace_execute_command_async(getCurrentProject())
+async def test_func(lsp: ALSLanguageClient) -> None:
+    response = await lsp.getCurrentProject()
     assert response
     assertEqual(response, URI("non-root/p2.gpr"))

testsuite/ada_lsp/config_global/test.py

@@ -18,9 +18,8 @@
 from drivers.pylsp import (
     URI,
     ALSClientServerConfig,
-    LanguageClient,
+    ALSLanguageClient,
     assertEqual,
-    getCurrentProject,
     test,
 )
 
@@ -31,7 +30,7 @@
         server_env=os.environ | {"XDG_CONFIG_HOME": os.path.abspath("xdg_config_home")},
     )
 )
-async def func(lsp: LanguageClient) -> None:
-    response = await lsp.workspace_execute_command_async(getCurrentProject())
+async def func(lsp: ALSLanguageClient) -> None:
+    response = await lsp.getCurrentProject()
     assert response
     assertEqual(response, URI("non-root/p2.gpr"))

testsuite/ada_lsp/config_local/test.py

@@ -11,12 +11,11 @@
 Then the test queries for the current project to determine the success or failure.
 """
 
-from pytest_lsp import LanguageClient
-from drivers.pylsp import URI, assertEqual, getCurrentProject, test
+from drivers.pylsp import URI, ALSLanguageClient, assertEqual, test
 
 
 @test()
-async def func(lsp: LanguageClient) -> None:
-    response = await lsp.workspace_execute_command_async(getCurrentProject())
+async def func(lsp: ALSLanguageClient) -> None:
+    response = await lsp.getCurrentProject()
     assert response
     assertEqual(response, URI("non-root/p2.gpr"))

testsuite/ada_lsp/config_priority/test.py

@@ -17,9 +17,8 @@
 from drivers.pylsp import (
     URI,
     ALSClientServerConfig,
-    LanguageClient,
+    ALSLanguageClient,
     assertEqual,
-    getCurrentProject,
     test,
 )
 
@@ -30,9 +29,9 @@
         server_env=os.environ | {"XDG_CONFIG_HOME": os.path.abspath("xdg_config_home")},
     )
 )
-async def test_global_local(lsp: LanguageClient) -> None:
+async def test_global_local(lsp: ALSLanguageClient) -> None:
     """Test that the local .als.json takes priority over the global config file"""
-    response = await lsp.workspace_execute_command_async(getCurrentProject())
+    response = await lsp.getCurrentProject()
     assertEqual(response, URI("non-root/p4.gpr"))
 
 
@@ -42,9 +41,9 @@ async def test_global_local(lsp: LanguageClient) -> None:
         server_env=os.environ | {"XDG_CONFIG_HOME": "some_non_existing_path"},
     )
 )
-async def test_local_cli(lsp: LanguageClient) -> None:
+async def test_local_cli(lsp: ALSLanguageClient) -> None:
     """Test that the CLI config file takes priority over the local .als.json one"""
-    response = await lsp.workspace_execute_command_async(getCurrentProject())
+    response = await lsp.getCurrentProject()
     assertEqual(response, URI("non-root/p2.gpr"))
 
 
@@ -54,7 +53,7 @@ async def test_local_cli(lsp: LanguageClient) -> None:
         server_env=os.environ | {"XDG_CONFIG_HOME": os.path.abspath("xdg_config_home")},
     )
 )
-async def test_all(lsp: LanguageClient) -> None:
+async def test_all(lsp: ALSLanguageClient) -> None:
     """Test that the CLI config file takes priority over both"""
-    response = await lsp.workspace_execute_command_async(getCurrentProject())
+    response = await lsp.getCurrentProject()
     assertEqual(response, URI("non-root/p2.gpr"))