Merge branch 'main' into feature/cross-package-typescript-references

# Conflicts:
#	CHANGELOG.md
#	src/solidlsp/ls.py

test/solidlsp/typescript/test_typescript_basic.py

@@ -5,6 +5,7 @@ import pytest
 from solidlsp import SolidLanguageServer
 from solidlsp.ls_config import Language
 from solidlsp.ls_utils import SymbolUtils
+from test.conftest import find_identifier_position, get_repo_path, language_has_verified_implementation_support
 from test.solidlsp.conftest import format_symbol_for_assert, has_malformed_name, request_all_symbols
 
 
@@ -33,6 +34,64 @@ class TestTypescriptLanguageServer:
             "index.ts should reference helperFunction (tried all positions in selectionRange)"
         )
 
+    if language_has_verified_implementation_support(Language.TYPESCRIPT):
+
+        @pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True)
+        def test_find_implementations(self, language_server: SolidLanguageServer) -> None:
+            repo_path = get_repo_path(Language.TYPESCRIPT)
+            pos = find_identifier_position(repo_path / "formatters.ts", "formatGreeting")
+            assert pos is not None, "Could not find Greeter.formatGreeting in fixture"
+
+            implementations = language_server.request_implementation("formatters.ts", *pos)
+            assert implementations, "Expected at least one implementation of Greeter.formatGreeting"
+            assert any("formatters.ts" in implementation.get("relativePath", "") for implementation in implementations), (
+                f"Expected ConsoleGreeter.formatGreeting in implementations, got: {implementations}"
+            )
+
+        @pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True)
+        def test_request_implementing_symbols(self, language_server: SolidLanguageServer) -> None:
+            repo_path = get_repo_path(Language.TYPESCRIPT)
+            pos = find_identifier_position(repo_path / "formatters.ts", "formatGreeting")
+            assert pos is not None, "Could not find Greeter.formatGreeting in fixture"
+
+            implementing_symbols = language_server.request_implementing_symbols("formatters.ts", *pos)
+            assert implementing_symbols, "Expected implementing symbols for Greeter.formatGreeting"
+            assert any(
+                symbol.get("name") == "formatGreeting" and "formatters.ts" in symbol["location"].get("relativePath", "")
+                for symbol in implementing_symbols
+            ), f"Expected ConsoleGreeter.formatGreeting symbol, got: {implementing_symbols}"
+
+    @pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True)
+    def test_tsx_symbol_range_not_truncated_by_jsx(self, language_server: SolidLanguageServer) -> None:
+        # Regression: when the language id is sent as "typescript" instead of
+        # "typescriptreact" for .tsx files, tsserver parses JSX as syntax
+        # errors and recovers by truncating the enclosing symbol's range at
+        # the first multi-line JSX expression. find_symbol then returns a
+        # body that ends mid-component and hides everything below.
+        file_path = "jsx_component.tsx"
+        roots = language_server.request_document_symbols(file_path).root_symbols
+
+        jsx_component = next((s for s in roots if s.get("name") == "JsxComponent"), None)
+        assert jsx_component is not None, "JsxComponent not found at root level of jsx_component.tsx"
+
+        end_line = jsx_component["location"]["range"]["end"]["line"]
+        # JsxComponent's body extends to line 38 (0-based 37) in the fixture;
+        # the truncation bug cut it at the first multi-line JSX (~line 21).
+        # Use a generous lower bound so the test survives small fixture edits
+        # that don't affect the regression behaviour we care about.
+        assert end_line >= 30, (
+            f"JsxComponent symbol range truncated at line {end_line + 1} (1-based); "
+            f"expected end at or past line 31 (1-based). "
+            f"This indicates the .tsx file was opened with the wrong languageId."
+        )
+
+        # The trailing helper must be visible as a top-level symbol — it lives
+        # past the truncation point and disappears entirely when the bug is
+        # active because tsserver stops emitting symbols after the parse error.
+        assert any(s.get("name") == "trailingHelper" for s in roots), (
+            "trailingHelper missing from jsx_component.tsx root symbols; tsserver likely stopped parsing at the first JSX expression."
+        )
+
     @pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True)
     def test_bare_symbol_names(self, language_server) -> None:
         all_symbols = request_all_symbols(language_server)

test/solidlsp/typescript/test_typescript_diagnostics.py

@@ -0,0 +1,17 @@
+import pytest
+
+from solidlsp import SolidLanguageServer
+from solidlsp.ls_config import Language
+from test.solidlsp.util.diagnostics import assert_file_diagnostics
+
+
+@pytest.mark.typescript
+class TestTypeScriptDiagnostics:
+    @pytest.mark.parametrize("language_server", [Language.TYPESCRIPT], indirect=True)
+    def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
+        assert_file_diagnostics(
+            language_server,
+            "diagnostics_sample.ts",
+            ("missingGreeting", "missingConsumerValue"),
+            min_count=2,
+        )