Refactoring: Rename Language to LanguageServerId

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

No files matched your search

+13 -11
View File
@@ -14,26 +14,28 @@ import pytest
from serena.util.text_utils import find_text_coordinates
from solidlsp import SolidLanguageServer
from solidlsp.ls_config import Language
from test.conftest import language_tests_enabled
from solidlsp.ls_config import LanguageServerId
from test.conftest import language_server_tests_enabled
from test.solidlsp.conftest import read_repo_file
from test.solidlsp.util.diagnostics import assert_file_diagnostics
pytestmark = [
pytest.mark.qml,
pytest.mark.skipif(not language_tests_enabled(Language.QML), reason="QML tests are disabled (qmlls/qmlls6 not available)"),
pytest.mark.skipif(
not language_server_tests_enabled(LanguageServerId.QML), reason="QML tests are disabled (qmlls/qmlls6 not available)"
),
]
class TestQmlLanguageServer:
"""Test QML language server startup and basic features."""
@pytest.mark.parametrize("language_server", [Language.QML], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.QML], indirect=True)
def test_ls_is_running(self, language_server: SolidLanguageServer) -> None:
"""Test that the language server starts successfully."""
assert language_server.is_running()
@pytest.mark.parametrize("language_server", [Language.QML], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.QML], indirect=True)
def test_document_symbols_main(self, language_server: SolidLanguageServer) -> None:
"""Test that document symbols are returned for the main file.
@@ -49,7 +51,7 @@ class TestQmlLanguageServer:
assert "ApplicationWindow" in root_names, f"ApplicationWindow root missing. Roots: {root_names}"
assert "Button" in symbol_names, f"Button component missing. Symbols: {symbol_names}"
@pytest.mark.parametrize("language_server", [Language.QML], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.QML], indirect=True)
def test_document_symbols_shapes(self, language_server: SolidLanguageServer) -> None:
"""Test that document symbols are returned for the shapes file."""
file_path = os.path.join("src", "shapes.qml")
@@ -61,8 +63,8 @@ class TestQmlLanguageServer:
assert "Rectangle" in root_names, f"Rectangle root missing. Roots: {root_names}"
assert "Text" in symbol_names, f"Text component missing. Symbols: {symbol_names}"
@pytest.mark.parametrize("language_server", [Language.QML], indirect=True)
@pytest.mark.parametrize("repo_path", [Language.QML], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.QML], indirect=True)
@pytest.mark.parametrize("repo_path", [LanguageServerId.QML], indirect=True)
def test_find_references_within_file(self, language_server: SolidLanguageServer, repo_path: Path) -> None:
"""Test that references are found within the same file.
@@ -87,8 +89,8 @@ class TestQmlLanguageServer:
ref_files = {loc["uri"].split("/")[-1] for loc in references}
assert "CustomComponent.qml" in ref_files, f"All references should be in CustomComponent.qml, got {ref_files}"
@pytest.mark.parametrize("language_server", [Language.QML], indirect=True)
@pytest.mark.parametrize("repo_path", [Language.QML], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.QML], indirect=True)
@pytest.mark.parametrize("repo_path", [LanguageServerId.QML], indirect=True)
def test_find_references_cross_file(self, language_server: SolidLanguageServer, repo_path: Path) -> None:
"""Test that references are found across files.
@@ -110,7 +112,7 @@ class TestQmlLanguageServer:
ref_files = {loc["uri"].split("/")[-1] for loc in references}
assert "UserComponent.qml" in ref_files, f"Expected at least one reference in UserComponent.qml, got {ref_files}"
@pytest.mark.parametrize("language_server", [Language.QML], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.QML], indirect=True)
def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
"""Test that diagnostics are reported for a QML file with errors.