Refactoring: Rename Language to LanguageServerId

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

test/solidlsp/python/test_basedpyright.py

@@ -5,7 +5,7 @@ from textwrap import dedent
 import pytest
 
 from solidlsp import SolidLanguageServer
-from solidlsp.ls_config import Language
+from solidlsp.ls_config import LanguageServerId
 from test.conftest import start_ls_context
 from test.solidlsp.conftest import document_symbol_names
 
@@ -56,7 +56,7 @@ def basedpyright_project(tmp_path_factory: pytest.TempPathFactory) -> Path:
 @pytest.fixture(scope="module")
 def basedpyright_language_server(basedpyright_project: Path) -> Iterator[SolidLanguageServer]:
     with start_ls_context(
-        language=Language.PYTHON_BASEDPYRIGHT,
+        ls_id=LanguageServerId.PYTHON_BASEDPYRIGHT,
         repo_path=str(basedpyright_project),
     ) as language_server:
         yield language_server
@@ -66,7 +66,7 @@ def test_basedpyright_starts(
     basedpyright_language_server: SolidLanguageServer,
     basedpyright_project: Path,
 ) -> None:
-    assert basedpyright_language_server.language == Language.PYTHON_BASEDPYRIGHT
+    assert basedpyright_language_server.ls_id == LanguageServerId.PYTHON_BASEDPYRIGHT
     assert basedpyright_language_server.is_running()
     assert Path(basedpyright_language_server.language_server.repository_root_path).resolve() == basedpyright_project.resolve()
 

test/solidlsp/python/test_basedpyright_server.py

@@ -6,7 +6,7 @@ import pytest
 from solidlsp.dependency_provider import LanguageServerDependencyProviderUvx
 from solidlsp.language_servers.basedpyright_server import BASEDPYRIGHT_VERSION, BasedPyrightLanguageServer
 from solidlsp.language_servers.pyright_server import PyrightServer
-from solidlsp.ls_config import Language, LanguageServerConfig
+from solidlsp.ls_config import LanguageServerConfig, LanguageServerId
 from solidlsp.settings import SolidLSPSettings
 
 
@@ -17,12 +17,12 @@ def _make_basedpyright_server(
     settings = SolidLSPSettings(
         solidlsp_dir=str(tmp_path / "global"),
         project_data_path=str(tmp_path / "project"),
-        ls_specific_settings={Language.PYTHON_BASEDPYRIGHT: custom_settings or {}},
+        ls_specific_settings={LanguageServerId.PYTHON_BASEDPYRIGHT: custom_settings or {}},
     )
     server_interface = Mock()
     with patch.object(BasedPyrightLanguageServer, "_create_language_server_interface", return_value=server_interface):
         return BasedPyrightLanguageServer(
-            LanguageServerConfig(code_language=Language.PYTHON_BASEDPYRIGHT),
+            LanguageServerConfig(ls_id=LanguageServerId.PYTHON_BASEDPYRIGHT),
             str(tmp_path),
             settings,
         )
@@ -35,7 +35,7 @@ def _make_pyright_server(tmp_path: Path) -> PyrightServer:
     )
     server_interface = Mock()
     with patch.object(PyrightServer, "_create_language_server_interface", return_value=server_interface):
-        return PyrightServer(LanguageServerConfig(code_language=Language.PYTHON), str(tmp_path), settings)
+        return PyrightServer(LanguageServerConfig(ls_id=LanguageServerId.PYTHON), str(tmp_path), settings)
 
 
 def test_dependency_provider_uses_basedpyright_profile(tmp_path: Path) -> None:
@@ -128,14 +128,14 @@ def test_base_command_and_args_overrides_are_preserved(tmp_path: Path) -> None:
 
 
 def test_language_registry_uses_separate_server_classes() -> None:
-    assert Language.PYTHON.get_ls_class() is PyrightServer
-    assert Language.PYTHON_BASEDPYRIGHT.get_ls_class() is BasedPyrightLanguageServer
+    assert LanguageServerId.PYTHON.get_ls_class() is PyrightServer
+    assert LanguageServerId.PYTHON_BASEDPYRIGHT.get_ls_class() is BasedPyrightLanguageServer
 
 
 def test_language_identity_separates_cache_directories(tmp_path: Path) -> None:
     pyright_server = _make_pyright_server(tmp_path)
     basedpyright_server = _make_basedpyright_server(tmp_path)
 
-    assert pyright_server.language == Language.PYTHON
-    assert basedpyright_server.language == Language.PYTHON_BASEDPYRIGHT
+    assert pyright_server.ls_id == LanguageServerId.PYTHON
+    assert basedpyright_server.ls_id == LanguageServerId.PYTHON_BASEDPYRIGHT
     assert pyright_server.cache_dir != basedpyright_server.cache_dir

test/solidlsp/python/test_retrieval_with_ignored_dirs.py

@@ -4,7 +4,7 @@ from pathlib import Path
 import pytest
 
 from solidlsp import SolidLanguageServer
-from solidlsp.ls_config import Language
+from solidlsp.ls_config import LanguageServerId
 from test.conftest import start_ls_context
 from test.solidlsp.conftest import PYTHON_BACKEND_LANGUAGES
 
@@ -16,7 +16,7 @@ pytestmark = pytest.mark.python
 def ls_with_ignored_dirs() -> Generator[SolidLanguageServer, None, None]:
     """Fixture to set up an LS for the python test repo with the 'scripts' directory ignored."""
     ignored_paths = ["scripts", "custom_test"]
-    with start_ls_context(language=Language.PYTHON, ignored_paths=ignored_paths) as ls:
+    with start_ls_context(ls_id=LanguageServerId.PYTHON, ignored_paths=ignored_paths) as ls:
         yield ls
 
 
@@ -47,7 +47,7 @@ def test_find_references_ignores_dir(ls_with_ignored_dirs: SolidLanguageServer):
 def test_refs_and_symbols_with_glob_patterns(repo_path: Path) -> None:
     """Tests that refs and symbols with glob patterns are ignored."""
     ignored_paths = ["*ipts", "custom_t*"]
-    with start_ls_context(language=Language.PYTHON, repo_path=str(repo_path), ignored_paths=ignored_paths) as ls:
+    with start_ls_context(ls_id=LanguageServerId.PYTHON, repo_path=str(repo_path), ignored_paths=ignored_paths) as ls:
         # same as in the above tests
         root = ls.request_full_symbol_tree()[0]
         root_children = root["children"]