Refactoring: Rename Language to LanguageServerId

This resolves a long-standing naming issue in Serena & SolidLSP.

test/solidlsp/svelte/test_svelte_basic.py

@@ -5,7 +5,7 @@ import pytest
 
 from serena.util.text_utils import find_text_coordinates
 from solidlsp import SolidLanguageServer
-from solidlsp.ls_config import Language
+from solidlsp.ls_config import LanguageServerId
 from solidlsp.ls_utils import SymbolUtils
 from test.solidlsp.conftest import read_repo_file
 from test.solidlsp.svelte import conftest as svelte_test_conftest
@@ -15,14 +15,14 @@ pytestmark = pytest.mark.svelte
 
 
 class TestSvelteLanguageServer:
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
-    @pytest.mark.parametrize("repo_path", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
+    @pytest.mark.parametrize("repo_path", [LanguageServerId.SVELTE], indirect=True)
     def test_svelte_language_server_root_matches_repo_path(self, language_server: SolidLanguageServer, repo_path: Path) -> None:
         assert language_server.is_running()
         assert repo_path.resolve() == svelte_test_conftest.repo_path.resolve()
         assert Path(language_server.language_server.repo_path).resolve() == repo_path.resolve()
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_svelte_and_typescript_files_in_symbol_tree(self, language_server: SolidLanguageServer) -> None:
         symbols = language_server.request_full_symbol_tree()
 
@@ -37,7 +37,7 @@ class TestSvelteLanguageServer:
             "GAME_VERSION (defined only in a .ts file) not found in symbol tree"
         )
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_document_symbols_inside_svelte_file(self, language_server: SolidLanguageServer) -> None:
         file_path = os.path.join("src", "lib", "components", "Counter.svelte")
         symbols = language_server.request_document_symbols(file_path).get_all_symbols_and_roots()
@@ -46,7 +46,7 @@ class TestSvelteLanguageServer:
         assert "offset" in symbol_names
         assert "modulo" in symbol_names
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_document_symbols_inside_typescript_file(self, language_server: SolidLanguageServer) -> None:
         # document symbols of a plain .ts file must be served by the companion TS server, not the
         # base svelte LS (which only provides documentSymbol for .svelte files); see issue #1552.
@@ -60,7 +60,7 @@ class TestSvelteLanguageServer:
         assert "enter" in symbol_names, symbol_names
         assert "toString" in symbol_names, symbol_names
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_overview_of_typescript_file(self, language_server: SolidLanguageServer) -> None:
         # get_symbols_overview on a .ts file must not be empty in svelte-only mode (issue #1552).
         file_path = os.path.join("src", "lib", "game.ts")
@@ -70,7 +70,7 @@ class TestSvelteLanguageServer:
         assert "GAME_VERSION" in top_level_names, overview
         assert "Game" in top_level_names, overview
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_definition_from_component_import_to_svelte_file(self, language_server: SolidLanguageServer) -> None:
         file_path = os.path.join("src", "lib", "components", "Header.svelte")
         coords = find_text_coordinates(read_repo_file(language_server, file_path), r"(count)")
@@ -81,7 +81,7 @@ class TestSvelteLanguageServer:
         assert len(definitions) == 1, definition_paths
         assert definitions[0]["relativePath"].replace("\\", "/") == "src/lib/components/Counter.svelte", definition_paths
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_diagnostics_in_typescript_file(self, language_server: SolidLanguageServer) -> None:
         assert_file_diagnostics(
             language_server,
@@ -90,7 +90,7 @@ class TestSvelteLanguageServer:
             min_count=2,
         )
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_diagnostics_in_svelte_file(self, language_server: SolidLanguageServer) -> None:
         assert_file_diagnostics(
             language_server,

test/solidlsp/svelte/test_svelte_references.py

@@ -3,13 +3,13 @@ import os
 import pytest
 
 from solidlsp import SolidLanguageServer
-from solidlsp.ls_config import Language
+from solidlsp.ls_config import LanguageServerId
 
 pytestmark = pytest.mark.svelte
 
 
 class TestSvelteReferences:
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_references_across_svelte_and_typescript(self, language_server: SolidLanguageServer) -> None:
         refs = language_server.request_references(os.path.join("src", "lib", "components", "Words.svelte"), 1, 17)
         ref_paths = {ref["relativePath"].replace("\\", "/") for ref in refs}
@@ -18,7 +18,7 @@ class TestSvelteReferences:
         assert "src/lib/game.ts" in ref_paths, sorted(ref_paths)
         assert "src/routes/(sverdle)/+page.svelte" in ref_paths, sorted(ref_paths)
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_references_from_typescript_file(self, language_server: SolidLanguageServer) -> None:
         refs = language_server.request_references(os.path.join("src", "lib", "game.ts"), 3, 13)
         ref_paths = {ref["relativePath"].replace("\\", "/") for ref in refs}

test/solidlsp/svelte/test_svelte_rename.py

@@ -6,7 +6,7 @@ import pytest
 
 from serena.util.text_utils import find_text_coordinates
 from solidlsp import SolidLanguageServer
-from solidlsp.ls_config import Language
+from solidlsp.ls_config import LanguageServerId
 from solidlsp.ls_types import TextEdit, WorkspaceEdit
 from test.solidlsp.conftest import read_repo_file
 
@@ -52,7 +52,7 @@ def _assert_rename_edit(
 
 
 class TestSvelteRename:
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_rename_svelte_export_updates_svelte_importers(self, language_server: SolidLanguageServer) -> None:
         file_path = os.path.join("src", "lib", "components", "Counter.svelte")
         coords = find_text_coordinates(read_repo_file(language_server, file_path), r"(count)")
@@ -65,7 +65,7 @@ class TestSvelteRename:
             {"src/lib/components/Counter.svelte", "src/lib/components/Header.svelte"},
         )
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_rename_svelte_export_updates_ts_and_svelte_files(self, language_server: SolidLanguageServer) -> None:
         file_path = os.path.join("src", "lib", "components", "Words.svelte")
         coords = find_text_coordinates(read_repo_file(language_server, file_path), r"(words)")
@@ -83,7 +83,7 @@ class TestSvelteRename:
             },
         )
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_rename_ts_export_declaration_site_workspace_edit(self, language_server: SolidLanguageServer) -> None:
         file_path = os.path.join("src", "routes", "(sverdle)", "words.server.ts")
         coords = find_text_coordinates(read_repo_file(language_server, file_path), r"(allowed)")
@@ -98,7 +98,7 @@ class TestSvelteRename:
             {"src/routes/(sverdle)/words.server.ts"},
         )
 
-    @pytest.mark.parametrize("language_server", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("language_server", [LanguageServerId.SVELTE], indirect=True)
     def test_rename_ts_class_cross_file_workspace_edit_when_supported(self, language_server: SolidLanguageServer) -> None:
         file_path = os.path.join("src", "lib", "game.ts")
         coords = find_text_coordinates(read_repo_file(language_server, file_path), r"(Game)")

test/solidlsp/svelte/test_svelte_symbols.py

@@ -17,7 +17,7 @@ import pytest
 
 from serena.project import Project
 from serena.symbol import LanguageServerSymbolRetriever
-from solidlsp.ls_config import Language
+from solidlsp.ls_config import LanguageServerId
 from solidlsp.ls_types import SymbolKind
 
 pytestmark = pytest.mark.svelte
@@ -27,7 +27,7 @@ GAME_TS = os.path.join("src", "lib", "game.ts")
 
 
 class TestSvelteTypeScriptSymbolDiscovery:
-    @pytest.mark.parametrize("project_with_ls", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("project_with_ls", [LanguageServerId.SVELTE], indirect=True)
     def test_find_symbol_in_typescript_file(self, project_with_ls: Project) -> None:
         retriever = LanguageServerSymbolRetriever(project_with_ls)
 
@@ -47,7 +47,7 @@ class TestSvelteTypeScriptSymbolDiscovery:
         assert len(enter_symbols) == 1, enter_symbols
         assert enter_symbols[0].get_name_path() == "Game/enter"
 
-    @pytest.mark.parametrize("project_with_ls", [Language.SVELTE], indirect=True)
+    @pytest.mark.parametrize("project_with_ls", [LanguageServerId.SVELTE], indirect=True)
     def test_find_referencing_symbols_locates_typescript_symbol(self, project_with_ls: Project) -> None:
         retriever = LanguageServerSymbolRetriever(project_with_ls)