Skip to content

Commit 61f364c

Browse files
committed
Update to latest mpickering ghcide version
at 3dde18f06ea18731bb3befa0d81af9a6b894d917
1 parent 856be56 commit 61f364c

File tree

5 files changed

+20
-9
lines changed

5 files changed

+20
-9
lines changed

exe/Main.hs

+5-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import Development.IDE.Types.Diagnostics
4949
import Development.IDE.Types.Location
5050
import Development.IDE.Types.Logger
5151
import Development.IDE.Types.Options
52-
import Development.Shake (Action, action)
52+
import Development.Shake (Action)
5353
import DynFlags (gopt_set, gopt_unset,
5454
updOptLevel)
5555
import DynFlags (PackageFlag(..), PackageArg(..))
@@ -195,7 +195,7 @@ main = do
195195
, optInterfaceLoadingDiagnostics = argsTesting
196196
}
197197
debouncer <- newAsyncDebouncer
198-
initialise caps (mainRule >> pluginRules plugins >> action kick)
198+
initialise caps (mainRule >> pluginRules plugins)
199199
getLspId event hlsLogger debouncer options vfs
200200
else do
201201
-- GHC produces messages with UTF8 in them, so make sure the terminal doesn't error
@@ -241,11 +241,13 @@ expandFiles = concatMapM $ \x -> do
241241
fail $ "Couldn't find any .hs/.lhs files inside directory: " ++ x
242242
return files
243243

244-
244+
-- Running this every hover is too expensive, 0.2s on GHC for example
245+
{-
245246
kick :: Action ()
246247
kick = do
247248
files <- getFilesOfInterest
248249
void $ uses TypeCheck $ HashSet.toList files
250+
-}
249251

250252
-- | Print an LSP event.
251253
showEvent :: Lock -> FromServerMessage -> IO ()

stack-8.6.4.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extra-deps:
1414
- cabal-plan-0.5.0.0
1515
- constrained-dynamic-0.1.0.0
1616
# - ghcide-0.1.0
17-
- extra-1.6.18
17+
- extra-1.6.21
1818
- floskell-0.10.2
1919
- fuzzy-0.1.0.0
2020
- ghc-check-0.1.0.3
@@ -28,7 +28,7 @@ extra-deps:
2828
- haskell-src-exts-1.21.1
2929
# - hie-bios-0.4.0
3030
- github: fendor/hie-bios
31-
commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb
31+
commit: 87db34de1b10b03bb2c3d7f6bd3623bc1da96ba8
3232
- hlint-2.2.8
3333
- hoogle-5.0.17.11
3434
- hsimport-0.11.0
@@ -41,7 +41,9 @@ extra-deps:
4141
- regex-base-0.94.0.0
4242
- regex-tdfa-1.3.1.0
4343
- rope-utf16-splay-0.3.1.0
44-
- shake-0.18.5
44+
# - shake-0.18.5
45+
- github: mpickering/shake
46+
commit: 4d56fe9f09bd3bd63ead541c571c756995da490a
4547
- syz-0.2.0.0
4648
- tasty-rerun-1.1.17
4749
- temporary-1.2.1.1

stack-8.6.5.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ extra-deps:
1414
- clock-0.7.2
1515
- floskell-0.10.2
1616
# - ghcide-0.1.0
17+
- extra-1.6.21
1718
- fuzzy-0.1.0.0
1819
- ghc-check-0.1.0.3
1920
- ghc-lib-parser-8.10.1.20200412
@@ -23,7 +24,7 @@ extra-deps:
2324
- haskell-lsp-types-0.21.0.0
2425
# - hie-bios-0.4.0
2526
- github: fendor/hie-bios
26-
commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb
27+
commit: 87db34de1b10b03bb2c3d7f6bd3623bc1da96ba8
2728
- indexed-profunctors-0.1
2829
- lsp-test-0.10.2.0
2930
- monad-dijkstra-0.1.1.2
@@ -34,6 +35,8 @@ extra-deps:
3435
- regex-base-0.94.0.0
3536
- regex-pcre-builtin-0.95.1.1.8.43
3637
- regex-tdfa-1.3.1.0
38+
- github: mpickering/shake
39+
commit: 4d56fe9f09bd3bd63ead541c571c756995da490a
3740
- semialign-1.1
3841
- tasty-rerun-1.1.17
3942
- temporary-1.2.1.1

stack-8.8.2.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extra-deps:
2323
- haskell-src-exts-1.21.1
2424
# - hie-bios-0.4.0
2525
- github: fendor/hie-bios
26-
commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb
26+
commit: 87db34de1b10b03bb2c3d7f6bd3623bc1da96ba8
2727
- hlint-2.2.8
2828
- hoogle-5.0.17.11
2929
- hsimport-0.11.0
@@ -32,6 +32,8 @@ extra-deps:
3232
- monad-dijkstra-0.1.1.2
3333
- ormolu-0.0.5.0
3434
- semigroups-0.18.5
35+
- github: mpickering/shake
36+
commit: 4d56fe9f09bd3bd63ead541c571c756995da490a
3537
- temporary-1.2.1.1
3638

3739
flags:

stack-8.8.3.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extra-deps:
2323
- haskell-src-exts-1.21.1
2424
# - hie-bios-0.4.0
2525
- github: fendor/hie-bios
26-
commit: 89d28817716a1c8df7e191f3a43c4504bc6379eb
26+
commit: 87db34de1b10b03bb2c3d7f6bd3623bc1da96ba8
2727
- hlint-2.2.8
2828
- hoogle-5.0.17.11
2929
- hsimport-0.11.0
@@ -32,6 +32,8 @@ extra-deps:
3232
- monad-dijkstra-0.1.1.2
3333
- ormolu-0.0.5.0
3434
- semigroups-0.18.5
35+
- github: mpickering/shake
36+
commit: 4d56fe9f09bd3bd63ead541c571c756995da490a
3537
- temporary-1.2.1.1
3638

3739
flags:

0 commit comments

Comments
 (0)