@@ -1,6 +1,7 @@
11-- Copyright (c) 2019 The DAML Authors. All rights reserved.
22-- SPDX-License-Identifier: Apache-2.0
33
4+{-# LANGUAGE AllowAmbiguousTypes #-}
45{-# LANGUAGE DuplicateRecordFields #-}
56{-# LANGUAGE PatternSynonyms #-}
67{-# LANGUAGE CPP #-}
@@ -9,29 +10,32 @@
910module Main (main) where
1011
1112import Control.Applicative.Combinators
12−import Control.Exception (catch)
13+import Control.Exception (bracket, catch)
14+import qualified Control.Lens as Lens
1315import Control.Monad
1416import Control.Monad.IO.Class (liftIO)
15−import Data.Aeson (Value)
16−import Data.Char (toLower)
17+import Data.Aeson (FromJSON, Value)
1718import Data.Foldable
18−import Data.List
19+import Data.List.Extra
1920import Data.Rope.UTF16 (Rope)
2021import qualified Data.Rope.UTF16 as Rope
2122import Development.IDE.Core.PositionMapping (fromCurrent, toCurrent)
2223import Development.IDE.GHC.Util
2324import qualified Data.Text as T
25+import Data.Typeable
2426import Development.IDE.Spans.Common
2527import Development.IDE.Test
2628import Development.IDE.Test.Runfiles
2729import Development.IDE.Types.Location
28−import qualified Language.Haskell.LSP.Test as LSPTest
29−import Language.Haskell.LSP.Test hiding (openDoc')
30+import Development.Shake (getDirectoryFilesIO)
31+import Language.Haskell.LSP.Test
3032import Language.Haskell.LSP.Messages
3133import Language.Haskell.LSP.Types
3234import Language.Haskell.LSP.Types.Capabilities
35+import qualified Language.Haskell.LSP.Types.Lens as Lsp (diagnostics, params, message)
3336import Language.Haskell.LSP.VFS (applyChange)
34−import System.Environment.Blank (setEnv)
37+import Network.URI
38+import System.Environment.Blank (getEnv, setEnv, unsetEnv)
3539import System.FilePath
3640import System.IO.Extra
3741import System.Directory
@@ -45,30 +49,35 @@ import Test.Tasty.QuickCheck
4549import Data.Maybe
4650
4751main :: IO ()
48−main = defaultMainWithRerun $ testGroup "HIE"
49− [ testSession "open close" $ do
50− doc <- openDoc' "Testing.hs" "haskell" ""
51− void (skipManyTill anyMessage message :: Session WorkDoneProgressCreateRequest)
52− void (skipManyTill anyMessage message :: Session WorkDoneProgressBeginNotification)
53− closeDoc doc
54− void (skipManyTill anyMessage message :: Session WorkDoneProgressEndNotification)
55− , initializeResponseTests
56− , completionTests
57− , cppTests
58− , diagnosticTests
59− , codeActionTests
60− , codeLensesTests
61− , outlineTests
62− , findDefinitionAndHoverTests
63− , pluginTests
64− , preprocessorTests
65− , thTests
66− , unitTests
67− , haddockTests
68− , positionMappingTests
69− , watchedFilesTests
70− , cradleTests
71− ]
52+main = do
53+ -- We mess with env vars so run single-threaded.
54+ setEnv "TASTY_NUM_THREADS" "1" True
55+ defaultMainWithRerun $ testGroup "HIE"
56+ [ testSession "open close" $ do
57+ doc <- createDoc "Testing.hs" "haskell" ""
58+ void (skipManyTill anyMessage message :: Session WorkDoneProgressCreateRequest)
59+ void (skipManyTill anyMessage message :: Session WorkDoneProgressBeginNotification)
60+ closeDoc doc
61+ void (skipManyTill anyMessage message :: Session WorkDoneProgressEndNotification)
62+ , initializeResponseTests
63+ , completionTests
64+ , cppTests
65+ , diagnosticTests
66+ , codeActionTests
67+ , codeLensesTests
68+ , outlineTests
69+ , findDefinitionAndHoverTests
70+ , pluginTests
71+ , preprocessorTests
72+ , thTests
73+ , safeTests
74+ , unitTests
75+ , haddockTests
76+ , positionMappingTests
77+ , watchedFilesTests
78+ , cradleTests
79+ , dependentFileTest
80+ ]
7281
7382initializeResponseTests :: TestTree
7483initializeResponseTests = withResource acquire release tests where
@@ -103,7 +112,7 @@ initializeResponseTests = withResource acquire release tests where
103112 , chk "NO doc link" _documentLinkProvider Nothing
104113 , chk "NO color" _colorProvider (Just $ ColorOptionsStatic False)
105114 , chk "NO folding range" _foldingRangeProvider (Just $ FoldingRangeOptionsStatic False)
106− , chk " execute command" _executeCommandProvider (Just $ ExecuteCommandOptions $ List ["typesignature.add"])
115+ , che " execute command" _executeCommandProvider (Just $ ExecuteCommandOptions $ List ["typesignature.add"])
107116 , chk " workspace" _workspace (Just $ WorkspaceOptions (Just WorkspaceFolderOptions{_supported = Just True, _changeNotifications = Just ( WorkspaceFolderChangeNotificationsBool True )}))
108117 , chk "NO experimental" _experimental Nothing
109118 ] where
@@ -119,8 +128,17 @@ initializeResponseTests = withResource acquire release tests where
119128 chk title getActual expected =
120129 testCase title $ getInitializeResponse >>= \ir -> expected @=? (getActual . innerCaps) ir
121130
131+ che :: TestName -> (InitializeResponseCapabilitiesInner -> Maybe ExecuteCommandOptions) -> Maybe ExecuteCommandOptions -> TestTree
132+ che title getActual _expected = testCase title doTest
133+ where
134+ doTest = do
135+ ir <- getInitializeResponse
136+ let Just ExecuteCommandOptions {_commands = List [command]} = getActual $ innerCaps ir
137+ True @=? T.isSuffixOf "typesignature.add" command
138+
139+
122140 innerCaps :: InitializeResponse -> InitializeResponseCapabilitiesInner
123− innerCaps (ResponseMessage _ _ (Just (InitializeResponseCapabilities c)) _) = c
141+ innerCaps (ResponseMessage _ _ (Right (InitializeResponseCapabilities c))) = c
124142 innerCaps _ = error "this test only expects inner capabilities"
125143
126144 acquire :: IO InitializeResponse
@@ -134,7 +152,7 @@ diagnosticTests :: TestTree
134152diagnosticTests = testGroup "diagnostics"
135153 [ testSessionWait "fix syntax error" $ do
136154 let content = T.unlines [ "module Testing wher" ]
137− doc <- openDoc' "Testing.hs" "haskell" content
155+ doc <- createDoc "Testing.hs" "haskell" content
138156 expectDiagnostics [("Testing.hs", [(DsError, (0, 15), "parse error")])]
139157 let change = TextDocumentContentChangeEvent
140158 { _range = Just (Range (Position 0 15) (Position 0 19))
@@ -145,7 +163,7 @@ diagnosticTests = testGroup "diagnostics"
145163 expectDiagnostics [("Testing.hs", [])]
146164 , testSessionWait "introduce syntax error" $ do
147165 let content = T.unlines [ "module Testing where" ]
148− doc <- openDoc' "Testing.hs" "haskell" content
166+ doc <- createDoc "Testing.hs" "haskell" content
149167 void $ skipManyTill anyMessage (message :: Session WorkDoneProgressCreateRequest)
150168 void $ skipManyTill anyMessage (message :: Session WorkDoneProgressBeginNotification)
151169 let change = TextDocumentContentChangeEvent
@@ -163,7 +181,7 @@ diagnosticTests = testGroup "diagnostics"
163181 , "bar :: Int -> Int -> Int"
164182 , "bar a b = cd + b"
165183 ]
166− _ <- openDoc' "Testing.hs" "haskell" content
184+ _ <- createDoc "Testing.hs" "haskell" content
167185 expectDiagnostics
168186 [ ( "Testing.hs"
169187 , [ (DsError, (2, 14), "Variable not in scope: ab")
@@ -177,7 +195,7 @@ diagnosticTests = testGroup "diagnostics"
177195 , "foo :: Int -> String -> Int"
178196 , "foo a b = a + b"
179197 ]
180− _ <- openDoc' "Testing.hs" "haskell" content
198+ _ <- createDoc "Testing.hs" "haskell" content
181199 expectDiagnostics
182200 [ ( "Testing.hs"
183201 , [(DsError, (2, 14), "Couldn't match type '[Char]' with 'Int'")]
@@ -189,7 +207,7 @@ diagnosticTests = testGroup "diagnostics"
189207 , "foo :: Int -> String"
190208 , "foo a = _ a"
191209 ]
192− _ <- openDoc' "Testing.hs" "haskell" content
210+ _ <- createDoc "Testing.hs" "haskell" content
193211 expectDiagnostics
194212 [ ( "Testing.hs"
195213 , [(DsError, (2, 8), "Found hole: _ :: Int -> String")]
@@ -211,24 +229,23 @@ diagnosticTests = testGroup "diagnostics"
211229 [ ("A.hs", [(DsError, (2,4), aMessage)])
212230 , ("B.hs", [(DsError, (3,4), bMessage)])]
213231 deferralTest title binding msg = testSessionWait title $ do
214− _ <- openDoc' "A.hs" "haskell" $ sourceA binding
215− _ <- openDoc' "B.hs" "haskell" sourceB
232+ _ <- createDoc "A.hs" "haskell" $ sourceA binding
233+ _ <- createDoc "B.hs" "haskell" sourceB
216234 expectDiagnostics $ expectedDs msg
217235 in
218236 [ deferralTest "type error" "True" "Couldn't match expected type"
219237 , deferralTest "typed hole" "_" "Found hole"
220238 , deferralTest "out of scope var" "unbound" "Variable not in scope"
221− , deferralTest "message shows error" "True" "A.hs:3:5: error:"
222239 ]
223240
224241 , testSessionWait "remove required module" $ do
225242 let contentA = T.unlines [ "module ModuleA where" ]
226− docA <- openDoc' "ModuleA.hs" "haskell" contentA
243+ docA <- createDoc "ModuleA.hs" "haskell" contentA
227244 let contentB = T.unlines
228245 [ "module ModuleB where"
229246 , "import ModuleA"
230247 ]
231− _ <- openDoc' "ModuleB.hs" "haskell" contentB
248+ _ <- createDoc "ModuleB.hs" "haskell" contentB
232249 let change = TextDocumentContentChangeEvent
233250 { _range = Just (Range (Position 0 0) (Position 0 20))
234251 , _rangeLength = Nothing
@@ -241,20 +258,20 @@ diagnosticTests = testGroup "diagnostics"
241258 [ "module ModuleB where"
242259 , "import ModuleA"
243260 ]
244− _ <- openDoc' "ModuleB.hs" "haskell" contentB
261+ _ <- createDoc "ModuleB.hs" "haskell" contentB
245262 expectDiagnostics [("ModuleB.hs", [(DsError, (1, 7), "Could not find module")])]
246263 let contentA = T.unlines [ "module ModuleA where" ]
247− _ <- openDoc' "ModuleA.hs" "haskell" contentA
264+ _ <- createDoc "ModuleA.hs" "haskell" contentA
248265 expectDiagnostics [("ModuleB.hs", [])]
249266 , testSessionWait "add missing module (non workspace)" $ do
250267 let contentB = T.unlines
251268 [ "module ModuleB where"
252269 , "import ModuleA"
253270 ]
254− _ <- openDoc'' "/tmp/ModuleB.hs" "haskell" contentB
271+ _ <- createDoc "/tmp/ModuleB.hs" "haskell" contentB
255272 expectDiagnostics [("/tmp/ModuleB.hs", [(DsError, (1, 7), "Could not find module")])]
256273 let contentA = T.unlines [ "module ModuleA where" ]
257− _ <- openDoc'' "/tmp/ModuleA.hs" "haskell" contentA
274+ _ <- createDoc "/tmp/ModuleA.hs" "haskell" contentA
258275 expectDiagnostics [("/tmp/ModuleB.hs", [])]
259276 , testSessionWait "cyclic module dependency" $ do
260277 let contentA = T.unlines
@@ -265,8 +282,8 @@ diagnosticTests = testGroup "diagnostics"
265282 [ "module ModuleB where"
266283 , "import ModuleA"
267284 ]
268− _ <- openDoc' "ModuleA.hs" "haskell" contentA
269− _ <- openDoc' "ModuleB.hs" "haskell" contentB
285+ _ <- createDoc "ModuleA.hs" "haskell" contentA
286+ _ <- createDoc "ModuleB.hs" "haskell" contentB
270287 expectDiagnostics
271288 [ ( "ModuleA.hs"
272289 , [(DsError, (1, 7), "Cyclic module dependency between ModuleA, ModuleB")]
@@ -287,9 +304,9 @@ diagnosticTests = testGroup "diagnostics"
287304 let contentBboot = T.unlines
288305 [ "module ModuleB where"
289306 ]
290− _ <- openDoc' "ModuleA.hs" "haskell" contentA
291− _ <- openDoc' "ModuleB.hs" "haskell" contentB
292− _ <- openDoc' "ModuleB.hs-boot" "haskell" contentBboot
307+ _ <- createDoc "ModuleA.hs" "haskell" contentA
308+ _ <- createDoc "ModuleB.hs" "haskell" contentB
309+ _ <- createDoc "ModuleB.hs-boot" "haskell" contentBboot
293310 expectDiagnostics []
294311 , testSessionWait "correct reference used with hs-boot" $ do
295312 let contentB = T.unlines
@@ -311,10 +328,10 @@ diagnosticTests = testGroup "diagnostics"
311328 -- resolved to the hs-boot file
312329 , "y = x"
313330 ]
314− _ <- openDoc' "ModuleB.hs" "haskell" contentB
315− _ <- openDoc' "ModuleA.hs" "haskell" contentA
316− _ <- openDoc' "ModuleA.hs-boot" "haskell" contentAboot
317− _ <- openDoc' "ModuleC.hs" "haskell" contentC
331+ _ <- createDoc "ModuleB.hs" "haskell" contentB
332+ _ <- createDoc "ModuleA.hs" "haskell" contentA
333+ _ <- createDoc "ModuleA.hs-boot" "haskell" contentAboot
334+ _ <- createDoc "ModuleC.hs" "haskell" contentC
318335 expectDiagnostics []
319336 , testSessionWait "redundant import" $ do
320337 let contentA = T.unlines ["module ModuleA where"]
@@ -323,8 +340,8 @@ diagnosticTests = testGroup "diagnostics"
323340 , "module ModuleB where"
324341 , "import ModuleA"
325342 ]
326− _ <- openDoc' "ModuleA.hs" "haskell" contentA
327− _ <- openDoc' "ModuleB.hs" "haskell" contentB
343+ _ <- createDoc "ModuleA.hs" "haskell" contentA
344+ _ <- createDoc "ModuleB.hs" "haskell" contentB
328345 expectDiagnostics
329346 [ ( "ModuleB.hs"
330347 , [(DsWarning, (2, 0), "The import of 'ModuleA' is redundant")]
@@ -346,8 +363,8 @@ diagnosticTests = testGroup "diagnostics"
346363 , "wrong1 = ThisList.map"
347364 , "wrong2 = BaseList.x"
348365 ]
349− _ <- openDoc' "Data/List.hs" "haskell" thisDataListContent
350− _ <- openDoc' "Main.hs" "haskell" mainContent
366+ _ <- createDoc "Data/List.hs" "haskell" thisDataListContent
367+ _ <- createDoc "Main.hs" "haskell" mainContent
351368 expectDiagnostics
352369 [ ( "Main.hs"
353370 , [(DsError, (6, 9), "Not in scope: \8216ThisList.map\8217")
@@ -362,7 +379,7 @@ diagnosticTests = testGroup "diagnostics"
362379 , "foo :: Ord a => a -> Int"
363380 , "foo a = 1"
364381 ]
365− _ <- openDoc' "Foo.hs" "haskell" fooContent
382+ _ <- createDoc "Foo.hs" "haskell" fooContent
366383 expectDiagnostics
367384 [ ( "Foo.hs"
368385 -- The test is to make sure that warnings contain unqualified names
@@ -387,18 +404,18 @@ diagnosticTests = testGroup "diagnostics"
387404 Just pathB <- pure $ uriToFilePath uriB
388405 uriB <- pure $
389406 let (drive, suffix) = splitDrive pathB
390− in filePathToUri (joinDrive (map toLower drive ) suffix)
407+ in filePathToUri (joinDrive (lower drive) suffix)
391408 liftIO $ createDirectoryIfMissing True (takeDirectory pathB)
392409 liftIO $ writeFileUTF8 pathB $ T.unpack bContent
393410 uriA <- getDocUri "A/A.hs"
394411 Just pathA <- pure $ uriToFilePath uriA
395412 uriA <- pure $
396413 let (drive, suffix) = splitDrive pathA
397− in filePathToUri (joinDrive (map toLower drive ) suffix)
414+ in filePathToUri (joinDrive (lower drive) suffix)
398415 let itemA = TextDocumentItem uriA "haskell" 0 aContent
399416 let a = TextDocumentIdentifier uriA
400417 sendNotification TextDocumentDidOpen (DidOpenTextDocumentParams itemA)
401− diagsNot <- skipManyTill anyMessage message :: Session PublishDiagnosticsNotification
418+ diagsNot <- skipManyTill anyMessage diagnostic
402419 let PublishDiagnosticsParams fileUri diags = _params (diagsNot :: PublishDiagnosticsNotification)
403420 -- Check that if we put a lower-case drive in for A.A
404421 -- the diagnostics for A.B will also be lower-case.
@@ -407,6 +424,38 @@ diagnosticTests = testGroup "diagnostics"
407424 liftIO $ unless ("redundant" `T.isInfixOf` msg) $
408425 assertFailure ("Expected redundant import but got " <> T.unpack msg)
409426 closeDoc a
427+ , testSessionWait "haddock parse error" $ do
428+ let fooContent = T.unlines
429+ [ "module Foo where"
430+ , "foo :: Int"
431+ , "foo = 1 {-|-}"
432+ ]
433+ _ <- createDoc "Foo.hs" "haskell" fooContent
434+ expectDiagnostics
435+ [ ( "Foo.hs"
436+ , [(DsError, (2, 8), "Parse error on input")
437+ ]
438+ )
439+ ]
440+ , testSessionWait "strip file path" $ do
441+ let
442+ name = "Testing"
443+ content = T.unlines
444+ [ "module " <> name <> " where"
445+ , "value :: Maybe ()"
446+ , "value = [()]"
447+ ]
448+ _ <- createDoc (T.unpack name <> ".hs") "haskell" content
449+ notification <- skipManyTill anyMessage diagnostic
450+ let
451+ offenders =
452+ Lsp.params .
453+ Lsp.diagnostics .
454+ Lens.folded .
455+ Lsp.message .
456+ Lens.filtered (T.isInfixOf ("/" <> name <> ".hs:"))
457+ failure msg = liftIO $ assertFailure $ "Expected file path to be stripped but got " <> T.unpack msg
458+ Lens.mapMOf_ offenders failure notification
410459 ]
411460
412461codeActionTests :: TestTree
@@ -432,26 +481,26 @@ codeLensesTests = testGroup "code lenses"
432481watchedFilesTests :: TestTree
433482watchedFilesTests = testGroup "watched files"
434483 [ testSession' "workspace files" $ \sessionDir -> do
435− liftIO $ writeFile (sessionDir </> "hie.yaml") $ "cradle: {direct: {arguments: [\"-isrc\"]}}"
436− _ <- openDoc' "A.hs" "haskell" "{-#LANGUAGE NoImplicitPrelude #-}\nmodule A where\nimport B"
437− watchedFileRegs <- getWatchedFilesSubscriptionsUntilProgressEnd
438−
439− -- Expect 6 subscriptions (A does not get any because it's VFS):
440− -- - /path-to-workspace/B.hs
441− -- - /path-to-workspace/B.lhs
442− -- - B.hs
443− -- - B.lhs
444− -- - src/B.hs
445− -- - src/B.lhs
446− liftIO $ length watchedFileRegs @?= 6
484+ liftIO $ writeFile (sessionDir </> "hie.yaml") "cradle: {direct: {arguments: [\"-isrc\"]}}"
485+ _doc <- createDoc "A.hs" "haskell" "{-#LANGUAGE NoImplicitPrelude #-}\nmodule A where\nimport WatchedFilesMissingModule"
486+ watchedFileRegs <- getWatchedFilesSubscriptionsUntil @PublishDiagnosticsNotification
487+
488+ -- Expect 4 subscriptions (A does not get any because it's VFS):
489+ -- - /path-to-workspace/WatchedFilesMissingModule.hs
490+ -- - /path-to-workspace/WatchedFilesMissingModule.lhs
491+ -- - /path-to-workspace/src/WatchedFilesMissingModule.hs
492+ -- - /path-to-workspace/src/WatchedFilesMissingModule.lhs
493+ liftIO $ length watchedFileRegs @?= 4
447494
448495 , testSession' "non workspace file" $ \sessionDir -> do
449− liftIO $ writeFile (sessionDir </> "hie.yaml") $ "cradle: {direct: {arguments: [\"-i/tmp\"]}}"
450− _ <- openDoc' "A.hs" "haskell" "{-# LANGUAGE NoImplicitPrelude#-}\nmodule A where\nimport B"
451− watchedFileRegs <- getWatchedFilesSubscriptionsUntilProgressEnd
496+ liftIO $ writeFile (sessionDir </> "hie.yaml") "cradle: {direct: {arguments: [\"-i/tmp\"]}}"
497+ _doc <- createDoc "A.hs" "haskell" "{-# LANGUAGE NoImplicitPrelude#-}\nmodule A where\nimport WatchedFilesMissingModule"
498+ watchedFileRegs <- getWatchedFilesSubscriptionsUntil @PublishDiagnosticsNotification
452499
453− -- Expect 4 subscriptions:
454− liftIO $ length watchedFileRegs @?= 4
500+ -- Expect 2 subscriptions (/tmp does not get any as it is out of the workspace):
501+ -- - /path-to-workspace/WatchedFilesMissingModule.hs
502+ -- - /path-to-workspace/WatchedFilesMissingModule.lhs
503+ liftIO $ length watchedFileRegs @?= 2
455504
456505 -- TODO add a test for didChangeWorkspaceFolder
457506 ]
@@ -464,7 +513,7 @@ renameActionTests = testGroup "rename actions"
464513 , "foo :: Int -> Int"
465514 , "foo argName = argNme"
466515 ]
467− doc <- openDoc' "Testing.hs" "haskell" content
516+ doc <- createDoc "Testing.hs" "haskell" content
468517 _ <- waitForDiagnostics
469518 action <- findCodeAction doc (Range (Position 2 14) (Position 2 20)) "Replace with ‘argName’"
470519 executeCodeAction action
@@ -482,7 +531,7 @@ renameActionTests = testGroup "rename actions"
482531 , "foo :: Maybe a -> [a]"
483532 , "foo = maybToList"
484533 ]
485− doc <- openDoc' "Testing.hs" "haskell" content
534+ doc <- createDoc "Testing.hs" "haskell" content
486535 _ <- waitForDiagnostics
487536 action <- findCodeAction doc (Range (Position 3 6) (Position 3 16)) "Replace with ‘maybeToList’"
488537 executeCodeAction action
@@ -500,7 +549,7 @@ renameActionTests = testGroup "rename actions"
500549 , "foo :: Char -> Char -> Char -> Char"
501550 , "foo argument1 argument2 argument3 = argumentX"
502551 ]
503− doc <- openDoc' "Testing.hs" "haskell" content
552+ doc <- createDoc "Testing.hs" "haskell" content
504553 _ <- waitForDiagnostics
505554 _ <- findCodeActions doc (Range (Position 2 36) (Position 2 45))
506555 ["Replace with ‘argument1’", "Replace with ‘argument2’", "Replace with ‘argument3’"]
@@ -512,7 +561,7 @@ renameActionTests = testGroup "rename actions"
512561 , "monus x y = max 0 (x - y)"
513562 , "foo x y = x `monnus` y"
514563 ]
515− doc <- openDoc' "Testing.hs" "haskell" content
564+ doc <- createDoc "Testing.hs" "haskell" content
516565 _ <- waitForDiagnostics
517566 actionsOrCommands <- getCodeActions doc (Range (Position 3 12) (Position 3 20))
518567 [fixTypo] <- pure [action | CACodeAction action@CodeAction{ _title = actionTitle } <- actionsOrCommands, "monus" `T.isInfixOf` actionTitle ]
@@ -535,7 +584,7 @@ typeWildCardActionTests = testGroup "type wildcard actions"
535584 , "func :: _"
536585 , "func x = x"
537586 ]
538− doc <- openDoc' "Testing.hs" "haskell" content
587+ doc <- createDoc "Testing.hs" "haskell" content
539588 _ <- waitForDiagnostics
540589 actionsOrCommands <- getCodeActions doc (Range (Position 2 1) (Position 2 10))
541590 let [addSignature] = [action | CACodeAction action@CodeAction { _title = actionTitle } <- actionsOrCommands
@@ -555,7 +604,7 @@ typeWildCardActionTests = testGroup "type wildcard actions"
555604 , "func :: _"
556605 , "func x y = x + y"
557606 ]
558− doc <- openDoc' "Testing.hs" "haskell" content
607+ doc <- createDoc "Testing.hs" "haskell" content
559608 _ <- waitForDiagnostics
560609 actionsOrCommands <- getCodeActions doc (Range (Position 2 1) (Position 2 10))
561610 let [addSignature] = [action | CACodeAction action@CodeAction { _title = actionTitle } <- actionsOrCommands
@@ -578,7 +627,7 @@ typeWildCardActionTests = testGroup "type wildcard actions"
578627 , " y = x * 2"
579628 , " in y"
580629 ]
581− doc <- openDoc' "Testing.hs" "haskell" content
630+ doc <- createDoc "Testing.hs" "haskell" content
582631 _ <- waitForDiagnostics
583632 actionsOrCommands <- getCodeActions doc (Range (Position 4 1) (Position 4 10))
584633 let [addSignature] = [action | CACodeAction action@CodeAction { _title = actionTitle } <- actionsOrCommands
@@ -603,7 +652,7 @@ removeImportTests = testGroup "remove import actions"
603652 let contentA = T.unlines
604653 [ "module ModuleA where"
605654 ]
606− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
655+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
607656 let contentB = T.unlines
608657 [ "{-# OPTIONS_GHC -Wunused-imports #-}"
609658 , "module ModuleB where"
@@ -611,7 +660,7 @@ removeImportTests = testGroup "remove import actions"
611660 , "stuffB :: Integer"
612661 , "stuffB = 123"
613662 ]
614− docB <- openDoc' "ModuleB.hs" "haskell" contentB
663+ docB <- createDoc "ModuleB.hs" "haskell" contentB
615664 _ <- waitForDiagnostics
616665 [CACodeAction action@CodeAction { _title = actionTitle }]
617666 <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
@@ -629,7 +678,7 @@ removeImportTests = testGroup "remove import actions"
629678 let contentA = T.unlines
630679 [ "module ModuleA where"
631680 ]
632− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
681+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
633682 let contentB = T.unlines
634683 [ "{-# OPTIONS_GHC -Wunused-imports #-}"
635684 , "module ModuleB where"
@@ -637,7 +686,7 @@ removeImportTests = testGroup "remove import actions"
637686 , "stuffB :: Integer"
638687 , "stuffB = 123"
639688 ]
640− docB <- openDoc' "ModuleB.hs" "haskell" contentB
689+ docB <- createDoc "ModuleB.hs" "haskell" contentB
641690 _ <- waitForDiagnostics
642691 [CACodeAction action@CodeAction { _title = actionTitle }]
643692 <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
@@ -659,14 +708,14 @@ removeImportTests = testGroup "remove import actions"
659708 , "stuffB = 123"
660709 , "stuffC = ()"
661710 ]
662− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
711+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
663712 let contentB = T.unlines
664713 [ "{-# OPTIONS_GHC -Wunused-imports #-}"
665714 , "module ModuleB where"
666715 , "import ModuleA (stuffA, stuffB, stuffC, stuffA)"
667716 , "main = print stuffB"
668717 ]
669− docB <- openDoc' "ModuleB.hs" "haskell" contentB
718+ docB <- createDoc "ModuleB.hs" "haskell" contentB
670719 _ <- waitForDiagnostics
671720 [CACodeAction action@CodeAction { _title = actionTitle }]
672721 <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
@@ -688,22 +737,18 @@ removeImportTests = testGroup "remove import actions"
688737 , "stuffB :: Integer"
689738 , "stuffB = 123"
690739 ]
691− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
740+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
692741 let contentB = T.unlines
693742 [ "{-# OPTIONS_GHC -Wunused-imports #-}"
694743 , "module ModuleB where"
695744 , "import qualified ModuleA as A ((<?>), stuffB, (!!))"
696745 , "main = print A.stuffB"
697746 ]
698− docB <- openDoc' "ModuleB.hs" "haskell" contentB
747+ docB <- createDoc "ModuleB.hs" "haskell" contentB
699748 _ <- waitForDiagnostics
700749 [CACodeAction action@CodeAction { _title = actionTitle }]
701750 <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
702−#if MIN_GHC_API_VERSION(8,6,0)
703751 liftIO $ "Remove !!, <?> from import" @=? actionTitle
704−#else
705− liftIO $ "Remove A.!!, A.<?> from import" @=? actionTitle
706−#endif
707752 executeCodeAction action
708753 contentAfterAction <- documentContents docB
709754 let expectedContentAfterAction = T.unlines
@@ -720,14 +765,14 @@ removeImportTests = testGroup "remove import actions"
720765 , "stuffB :: Integer"
721766 , "stuffB = 123"
722767 ]
723− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
768+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
724769 let contentB = T.unlines
725770 [ "{-# OPTIONS_GHC -Wunused-imports #-}"
726771 , "module ModuleB where"
727772 , "import ModuleA (A(..), stuffB)"
728773 , "main = print stuffB"
729774 ]
730− docB <- openDoc' "ModuleB.hs" "haskell" contentB
775+ docB <- createDoc "ModuleB.hs" "haskell" contentB
731776 _ <- waitForDiagnostics
732777 [CACodeAction action@CodeAction { _title = actionTitle }]
733778 <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
@@ -747,14 +792,14 @@ removeImportTests = testGroup "remove import actions"
747792 , "data D = A | B"
748793 , "data E = F"
749794 ]
750− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
795+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
751796 let contentB = T.unlines
752797 [ "{-# OPTIONS_GHC -Wunused-imports #-}"
753798 , "module ModuleB where"
754799 , "import ModuleA (D(A,B), E(F))"
755800 , "main = B"
756801 ]
757− docB <- openDoc' "ModuleB.hs" "haskell" contentB
802+ docB <- createDoc "ModuleB.hs" "haskell" contentB
758803 _ <- waitForDiagnostics
759804 [CACodeAction action@CodeAction { _title = actionTitle }]
760805 <- getCodeActions docB (Range (Position 2 0) (Position 2 5))
@@ -895,8 +940,8 @@ extendImportTests = testGroup "extend import actions"
895940 ]
896941 where
897942 template contentA contentB range expectedAction expectedContentB = do
898− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
899− docB <- openDoc' "ModuleB.hs" "haskell" contentB
943+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
944+ docB <- createDoc "ModuleB.hs" "haskell" contentB
900945 _ <- waitForDiagnostics
901946 CACodeAction action@CodeAction { _title = actionTitle } : _
902947 <- sortOn (\(CACodeAction CodeAction{_title=x}) -> x) <$>
@@ -936,6 +981,8 @@ suggestImportTests = testGroup "suggest import actions"
936981 , test True [] "f :: Typeable a => a" ["f = undefined"] "import Data.Typeable (Typeable)"
937982 , test True [] "f = pack" [] "import Data.Text (pack)"
938983 , test True [] "f :: Text" ["f = undefined"] "import Data.Text (Text)"
984+ , test True [] "f = [] & id" [] "import Data.Function ((&))"
985+ , test True [] "f = (&) [] id" [] "import Data.Function ((&))"
939986 ]
940987 ]
941988 where
@@ -944,19 +991,20 @@ suggestImportTests = testGroup "suggest import actions"
944991 after = T.unlines $ "module A where" : ["import " <> x | x <- imps] ++ [newImp] ++ def : other
945992 cradle = "cradle: {direct: {arguments: [-hide-all-packages, -package, base, -package, text, -package-env, -]}}"
946993 liftIO $ writeFileUTF8 (dir </> "hie.yaml") cradle
947− doc <- openDoc' "Test.hs" "haskell" before
994+ doc <- createDoc "Test.hs" "haskell" before
948995 _diags <- waitForDiagnostics
949996 let defLine = length imps + 1
950997 range = Range (Position defLine 0) (Position defLine maxBound)
951998 actions <- getCodeActions doc range
952− case wanted of
953− False ->
954− liftIO $ [_title | CACodeAction CodeAction{_title} <- actions, _title == newImp ] @?= []
955− True -> do
956− action <- liftIO $ pickActionWithTitle newImp actions
957− executeCodeAction action
958− contentAfterAction <- documentContents doc
959− liftIO $ after @=? contentAfterAction
999+ if wanted
1000+ then do
1001+ action <- liftIO $ pickActionWithTitle newImp actions
1002+ executeCodeAction action
1003+ contentAfterAction <- documentContents doc
1004+ liftIO $ after @=? contentAfterAction
1005+ else
1006+ liftIO $ [_title | CACodeAction CodeAction{_title} <- actions, _title == newImp ] @?= []
1007+
9601008
9611009addExtensionTests :: TestTree
9621010addExtensionTests = testGroup "add language extension actions"
@@ -1003,7 +1051,7 @@ addExtensionTests = testGroup "add language extension actions"
10031051 ]
10041052 where
10051053 template initialContent range expectedAction expectedContents = do
1006− doc <- openDoc' "Module.hs" "haskell" initialContent
1054+ doc <- createDoc "Module.hs" "haskell" initialContent
10071055 _ <- waitForDiagnostics
10081056 CACodeAction action@CodeAction { _title = actionTitle } : _
10091057 <- sortOn (\(CACodeAction CodeAction{_title=x}) -> x) <$>
@@ -1026,7 +1074,7 @@ insertNewDefinitionTests = testGroup "insert new definition actions"
10261074 [""
10271075 ,"someOtherCode = ()"
10281076 ]
1029− docB <- openDoc' "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
1077+ docB <- createDoc "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
10301078 _ <- waitForDiagnostics
10311079 CACodeAction action@CodeAction { _title = actionTitle } : _
10321080 <- sortOn (\(CACodeAction CodeAction{_title=x}) -> x) <$>
@@ -1050,7 +1098,7 @@ insertNewDefinitionTests = testGroup "insert new definition actions"
10501098 [""
10511099 ,"someOtherCode = ()"
10521100 ]
1053− docB <- openDoc' "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
1101+ docB <- createDoc "ModuleB.hs" "haskell" (T.unlines $ txtB ++ txtB')
10541102 _ <- waitForDiagnostics
10551103 CACodeAction action@CodeAction { _title = actionTitle } : _
10561104 <- sortOn (\(CACodeAction CodeAction{_title=x}) -> x) <$>
@@ -1089,8 +1137,8 @@ fixConstructorImportTests = testGroup "fix import actions"
10891137 ]
10901138 where
10911139 template contentA contentB range expectedAction expectedContentB = do
1092− _docA <- openDoc' "ModuleA.hs" "haskell" contentA
1093− docB <- openDoc' "ModuleB.hs" "haskell" contentB
1140+ _docA <- createDoc "ModuleA.hs" "haskell" contentA
1141+ docB <- createDoc "ModuleB.hs" "haskell" contentB
10941142 _diags <- waitForDiagnostics
10951143 CACodeAction action@CodeAction { _title = actionTitle } : _
10961144 <- sortOn (\(CACodeAction CodeAction{_title=x}) -> x) <$>
@@ -1109,7 +1157,7 @@ importRenameActionTests = testGroup "import rename actions"
11091157 [ "module Testing where"
11101158 , "import Data.Mape"
11111159 ]
1112− doc <- openDoc' "Testing.hs" "haskell" content
1160+ doc <- createDoc "Testing.hs" "haskell" content
11131161 _ <- waitForDiagnostics
11141162 actionsOrCommands <- getCodeActions doc (Range (Position 2 8) (Position 2 16))
11151163 let [changeToMap] = [action | CACodeAction action@CodeAction{ _title = actionTitle } <- actionsOrCommands, ("Data." <> modname) `T.isInfixOf` actionTitle ]
@@ -1146,7 +1194,7 @@ fillTypedHoleTests = let
11461194 newA newB newC = testSession (T.unpack actionTitle) $ do
11471195 let originalCode = sourceCode oldA oldB oldC
11481196 let expectedCode = sourceCode newA newB newC
1149− doc <- openDoc' "Testing.hs" "haskell" originalCode
1197+ doc <- createDoc "Testing.hs" "haskell" originalCode
11501198 _ <- waitForDiagnostics
11511199 actionsOrCommands <- getCodeActions doc (Range (Position 9 0) (Position 9 maxBound))
11521200 chosenAction <- liftIO $ pickActionWithTitle actionTitle actionsOrCommands
@@ -1194,7 +1242,7 @@ addSigActionTests = let
11941242 def >:: sig = testSession (T.unpack def) $ do
11951243 let originalCode = before def
11961244 let expectedCode = after' def sig
1197− doc <- openDoc' "Sigs.hs" "haskell" originalCode
1245+ doc <- createDoc "Sigs.hs" "haskell" originalCode
11981246 _ <- waitForDiagnostics
11991247 actionsOrCommands <- getCodeActions doc (Range (Position 3 1) (Position 3 maxBound))
12001248 chosenAction <- liftIO $ pickActionWithTitle ("add signature: " <> sig) actionsOrCommands
@@ -1226,7 +1274,7 @@ addSigLensesTests = let
12261274 sigSession withMissing def sig = testSession (T.unpack def) $ do
12271275 let originalCode = before withMissing def
12281276 let expectedCode = after' withMissing def sig
1229− doc <- openDoc' "Sigs.hs" "haskell" originalCode
1277+ doc <- createDoc "Sigs.hs" "haskell" originalCode
12301278 [CodeLens {_command = Just c}] <- getCodeLenses doc
12311279 executeCommand c
12321280 modifiedCode <- getDocumentEdit doc
@@ -1248,24 +1296,19 @@ addSigLensesTests = let
12481296 ]
12491297 ]
12501298
1251−findDefinitionAndHoverTests :: TestTree
1252−findDefinitionAndHoverTests = let
1253−
1254− tst (get, check) pos targetRange title = testSession title $ do
1255− doc <- openTestDataDoc sourceFilePath
1256− found <- get doc pos
1257− check found targetRange
1299+checkDefs :: [Location] -> Session [Expect] -> Session ()
1300+checkDefs defs mkExpectations = traverse_ check =<< mkExpectations where
12581301
1259− checkDefs :: [Location] -> [Expect] -> Session ()
1260− checkDefs defs expectations = traverse_ check expectations where
1261−
1262− check (ExpectRange expectedRange) = do
1263− assertNDefinitionsFound 1 defs
1264− assertRangeCorrect (head defs) expectedRange
1265− check ExpectNoDefinitions = do
1266− assertNDefinitionsFound 0 defs
1267− check ExpectExternFail = liftIO $ assertFailure "Expecting to fail to find in external file"
1268− check _ = pure () -- all other expectations not relevant to getDefinition
1302+ check (ExpectRange expectedRange) = do
1303+ assertNDefinitionsFound 1 defs
1304+ assertRangeCorrect (head defs) expectedRange
1305+ check (ExpectLocation expectedLocation) = do
1306+ assertNDefinitionsFound 1 defs
1307+ liftIO $ head defs @?= expectedLocation
1308+ check ExpectNoDefinitions = do
1309+ assertNDefinitionsFound 0 defs
1310+ check ExpectExternFail = liftIO $ assertFailure "Expecting to fail to find in external file"
1311+ check _ = pure () -- all other expectations not relevant to getDefinition
12691312
12701313 assertNDefinitionsFound :: Int -> [a] -> Session ()
12711314 assertNDefinitionsFound n defs = liftIO $ assertEqual "number of definitions" n (length defs)
@@ -1273,8 +1316,19 @@ findDefinitionAndHoverTests = let
12731316 assertRangeCorrect Location{_range = foundRange} expectedRange =
12741317 liftIO $ expectedRange @=? foundRange
12751318
1276− checkHover :: Maybe Hover -> [Expect] -> Session ()
1277− checkHover hover expectations = traverse_ check expectations where
1319+
1320+findDefinitionAndHoverTests :: TestTree
1321+findDefinitionAndHoverTests = let
1322+
1323+ tst (get, check) pos targetRange title = testSessionWithExtraFiles "hover" title $ \dir -> do
1324+ doc <- openTestDataDoc (dir </> sourceFilePath)
1325+ found <- get doc pos
1326+ check found targetRange
1327+
1328+
1329+
1330+ checkHover :: Maybe Hover -> Session [Expect] -> Session ()
1331+ checkHover hover expectations = traverse_ check =<< expectations where
12781332
12791333 check expected =
12801334 case hover of
@@ -1317,9 +1371,12 @@ findDefinitionAndHoverTests = let
13171371
13181372 mkFindTests tests = testGroup "get"
13191373 [ testGroup "definition" $ mapMaybe fst tests
1320− , testGroup "hover" $ mapMaybe snd tests ]
1374+ , testGroup "hover" $ mapMaybe snd tests
1375+ , checkFileCompiles sourceFilePath ]
1376+
1377+ test runDef runHover look expect = testM runDef runHover look (return expect)
13211378
1322− test runDef runHover look expect title =
1379+ testM runDef runHover look expect title =
13231380 ( runDef $ tst def look expect title
13241381 , runHover $ tst hover look expect title ) where
13251382 def = (getDefinitions, checkDefs)
@@ -1327,87 +1384,100 @@ findDefinitionAndHoverTests = let
13271384 --type_ = (getTypeDefinitions, checkTDefs) -- getTypeDefinitions always times out
13281385
13291386 -- search locations expectations on results
1330− fffL4 = _start fffR ; fffR = mkRange 4 4 4 7 ; fff = [ExpectRange fffR]
1331− fffL8 = Position 8 4 ;
1332− fffL14 = Position 14 7 ;
1333− aaaL14 = Position 14 20 ; aaa = [mkR 7 0 7 3]
1334− dcL7 = Position 7 11 ; tcDC = [mkR 3 23 5 16]
1335− dcL12 = Position 12 11 ;
1336− xtcL5 = Position 5 11 ; xtc = [ExpectExternFail, ExpectHoverText ["Int", "Defined in ‘GHC.Types’"]]
1337− tcL6 = Position 6 11 ; tcData = [mkR 3 0 5 16, ExpectHoverText ["TypeConstructor", "GotoHover.hs:4:1"]]
1338− vvL16 = Position 16 12 ; vv = [mkR 16 4 16 6]
1339− opL16 = Position 16 15 ; op = [mkR 17 2 17 4]
1340− opL18 = Position 18 22 ; opp = [mkR 18 13 18 17]
1341− aL18 = Position 18 20 ; apmp = [mkR 18 10 18 11]
1342− b'L19 = Position 19 13 ; bp = [mkR 19 6 19 7]
1343− xvL20 = Position 20 8 ; xvMsg = [ExpectExternFail, ExpectHoverText ["Data.Text.pack", ":: String -> Text"]]
1344− clL23 = Position 23 11 ; cls = [mkR 21 0 22 20, ExpectHoverText ["MyClass", "GotoHover.hs:22:1"]]
1345− clL25 = Position 25 9
1346− eclL15 = Position 15 8 ; ecls = [ExpectExternFail, ExpectHoverText ["Num", "Defined in ‘GHC.Num’"]]
1347− dnbL29 = Position 29 18 ; dnb = [ExpectHoverText [":: ()"], mkR 29 12 29 21]
1348− dnbL30 = Position 30 23
1349− lcbL33 = Position 33 26 ; lcb = [ExpectHoverText [":: Char"], mkR 33 26 33 27]
1350− lclL33 = Position 33 22
1351− mclL36 = Position 36 1 ; mcl = [mkR 36 0 36 14]
1352− mclL37 = Position 37 1
1353− spaceL37 = Position 37 24 ; space = [ExpectNoDefinitions, ExpectHoverText [":: Char"]]
1354− docL41 = Position 41 1 ; doc = [ExpectHoverText ["Recognizable docs: kpqz"]]
1387+ fffL4 = _start fffR ; fffR = mkRange 8 4 8 7 ; fff = [ExpectRange fffR]
1388+ fffL8 = Position 12 4 ;
1389+ fffL14 = Position 18 7 ;
1390+ aaaL14 = Position 18 20 ; aaa = [mkR 11 0 11 3]
1391+ dcL7 = Position 11 11 ; tcDC = [mkR 7 23 9 16]
1392+ dcL12 = Position 16 11 ;
1393+ xtcL5 = Position 9 11 ; xtc = [ExpectExternFail, ExpectHoverText ["Int", "Defined in ‘GHC.Types’"]]
1394+ tcL6 = Position 10 11 ; tcData = [mkR 7 0 9 16, ExpectHoverText ["TypeConstructor", "GotoHover.hs:8:1"]]
1395+ vvL16 = Position 20 12 ; vv = [mkR 20 4 20 6]
1396+ opL16 = Position 20 15 ; op = [mkR 21 2 21 4]
1397+ opL18 = Position 22 22 ; opp = [mkR 22 13 22 17]
1398+ aL18 = Position 22 20 ; apmp = [mkR 22 10 22 11]
1399+ b'L19 = Position 23 13 ; bp = [mkR 23 6 23 7]
1400+ xvL20 = Position 24 8 ; xvMsg = [ExpectExternFail, ExpectHoverText ["Data.Text.pack", ":: String -> Text"]]
1401+ clL23 = Position 27 11 ; cls = [mkR 25 0 26 20, ExpectHoverText ["MyClass", "GotoHover.hs:26:1"]]
1402+ clL25 = Position 29 9
1403+ eclL15 = Position 19 8 ; ecls = [ExpectExternFail, ExpectHoverText ["Num", "Defined in ‘GHC.Num’"]]
1404+ dnbL29 = Position 33 18 ; dnb = [ExpectHoverText [":: ()"], mkR 33 12 33 21]
1405+ dnbL30 = Position 34 23
1406+ lcbL33 = Position 37 26 ; lcb = [ExpectHoverText [":: Char"], mkR 37 26 37 27]
1407+ lclL33 = Position 37 22
1408+ mclL36 = Position 40 1 ; mcl = [mkR 40 0 40 14]
1409+ mclL37 = Position 41 1
1410+ spaceL37 = Position 41 24 ; space = [ExpectNoDefinitions, ExpectHoverText [":: Char"]]
1411+ docL41 = Position 45 1 ; doc = [ExpectHoverText ["Recognizable docs: kpqz"]]
13551412 ; constr = [ExpectHoverText ["Monad m"]]
1356− eitL40 = Position 40 28 ; kindE = [ExpectHoverText [":: * -> * -> *\n"]]
1357− intL40 = Position 40 34 ; kindI = [ExpectHoverText [":: *\n"]]
1358− tvrL40 = Position 40 37 ; kindV = [ExpectHoverText [":: * -> *\n"]]
1359− intL41 = Position 41 20 ; litI = [ExpectHoverText ["7518"]]
1360− chrL36 = Position 37 24 ; litC = [ExpectHoverText ["'f'"]]
1361− txtL8 = Position 8 14 ; litT = [ExpectHoverText ["\"dfgy\""]]
1362− lstL43 = Position 43 12 ; litL = [ExpectHoverText ["[8391 :: Int, 6268]"]]
1363− outL45 = Position 45 3 ; outSig = [ExpectHoverText ["outer", "Bool"], mkR 46 0 46 5]
1364− innL48 = Position 48 5 ; innSig = [ExpectHoverText ["inner", "Char"], mkR 49 2 49 7]
1413+ eitL40 = Position 44 28 ; kindE = [ExpectHoverText [":: * -> * -> *\n"]]
1414+ intL40 = Position 44 34 ; kindI = [ExpectHoverText [":: *\n"]]
1415+ tvrL40 = Position 44 37 ; kindV = [ExpectHoverText [":: * -> *\n"]]
1416+ intL41 = Position 45 20 ; litI = [ExpectHoverText ["7518"]]
1417+ chrL36 = Position 41 24 ; litC = [ExpectHoverText ["'f'"]]
1418+ txtL8 = Position 12 14 ; litT = [ExpectHoverText ["\"dfgy\""]]
1419+ lstL43 = Position 47 12 ; litL = [ExpectHoverText ["[8391 :: Int, 6268]"]]
1420+ outL45 = Position 49 3 ; outSig = [ExpectHoverText ["outer", "Bool"], mkR 46 0 46 5]
1421+ innL48 = Position 52 5 ; innSig = [ExpectHoverText ["inner", "Char"], mkR 49 2 49 7]
1422+ imported = Position 56 13 ; importedSig = getDocUri "Foo.hs" >>= \foo -> return [ExpectHoverText ["foo", "Foo"], mkL foo 4 0 4 3]
1423+ reexported = Position 55 14 ; reexportedSig = getDocUri "Bar.hs" >>= \bar -> return [ExpectHoverText ["Bar", "Bar"], mkL bar 2 0 2 14]
13651424 in
13661425 mkFindTests
1367− -- def hover look expect
1368− [ test yes yes fffL4 fff "field in record definition"
1369− , test broken broken fffL8 fff "field in record construction #71"
1370− , test yes yes fffL14 fff "field name used as accessor" -- 120 in Calculate.hs
1371− , test yes yes aaaL14 aaa "top-level name" -- 120
1372− , test yes yes dcL7 tcDC "data constructor record #247"
1373− , test yes yes dcL12 tcDC "data constructor plain" -- 121
1374− , test yes yes tcL6 tcData "type constructor #248" -- 147
1375− , test broken yes xtcL5 xtc "type constructor external #248,249"
1376− , test broken yes xvL20 xvMsg "value external package #249" -- 120
1377− , test yes yes vvL16 vv "plain parameter" -- 120
1378− , test yes yes aL18 apmp "pattern match name" -- 120
1379− , test yes yes opL16 op "top-level operator" -- 120, 123
1380− , test yes yes opL18 opp "parameter operator" -- 120
1381− , test yes yes b'L19 bp "name in backticks" -- 120
1382− , test yes yes clL23 cls "class in instance declaration #250"
1383− , test yes yes clL25 cls "class in signature #250" -- 147
1384− , test broken yes eclL15 ecls "external class in signature #249,250"
1385− , test yes yes dnbL29 dnb "do-notation bind" -- 137
1386− , test yes yes dnbL30 dnb "do-notation lookup"
1387− , test yes yes lcbL33 lcb "listcomp bind" -- 137
1388− , test yes yes lclL33 lcb "listcomp lookup"
1389− , test yes yes mclL36 mcl "top-level fn 1st clause"
1390− , test yes yes mclL37 mcl "top-level fn 2nd clause #246"
1391− , test yes yes spaceL37 space "top-level fn on space #315"
1392− , test no broken docL41 doc "documentation #7"
1393− , test no yes eitL40 kindE "kind of Either #273"
1394− , test no yes intL40 kindI "kind of Int #273"
1395− , test no broken tvrL40 kindV "kind of (* -> *) type variable #273"
1396− , test no yes intL41 litI "literal Int in hover info #274"
1397− , test no yes chrL36 litC "literal Char in hover info #274"
1398− , test no yes txtL8 litT "literal Text in hover info #274"
1399− , test no yes lstL43 litL "literal List in hover info #274"
1400− , test no yes docL41 constr "type constraint in hover info #283"
1401− , test broken broken outL45 outSig "top-level signature #310"
1402− , test broken broken innL48 innSig "inner signature #310"
1426+ -- def hover look expect
1427+ [ test yes yes fffL4 fff "field in record definition"
1428+ , test broken broken fffL8 fff "field in record construction #71"
1429+ , test yes yes fffL14 fff "field name used as accessor" -- 120 in Calculate.hs
1430+ , test yes yes aaaL14 aaa "top-level name" -- 120
1431+ , test yes yes dcL7 tcDC "data constructor record #247"
1432+ , test yes yes dcL12 tcDC "data constructor plain" -- 121
1433+ , test yes yes tcL6 tcData "type constructor #248" -- 147
1434+ , test broken yes xtcL5 xtc "type constructor external #248,249"
1435+ , test broken yes xvL20 xvMsg "value external package #249" -- 120
1436+ , test yes yes vvL16 vv "plain parameter" -- 120
1437+ , test yes yes aL18 apmp "pattern match name" -- 120
1438+ , test yes yes opL16 op "top-level operator" -- 120, 123
1439+ , test yes yes opL18 opp "parameter operator" -- 120
1440+ , test yes yes b'L19 bp "name in backticks" -- 120
1441+ , test yes yes clL23 cls "class in instance declaration #250"
1442+ , test yes yes clL25 cls "class in signature #250" -- 147
1443+ , test broken yes eclL15 ecls "external class in signature #249,250"
1444+ , test yes yes dnbL29 dnb "do-notation bind" -- 137
1445+ , test yes yes dnbL30 dnb "do-notation lookup"
1446+ , test yes yes lcbL33 lcb "listcomp bind" -- 137
1447+ , test yes yes lclL33 lcb "listcomp lookup"
1448+ , test yes yes mclL36 mcl "top-level fn 1st clause"
1449+ , test yes yes mclL37 mcl "top-level fn 2nd clause #246"
1450+ , test yes yes spaceL37 space "top-level fn on space #315"
1451+ , test no broken docL41 doc "documentation #7"
1452+ , test no yes eitL40 kindE "kind of Either #273"
1453+ , test no yes intL40 kindI "kind of Int #273"
1454+ , test no broken tvrL40 kindV "kind of (* -> *) type variable #273"
1455+ , test no yes intL41 litI "literal Int in hover info #274"
1456+ , test no yes chrL36 litC "literal Char in hover info #274"
1457+ , test no yes txtL8 litT "literal Text in hover info #274"
1458+ , test no yes lstL43 litL "literal List in hover info #274"
1459+ , test no yes docL41 constr "type constraint in hover info #283"
1460+ , test broken broken outL45 outSig "top-level signature #310"
1461+ , test broken broken innL48 innSig "inner signature #310"
1462+ , testM yes yes imported importedSig "Imported symbol"
1463+ , testM yes yes reexported reexportedSig "Imported symbol (reexported)"
14031464 ]
14041465 where yes, broken :: (TestTree -> Maybe TestTree)
14051466 yes = Just -- test should run and pass
14061467 broken = Just . (`xfail` "known broken")
14071468 no = const Nothing -- don't run this test at all
14081469
1470+checkFileCompiles :: FilePath -> TestTree
1471+checkFileCompiles fp =
1472+ testSessionWithExtraFiles "hover" ("Does " ++ fp ++ " compile") $ \dir -> do
1473+ void (openTestDataDoc (dir </> fp))
1474+ expectNoMoreDiagnostics 0.5
1475+
1476+
1477+
14091478pluginTests :: TestTree
1410−pluginTests = testSessionWait "plugins" $ do
1479+pluginTests = (`xfail8101` "known broken (#556)")
1480+ $ testSessionWait "plugins" $ do
14111481 let content =
14121482 T.unlines
14131483 [ "{-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-}"
@@ -1421,7 +1491,7 @@ pluginTests = testSessionWait "plugins" $ do
14211491 , "foo :: Int -> Int -> Int"
14221492 , "foo a b = a + c"
14231493 ]
1424− _ <- openDoc' "Testing.hs" "haskell" content
1494+ _ <- createDoc "Testing.hs" "haskell" content
14251495 expectDiagnostics
14261496 [ ( "Testing.hs",
14271497 [(DsError, (8, 14), "Variable not in scope: c")]
@@ -1448,7 +1518,7 @@ cppTests =
14481518 run $ expectError content (2, 1)
14491519 )
14501520 , testSessionWait "cpp-ghcide" $ do
1451− _ <- openDoc' "A.hs" "haskell" $ T.unlines
1521+ _ <- createDoc "A.hs" "haskell" $ T.unlines
14521522 ["{-# LANGUAGE CPP #-}"
14531523 ,"main ="
14541524 ,"#ifdef __GHCIDE__"
@@ -1462,7 +1532,7 @@ cppTests =
14621532 where
14631533 expectError :: T.Text -> Cursor -> Session ()
14641534 expectError content cursor = do
1465− _ <- openDoc' "Testing.hs" "haskell" content
1535+ _ <- createDoc "Testing.hs" "haskell" content
14661536 expectDiagnostics
14671537 [ ( "Testing.hs",
14681538 [(DsError, cursor, "error: unterminated")]
@@ -1478,13 +1548,43 @@ preprocessorTests = testSessionWait "preprocessor" $ do
14781548 , "module Testing where"
14791549 , "y = x + z" -- plugin replaces x with y, making this have only one diagnostic
14801550 ]
1481− _ <- openDoc' "Testing.hs" "haskell" content
1551+ _ <- createDoc "Testing.hs" "haskell" content
14821552 expectDiagnostics
14831553 [ ( "Testing.hs",
14841554 [(DsError, (2, 8), "Variable not in scope: z")]
14851555 )
14861556 ]
14871557
1558+
1559+safeTests :: TestTree
1560+safeTests =
1561+ testGroup
1562+ "SafeHaskell"
1563+ [ -- Test for https://github.com/digital-asset/ghcide/issues/424
1564+ testSessionWait "load" $ do
1565+ let sourceA =
1566+ T.unlines
1567+ ["{-# LANGUAGE Trustworthy #-}"
1568+ ,"module A where"
1569+ ,"import System.IO.Unsafe"
1570+ ,"import System.IO"
1571+ ,"trustWorthyId :: a -> a"
1572+ ,"trustWorthyId i = unsafePerformIO $ do"
1573+ ," putStrLn \"I'm safe\""
1574+ ," return i"]
1575+ sourceB =
1576+ T.unlines
1577+ ["{-# LANGUAGE Safe #-}"
1578+ ,"module B where"
1579+ ,"import A"
1580+ ,"safeId :: a -> a"
1581+ ,"safeId = trustWorthyId"
1582+ ]
1583+
1584+ _ <- createDoc "A.hs" "haskell" sourceA
1585+ _ <- createDoc "B.hs" "haskell" sourceB
1586+ expectNoMoreDiagnostics 1 ]
1587+
14881588thTests :: TestTree
14891589thTests =
14901590 testGroup
@@ -1510,8 +1610,8 @@ thTests =
15101610 "b :: Integer",
15111611 "b = $(litE $ IntegerL $ a) + n"
15121612 ]
1513− _ <- openDoc' "A.hs" "haskell" sourceA
1514− _ <- openDoc' "B.hs" "haskell" sourceB
1613+ _ <- createDoc "A.hs" "haskell" sourceA
1614+ _ <- createDoc "B.hs" "haskell" sourceB
15151615 expectDiagnostics [ ( "B.hs", [(DsError, (6, 29), "Variable not in scope: n")] ) ]
15161616 , testSessionWait "newtype-closure" $ do
15171617 let sourceA =
@@ -1531,8 +1631,8 @@ thTests =
15311631 ,"import A"
15321632 ,"b :: Int"
15331633 ,"b = $( a )" ]
1534− _ <- openDoc' "A.hs" "haskell" sourceA
1535− _ <- openDoc' "B.hs" "haskell" sourceB
1634+ _ <- createDoc "A.hs" "haskell" sourceA
1635+ _ <- createDoc "B.hs" "haskell" sourceB
15361636 return ()
15371637 ]
15381638
@@ -1541,7 +1641,7 @@ completionTests
15411641 = testGroup "completion"
15421642 [ testSessionWait "variable" $ do
15431643 let source = T.unlines ["module A where", "f = hea"]
1544− docId <- openDoc' "A.hs" "haskell" source
1644+ docId <- createDoc "A.hs" "haskell" source
15451645 compls <- getCompletions docId (Position 1 7)
15461646 liftIO $ map dropDocs compls @?=
15471647 [complItem "head" (Just CiFunction) (Just "[a] -> a")]
@@ -1553,7 +1653,7 @@ completionTests
15531653 ]
15541654 , testSessionWait "constructor" $ do
15551655 let source = T.unlines ["module A where", "f = Tru"]
1556− docId <- openDoc' "A.hs" "haskell" source
1656+ docId <- createDoc "A.hs" "haskell" source
15571657 compls <- getCompletions docId (Position 1 7)
15581658 liftIO $ map dropDocs compls @?=
15591659 [ complItem "True" (Just CiConstructor) (Just "Bool")
@@ -1565,7 +1665,7 @@ completionTests
15651665 ]
15661666 , testSessionWait "type" $ do
15671667 let source = T.unlines ["{-# OPTIONS_GHC -Wall #-}", "module A () where", "f :: ()", "f = ()"]
1568− docId <- openDoc' "A.hs" "haskell" source
1668+ docId <- createDoc "A.hs" "haskell" source
15691669 expectDiagnostics [ ("A.hs", [(DsWarning, (3,0), "not used")]) ]
15701670 changeDoc docId [TextDocumentContentChangeEvent Nothing Nothing $ T.unlines ["{-# OPTIONS_GHC -Wall #-}", "module A () where", "f :: Bo", "f = True"]]
15711671 compls <- getCompletions docId (Position 2 7)
@@ -1582,7 +1682,7 @@ completionTests
15821682 checkDocText "Bool" boolDocs [ "Defined in 'Prelude'" ]
15831683 , testSessionWait "qualified" $ do
15841684 let source = T.unlines ["{-# OPTIONS_GHC -Wunused-binds #-}", "module A () where", "f = ()"]
1585− docId <- openDoc' "A.hs" "haskell" source
1685+ docId <- createDoc "A.hs" "haskell" source
15861686 expectDiagnostics [ ("A.hs", [(DsWarning, (2, 0), "not used")]) ]
15871687 changeDoc docId [TextDocumentContentChangeEvent Nothing Nothing $ T.unlines ["{-# OPTIONS_GHC -Wunused-binds #-}", "module A () where", "f = Prelude.hea"]]
15881688 compls <- getCompletions docId (Position 2 15)
@@ -1596,9 +1696,30 @@ completionTests
15961696 ]
15971697 , testSessionWait "keyword" $ do
15981698 let source = T.unlines ["module A where", "f = newty"]
1599− docId <- openDoc' "A.hs" "haskell" source
1699+ docId <- createDoc "A.hs" "haskell" source
16001700 compls <- getCompletions docId (Position 1 9)
16011701 liftIO $ compls @?= [keywordItem "newtype"]
1702+ , testSessionWait "type context" $ do
1703+ let source = T.unlines
1704+ [ "{-# OPTIONS_GHC -Wunused-binds #-}"
1705+ , "module A () where"
1706+ , "f = f"
1707+ ]
1708+ docId <- createDoc "A.hs" "haskell" source
1709+ expectDiagnostics [("A.hs", [(DsWarning, (2, 0), "not used")])]
1710+ changeDoc docId
1711+ [ TextDocumentContentChangeEvent Nothing Nothing $ T.unlines
1712+ [ "{-# OPTIONS_GHC -Wunused-binds #-}"
1713+ , "module A () where"
1714+ , "f = f"
1715+ , "g :: Intege"
1716+ ]
1717+ ]
1718+ -- At this point the module parses but does not typecheck.
1719+ -- This should be sufficient to detect that we are in a
1720+ -- type context and only show the completion to the type.
1721+ compls <- getCompletions docId (Position 3 11)
1722+ liftIO $ map dropDocs compls @?= [complItem "Integer"(Just CiStruct) (Just "*")]
16021723 ]
16031724 where
16041725 dropDocs :: CompletionItem -> CompletionItem
@@ -1606,6 +1727,7 @@ completionTests
16061727 complItem label kind ty = CompletionItem
16071728 { _label = label
16081729 , _kind = kind
1730+ , _tags = List []
16091731 , _detail = (":: " <>) <$> ty
16101732 , _documentation = Nothing
16111733 , _deprecated = Nothing
@@ -1623,6 +1745,7 @@ completionTests
16231745 keywordItem label = CompletionItem
16241746 { _label = label
16251747 , _kind = Just CiKeyword
1748+ , _tags = List []
16261749 , _detail = Nothing
16271750 , _documentation = Nothing
16281751 , _deprecated = Nothing
@@ -1650,7 +1773,7 @@ outlineTests = testGroup
16501773 "outline"
16511774 [ testSessionWait "type class" $ do
16521775 let source = T.unlines ["module A where", "class A a where a :: a -> Bool"]
1653− docId <- openDoc' "A.hs" "haskell" source
1776+ docId <- createDoc "A.hs" "haskell" source
16541777 symbols <- getDocumentSymbols docId
16551778 liftIO $ symbols @?= Left
16561779 [ moduleSymbol
@@ -1663,7 +1786,7 @@ outlineTests = testGroup
16631786 ]
16641787 , testSessionWait "type class instance " $ do
16651788 let source = T.unlines ["class A a where", "instance A () where"]
1666− docId <- openDoc' "A.hs" "haskell" source
1789+ docId <- createDoc "A.hs" "haskell" source
16671790 symbols <- getDocumentSymbols docId
16681791 liftIO $ symbols @?= Left
16691792 [ classSymbol "A a" (R 0 0 0 15) []
@@ -1671,7 +1794,7 @@ outlineTests = testGroup
16711794 ]
16721795 , testSessionWait "type family" $ do
16731796 let source = T.unlines ["{-# language TypeFamilies #-}", "type family A"]
1674− docId <- openDoc' "A.hs" "haskell" source
1797+ docId <- createDoc "A.hs" "haskell" source
16751798 symbols <- getDocumentSymbols docId
16761799 liftIO $ symbols @?= Left [docSymbolD "A" "type family" SkClass (R 1 0 1 13)]
16771800 , testSessionWait "type family instance " $ do
@@ -1680,7 +1803,7 @@ outlineTests = testGroup
16801803 , "type family A a"
16811804 , "type instance A () = ()"
16821805 ]
1683− docId <- openDoc' "A.hs" "haskell" source
1806+ docId <- createDoc "A.hs" "haskell" source
16841807 symbols <- getDocumentSymbols docId
16851808 liftIO $ symbols @?= Left
16861809 [ docSymbolD "A a" "type family" SkClass (R 1 0 1 15)
@@ -1688,7 +1811,7 @@ outlineTests = testGroup
16881811 ]
16891812 , testSessionWait "data family" $ do
16901813 let source = T.unlines ["{-# language TypeFamilies #-}", "data family A"]
1691− docId <- openDoc' "A.hs" "haskell" source
1814+ docId <- createDoc "A.hs" "haskell" source
16921815 symbols <- getDocumentSymbols docId
16931816 liftIO $ symbols @?= Left [docSymbolD "A" "data family" SkClass (R 1 0 1 11)]
16941817 , testSessionWait "data family instance " $ do
@@ -1697,7 +1820,7 @@ outlineTests = testGroup
16971820 , "data family A a"
16981821 , "data instance A () = A ()"
16991822 ]
1700− docId <- openDoc' "A.hs" "haskell" source
1823+ docId <- createDoc "A.hs" "haskell" source
17011824 symbols <- getDocumentSymbols docId
17021825 liftIO $ symbols @?= Left
17031826 [ docSymbolD "A a" "data family" SkClass (R 1 0 1 11)
@@ -1705,36 +1828,36 @@ outlineTests = testGroup
17051828 ]
17061829 , testSessionWait "constant" $ do
17071830 let source = T.unlines ["a = ()"]
1708− docId <- openDoc' "A.hs" "haskell" source
1831+ docId <- createDoc "A.hs" "haskell" source
17091832 symbols <- getDocumentSymbols docId
17101833 liftIO $ symbols @?= Left
17111834 [docSymbol "a" SkFunction (R 0 0 0 6)]
17121835 , testSessionWait "pattern" $ do
17131836 let source = T.unlines ["Just foo = Just 21"]
1714− docId <- openDoc' "A.hs" "haskell" source
1837+ docId <- createDoc "A.hs" "haskell" source
17151838 symbols <- getDocumentSymbols docId
17161839 liftIO $ symbols @?= Left
17171840 [docSymbol "Just foo" SkFunction (R 0 0 0 18)]
17181841 , testSessionWait "pattern with type signature" $ do
17191842 let source = T.unlines ["{-# language ScopedTypeVariables #-}", "a :: () = ()"]
1720− docId <- openDoc' "A.hs" "haskell" source
1843+ docId <- createDoc "A.hs" "haskell" source
17211844 symbols <- getDocumentSymbols docId
17221845 liftIO $ symbols @?= Left
17231846 [docSymbol "a :: ()" SkFunction (R 1 0 1 12)]
17241847 , testSessionWait "function" $ do
17251848 let source = T.unlines ["a x = ()"]
1726− docId <- openDoc' "A.hs" "haskell" source
1849+ docId <- createDoc "A.hs" "haskell" source
17271850 symbols <- getDocumentSymbols docId
17281851 liftIO $ symbols @?= Left [docSymbol "a" SkFunction (R 0 0 0 8)]
17291852 , testSessionWait "type synonym" $ do
17301853 let source = T.unlines ["type A = Bool"]
1731− docId <- openDoc' "A.hs" "haskell" source
1854+ docId <- createDoc "A.hs" "haskell" source
17321855 symbols <- getDocumentSymbols docId
17331856 liftIO $ symbols @?= Left
17341857 [docSymbol' "A" SkTypeParameter (R 0 0 0 13) (R 0 5 0 6)]
17351858 , testSessionWait "datatype" $ do
17361859 let source = T.unlines ["data A = C"]
1737− docId <- openDoc' "A.hs" "haskell" source
1860+ docId <- createDoc "A.hs" "haskell" source
17381861 symbols <- getDocumentSymbols docId
17391862 liftIO $ symbols @?= Left
17401863 [ docSymbolWithChildren "A"
@@ -1742,9 +1865,21 @@ outlineTests = testGroup
17421865 (R 0 0 0 10)
17431866 [docSymbol "C" SkConstructor (R 0 9 0 10)]
17441867 ]
1868+ , testSessionWait "record fields" $ do
1869+ let source = T.unlines ["data A = B {", " x :: Int", " , y :: Int}"]
1870+ docId <- createDoc "A.hs" "haskell" source
1871+ symbols <- getDocumentSymbols docId
1872+ liftIO $ symbols @=? Left
1873+ [ docSymbolWithChildren "A" SkStruct (R 0 0 2 13)
1874+ [ docSymbolWithChildren' "B" SkConstructor (R 0 9 2 13) (R 0 9 0 10)
1875+ [ docSymbol "x" SkField (R 1 2 1 3)
1876+ , docSymbol "y" SkField (R 2 4 2 5)
1877+ ]
1878+ ]
1879+ ]
17451880 , testSessionWait "import" $ do
17461881 let source = T.unlines ["import Data.Maybe"]
1747− docId <- openDoc' "A.hs" "haskell" source
1882+ docId <- createDoc "A.hs" "haskell" source
17481883 symbols <- getDocumentSymbols docId
17491884 liftIO $ symbols @?= Left
17501885 [docSymbolWithChildren "imports"
@@ -1755,7 +1890,7 @@ outlineTests = testGroup
17551890 ]
17561891 , testSessionWait "multiple import" $ do
17571892 let source = T.unlines ["", "import Data.Maybe", "", "import Control.Exception", ""]
1758− docId <- openDoc' "A.hs" "haskell" source
1893+ docId <- createDoc "A.hs" "haskell" source
17591894 symbols <- getDocumentSymbols docId
17601895 liftIO $ symbols @?= Left
17611896 [docSymbolWithChildren "imports"
@@ -1770,7 +1905,7 @@ outlineTests = testGroup
17701905 [ "{-# language ForeignFunctionInterface #-}"
17711906 , "foreign import ccall \"a\" a :: Int"
17721907 ]
1773− docId <- openDoc' "A.hs" "haskell" source
1908+ docId <- createDoc "A.hs" "haskell" source
17741909 symbols <- getDocumentSymbols docId
17751910 liftIO $ symbols @?= Left [docSymbolD "a" "import" SkObject (R 1 0 1 33)]
17761911 , testSessionWait "foreign export" $ do
@@ -1778,7 +1913,7 @@ outlineTests = testGroup
17781913 [ "{-# language ForeignFunctionInterface #-}"
17791914 , "foreign export ccall odd :: Int -> Bool"
17801915 ]
1781− docId <- openDoc' "A.hs" "haskell" source
1916+ docId <- createDoc "A.hs" "haskell" source
17821917 symbols <- getDocumentSymbols docId
17831918 liftIO $ symbols @?= Left [docSymbolD "odd" "export" SkObject (R 1 0 1 39)]
17841919 ]
@@ -1791,6 +1926,8 @@ outlineTests = testGroup
17911926 DocumentSymbol name (Just detail) kind Nothing loc loc Nothing
17921927 docSymbolWithChildren name kind loc cc =
17931928 DocumentSymbol name Nothing kind Nothing loc loc (Just $ List cc)
1929+ docSymbolWithChildren' name kind loc selectionLoc cc =
1930+ DocumentSymbol name Nothing kind Nothing loc selectionLoc (Just $ List cc)
17941931 moduleSymbol name loc cc = DocumentSymbol name
17951932 Nothing
17961933 SkFile
@@ -1812,8 +1949,16 @@ pattern R x y x' y' = Range (Position x y) (Position x' y')
18121949xfail :: TestTree -> String -> TestTree
18131950xfail = flip expectFailBecause
18141951
1952+xfail8101 :: TestTree -> String -> TestTree
1953+#if MIN_GHC_API_VERSION(8,10,0)
1954+xfail8101 = flip expectFailBecause
1955+#else
1956+xfail8101 t _ = t
1957+#endif
1958+
18151959data Expect
18161960 = ExpectRange Range -- Both gotoDef and hover should report this range
1961+ | ExpectLocation Location
18171962-- | ExpectDefRange Range -- Only gotoDef should report this range
18181963 | ExpectHoverRange Range -- Only hover should report this range
18191964 | ExpectHoverText [T.Text] -- the hover message must contain these snippets
@@ -1826,6 +1971,9 @@ data Expect
18261971mkR :: Int -> Int -> Int -> Int -> Expect
18271972mkR startLine startColumn endLine endColumn = ExpectRange $ mkRange startLine startColumn endLine endColumn
18281973
1974+mkL :: Uri -> Int -> Int -> Int -> Int -> Expect
1975+mkL uri startLine startColumn endLine endColumn = ExpectLocation $ Location uri $ mkRange startLine startColumn endLine endColumn
1976+
18291977haddockTests :: TestTree
18301978haddockTests
18311979 = testGroup "haddock"
@@ -1885,6 +2033,7 @@ cradleTests :: TestTree
18852033cradleTests = testGroup "cradle"
18862034 [testGroup "dependencies" [sessionDepsArePickedUp]
18872035 ,testGroup "loading" [loadCradleOnlyonce]
2036+ ,testGroup "multi" [simpleMultiTest, simpleMultiTest2]
18882037 ]
18892038
18902039loadCradleOnlyonce :: TestTree
@@ -1899,17 +2048,53 @@ loadCradleOnlyonce = testGroup "load cradle only once"
18992048 test dir
19002049 implicit dir = test dir
19012050 test _dir = do
1902− doc <- openDoc' "B.hs" "haskell" "module B where\nimport Data.Foo"
2051+ doc <- createDoc "B.hs" "haskell" "module B where\nimport Data.Foo"
19032052 msgs <- someTill (skipManyTill anyMessage cradleLoadedMessage) (skipManyTill anyMessage (message @PublishDiagnosticsNotification))
19042053 liftIO $ length msgs @?= 1
19052054 changeDoc doc [TextDocumentContentChangeEvent Nothing Nothing "module B where\nimport Data.Maybe"]
19062055 msgs <- manyTill (skipManyTill anyMessage cradleLoadedMessage) (skipManyTill anyMessage (message @PublishDiagnosticsNotification))
19072056 liftIO $ length msgs @?= 0
1908− _ <- openDoc' "A.hs" "haskell" "module A where\nimport Bar"
2057+ _ <- createDoc "A.hs" "haskell" "module A where\nimport LoadCradleBar"
19092058 msgs <- manyTill (skipManyTill anyMessage cradleLoadedMessage) (skipManyTill anyMessage (message @PublishDiagnosticsNotification))
19102059 liftIO $ length msgs @?= 0
19112060
19122061
2062+dependentFileTest :: TestTree
2063+dependentFileTest = testGroup "addDependentFile"
2064+ [testGroup "file-changed" [testSession' "test" test]
2065+ ]
2066+ where
2067+ test dir = do
2068+ -- If the file contains B then no type error
2069+ -- otherwise type error
2070+ liftIO $ writeFile (dir </> "dep-file.txt") "A"
2071+ let fooContent = T.unlines
2072+ [ "{-# LANGUAGE TemplateHaskell #-}"
2073+ , "module Foo where"
2074+ , "import Language.Haskell.TH.Syntax"
2075+ , "foo :: Int"
2076+ , "foo = 1 + $(do"
2077+ , " qAddDependentFile \"dep-file.txt\""
2078+ , " f <- qRunIO (readFile \"dep-file.txt\")"
2079+ , " if f == \"B\" then [| 1 |] else lift f)"
2080+ ]
2081+ let bazContent = T.unlines ["module Baz where", "import Foo"]
2082+ _ <-createDoc "Foo.hs" "haskell" fooContent
2083+ doc <- createDoc "Baz.hs" "haskell" bazContent
2084+ expectDiagnostics
2085+ [("Foo.hs", [(DsError, (4, 6), "Couldn't match expected type")])]
2086+ -- Now modify the dependent file
2087+ liftIO $ writeFile (dir </> "dep-file.txt") "B"
2088+ let change = TextDocumentContentChangeEvent
2089+ { _range = Just (Range (Position 2 0) (Position 2 6))
2090+ , _rangeLength = Nothing
2091+ , _text = "f = ()"
2092+ }
2093+ -- Modifying Baz will now trigger Foo to be rebuilt as well
2094+ changeDoc doc [change]
2095+ expectDiagnostics [("Foo.hs", [])]
2096+
2097+
19132098cradleLoadedMessage :: Session FromServerMessage
19142099cradleLoadedMessage = satisfy $ \case
19152100 NotCustomServer (NotificationMessage _ (CustomServerMethod m) _) -> m == cradleLoadedMethod
@@ -1918,6 +2103,56 @@ cradleLoadedMessage = satisfy $ \case
19182103cradleLoadedMethod :: T.Text
19192104cradleLoadedMethod = "ghcide/cradle/loaded"
19202105
2106+-- Stack sets this which trips up cabal in the multi-component tests.
2107+-- However, our plugin tests rely on those env vars so we unset it locally.
2108+withoutStackEnv :: IO a -> IO a
2109+withoutStackEnv s =
2110+ bracket
2111+ (mapM getEnv vars >>= \prevState -> mapM_ unsetEnv vars >> pure prevState)
2112+ (\prevState -> mapM_ (\(var, value) -> restore var value) (zip vars prevState))
2113+ (const s)
2114+ where vars =
2115+ [ "GHC_PACKAGE_PATH"
2116+ , "GHC_ENVIRONMENT"
2117+ , "HASKELL_DIST_DIR"
2118+ , "HASKELL_PACKAGE_SANDBOX"
2119+ , "HASKELL_PACKAGE_SANDBOXES"
2120+ ]
2121+ restore var Nothing = unsetEnv var
2122+ restore var (Just val) = setEnv var val True
2123+
2124+simpleMultiTest :: TestTree
2125+simpleMultiTest = testCase "simple-multi-test" $ withoutStackEnv $ runWithExtraFiles "multi" $ \dir -> do
2126+ let aPath = dir </> "a/A.hs"
2127+ bPath = dir </> "b/B.hs"
2128+ aSource <- liftIO $ readFileUtf8 aPath
2129+ (TextDocumentIdentifier adoc) <- createDoc aPath "haskell" aSource
2130+ expectNoMoreDiagnostics 0.5
2131+ bSource <- liftIO $ readFileUtf8 bPath
2132+ bdoc <- createDoc bPath "haskell" bSource
2133+ expectNoMoreDiagnostics 0.5
2134+ locs <- getDefinitions bdoc (Position 2 7)
2135+ let fooL = mkL adoc 2 0 2 3
2136+ checkDefs locs (pure [fooL])
2137+ expectNoMoreDiagnostics 0.5
2138+
2139+-- Like simpleMultiTest but open the files in the other order
2140+simpleMultiTest2 :: TestTree
2141+simpleMultiTest2 = testCase "simple-multi-test2" $ withoutStackEnv $ runWithExtraFiles "multi" $ \dir -> do
2142+ let aPath = dir </> "a/A.hs"
2143+ bPath = dir </> "b/B.hs"
2144+ bSource <- liftIO $ readFileUtf8 bPath
2145+ bdoc <- createDoc bPath "haskell" bSource
2146+ expectNoMoreDiagnostics 5
2147+ aSource <- liftIO $ readFileUtf8 aPath
2148+ (TextDocumentIdentifier adoc) <- createDoc aPath "haskell" aSource
2149+ -- Need to have some delay here or the test fails
2150+ expectNoMoreDiagnostics 5
2151+ locs <- getDefinitions bdoc (Position 2 7)
2152+ let fooL = mkL adoc 2 0 2 3
2153+ checkDefs locs (pure [fooL])
2154+ expectNoMoreDiagnostics 0.5
2155+
19212156sessionDepsArePickedUp :: TestTree
19222157sessionDepsArePickedUp = testSession'
19232158 "session-deps-are-picked-up"
@@ -1927,7 +2162,7 @@ sessionDepsArePickedUp = testSession'
19272162 (dir </> "hie.yaml")
19282163 "cradle: {direct: {arguments: []}}"
19292164 -- Open without OverloadedStrings and expect an error.
1930− doc <- openDoc' "Foo.hs" "haskell" fooContent
2165+ doc <- createDoc "Foo.hs" "haskell" fooContent
19312166 expectDiagnostics
19322167 [("Foo.hs", [(DsError, (3, 6), "Couldn't match expected type")])]
19332168 -- Update hie.yaml to enable OverloadedStrings.
@@ -1962,6 +2197,9 @@ sessionDepsArePickedUp = testSession'
19622197testSession :: String -> Session () -> TestTree
19632198testSession name = testCase name . run
19642199
2200+testSessionWithExtraFiles :: FilePath -> String -> (FilePath -> Session ()) -> TestTree
2201+testSessionWithExtraFiles prefix name = testCase name . runWithExtraFiles prefix
2202+
19652203testSession' :: String -> (FilePath -> Session ()) -> TestTree
19662204testSession' name = testCase name . run'
19672205
@@ -1996,6 +2234,19 @@ mkRange a b c d = Range (Position a b) (Position c d)
19962234run :: Session a -> IO a
19972235run s = withTempDir $ \dir -> runInDir dir s
19982236
2237+runWithExtraFiles :: FilePath -> (FilePath -> Session a) -> IO a
2238+runWithExtraFiles prefix s = withTempDir $ \dir -> do
2239+ copyTestDataFiles dir prefix
2240+ runInDir dir (s dir)
2241+
2242+copyTestDataFiles :: FilePath -> FilePath -> IO ()
2243+copyTestDataFiles dir prefix = do
2244+ -- Copy all the test data files to the temporary workspace
2245+ testDataFiles <- getDirectoryFilesIO ("test/data" </> prefix) ["//*"]
2246+ for_ testDataFiles $ \f -> do
2247+ createDirectoryIfMissing True $ dir </> takeDirectory f
2248+ copyFile ("test/data" </> prefix </> f) (dir </> f)
2249+
19992250run' :: (FilePath -> Session a) -> IO a
20002251run' s = withTempDir $ \dir -> runInDir dir (s dir)
20012252
@@ -2007,6 +2258,7 @@ runInDir dir s = do
20072258 -- since the package import test creates "Data/List.hs", which otherwise has no physical home
20082259 createDirectoryIfMissing True $ dir ++ "/Data"
20092260
2261+
20102262 let cmd = unwords [ghcideExe, "--lsp", "--test", "--cwd", dir]
20112263 -- HIE calls getXgdDirectory which assumes that HOME is set.
20122264 -- Only sets HOME if it wasn't already set.
@@ -2024,7 +2276,7 @@ runInDir dir s = do
20242276openTestDataDoc :: FilePath -> Session TextDocumentIdentifier
20252277openTestDataDoc path = do
20262278 source <- liftIO $ readFileUtf8 $ "test/data" </> path
2027− openDoc' path "haskell" source
2279+ createDoc path "haskell" source
20282280
20292281findCodeActions :: TextDocumentIdentifier -> Range -> [T.Text] -> Session [CodeAction]
20302282findCodeActions doc range expectedTitles = do
@@ -2052,24 +2304,19 @@ findCodeAction doc range t = head <$> findCodeActions doc range [t]
20522304unitTests :: TestTree
20532305unitTests = do
20542306 testGroup "Unit"
2055− [ testCase "empty file path" $
2056− uriToFilePath' (fromNormalizedUri $ filePathToUri' "") @?= Just ""
2307+ [ testCase "empty file path does NOT work with the empty String literal" $
2308+ uriToFilePath' (fromNormalizedUri $ filePathToUri' "") @?= Just "."
2309+ , testCase "empty file path works using toNormalizedFilePath'" $
2310+ uriToFilePath' (fromNormalizedUri $ filePathToUri' (toNormalizedFilePath' "")) @?= Just ""
2311+ , testCase "empty path URI" $ do
2312+ Just URI{..} <- pure $ parseURI (T.unpack $ getUri $ fromNormalizedUri emptyPathUri)
2313+ uriScheme @?= "file:"
2314+ uriPath @?= ""
2315+ , testCase "from empty path URI" $ do
2316+ let uri = Uri "file://"
2317+ uriToFilePath' uri @?= Just ""
20572318 ]
20582319
2059−-- | Wrapper around 'LSPTest.openDoc'' that sends file creation events
2060−openDoc' :: FilePath -> String -> T.Text -> Session TextDocumentIdentifier
2061−openDoc' fp name contents = do
2062− res@(TextDocumentIdentifier uri) <- LSPTest.openDoc' fp name contents
2063− -- Needed as ghcide sets up and relies on WatchedFiles but lsp-test does not track them
2064− sendNotification WorkspaceDidChangeWatchedFiles (DidChangeWatchedFilesParams $ List [FileEvent uri FcCreated])
2065− return res
2066−
2067−-- | Version of 'LSPTest.openDoc'' that does not send WatchedFiles events for files outside the workspace
2068−openDoc'' :: FilePath -> String -> T.Text -> Session TextDocumentIdentifier
2069−-- At the moment this is just LSPTest.openDoc' but it may change in the future
2070−-- when/if lsp-test implements WatchedFiles
2071−openDoc'' = LSPTest.openDoc'
2072−
20732320positionMappingTests :: TestTree
20742321positionMappingTests =
20752322 testGroup "position mapping"
@@ -2239,11 +2486,11 @@ nthLine i r
22392486 | i >= Rope.rows r = error $ "Row number out of bounds: " <> show i <> "/" <> show (Rope.rows r)
22402487 | otherwise = Rope.takeWhile (/= '\n') $ fst $ Rope.splitAtLine 1 $ snd $ Rope.splitAtLine (i - 1) r
22412488
2242−getWatchedFilesSubscriptionsUntilProgressEnd :: Session [Maybe Value]
2243−getWatchedFilesSubscriptionsUntilProgressEnd = do
2244− msgs <- manyTill (Just <$> message @RegisterCapabilityRequest <|> Nothing <$ anyMessage) (message @WorkDoneProgressEndNotification)
2489+getWatchedFilesSubscriptionsUntil :: forall end . (FromJSON end, Typeable end) => Session [Maybe Value]
2490+getWatchedFilesSubscriptionsUntil = do
2491+ msgs <- manyTill (Just <$> message @RegisterCapabilityRequest <|> Nothing <$ anyMessage) (message @end)
22452492 return
22462493 [ args
2247− | Just (RequestMessage{_params = RegistrationParams (List regs)}) <- msgs
2494+ | Just RequestMessage{_params = RegistrationParams (List regs)} <- msgs
22482495 , Registration _id WorkspaceDidChangeWatchedFiles args <- regs
22492496 ]