File tree 6 files changed +12
-5
lines changed
6 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -156,7 +156,13 @@ showEvent lock e = withLock lock $ print e
156
156
157
157
cradleToSession :: Cradle -> IO HscEnvEq
158
158
cradleToSession cradle = do
159
- opts <- either throwIO return =<< getCompilerOptions " " cradle
159
+ cradleRes <- getCompilerOptions " " cradle
160
+ opts <- case cradleRes of
161
+ CradleSuccess r -> pure r
162
+ CradleFail err -> throwIO err
163
+ -- TODO Rather than failing here, we should ignore any files that use this cradle.
164
+ -- That will require some more changes.
165
+ CradleNone -> fail " 'none' cradle is not yet supported"
160
166
libdir <- getLibdir
161
167
env <- runGhc (Just libdir) $ do
162
168
_targets <- initSession opts
Original file line number Diff line number Diff line change @@ -150,7 +150,7 @@ executable ghcide
150
150
ghc-paths,
151
151
ghc,
152
152
haskell-lsp,
153
- hie-bios >= 0.2 && < 0.3 ,
153
+ hie-bios >= 0.3 && < 0.4 ,
154
154
ghcide,
155
155
optparse-applicative,
156
156
shake,
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ extra-deps:
5
5
- haskell-lsp-0.18.0.0
6
6
- haskell-lsp-types-0.18.0.0
7
7
- lsp-test-0.8.2.0
8
- - hie-bios-0.2 .0
8
+ - hie-bios-0.3 .0
9
9
- ghc-lib-parser-8.8.1
10
10
- ghc-lib-8.8.1
11
11
nix :
Original file line number Diff line number Diff line change @@ -5,6 +5,6 @@ extra-deps:
5
5
- haskell-lsp-0.18.0.0
6
6
- haskell-lsp-types-0.18.0.0
7
7
- lsp-test-0.8.2.0
8
- - hie-bios-0.2.1
8
+ - hie-bios-0.3.0
9
9
nix :
10
10
packages : [zlib]
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ extra-deps:
10
10
- shake-0.18.3
11
11
- filepattern-0.1.1
12
12
- js-dgtable-0.5.2
13
- - hie-bios-0.2.1
13
+ - hie-bios-0.3.0
14
14
nix :
15
15
packages : [zlib]
16
16
allow-newer : true
Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ resolver: nightly-2019-12-06
2
2
packages :
3
3
- .
4
4
extra-deps :
5
+ - hie-bios-0.3.0
5
6
allow-newer : true
6
7
nix :
7
8
packages : [zlib]
You can’t perform that action at this time.
0 commit comments