tiennm99/serena
1
0 Fork 0
mirror of https://github.com/tiennm99/serena.git synced 2026-10-12 12:14:19 +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/java/test_java_basic.py
+14 -14
View File
@@ -3,28 +3,28 @@ import os
import pytest
from solidlsp import SolidLanguageServer
from solidlsp.ls_config import Language
from solidlsp.ls_config import LanguageServerId
from solidlsp.ls_utils import SymbolUtils
from test.conftest import (
find_identifier_position,
get_repo_path,
language_has_verified_implementation_support,
language_tests_enabled,
language_server_tests_enabled,
ls_has_verified_implementation_support,
)
from test.solidlsp.conftest import format_symbol_for_assert, has_malformed_name, request_all_symbols
pytestmark = [pytest.mark.java, pytest.mark.skipif(not language_tests_enabled(Language.JAVA), reason="Java tests disabled")]
pytestmark = [pytest.mark.java, pytest.mark.skipif(not language_server_tests_enabled(LanguageServerId.JAVA), reason="Java tests disabled")]
class TestJavaLanguageServer:
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.JAVA], indirect=True)
def test_find_symbol(self, language_server: SolidLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert SymbolUtils.symbol_tree_contains_name(symbols, "Main"), "Main class not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Utils"), "Utils class not found in symbol tree"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Model"), "Model class not found in symbol tree"
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.JAVA], indirect=True)
def test_find_referencing_symbols(self, language_server: SolidLanguageServer) -> None:
# Use correct Maven/Java file paths
file_path = os.path.join("src", "main", "java", "test_repo", "Utils.java")
@@ -50,18 +50,18 @@ class TestJavaLanguageServer:
"Main should reference Model (tried all positions in selectionRange)"
)
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.JAVA], indirect=True)
def test_overview_methods(self, language_server: SolidLanguageServer) -> None:
symbols = language_server.request_full_symbol_tree()
assert SymbolUtils.symbol_tree_contains_name(symbols, "Main"), "Main missing from overview"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Utils"), "Utils missing from overview"
assert SymbolUtils.symbol_tree_contains_name(symbols, "Model"), "Model missing from overview"
if language_has_verified_implementation_support(Language.JAVA):
if ls_has_verified_implementation_support(LanguageServerId.JAVA):
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.JAVA], indirect=True)
def test_find_implementations(self, language_server: SolidLanguageServer) -> None:
repo_path = get_repo_path(Language.JAVA)
repo_path = get_repo_path(LanguageServerId.JAVA)
pos = find_identifier_position(repo_path / "src/main/java/test_repo/Greeter.java", "formatGreeting")
assert pos is not None, "Could not find Greeter.formatGreeting in fixture"
@@ -71,9 +71,9 @@ class TestJavaLanguageServer:
f"Expected ConsoleGreeter.formatGreeting in implementations, got: {implementations}"
)
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.JAVA], indirect=True)
def test_request_implementing_symbols(self, language_server: SolidLanguageServer) -> None:
repo_path = get_repo_path(Language.JAVA)
repo_path = get_repo_path(LanguageServerId.JAVA)
pos = find_identifier_position(repo_path / "src/main/java/test_repo/Greeter.java", "formatGreeting")
assert pos is not None, "Could not find Greeter.formatGreeting in fixture"
@@ -84,7 +84,7 @@ class TestJavaLanguageServer:
for symbol in implementing_symbols
), f"Expected ConsoleGreeter.formatGreeting symbol, got: {implementing_symbols}"
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.JAVA], indirect=True)
def test_bare_symbol_names(self, language_server) -> None:
all_symbols = request_all_symbols(language_server)
malformed_symbols = []
@@ -97,7 +97,7 @@ class TestJavaLanguageServer:
pytrace=False,
)
@pytest.mark.parametrize("language_server", [Language.JAVA], indirect=True)
@pytest.mark.parametrize("language_server", [LanguageServerId.JAVA], indirect=True)
def test_lombok_generated_methods_visible_by_default(self, language_server: SolidLanguageServer) -> None:
"""Generated Lombok methods must appear in document symbols across the common annotations.