Skip to content

Commit e4bb856

Browse files
authored
Merge branch 'master' into fourmolu-3
2 parents 1075e75 + 6322eb1 commit e4bb856

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1192
-531
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This is *very* early stage software.
7575
"$everything": -haddock
7676
```
7777
78-
This will cause compilation errors if a dependency contains invalid Haddock markup, though in a future version of GHC (hopefully 8.12), [these will be demoted to warnings](https://gitlab.haskell.org/ghc/ghc/-/merge_requests/2377).
78+
This will cause compilation errors if a dependency contains invalid Haddock markup, though from GHC version 9.0, [these will be demoted to warnings](https://gitlab.haskell.org/ghc/ghc/-/merge_requests/2377).
7979
8080
- Integration with [retrie](https://hackage.haskell.org/package/retrie)
8181

ghcide

haskell-language-server.cabal

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ library
8080
executable haskell-language-server
8181
import: agpl, common-deps
8282
main-is: Main.hs
83-
hs-source-dirs: exe plugins/default/src
83+
hs-source-dirs: exe plugins/default/src plugins/tactics/src
8484
other-modules:
8585
Ide.Plugin.Eval
8686
Ide.Plugin.Example
@@ -93,9 +93,17 @@ executable haskell-language-server
9393
Ide.Plugin.Retrie
9494
Ide.Plugin.StylishHaskell
9595
Ide.Plugin.Tactic
96-
Ide.Plugin.Tactic.Types
96+
Ide.Plugin.Tactic.CodeGen
97+
Ide.Plugin.Tactic.Context
98+
Ide.Plugin.Tactic.Debug
99+
Ide.Plugin.Tactic.GHC
100+
Ide.Plugin.Tactic.Judgements
97101
Ide.Plugin.Tactic.Machinery
102+
Ide.Plugin.Tactic.Naming
103+
Ide.Plugin.Tactic.Range
98104
Ide.Plugin.Tactic.Tactics
105+
Ide.Plugin.Tactic.Types
106+
Ide.Plugin.Tactic.TestTypes
99107
Ide.TreeTransform
100108

101109
ghc-options:
@@ -147,8 +155,9 @@ executable haskell-language-server
147155
, transformers
148156
, unordered-containers
149157
, ghc-source-gen
150-
, refinery ^>=0.1
158+
, refinery ^>=0.2
151159
, ghc-exactprint
160+
, fingertree
152161

153162
if flag(agpl)
154163
build-depends: brittany
@@ -237,7 +246,8 @@ test-suite func-test
237246
, tasty-golden
238247
, tasty-rerun
239248

240-
hs-source-dirs: test/functional plugins/default/src
249+
hs-source-dirs: test/functional plugins/tactics/src
250+
241251
main-is: Main.hs
242252
other-modules:
243253
Command
@@ -258,7 +268,7 @@ test-suite func-test
258268
Symbol
259269
TypeDefinition
260270
Tactic
261-
Ide.Plugin.Tactic.Types
271+
Ide.Plugin.Tactic.TestTypes
262272

263273
ghc-options:
264274
-Wall -Wno-name-shadowing -threaded -rtsopts -with-rtsopts=-N

plugins/default/src/Ide/Plugin/Tactic/Machinery.hs

Lines changed: 0 additions & 264 deletions
This file was deleted.

0 commit comments

Comments
 (0)