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

Support for 9.10 #4233

Merged
merged 94 commits into from
Jun 13, 2024
Merged
Changes from 1 commit
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
9dd4315
Support for 9.10
wz1000 May 7, 2024
6818217
Remove indexed-traversable allow-newer
jhrcek May 16, 2024
d188e46
Fix couple of warnings
jhrcek May 16, 2024
adebee5
Fix flags job for hls-graph
jhrcek May 16, 2024
263bd98
foldl' exposed from Prelude since base 4.20
jhrcek May 16, 2024
cd5d313
Fix flags job for hls-plugin-api
jhrcek May 16, 2024
d650b8a
Fix ghcide hover test
jhrcek May 16, 2024
2a6da3c
Fix flags job for hls-eval-plugin
jhrcek May 16, 2024
998a62a
unzip since 4.19
jhrcek May 16, 2024
3c738e3
More pedantic fixes
jhrcek May 16, 2024
125286e
Don't CPP in tests, fix another test
jhrcek May 16, 2024
55975ce
Switch to ghc-exactprint and witherable from hackage
jhrcek May 17, 2024
c4bd43c
Fix all warnings in hls-refactor-plugin
jhrcek May 17, 2024
8bfb302
Remove more no longer necessary allow newers
jhrcek May 17, 2024
0f86666
Fix all warnings in hls-gadp-plugin and hls-qualify-imported-names-pl…
jhrcek May 17, 2024
83da672
Remove allow-newer for boring
jhrcek May 17, 2024
9cd79b3
Bump to lsp 2.6, remove more allow-newers
jhrcek May 17, 2024
ed044ce
outline tests
wz1000 May 17, 2024
c7fa870
disable simple plugin on 9.10
wz1000 May 17, 2024
f29a55c
Remove allow-newer for ghc-trace-events
jhrcek May 18, 2024
31ff952
Merge master, resolve merge conflicts
jhrcek May 18, 2024
2746b1f
fix appendConstraint
soulomoon May 18, 2024
24e7831
stylish
soulomoon May 18, 2024
190894d
Remove commutative-semigroups and monoid-subclasses from allow-newer
jhrcek May 19, 2024
0e61fa3
Remove free from allow-newer
jhrcek May 19, 2024
f72f2d9
Fix 'type wilcard actions' tests
jhrcek May 19, 2024
b0e117b
Remove hie-bios from allow-newer
jhrcek May 19, 2024
2f3300e
Fix suggestNewDefinition tests
jhrcek May 19, 2024
86f28b7
Revert "Fix suggestNewDefinition tests"
jhrcek May 19, 2024
2be2b20
Remove makeDeltaAst breaking tests unrelated to addArgument
jhrcek May 20, 2024
cebd20d
Merge master
jhrcek May 21, 2024
d45aa21
Fix 79 code action tests
jhrcek May 21, 2024
be89b2d
Fix 12 more tests
jhrcek May 21, 2024
b8b0f1c
Remove co-log-core from allow-newer
jhrcek May 21, 2024
79b6eba
Fix 21 more tests
jhrcek May 21, 2024
a9d4b4b
Fix 8 import disambiguation tests
jhrcek May 22, 2024
5a4405d
fix windows ghcide tests
wz1000 May 22, 2024
5bf9e7d
Fix adding argument to function body
jhrcek May 23, 2024
45ee5ea
update retrie commit, progress in add argument tests
jhrcek May 23, 2024
e7b14fc
Fix few stylish-haskell parse errors
jhrcek May 23, 2024
80dd20f
Fix remaining redundant constraint tests
jhrcek May 26, 2024
5849e23
Merge branch 'master' into wip/9.10
soulomoon May 27, 2024
ba58c22
Remove allow-newer for constraint-extras
jhrcek May 28, 2024
d955f9a
Fix warnings after master merge
jhrcek May 28, 2024
0655fcc
Fix most add argument tests except for one
jhrcek May 28, 2024
625190d
Remove dependent-map from allow-newer
jhrcek May 28, 2024
6f60029
Try removing some allow-newers from lsp
michaelpj May 28, 2024
c4e607e
Ormolu is updated, add links for other tool dependencies
michaelpj May 28, 2024
cfdf0d7
Revert "Try removing some allow-newers from lsp"
michaelpj May 28, 2024
ebf876e
Try this
michaelpj May 28, 2024
7a8b116
Fix all gadt plugin and most class plugin tests, enable 2 tests for g…
jhrcek May 28, 2024
bf53e20
Undo spurious changes
jhrcek May 28, 2024
7530af8
Update eval plugin tests
jhrcek May 29, 2024
fca8500
Disable broken refactor plugin test for now
jhrcek May 29, 2024
cabdbfd
Merge branch 'master' into wip/9.10
jhrcek May 29, 2024
aee8cd6
Fix warnings
jhrcek May 29, 2024
d25ea19
Add source-repository-package to unblock floskell
jhrcek May 29, 2024
28cce35
Make call hierarchy plugin tests green
jhrcek May 29, 2024
de01710
fix semantic tokens 9.10
soulomoon May 29, 2024
7649381
Merge branch 'master' into wip/9.10
soulomoon May 29, 2024
07087f2
Fix remaining class plugin test
jhrcek May 30, 2024
91646e5
Merge branch 'master' into wip/9.10
jhrcek May 30, 2024
58aa714
Update hls-change-type tests
jhrcek May 30, 2024
ec02b11
Make class plugin more robust
jhrcek May 31, 2024
faf6ac2
Merge branch 'master' into wip/9.10
jhrcek Jun 1, 2024
3283c6b
Fix stylish parse errors, simplify CPP
jhrcek Jun 1, 2024
750ee5b
Cleanups
jhrcek Jun 1, 2024
07080c0
Remove retrie dep from hls-refactor-plugin
wz1000 Jun 3, 2024
61403b1
More retrie fixes
wz1000 Jun 3, 2024
ea62173
Fix cabal-plugin-tests by respecting maxCompletions client cfg + a bi…
jhrcek Jun 8, 2024
1350419
Merge branch 'master' into wip/9.10
jhrcek Jun 8, 2024
2923ac3
Merge branch 'master' into wip/9.10
soulomoon Jun 9, 2024
f687205
Fixup ghcide-tests
michaelpj Jun 10, 2024
4efb898
disable retrie, splice and floskell plugins for 9.10
wz1000 Jun 10, 2024
03fff2c
Merge branch 'master' into wip/9.10
jhrcek Jun 11, 2024
1b405cc
Update tested-with + fix import warning
jhrcek Jun 11, 2024
9d45176
Fix stylish
jhrcek Jun 11, 2024
b1447b6
Fix compilation with 9.2.8, fix stack jobs
jhrcek Jun 11, 2024
0a746f3
Remove no longer relevant :type +v test
jhrcek Jun 11, 2024
de8a315
Disable tests of disabled plugins in CI
jhrcek Jun 11, 2024
e1e3085
Try a better broken specifier?
michaelpj Jun 11, 2024
e64e117
Fix invalid CI config
jhrcek Jun 11, 2024
4f92fbf
Use getClientConfigAction instead of introducing new HandlerM action
jhrcek Jun 11, 2024
747b1c7
Move CPPd imports to prevent stylish from evaluating CPP
jhrcek Jun 11, 2024
8267cad
Disable stan tests with ghc 9.10 in CI
jhrcek Jun 11, 2024
efad46c
attempt fixing exactprint <9.10
wz1000 Jun 12, 2024
7142686
Try enabling fourmolu now
michaelpj Jun 12, 2024
eafeda8
Revert "Try enabling fourmolu now"
michaelpj Jun 12, 2024
dfe720d
Update code-range-plugin tests
jhrcek Jun 13, 2024
35a0002
Fix No newline at the end of file
jhrcek Jun 13, 2024
db3aa95
Use more recent cabal-gild
jhrcek Jun 13, 2024
333d5b0
Try setting some linker flags for macos
michaelpj Jun 13, 2024
acf9667
Merge branch 'master' into wip/9.10
michaelpj Jun 13, 2024
531b198
Ignore non-local variable completion test on windows for GHC 9.8
fendor Jun 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
attempt fixing exactprint <9.10
  • Loading branch information
wz1000 committed Jun 12, 2024
commit efad46c20e8a4d8cd97ef16f22b264d1d1eb03e7
Original file line number Diff line number Diff line change
Expand Up @@ -213,17 +213,7 @@ toCodeAction3 get f = ExceptT . ReaderT $ \caa -> get caa >>= flip runReaderT ca

-- | this instance returns a delta AST, useful for exactprint transforms
instance ToCodeAction r => ToCodeAction (ParsedSource -> r) where
#if !MIN_VERSION_ghc(9,3,0)
toCodeAction f = ExceptT . ReaderT $ \caa@CodeActionArgs {caaAnnSource = x} ->
x >>= \case
Just s -> flip runReaderT caa . runExceptT . toCodeAction $ f s
_ -> pure $ Right []
#else
toCodeAction f = ExceptT . ReaderT $ \caa@CodeActionArgs {caaParsedModule = x} ->
x >>= \case
Just s -> flip runReaderT caa . runExceptT . toCodeAction . f . pm_parsed_source $ s
_ -> pure $ Right []
#endif
toCodeAction = toCodeAction2 caaAnnSource

instance ToCodeAction r => ToCodeAction (ExportsMap -> r) where
toCodeAction = toCodeAction3 caaExportsMap
Expand Down
Loading