Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GHC-9.0 support for hls-tactics-plugin #2581

Merged
merged 38 commits into from Jan 19, 2022
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
40b77d8
Initial partially broken ghc9 support for tactics
anka-213 Sep 16, 2021
3741044
Merge branch 'master' into tactics-ghc90
jneira Sep 17, 2021
caba0ca
Enable tactics plugin for nix as well
anka-213 Sep 17, 2021
cda6971
Wingman does support ghc9 now
anka-213 Sep 18, 2021
dec5fc3
Fix stack support for tactics ghc-9.0.1
anka-213 Sep 18, 2021
d382412
Enable tests for tactics on ghc-9 on ci
anka-213 Sep 18, 2021
ed528be
Actually enable tactics for ghc-9 on nix
anka-213 Sep 18, 2021
1474188
Wingman: Improve test failure messages
anka-213 Sep 18, 2021
75a7d85
Merge branch 'master' into tactics-ghc90
anka-213 Sep 20, 2021
dc2c5d7
Merge branch 'tactics-ghc90' of https://github.com/anka-213/haskell-l…
isovector Jan 12, 2022
2a9ea27
Get theta
isovector Jan 12, 2022
0aa62a1
Make wrapper theta discovery more reliable
isovector Jan 12, 2022
4460c6c
Fix AutoThetaRankN
isovector Jan 12, 2022
a208dda
Fix FmapJoin and FmapJoinInLet
isovector Jan 12, 2022
67ddf23
Fix MetaBegin
isovector Jan 12, 2022
86d63ff
Cleanup
isovector Jan 12, 2022
fa3e916
Merge branch 'master' into anka-213-tactics-ghc90
isovector Jan 12, 2022
ec8e439
Fix merge
isovector Jan 12, 2022
8dc0e63
Merge branch 'master' into anka-213-tactics-ghc90
isovector Jan 13, 2022
21779f9
Need a comma
isovector Jan 13, 2022
a812243
Try a better ConPatIn
isovector Jan 16, 2022
1440350
Oops
isovector Jan 16, 2022
fe01a29
its a nightmare
isovector Jan 16, 2022
b72ee1a
i hate ci
isovector Jan 16, 2022
8d1a052
ok that fixes the conpat
isovector Jan 17, 2022
c0082bc
Maybe this is the end of it
isovector Jan 17, 2022
254f8e4
ci
isovector Jan 17, 2022
68f79e3
Merge branch 'master' into anka-213-tactics-ghc90
isovector Jan 17, 2022
c0e67f2
refinery
isovector Jan 17, 2022
8d285a6
undo some changes
isovector Jan 17, 2022
1700d9b
no more tctypes?
isovector Jan 17, 2022
168d918
maybe it builds now
isovector Jan 17, 2022
df025ea
omg
isovector Jan 17, 2022
449a451
om F g
isovector Jan 17, 2022
688d946
expect fail on 9.2
isovector Jan 18, 2022
17eaad2
Merge branch 'master' into anka-213-tactics-ghc90
isovector Jan 19, 2022
a22dd48
fix
isovector Jan 19, 2022
30723f7
fix again
isovector Jan 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions test/functional/FunctionalCodeAction.hs
Expand Up @@ -231,7 +231,8 @@ typedHoleTests = testGroup "typed hole code actions" [
, "foo x = maxBound"
]

, testCase "doesn't work when wingman is active" $
, expectFailIfGhc92 "The wingman plugin doesn't yet compile in GHC92" $
testCase "doesn't work when wingman is active" $
runSession hlsCommand fullCaps "test/testdata" $ do
doc <- openDoc "TypedHoles.hs" "haskell"
_ <- waitForDiagnosticsFromSource doc "typecheck"
Expand Down Expand Up @@ -265,7 +266,8 @@ typedHoleTests = testGroup "typed hole code actions" [
, " stuff (A a) = A (a + 1)"
]

, testCase "doesnt show more suggestions when wingman is active" $
, expectFailIfGhc92 "The wingman plugin doesn't yet compile in GHC92" $
testCase "doesnt show more suggestions when wingman is active" $
runSession hlsCommand fullCaps "test/testdata" $ do
doc <- openDoc "TypedHoles2.hs" "haskell"
_ <- waitForDiagnosticsFromSource doc "typecheck"
Expand Down Expand Up @@ -353,6 +355,12 @@ unusedTermTests = testGroup "unused term code actions" [
$ Just CodeActionQuickFix `notElem` kinds
]

expectFailIfGhc92 :: String -> TestTree -> TestTree
expectFailIfGhc92 reason =
isovector marked this conversation as resolved.
Show resolved Hide resolved
case ghcVersion of
GHC92 -> expectFailBecause reason
_ -> id

disableWingman :: Session ()
disableWingman =
sendConfigurationChanged $ toJSON $ def
Expand Down