mirror of
https://github.com/tiennm99/serena.git
synced 2026-10-12 14:15:14 +00:00
Refactoring: Rename Language to LanguageServerId
This resolves a long-standing naming issue in Serena & SolidLSP.
This commit is contained in:
1 parent
ef0e218fb1
commit
d2cf18ddcb
180 files changed
+1806
-1767
No files matched your search
@@ -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
|
||||
Reference in new issue
Block a user