Skip to content

Add support for brittany (needs aeson-2) and floskell with ghc-9.0.1 #2551

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.

Sign up for GitHub

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

Merged
merged 41 commits into from
Jan 12, 2022
Merged

Add support for brittany (needs aeson-2) and floskell with ghc-9.0.1 #2551

Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
cb6ad8c
Enable tests for brittany and 9.0.2
jneira Dec 27, 2021
4dc94ce
Enable tests for floskell plugin
jneira Dec 27, 2021
9430cc6
Merge branch 'master' of https://github.com/haskell/haskell-language-…
jneira Dec 29, 2021
e2822c2
cabal-ghc901.project: naively enable brittany
Anton-Latukha Dec 12, 2021
3b46968
haskell-language-server.cabal: bump brittany flag <(9.0.1->9.2.1)
Anton-Latukha Dec 12, 2021
40b48da
Trying to add support for brittany
jneira Dec 12, 2021
6d48732
Use last hackage floskell version
jneira Dec 14, 2021
159d507
Activate floskell in func-test suite
jneira Dec 21, 2021
0cd1c52
Restrict brittany in hackage for ghc<9.0.1
jneira Dec 21, 2021
7eb59ae
Adapt to Aeson.Key
jneira Dec 21, 2021
aa29a92
Update lsp source repo package
jneira Dec 21, 2021
0a70964
Refer pr for butcher
jneira Dec 21, 2021
ab79e36
Add missing prefix
jneira Dec 21, 2021
08c5d94
Adapt to aeson-2 (incomplete)
jneira Dec 21, 2021
dfe6e37
Use compat module
jneira Dec 22, 2021
dc06c41
Support for aeson-2 and extra-1.7.10
jneira Dec 27, 2021
e419f6b
Remove lsp
jneira Dec 29, 2021
5ea7bef
Allow newer aeson for stylish-haskell
jneira Dec 29, 2021
1dbbc52
Add needed import for non windows
jneira Dec 29, 2021
b528bcd
Remove insertJson and toJsonKey
jneira Dec 29, 2021
1a7c60b
Update cabal-ghc901.project
jneira Dec 30, 2021
ad303ff
Merge branch 'master' into brittany-9.0.1
jneira Dec 30, 2021
223e6ee
Missing import
jneira Dec 30, 2021
e49c437
Merge branch 'master' into brittany-9.0.1
jneira Jan 3, 2022
eaef641
Avoid CPP by using lens-aeson
michaelpj Jan 5, 2022
2d15a5c
Update hls-plugin-api/src/Ide/Plugin/ConfigUtils.hs
jneira Jan 5, 2022
9146431
Merge pull request #62 from michaelpj/mpj/brittany-lens
jneira Jan 5, 2022
9e33d28
Merge branch 'master' into brittany-9.0.1
jneira Jan 5, 2022
34000ba
Use ghcide compat module
jneira Jan 8, 2022
238f553
Use type alias in cpp
jneira Jan 8, 2022
31c3258
Fix stack build for ghc-8.6.5
jneira Jan 8, 2022
8afbd7c
Use lens-aeson key
jneira Jan 10, 2022
c6d56f1
Use lens-aeson in func-test
jneira Jan 10, 2022
478203c
Fixup shake-bench
michaelpj Jan 10, 2022
61e8d7f
Merge branch 'master' into brittany-9.0.1
jneira Jan 10, 2022
15b241c
Merge pull request #63 from michaelpj/mpj/shake-bench-aeson
jneira Jan 10, 2022
a545d9f
Update docs
jneira Jan 10, 2022
0f1383f
Switch to lens ix
jneira Jan 11, 2022
b81761d
Try this
michaelpj Jan 11, 2022
97a9bf3
Merge pull request #64 from michaelpj/mpj/shake-bench-aeson
jneira Jan 12, 2022
5a6b878
Merge branch 'master' into brittany-9.0.1
mergify[bot] Jan 12, 2022
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
2 changes: 1 addition & 1 deletion hls-plugin-api/src/Ide/Plugin/ConfigUtils.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import Language.LSP.Types
-- | Generates a default 'Config', but remains only effective items
pluginsToDefaultConfig :: IdePlugins a -> A.Value
pluginsToDefaultConfig IdePlugins {..} =
-- Use 'ix' to look at all the "haskell" keys in the outer value (since we're not
-- Use 'key' to look at all the "haskell" keys in the outer value (since we're not
-- setting it if missing), then we use '_Object' and 'at' to get at the "plugin" key
-- and actually set it.
A.toJSON defaultConfig & key "haskell" . _Object . at "plugin" ?~ elems
Expand Down