Fixes in diagnostics tests and in clojure test paths

MischaPanch · MischaPanch · commit 67dfa7b415ec · 2026-04-29T09:42:19.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -79,6 +79,8 @@ downloads/
 eggs/
 .eggs/
 lib/
+!test/resources/repos/dart/test_repo/lib/
+!test/resources/repos/dart/test_repo/lib/diagnostics_sample.dart
 lib64/
 parts/
 sdist/
@@ -271,4 +273,4 @@ cabal.project.local*
 zz-misc/
 vue-implementation/
 
-news/news.json
+news/news.json
diff --git a/src/solidlsp/language_servers/vue_language_server.py b/src/solidlsp/language_servers/vue_language_server.py
@@ -598,6 +598,7 @@ def _get_initialize_params(self, repository_absolute_path: str) -> InitializePar
                     "signatureHelp": {"dynamicRegistration": True},
                     "codeAction": {"dynamicRegistration": True},
                     "rename": {"dynamicRegistration": True, "prepareSupport": True},
+                    "publishDiagnostics": {"relatedInformation": True},
                 },
                 "workspace": {
                     "workspaceFolders": True,
diff --git a/test/resources/repos/elm/test_repo/DiagnosticsSample.elm b/test/resources/repos/elm/test_repo/DiagnosticsSample.elm
@@ -1,9 +1,5 @@
-module DiagnosticsSample exposing (brokenFactory, brokenConsumer)
+module DiagnosticsSample exposing (brokenFactory)
 
 brokenFactory : String
 brokenFactory =
-    missingGreeting
-
-brokenConsumer : String
-brokenConsumer =
-    missingConsumerValue
+    "unterminated
diff --git a/test/resources/repos/fortran/test_repo/diagnostics_sample.f90 b/test/resources/repos/fortran/test_repo/diagnostics_sample.f90
@@ -1,4 +1,4 @@
 program diagnostics_sample
   implicit none
-  print *, missingGreeting
+  print *, 
 end program diagnostics_sample
diff --git a/test/resources/repos/julia/test_repo/diagnostics_sample.jl b/test/resources/repos/julia/test_repo/diagnostics_sample.jl
@@ -1,8 +1,3 @@
-function broken_factory()
-    missingGreeting
-end
-
-function broken_consumer()
-    value = broken_factory()
-    missingConsumerValue
+function broken_factory(
+    value = 1
 end
diff --git a/test/resources/repos/lean4/test_repo/DiagnosticsSample.lean b/test/resources/repos/lean4/test_repo/DiagnosticsSample.lean
@@ -1,6 +1 @@
 def brokenFactory : Nat :=
-  missingGreeting
-
-def brokenConsumer : Nat :=
-  let value := brokenFactory
-  value + missingConsumerValue
diff --git a/test/resources/repos/pascal/test_repo/diagnostics_sample.pas b/test/resources/repos/pascal/test_repo/diagnostics_sample.pas
@@ -1,4 +1,4 @@
 program DiagnosticsSample;
 begin
-  writeln(missingGreeting);
+  writeln(
 end.
diff --git a/test/resources/repos/powershell/test_repo/diagnostics_sample.ps1 b/test/resources/repos/powershell/test_repo/diagnostics_sample.ps1
@@ -1,9 +1,4 @@
 function Invoke-BrokenFactory {
-    Invoke-MissingGreeting
-}
-
-function Invoke-BrokenConsumer {
-    $value = Invoke-BrokenFactory
-    Write-Output $value
-    Invoke-MissingConsumerValue
+    if ($true) {
+        Write-Output "broken"
 }
diff --git a/test/resources/repos/solidity/test_repo/contracts/DiagnosticsSample.sol b/test/resources/repos/solidity/test_repo/contracts/DiagnosticsSample.sol
@@ -2,6 +2,6 @@ pragma solidity ^0.8.0;
 
 contract DiagnosticsSample {
     function brokenFactory() public pure returns (string memory) {
-        return missingGreeting;
+        return "broken"
     }
 }
diff --git a/test/resources/repos/swift/test_repo/src/diagnostics_sample.swift b/test/resources/repos/swift/test_repo/src/diagnostics_sample.swift
@@ -1,8 +1,3 @@
 func brokenFactory() -> String {
-    missingGreeting
-}
-
-func brokenConsumer() {
-    print(brokenFactory())
-    print(missingConsumerValue)
+    return "broken"
 }
diff --git a/test/resources/repos/systemverilog/test_repo/diagnostics_sample.sv b/test/resources/repos/systemverilog/test_repo/diagnostics_sample.sv
@@ -1,5 +1,5 @@
 module diagnostics_sample;
   initial begin
-    missingGreeting = 1'b0;
+    if (
   end
 endmodule
diff --git a/test/resources/repos/terraform/test_repo/diagnostics_sample.tf b/test/resources/repos/terraform/test_repo/diagnostics_sample.tf
@@ -1,4 +1,4 @@
 resource "aws_instance" "broken" {
-  ami           = missingGreeting
+  ami           = 
   instance_type = "t2.micro"
 }
diff --git a/test/resources/repos/vue/test_repo/src/DiagnosticsSample.vue b/test/resources/repos/vue/test_repo/src/DiagnosticsSample.vue
@@ -1,3 +1,3 @@
 <script setup lang="ts">
-const value: string = missingGreeting
+const value: string =
 </script>
diff --git a/test/resources/repos/zig/test_repo/src/diagnostics_sample.zig b/test/resources/repos/zig/test_repo/src/diagnostics_sample.zig
@@ -1,8 +1,3 @@
-pub fn brokenFactory() []const u8 {
-    return missingGreeting;
-}
-
-pub fn brokenConsumer() void {
-    _ = brokenFactory();
-    _ = missingConsumerValue;
+pub fn brokenFactory() void {
+    const value =
 }
diff --git a/test/solidlsp/clojure/__init__.py b/test/solidlsp/clojure/__init__.py
@@ -13,8 +13,8 @@ def _test_clojure_cli() -> bool:
 
 CLI_FAIL = _test_clojure_cli()
 TEST_APP_PATH = Path("src") / "test_app"
-CORE_PATH = str(TEST_APP_PATH / "core.clj").replace("\\", "/")
-UTILS_PATH = str(TEST_APP_PATH / "utils.clj").replace("\\", "/")
+CORE_PATH = str(TEST_APP_PATH / "core.clj")
+UTILS_PATH = str(TEST_APP_PATH / "utils.clj")
 
 
 def is_clojure_cli_available() -> bool:
diff --git a/test/solidlsp/conftest.py b/test/solidlsp/conftest.py
@@ -5,6 +5,12 @@
 PYTHON_BACKEND_LANGUAGES = [Language.PYTHON, Language.PYTHON_TY]
 
 
+def is_diagnostics_test_file(relative_path: str) -> bool:
+    normalized_path = relative_path.replace("\\", "/")
+    filename = normalized_path.rsplit("/", 1)[-1].lower()
+    return filename.startswith(("diagnosticssample.", "diagnostics_sample."))
+
+
 def has_malformed_name(
     symbol: UnifiedSymbolInformation,
     whitespace_allowed: bool = False,
@@ -36,6 +42,9 @@ def request_all_symbols(language_server: SolidLanguageServer) -> list[UnifiedSym
     result: list[UnifiedSymbolInformation] = []
 
     def visit(symbol: UnifiedSymbolInformation) -> None:
+        relative_path = symbol.get("location", {}).get("relativePath", "")
+        if relative_path and is_diagnostics_test_file(relative_path):
+            return
         result.append(symbol)
         for child in symbol.get("children", []):
             visit(child)
diff --git a/test/solidlsp/crystal/test_crystal_diagnostics.py b/test/solidlsp/crystal/test_crystal_diagnostics.py
@@ -1,11 +1,17 @@
+import shutil
+
 import pytest
 
 from solidlsp import SolidLanguageServer
 from solidlsp.ls_config import Language
 from test.solidlsp.util.diagnostics import assert_file_diagnostics
 
+pytestmark = [
+    pytest.mark.crystal,
+    pytest.mark.skipif(shutil.which("crystalline") is None, reason="Crystalline is not installed"),
+]
+
 
-@pytest.mark.crystal
 class TestCrystalDiagnostics:
     @pytest.mark.parametrize("language_server", [Language.CRYSTAL], indirect=True)
     def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
diff --git a/test/solidlsp/elixir/test_elixir_basic.py b/test/solidlsp/elixir/test_elixir_basic.py
@@ -14,6 +14,7 @@
 from solidlsp.ls_types import SymbolKind
 from test.solidlsp.conftest import format_symbol_for_assert, has_malformed_name, request_all_symbols
 
+from ..util.diagnostics import assert_file_diagnostics
 from . import EXPERT_UNAVAILABLE, EXPERT_UNAVAILABLE_REASON
 
 # These marks will be applied to all tests in this module
@@ -138,3 +139,12 @@ def test_bare_symbol_names(self, language_server) -> None:
                 f"Found malformed symbols: {[format_symbol_for_assert(sym) for sym in malformed_symbols]}",
                 pytrace=False,
             )
+
+    @pytest.mark.parametrize("language_server", [Language.ELIXIR], indirect=True)
+    def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
+        assert_file_diagnostics(
+            language_server,
+            "lib/diagnostics_sample.ex",
+            (),
+            min_count=1,
+        )
diff --git a/test/solidlsp/elixir/test_elixir_diagnostics.py b/test/solidlsp/elixir/test_elixir_diagnostics.py
diff --git a/test/solidlsp/erlang/test_erlang_basic.py b/test/solidlsp/erlang/test_erlang_basic.py
@@ -11,6 +11,7 @@
 from solidlsp.ls_config import Language
 from test.solidlsp.conftest import format_symbol_for_assert, has_malformed_name, request_all_symbols
 
+from ..util.diagnostics import assert_file_diagnostics
 from . import ERLANG_LS_UNAVAILABLE, ERLANG_LS_UNAVAILABLE_REASON
 
 
@@ -55,3 +56,12 @@ def test_bare_symbol_names(self, language_server) -> None:
                 f"Found malformed symbols: {[format_symbol_for_assert(sym) for sym in malformed_symbols]}",
                 pytrace=False,
             )
+
+    @pytest.mark.parametrize("language_server", [Language.ERLANG], indirect=True)
+    def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
+        assert_file_diagnostics(
+            language_server,
+            "src/diagnostics_sample.erl",
+            (),
+            min_count=1,
+        )
diff --git a/test/solidlsp/erlang/test_erlang_diagnostics.py b/test/solidlsp/erlang/test_erlang_diagnostics.py
diff --git a/test/solidlsp/groovy/test_groovy_basic.py b/test/solidlsp/groovy/test_groovy_basic.py
@@ -9,6 +9,7 @@
 from solidlsp.ls_utils import SymbolUtils
 from solidlsp.settings import SolidLSPSettings
 from test.solidlsp.conftest import format_symbol_for_assert, has_malformed_name, request_all_symbols
+from test.solidlsp.util.diagnostics import assert_file_diagnostics
 
 
 @pytest.mark.groovy
@@ -117,3 +118,12 @@ def test_bare_symbol_names(self) -> None:
                 f"Found malformed symbols: {[format_symbol_for_assert(sym) for sym in malformed_symbols]}",
                 pytrace=False,
             )
+
+    @pytest.mark.parametrize("language_server", [Language.GROOVY], indirect=True)
+    def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
+        assert_file_diagnostics(
+            language_server,
+            "src/main/groovy/com/example/DiagnosticsSample.groovy",
+            (),
+            min_count=1,
+        )
diff --git a/test/solidlsp/groovy/test_groovy_diagnostics.py b/test/solidlsp/groovy/test_groovy_diagnostics.py
diff --git a/test/solidlsp/haskell/test_haskell_basic.py b/test/solidlsp/haskell/test_haskell_basic.py
@@ -21,6 +21,7 @@
 from solidlsp.ls_config import Language
 from solidlsp.ls_types import SymbolKind
 from test.solidlsp.conftest import format_symbol_for_assert, has_malformed_name, request_all_symbols
+from test.solidlsp.util.diagnostics import assert_file_diagnostics
 
 
 @pytest.mark.haskell
@@ -240,3 +241,12 @@ def test_bare_symbol_names(self, language_server) -> None:
                 for sym in malformed_symbols
             ]
             pytest.fail(f"Found malformed symbols: {diagnostics}", pytrace=False)
+
+    @pytest.mark.parametrize("language_server", [Language.HASKELL], indirect=True)
+    def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
+        assert_file_diagnostics(
+            language_server,
+            "src/DiagnosticsSample.hs",
+            (),
+            min_count=1,
+        )
diff --git a/test/solidlsp/haskell/test_haskell_diagnostics.py b/test/solidlsp/haskell/test_haskell_diagnostics.py
diff --git a/test/solidlsp/matlab/test_matlab_basic.py b/test/solidlsp/matlab/test_matlab_basic.py
@@ -17,6 +17,7 @@
 from solidlsp import SolidLanguageServer
 from solidlsp.ls_config import Language
 from test.solidlsp.conftest import format_symbol_for_assert, has_malformed_name, request_all_symbols
+from test.solidlsp.util.diagnostics import assert_file_diagnostics
 
 # Skip all tests if MATLAB is not available
 pytestmark = pytest.mark.matlab
@@ -129,3 +130,12 @@ def test_bare_symbol_names(self, language_server) -> None:
                 f"Found malformed symbols: {[format_symbol_for_assert(sym) for sym in malformed_symbols]}",
                 pytrace=False,
             )
+
+    @pytest.mark.parametrize("language_server", [Language.MATLAB], indirect=True)
+    def test_file_diagnostics(self, language_server: SolidLanguageServer) -> None:
+        assert_file_diagnostics(
+            language_server,
+            "diagnostics_sample.m",
+            (),
+            min_count=1,
+        )
diff --git a/test/solidlsp/matlab/test_matlab_diagnostics.py b/test/solidlsp/matlab/test_matlab_diagnostics.py
diff --git a/test/solidlsp/scala/test_scala_diagnostics.py b/test/solidlsp/scala/test_scala_diagnostics.py
diff --git a/test/solidlsp/scala/test_scala_language_server.py b/test/solidlsp/scala/test_scala_language_server.py
diff --git a/test/solidlsp/swift/test_swift_basic.py b/test/solidlsp/swift/test_swift_basic.py
diff --git a/test/solidlsp/swift/test_swift_diagnostics.py b/test/solidlsp/swift/test_swift_diagnostics.py
diff --git a/test/solidlsp/zig/test_zig_basic.py b/test/solidlsp/zig/test_zig_basic.py
diff --git a/test/solidlsp/zig/test_zig_diagnostics.py b/test/solidlsp/zig/test_zig_diagnostics.py

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ pragma solidity ^0.8.0;`
`2`	`2`
`3`	`3`	`contract DiagnosticsSample {`
`4`	`4`	`function brokenFactory() public pure returns (string memory) {`
`5`		`- return missingGreeting;`
	`5`	`+ return "broken"`
`6`	`6`	`}`
`7`	`7`	`}`