Working on moving LSP test code out to lsp-test-helpers noci

thomasjm · thomasjm · commit 2a72c8669e87 · 2026-01-09T19:38:47.000-08:00
diff --git a/tests/app/Spec/Tests/Bash.hs b/tests/app/Spec/Tests/Bash.hs
@@ -37,7 +37,7 @@ tests = describe "Bash" $ introduceNixEnvironment [kernelSpec] [] "Bash" $ intro
   --                                            |] $ \diagnostics -> do
   --   assertDiagnosticRanges diagnostics []
 
-  testDiagnostics "bash-language-server" "test.sh" Nothing [__i|FOO=42|] $ \diagnostics -> do
+  testDiagnostics "bash-language-server" "test.sh" [__i|FOO=42|] $ \diagnostics -> do
     assertDiagnosticRanges diagnostics [
       (Range (Position 0 0) (Position 0 3), Just (InR "SC2034"))
       ]
diff --git a/tests/app/Spec/Tests/Clojure.hs b/tests/app/Spec/Tests/Clojure.hs
@@ -31,7 +31,7 @@ tests = describe "Clojure" $ introduceNixEnvironment [kernelSpec] [] "Clojure" $
 
   testKernelStdout "clojure" [__i|(println "hi")|] "hi\n"
 
-  testDiagnostics "clojure-lsp" "test.clj" Nothing [__i|(foo 42)|] $ \diagnostics -> do
+  testDiagnostics "clojure-lsp" "test.clj" [__i|(foo 42)|] $ \diagnostics -> do
     assertDiagnosticRanges diagnostics [(Range (Position 0 1) (Position 0 4), Just (InR "unresolved-symbol"))]
 
 
diff --git a/tests/app/Spec/Tests/Cpp.hs b/tests/app/Spec/Tests/Cpp.hs
@@ -40,7 +40,7 @@ tests' flavor = describe [i|C++ (#{flavor})|] $ introduceNixEnvironment [kernelS
 testsWithLsp :: Text -> LanguageSpec
 testsWithLsp flavor = describe [i|C++ (#{flavor}) with LSP|] $ introduceNixEnvironment [kernelSpecWithLsp flavor] [] "C++" $ do
   describe "LSP" $ do
-    testDiagnostics'' "simple" lsName "test.cpp" (Just "cpp")
+    testDiagnostics'' "simple" lsName "test.cpp"
       [__i|int main() {
              undefined_function();
              return 0;
diff --git a/tests/app/Spec/Tests/Go.hs b/tests/app/Spec/Tests/Go.hs
@@ -33,7 +33,7 @@ tests = describe "Go" $ introduceNixEnvironment [kernelSpec] [] "Go" $ introduce
   testKernelStdout "go" [__i|import("fmt")
                              fmt.Println("hi")|] "hi\n"
 
-  testDiagnosticsLabel "gopls: Undeclared name" "gopls" "test.go" Nothing printUnknownCode $ \diagnostics ->
+  testDiagnosticsLabel "gopls: Undeclared name" "gopls" "test.go" printUnknownCode $ \diagnostics ->
     assertDiagnosticRanges diagnostics [(Range (Position 3 12) (Position 3 15), Just (InR "UndeclaredName"))]
 
 printUnknownCode :: Text
diff --git a/tests/app/Spec/Tests/Haskell/Diagnostics.hs b/tests/app/Spec/Tests/Haskell/Diagnostics.hs
@@ -27,26 +27,26 @@ import TestLib.Types
 tests :: (LspContext context m, HasNixEnvironment context) => Text -> Text -> SpecFree context m ()
 tests ghcPackage lsName = describe "Diagnostics" $ do
   describe "Foo.hs" $ do
-    testDiagnosticsLabelDesired "Out of scope variable" lsName "Foo.hs" Nothing
+    testDiagnosticsLabelDesired "Out of scope variable" lsName "Foo.hs"
       [__i|module Foo where
            foo = bar
           |]
       ((== [(Range (Position 1 6) (Position 1 9), Just (InR "GHC-88464"))]) . getDiagnosticRanges)
 
     when (ghcPackage /= "ghc910") $ -- TODO: re-enable hlint test
-      testDiagnosticsLabelDesired "Eta reduce" lsName "Foo.hs" Nothing etaExpandCode
+      testDiagnosticsLabelDesired "Eta reduce" lsName "Foo.hs" etaExpandCode
         ((== [(Range (Position 6 0) (Position 6 14), Just (InR "refact:Eta reduce"))]) . getDiagnosticRanges)
 
   describe "main.ipynb" $ do
-    testDiagnosticsLabelDesired "Top-level putStrLn" lsName "main.ipynb" Nothing
+    testDiagnosticsLabelDesired "Top-level putStrLn" lsName "main.ipynb"
       [__i|-- A comment
            foo = bar
 
            putStrLn "HI"
           |]
       ((== [(Range (Position 1 6) (Position 1 9), Just (InR "GHC-88464"))]) . getDiagnosticRanges)
 
-    testDiagnosticsLabel "Top-level putStrLn with diagnostic" lsName "main.ipynb" Nothing
+    testDiagnosticsLabel "Top-level putStrLn with diagnostic" lsName "main.ipynb"
       [__i|-- Some comment
            import Data.ByteString.Lazy.Char8 as BL
            foo = bar
@@ -56,15 +56,15 @@ tests ghcPackage lsName = describe "Diagnostics" $ do
         [(Range (Position 4 0) (Position 4 8), x)] | containsAll x ["Ambiguous occurrence", "putStrLn"] -> return ()
         xs -> expectationFailure [i|Unexpected diagnostics: #{xs}|]
 
-    testDiagnosticsLabelDesired "Reordering" lsName "main.ipynb" Nothing
+    testDiagnosticsLabelDesired "Reordering" lsName "main.ipynb"
       [__i|import Data.Aeson.TH
            {-\# LANGUAGE TemplateHaskell \#-}
            foo = bar -- This should be the only diagnostic we get
            data Foo = Bar | Baz
            $(deriveJSON defaultOptions ''Foo)|]
       ((== [(Range (Position 2 6) (Position 2 9), Just (InR "GHC-88464"))]) . getDiagnosticRanges)
 
-    testDiagnosticsLabelDesired "Complicated reordering" lsName "main.ipynb" Nothing
+    testDiagnosticsLabelDesired "Complicated reordering" lsName "main.ipynb"
       [__i|import Data.Aeson as A
            import Data.Aeson.TH
            :set -XTemplateHaskell
diff --git a/tests/app/Spec/Tests/Haskell/Statements.hs b/tests/app/Spec/Tests/Haskell/Statements.hs
@@ -22,7 +22,7 @@ tests ghcPackage = describe "Statements" $ do
       timeout 120_000_000 (getHighlights ident (Position 0 1)) >>= (`shouldBe` (Just documentHighlightResults))
 
     when (ghcPackage /= "ghc910") $ -- TODO: re-enable hlint test
-      testDiagnosticsLabel "Empty diagnostics" lsName "main.ipynb" Nothing statementsCode $ \diagnostics -> do
+      testDiagnosticsLabel "Empty diagnostics" lsName "main.ipynb" statementsCode $ \diagnostics -> do
         -- Note: normally the server wouldn't send empty diagnostics. But the statement inserts "= unsafePerformIO $ ",
         -- which causes it to emit a "redundant bracket" diagnostic, which then gets filtered out by untransformPosition
         diagnostics `shouldBe` []
@@ -33,7 +33,7 @@ tests ghcPackage = describe "Statements" $ do
       timeout 120_000_000 (getHighlights ident (Position 0 1)) >>= (`shouldBe` (Just documentHighlightResults))
 
     when (ghcPackage /= "ghc910") $ -- TODO: re-enable hlint test
-      testDiagnosticsLabel "Redundant bracket" lsName "main.ipynb" Nothing statementsCodeMultiline $ \diagnostics -> do
+      testDiagnosticsLabel "Redundant bracket" lsName "main.ipynb" statementsCodeMultiline $ \diagnostics -> do
         info [i|Got diagnostics: #{diagnostics}|]
         assertDiagnosticRanges diagnostics [(Range (Position 1 9) (Position 1 14), Just (InR "refact:Redundant bracket"))]
 
diff --git a/tests/app/Spec/Tests/Julia.hs b/tests/app/Spec/Tests/Julia.hs
@@ -45,7 +45,7 @@ juliaTests juliaPackage = describe [i|Julia (#{juliaPackage})|] $ introduceNixEn
   describe "LSP" $ do
     Diagnostics.tests lsName
 
-    itHasHoverSatisfying lsName "test.jl" (Just "julia") [__i|print("hi")|] (Position 0 2) $ \hover -> do
+    itHasHoverSatisfying lsName "test.jl" [__i|print("hi")|] (Position 0 2) $ \hover -> do
       let InL (MarkupContent MarkupKind_Markdown text) = hover ^. contents
       text `textShouldContain` "Write to `io` (or to the default output stream"
 
diff --git a/tests/app/Spec/Tests/Julia/Diagnostics.hs b/tests/app/Spec/Tests/Julia/Diagnostics.hs
@@ -13,18 +13,18 @@ import TestLib.Types
 
 tests :: (LspContext context m, HasNixEnvironment context) => Text -> SpecFree context m ()
 tests lsName = describe "Diagnostics" $ do
-  testDiagnostics'' "flags a simple missing reference" lsName "test.jl" (Just "julia") [i|printlnzzzz("HI")|] [] $ \diagnostics -> do
+  testDiagnostics'' "flags a simple missing reference" lsName "test.jl" [i|printlnzzzz("HI")|] [] $ \diagnostics -> do
     assertDiagnosticRanges' diagnostics [(Range (Position 0 0) (Position 0 11), Nothing, "Missing reference: printlnzzzz")]
 
-  testDiagnosticsLabelDesired "finds symbols from JSON3 package" lsName "test.jl" (Just "julia")
+  testDiagnosticsLabelDesired "finds symbols from JSON3 package" lsName "test.jl"
     [__i|using JSON3: write
          tup = (:car,"Mercedes","S500",5,250.1)
          write(tup)
          printlnzzzz("HI")
          |]
     ((== [(Range (Position 3 0) (Position 3 11), Nothing, "Missing reference: printlnzzzz")]) . getDiagnosticRanges')
 
-  testDiagnosticsLabelDesired "finds symbols from Roots package" lsName "test.jl" (Just "julia")
+  testDiagnosticsLabelDesired "finds symbols from Roots package" lsName "test.jl"
     [__i|using Roots: Bisection, find_zero
          f(x) = exp(x) - x^4
          find_zero(f, (8, 9), Bisection())
@@ -34,7 +34,7 @@ tests lsName = describe "Diagnostics" $ do
 
   -- This test is tricky because symbols like "plot" actually come from RecipesBase (or something), so
   -- it checks we're indexing such a transitive dependency.
-  testDiagnosticsLabelDesired "finds symbols from Plots package" lsName "test.jl" (Just "julia")
+  testDiagnosticsLabelDesired "finds symbols from Plots package" lsName "test.jl"
     [__i|using Plots: plot, plot!
          xx = range(0, 10, length=100)
          y = sin.(xx)
diff --git a/tests/app/Spec/Tests/Python.hs b/tests/app/Spec/Tests/Python.hs
@@ -35,17 +35,17 @@ tests' (kernelName, pythonPackage) = introduceNixEnvironment [kernelSpec kernelN
   testKernelStdout "python3" [i|print(42)|] "42\n"
   testKernelStdout' "python3" [i|import scipy|] Nothing
 
-  testDiagnostics "python-lsp-server" "test.py" Nothing [i|\n\n\nfoo = 42|] $ \diagnostics -> do
+  testDiagnostics "python-lsp-server" "test.py" [i|\n\n\nfoo = 42|] $ \diagnostics -> do
     assertDiagnosticRanges diagnostics []
 
-  testDiagnostics "pylint" "test.py" Nothing [i|\n\n\nfoo = 42|] $ \diagnostics -> do
+  testDiagnostics "pylint" "test.py" [i|\n\n\nfoo = 42|] $ \diagnostics -> do
     assertDiagnosticRanges' diagnostics [
       (Range (Position 3 0) (Position 3 0), Nothing, "Final newline missing (C0304:missing-final-newline)")
       , (Range (Position 0 0) (Position 0 0), Nothing, "Missing module docstring (C0114:missing-module-docstring)")
       , (Range (Position 3 0) (Position 3 0), Nothing, "Disallowed name \"foo\" (C0104:disallowed-name)")
       ]
 
-  testDiagnostics "pyright" "test.py" Nothing [__i|\# pyright: strict
+  testDiagnostics "pyright" "test.py" [__i|\# pyright: strict
                                                    def f(x: int, y: str) -> None:
                                                      z = 1.0
                                                    f("asdf", 42)
@@ -61,10 +61,10 @@ tests' (kernelName, pythonPackage) = introduceNixEnvironment [kernelSpec kernelN
       , (Range (Position 2 2) (Position 2 3), Just (InR "reportUnusedVariable"), "Variable \"z\" is not accessed")
       ]
 
-  testDiagnostics "pycodestyle" "test.py" Nothing [__i|def f(x: int, y: str) -> None:
-                                                         z = 1.0
-                                                       f("asdf", 42)
-                                                      |] $ \diagnostics -> do
+  testDiagnostics "pycodestyle" "test.py" [__i|def f(x: int, y: str) -> None:
+                                                 z = 1.0
+                                               f("asdf", 42)
+                                              |] $ \diagnostics -> do
     assertDiagnosticRanges diagnostics []
 
 
diff --git a/tests/app/Spec/Tests/Ruby.hs b/tests/app/Spec/Tests/Ruby.hs
@@ -49,7 +49,7 @@ kernelTests rubyPackage = do
             info [i|RUBY_VERSION result: #{t}|]
             t `textShouldContain` versionString
 
-    itHasHoverSatisfying "solargraph" "test.rb" Nothing [__i|puts "hi"|] (Position 0 2) $ \hover -> do
+    itHasHoverSatisfying "solargraph" "test.rb" [__i|puts "hi"|] (Position 0 2) $ \hover -> do
       let InL (MarkupContent MarkupKind_Markdown text) = hover ^. contents
       text `textShouldContain` "Kernel#puts"
       text `textShouldContain` "$stdout.puts(obj"
diff --git a/tests/app/Spec/Tests/Rust/Diagnostics.hs b/tests/app/Spec/Tests/Rust/Diagnostics.hs
@@ -14,27 +14,27 @@ import TestLib.Types
 
 tests :: (LspContext context m, HasNixEnvironment context) => SpecFree context m ()
 tests = describe "Diagnostics" $ do
-  testDiagnostics "rust-analyzer" "main.ipynb" Nothing [__i|printlnz!("Hello world");
-                                                           |] $ \diagnostics -> do
+  testDiagnostics "rust-analyzer" "main.ipynb" [__i|printlnz!("Hello world");
+                                                   |] $ \diagnostics -> do
     assertDiagnosticRanges' diagnostics [
       (Range (Position 0 0) (Position 0 8), Nothing, "cannot find macro `printlnz` in this scope")
       , (Range (Position 0 0) (Position 0 8), Nothing, "a macro with a similar name exists: `println`")
       ]
 
-  testDiagnostics "rust-analyzer" "test.rs" Nothing [__i|struct A { a: u8, b: u8 }
-                                                         const a: A = A { a: 10, };
-                                                        |] $ \diagnostics -> do
+  testDiagnostics "rust-analyzer" "test.rs" [__i|struct A { a: u8, b: u8 }
+                                                 const a: A = A { a: 10, };
+                                                |] $ \diagnostics -> do
     assertDiagnosticRanges' (L.sortBy (compare `on` (^. LSP.message)) diagnostics) [
       (Range (Position 1 13) (Position 1 14), Just (InR "E0063"), "missing field `b` in initializer of `A`\nmissing `b`")
       -- (Range (Position 1 6) (Position 1 7), Just (InR "non_upper_case_globals"), "Constant `a` should have UPPER_SNAKE_CASE name, e.g. `A`")
       -- , (Range (Position 1 13) (Position 1 14), Just (InR "E0063"), "missing field `b` in initializer of `A`\nmissing `b`")
       -- , (Range (Position 1 13) (Position 1 14), Just (InR "E0063"), "missing structure fields:\n- b\n")
       ]
 
-  testDiagnostics "rust-analyzer" "main.ipynb" Nothing [__i|println!("Hello world");
-                                                            eprintln!("Hello error");
-                                                            format!("Hello {}", "world")
-                                                           |] $ \diagnostics -> do
+  testDiagnostics "rust-analyzer" "main.ipynb" [__i|println!("Hello world");
+                                                    eprintln!("Hello error");
+                                                    format!("Hello {}", "world")
+                                                   |] $ \diagnostics -> do
     assertDiagnosticRanges' (L.sortBy (compare `on` (^. LSP.message)) diagnostics) [
       (Range (Position 2 0) (Position 2 28), Just (InR "E0308"), "mismatched types\nexpected `()`, found `String`")
       ]
diff --git a/tests/app/Spec/Tests/Spellchecker.hs b/tests/app/Spec/Tests/Spellchecker.hs
@@ -29,9 +29,7 @@ otherConfig = [
 tests :: TopSpec
 tests = describe "Spellchecker" $ introduceNixEnvironment [] otherConfig "Spellchecker env" $ introduceJustBubblewrap $ do
   it "Gets diagnostics and a working code action" $ do
-    lspConfig <- findLspConfig "spellchecker"
-    (pathToUse, closure) <- getPathAndNixEnvironmentClosure
-    withLspSession lspConfig pathToUse closure "test.md" [i|\# This is mispelled|] [] $ \lspHomeDir -> do
+    doSession'' "test.md" "spellchecker" [i|\# This is mispelled|] [] $ \lspHomeDir -> do
       ident <- openDoc "test.md" "spellchecker"
       waitUntil 300.0 $ do
         diagnostics <- waitForDiagnostics
@@ -51,16 +49,14 @@ tests = describe "Spellchecker" $ introduceNixEnvironment [] otherConfig "Spellc
         liftIO (T.readFile datPath) >>= (`shouldBe` "mispelled\n")
 
   it "Uses a personal dictionary on startup" $ do
-    lspConfig <- findLspConfig "spellchecker"
-    (pathToUse, closure) <- getPathAndNixEnvironmentClosure
     let extraFiles = [(".codedown/personal-dictionary.dat", "mispelled\n")]
-    withLspSession' id lspConfig pathToUse closure "test.md" [i|\# This is mispelled|] extraFiles $ \_homeDir -> do
+    doSession'' "test.md" "spellchecker" [i|\# This is mispelled|] extraFiles $ \_homeDir -> do
       _ident <- openDoc "test.md" "spellchecker"
       waitUntil 300.0 $ do
         diagnostics <- waitForDiagnostics
         lift $ assertDiagnosticRanges diagnostics []
 
-  testDiagnostics "spellchecker" "test.md" Nothing [i|I've done a thing.|] $ \diagnostics -> do
+  testDiagnostics "spellchecker" "test.md" [i|I've done a thing.|] $ \diagnostics -> do
     assertDiagnosticRanges diagnostics []
 
 
diff --git a/tests/app/Spec/Tests/Typst.hs b/tests/app/Spec/Tests/Typst.hs
@@ -35,7 +35,7 @@ tests = describe [i|Typst|] $ introduceNixEnvironment [] config [i|Typst|] $ int
     void $ testBuild [i|exporters.typst.packageSearch|]
 
   describe "LSP" $ do
-    testDiagnosticsLabelDesired "simple" lsName "test.typ" (Just "typst")
+    testDiagnosticsLabelDesired "simple" lsName "test.typ"
       [__i|\#loremz(45)|]
       ((== [(Range (Position 0 1) (Position 0 7), Nothing, "unknown variable: loremz")]) . getDiagnosticRanges')
 
diff --git a/tests/src/TestLib/LSP.hs b/tests/src/TestLib/LSP.hs
diff --git a/tests/stack.yaml b/tests/stack.yaml

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ tests = describe "Bash" $ introduceNixEnvironment [kernelSpec] [] "Bash" $ intro`
`37`	`37`	`-- \|] $ \diagnostics -> do`
`38`	`38`	`-- assertDiagnosticRanges diagnostics []`
`39`	`39`
`40`		`- testDiagnostics "bash-language-server" "test.sh" Nothing [__i\|FOO=42\|] $ \diagnostics -> do`
	`40`	`+ testDiagnostics "bash-language-server" "test.sh" [__i\|FOO=42\|] $ \diagnostics -> do`
`41`	`41`	`assertDiagnosticRanges diagnostics [`
`42`	`42`	`(Range (Position 0 0) (Position 0 3), Just (InR "SC2034"))`
`43`	`43`	`]`