Skip to content

Commit 2cdbe2e

Browse files
alanzalanz
committed
Update stack files
1 parent 77dda30 commit 2cdbe2e

File tree

11 files changed

+428
-307
lines changed

11 files changed

+428
-307
lines changed

‎cabal.project‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@ packages:
22
./
33
ghcide
44

5-
source-repository-package
6-
type: git
7-
location: https://github.com/wz1000/shake
8-
tag: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
9-
10-
-- See https://github.com/haskell-hvr/cabal-plan/pull/55
11-
source-repository-package
12-
type: git
13-
location: https://github.com/peti/cabal-plan
14-
tag: 894b76c0b6bf8f7d2f881431df1f13959a8fce87
15-
165
tests: true
176
documentation: true
187

@@ -23,4 +12,4 @@ package ghcide
2312

2413
write-ghc-environment-files: never
2514

26-
index-state: 2020-05-24T12:28:23Z
15+
index-state: 2020-06-13T11:31:46Z

‎exe/Main.hs‎

Lines changed: 401 additions & 268 deletions
Large diffs are not rendered by default.

‎ghcide‎

Submodule ghcide updated 64 files

‎haskell-language-server.cabal‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ executable haskell-language-server
154154
-- which works for now.
155155
, ghc
156156
--------------------------------------------------------------
157-
, ghc-check >= 0.3.0.1 && < 0.4
157+
, ghc-check >= 0.5.0.1 && < 0.6
158158
, ghc-paths
159159
, ghcide
160160
, gitrev
@@ -164,6 +164,7 @@ executable haskell-language-server
164164
, haskell-language-server
165165
, hslogger
166166
, optparse-applicative
167+
, safe-exceptions
167168
, shake >= 0.17.5
168169
, text
169170
, time

‎src/Ide/Plugin/Example.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
122122
logInfo (ideLogger ideState) "Example.codeLens entered (ideLogger)" -- AZ
123123
case uriToFilePath' uri of
124124
Just (toNormalizedFilePath -> filePath) -> do
125-
_ <- runIdeAction "Example.codeLens" ideState $ runMaybeT $ useE TypeCheck filePath
125+
_ <- runIdeAction "Example.codeLens" (shakeExtras ideState) $ runMaybeT $ useE TypeCheck filePath
126126
_diag <- getDiagnostics ideState
127127
_hDiag <- getHiddenDiagnostics ideState
128128
let

‎src/Ide/Plugin/Example2.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
122122
logInfo (ideLogger ideState) "Example2.codeLens entered (ideLogger)" -- AZ
123123
case uriToFilePath' uri of
124124
Just (toNormalizedFilePath -> filePath) -> do
125-
_ <- runIdeAction (fromNormalizedFilePath filePath) ideState $ runMaybeT $ useE TypeCheck filePath
125+
_ <- runIdeAction (fromNormalizedFilePath filePath) (shakeExtras ideState) $ runMaybeT $ useE TypeCheck filePath
126126
_diag <- getDiagnostics ideState
127127
_hDiag <- getHiddenDiagnostics ideState
128128
let

‎stack-8.10.1.yaml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@ extra-deps:
1313
commit: 894b76c0b6bf8f7d2f881431df1f13959a8fce87
1414
- clock-0.7.2
1515
- floskell-0.10.3
16-
# - ghcide-0.1.0
16+
- ghc-check-0.5.0.1
1717
- ghc-exactprint-0.6.3
1818
- ghc-lib-parser-8.10.1.20200523
1919
- lens-4.19.1
20+
- lsp-test-0.11.0.2
2021
- monad-dijkstra-0.1.1.2
21-
- optics-core-0.3
22-
- github: wz1000/shake
23-
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
2422
- semigroups-0.18.5
2523
- temporary-1.2.1.1
2624

@@ -37,4 +35,4 @@ flags:
3735
nix:
3836
packages: [ icu libcxx zlib ]
3937

40-
concurrent-tests: false
38+
concurrent-tests: false

‎stack-8.6.4.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extra-deps:
1818
- extra-1.6.21
1919
- floskell-0.10.3
2020
- fuzzy-0.1.0.0
21-
- ghc-check-0.3.0.1
21+
- ghc-check-0.5.0.1
2222
- ghc-exactprint-0.6.2 # for HaRe
2323
- ghc-lib-parser-8.10.1.20200523
2424
- ghc-lib-parser-ex-8.10.0.4
@@ -36,7 +36,7 @@ extra-deps:
3636
- HsYAML-0.2.1.0@rev:1
3737
- HsYAML-aeson-0.2.0.0@rev:1
3838
- lens-4.18
39-
- lsp-test-0.10.3.0
39+
- lsp-test-0.11.0.2
4040
- microlens-th-0.4.2.3@rev:1
4141
- monad-dijkstra-0.1.1.2
4242
- monad-memo-0.4.1
@@ -47,9 +47,9 @@ extra-deps:
4747
- regex-base-0.94.0.0
4848
- regex-tdfa-1.3.1.0
4949
- rope-utf16-splay-0.3.1.0
50-
# - shake-0.18.5
51-
- github: wz1000/shake
52-
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
50+
- shake-0.19.1
51+
# - github: wz1000/shake
52+
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
5353
- stylish-haskell-0.11.0.0
5454
- syz-0.2.0.0
5555
- tasty-rerun-1.1.17

‎stack-8.6.5.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-14.27 # Last 8.6.5
1+
resolver: lts-14.27 # Last 8.6.5
22

33
packages:
44
- .
@@ -17,7 +17,7 @@ extra-deps:
1717
- floskell-0.10.3
1818
- fuzzy-0.1.0.0
1919
# - ghcide-0.1.0
20-
- ghc-check-0.3.0.1
20+
- ghc-check-0.5.0.1
2121
- ghc-lib-parser-8.10.1.20200523
2222
- ghc-lib-parser-ex-8.10.0.4
2323
- haddock-api-2.22.0@rev:1
@@ -29,7 +29,7 @@ extra-deps:
2929
- HsYAML-aeson-0.2.0.0@rev:1
3030
- indexed-profunctors-0.1
3131
- lens-4.18
32-
- lsp-test-0.10.3.0
32+
- lsp-test-0.11.0.2
3333
- monad-dijkstra-0.1.1.2
3434
- opentelemetry-0.4.0
3535
- optics-core-0.2
@@ -40,8 +40,8 @@ extra-deps:
4040
- regex-pcre-builtin-0.95.1.1.8.43
4141
- regex-tdfa-1.3.1.0
4242
- semialign-1.1
43-
- github: wz1000/shake
44-
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
43+
# - github: wz1000/shake
44+
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
4545
- stylish-haskell-0.11.0.0
4646
- tasty-rerun-1.1.17
4747
- temporary-1.2.1.1

‎stack-8.8.2.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extra-deps:
1212
- constrained-dynamic-0.1.0.0
1313
- floskell-0.10.3
1414
# - ghcide-0.1.0
15-
- ghc-check-0.3.0.1
15+
- ghc-check-0.5.0.1
1616
- ghc-lib-parser-8.10.1.20200523
1717
- ghc-lib-parser-ex-8.10.0.4
1818
- haddock-library-1.8.0
@@ -26,13 +26,13 @@ extra-deps:
2626
- HsYAML-0.2.1.0@rev:1
2727
- HsYAML-aeson-0.2.0.0@rev:1
2828
- ilist-0.3.1.0
29-
- lsp-test-0.10.3.0
29+
- lsp-test-0.11.0.2
3030
- monad-dijkstra-0.1.1.2
3131
- opentelemetry-0.4.0
3232
- ormolu-0.0.5.0
3333
- semigroups-0.18.5
34-
- github: wz1000/shake
35-
commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
34+
# - github: wz1000/shake
35+
# commit: fb3859dca2e54d1bbb2c873e68ed225fa179fbef
3636
- stylish-haskell-0.11.0.0
3737
- temporary-1.2.1.1
3838

0 commit comments

Comments
 (0)