tiennm99/serena
1
0 Fork 0
mirror of https://github.com/tiennm99/serena.git synced 2026-10-15 10:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring: Rename Language to LanguageServerId

Browse Source 
This resolves a long-standing naming issue in Serena & SolidLSP.
This commit is contained in:
Dominik Jain authored and Dominik Jain committed 2026-07-22 20:55:36 +02:00
1 parent ef0e218fb1
commit d2cf18ddcb
180 files changed
+1806 -1767
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/solidlsp/scala/test_scala_language_server.py
+2 -2
View File
@@ -3,7 +3,7 @@ import os
import pytest
from solidlsp.language_servers.scala_language_server import ScalaLanguageServer
from solidlsp.ls_config import Language, LanguageServerConfig
from solidlsp.ls_config import LanguageServerConfig, LanguageServerId
from solidlsp.settings import SolidLSPSettings
from test.solidlsp.util.diagnostics import assert_file_diagnostics
@@ -17,7 +17,7 @@ pytestmark = pytest.mark.scala
@pytest.fixture(scope="module")
def scala_ls():
repo_root = os.path.abspath("test/resources/repos/scala")
config = LanguageServerConfig(code_language=Language.SCALA)
config = LanguageServerConfig(ls_id=LanguageServerId.SCALA)
solidlsp_settings = SolidLSPSettings()
ls = ScalaLanguageServer(config, repo_root, solidlsp_settings)
test/solidlsp/scala/test_scala_stale_lock_handling.py
+8 -8
View File
@@ -14,7 +14,7 @@ import pytest
from _pytest.logging import LogCaptureFixture
from solidlsp.language_servers.scala_language_server import ScalaLanguageServer
from solidlsp.ls_config import Language
from solidlsp.ls_config import LanguageServerId
from solidlsp.settings import SolidLSPSettings
from solidlsp.util.metals_db_utils import MetalsDbStatus, MetalsLockInfo
@@ -69,7 +69,7 @@ class TestStaleLockHandling:
):
# Create instance without calling __init__
ls = object.__new__(ScalaLanguageServer)
settings = SolidLSPSettings(ls_specific_settings={Language.SCALA: {"on_stale_lock": "auto-clean"}})
settings = SolidLSPSettings(ls_specific_settings={LanguageServerId.SCALA: {"on_stale_lock": "auto-clean"}})
# Call the method under test
ls._check_metals_db_status(str(tmp_path), settings)
@@ -100,7 +100,7 @@ class TestStaleLockHandling:
caplog.at_level(logging.WARNING),
):
ls = object.__new__(ScalaLanguageServer)
settings = SolidLSPSettings(ls_specific_settings={Language.SCALA: {"on_stale_lock": "warn"}})
settings = SolidLSPSettings(ls_specific_settings={LanguageServerId.SCALA: {"on_stale_lock": "warn"}})
ls._check_metals_db_status(str(tmp_path), settings)
@@ -128,7 +128,7 @@ class TestStaleLockHandling:
pytest.raises(MetalsStaleLockError) as exc_info,
):
ls = object.__new__(ScalaLanguageServer)
settings = SolidLSPSettings(ls_specific_settings={Language.SCALA: {"on_stale_lock": "fail"}})
settings = SolidLSPSettings(ls_specific_settings={LanguageServerId.SCALA: {"on_stale_lock": "fail"}})
ls._check_metals_db_status(str(tmp_path), settings)
@@ -160,7 +160,7 @@ class TestStaleLockHandling:
ls = object.__new__(ScalaLanguageServer)
settings = SolidLSPSettings(
ls_specific_settings={
Language.SCALA: {
LanguageServerId.SCALA: {
"on_stale_lock": "auto-clean",
"log_multi_instance_notice": True,
}
@@ -198,7 +198,7 @@ class TestStaleLockHandling:
ls = object.__new__(ScalaLanguageServer)
settings = SolidLSPSettings(
ls_specific_settings={
Language.SCALA: {
LanguageServerId.SCALA: {
"on_stale_lock": "auto-clean",
"log_multi_instance_notice": False,
}
@@ -226,7 +226,7 @@ class TestStaleLockHandling:
caplog.at_level(logging.DEBUG),
):
ls = object.__new__(ScalaLanguageServer)
settings = SolidLSPSettings(ls_specific_settings={Language.SCALA: {"on_stale_lock": "auto-clean"}})
settings = SolidLSPSettings(ls_specific_settings={LanguageServerId.SCALA: {"on_stale_lock": "auto-clean"}})
# Should complete without error
ls._check_metals_db_status(str(tmp_path), settings)
@@ -251,7 +251,7 @@ class TestStaleLockHandling:
caplog.at_level(logging.DEBUG),
):
ls = object.__new__(ScalaLanguageServer)
settings = SolidLSPSettings(ls_specific_settings={Language.SCALA: {"on_stale_lock": "auto-clean"}})
settings = SolidLSPSettings(ls_specific_settings={LanguageServerId.SCALA: {"on_stale_lock": "auto-clean"}})
# Should complete without error
ls._check_metals_db_status(str(tmp_path), settings)