Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit aca3241

Browse files
committed
Update to hie-bios 0.5.0
1 parent d9d21fb commit aca3241

11 files changed

+13
-10
lines changed

cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ constraints:
2121

2222
write-ghc-environment-files: never
2323

24-
index-state: 2020-05-02T10:11:15Z
24+
index-state: 2020-05-08T10:11:15Z

haskell-ide-engine.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ library
9999
, vector
100100
, versions
101101
, yaml >= 0.8.31
102-
, hie-bios >= 0.4 && < 0.5.0
102+
, hie-bios >= 0.5 && < 0.6.0
103103
, bytestring-trie
104104
, unliftio
105105
, hlint >= 2.2.11

hie-plugin-api/Haskell/Ide/Engine/Cradle.hs

+3-2
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@ cabalHelperCradle file = do
471471
$ CradleSuccess
472472
ComponentOptions
473473
{ componentOptions = [file, fixImportDirs cwd "-i."]
474+
, componentRoot = cwd
474475
, componentDependencies = []
475476
}
476477
}
@@ -542,15 +543,15 @@ cabalHelperAction proj env fp = do
542543
getComponent proj env (toList units) relativeFp
543544
>>= \case
544545
Right comp -> do
545-
let fs' = getFlags comp
546-
let fs = map (fixImportDirs packageRoot) fs'
546+
let fs = getFlags comp
547547
let targets = getTargets comp relativeFp
548548
let ghcOptions = removeRTS (fs ++ targets)
549549
debugm $ "Flags for \"" ++ fp ++ "\": " ++ show ghcOptions
550550
debugm $ "Component Infos: " ++ show comp
551551
return
552552
$ CradleSuccess
553553
ComponentOptions { componentOptions = ghcOptions
554+
, componentRoot = packageRoot
554555
, componentDependencies = []
555556
}
556557
Left err -> return

stack-8.4.2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ extra-deps:
3333
- haskell-lsp-types-0.20.0.0
3434
- haskell-src-exts-1.22.0
3535
- haskell-src-exts-util-0.2.5
36-
- hie-bios-0.4.0
36+
- hie-bios-0.5.0
3737
- hlint-2.2.11
3838
- hoogle-5.0.17.15
3939
- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170

stack-8.4.3.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extra-deps:
3939
- haskell-lsp-types-0.20.0.0
4040
- haskell-src-exts-1.22.0
4141
- haskell-src-exts-util-0.2.5
42-
- hie-bios-0.4.0
42+
- hie-bios-0.5.0
4343
- hlint-2.2.11
4444
- hoogle-5.0.17.15
4545
- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170

stack-8.4.4.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ extra-deps:
3232
- haskell-lsp-types-0.20.0.0
3333
- haskell-src-exts-1.22.0
3434
- haskell-src-exts-util-0.2.5
35-
- hie-bios-0.4.0
35+
- hie-bios-0.5.0
3636
- hlint-2.2.11
3737
- hoogle-5.0.17.15
3838
- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170

stack-8.6.4.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extra-deps:
2525
- haskell-lsp-0.20.0.0
2626
- haskell-lsp-types-0.20.0.0
2727
- haskell-src-exts-1.22.0
28-
- hie-bios-0.4.0
28+
- hie-bios-0.5.0
2929
- hlint-2.2.11
3030
- hoogle-5.0.17.15
3131
- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170

stack-8.6.5.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extra-deps:
2828
- haskell-lsp-0.20.0.0
2929
- haskell-lsp-types-0.20.0.0
3030
- haskell-src-exts-1.22.0
31-
- hie-bios-0.4.0
31+
- hie-bios-0.5.0
3232
- hlint-2.2.11
3333
- hoogle-5.0.17.15
3434
- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170

stack-8.8.2.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extra-deps:
2222
- haskell-lsp-0.20.0.0
2323
- haskell-lsp-types-0.20.0.0
2424
- lsp-test-0.10.1.0
25-
- hie-bios-0.4.0
25+
- hie-bios-0.5.0
2626
- hlint-2.2.11
2727
- hoogle-5.0.17.15
2828
- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170

stack-8.8.3.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ extra-deps:
2424
- semigroups-0.18.5
2525
- temporary-1.2.1.1
2626
- unliftio-core-0.2.0.1
27+
- hie-bios-0.5.0
2728

2829
flags:
2930
haskell-ide-engine:

stack.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ extra-deps:
2323
- haskell-lsp-types-0.20.0.0
2424
- haskell-src-exts-1.22.0
2525
- hoogle-5.0.17.15
26+
- hie-bios-0.5.0
2627
- hsimport-0.11.0
2728
- ilist-0.3.1.0
2829
- lsp-test-0.10.1.0

0 commit comments

Comments
 (0)