Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c3b61fe

Browse files
fendormergify[bot]
andauthored
Use hie-bios 0.16 (#4647)
* Use hie-bios 0.16 * Strip RTS and verbosity flags after -unit flag parsing * Add RTS flags to test cases to make sure they are stripped out * pre-commit hook --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
1 parent 0a52558 commit c3b61fe

File tree

8 files changed

+19
-6
lines changed

8 files changed

+19
-6
lines changed

‎cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ packages:
88
./hls-test-utils
99

1010

11-
index-state: 2025-06-16T09:44:13Z
11+
index-state: 2025-07-09T16:51:20Z
1212

1313
tests: True
1414
test-show-details: direct

‎ghcide-test/data/multi-unit/a-1.0.0-inplace

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ base
1616
text
1717
-XHaskell98
1818
A
19+
+RTS
20+
-A32M
21+
-RTS

‎ghcide-test/data/multi-unit/c-1.0.0-inplace

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ a-1.0.0-inplace
1717
base
1818
-XHaskell98
1919
C
20+
+RTS
21+
-A32M

‎ghcide-test/exe/CradleTests.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,11 @@ simpleSubDirectoryTest =
117117

118118
multiTests :: FilePath -> [TestTree]
119119
multiTests dir =
120-
[simpleMultiTest dir, simpleMultiTest2 dir, simpleMultiTest3 dir, simpleMultiDefTest dir]
120+
[ simpleMultiTest dir
121+
, simpleMultiTest2 dir
122+
, simpleMultiTest3 dir
123+
, simpleMultiDefTest dir
124+
]
121125

122126
multiTestName :: FilePath -> String -> String
123127
multiTestName dir name = "simple-" ++ dir ++ "-" ++ name

‎ghcide/ghcide.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ library
7373
, Glob
7474
, haddock-library >=1.8 && <1.12
7575
, hashable
76-
, hie-bios ^>=0.15.0
76+
, hie-bios ^>=0.16.0
7777
, hie-compat ^>=0.3.0.0
7878
, hiedb ^>= 0.7.0.0
7979
, hls-graph == 2.11.0.0

‎ghcide/session-loader/Development/IDE/Session.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ import Development.IDE.Types.Location
6767
import Development.IDE.Types.Options
6868
import GHC.ResponseFile
6969
import qualified HIE.Bios as HieBios
70+
import qualified HIE.Bios.Cradle.Utils as HieBios
7071
import HIE.Bios.Environment hiding (getCacheDir)
7172
import HIE.Bios.Types hiding (Log)
7273
import qualified HIE.Bios.Types as HieBios
@@ -1144,7 +1145,10 @@ setOptions cfp (ComponentOptions theOpts compRoot _) dflags rootDir = do
11441145
initMulti unitArgFiles =
11451146
forM unitArgFiles $ \f -> do
11461147
args <- liftIO $ expandResponse [f]
1147-
initOne args
1148+
-- The reponse files may contain arguments like "+RTS",
1149+
-- and hie-bios doesn't expand the response files of @-unit@ arguments.
1150+
-- Thus, we need to do the stripping here.
1151+
initOne $ HieBios.removeRTS $ HieBios.removeVerbosityOpts args
11481152
initOne this_opts = do
11491153
(dflags', targets') <- addCmdOpts this_opts dflags
11501154
let dflags'' =

‎stack-lts22.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ extra-deps:
2222
- Diff-0.5
2323
- floskell-0.11.1
2424
- hiedb-0.7.0.0
25-
- hie-bios-0.15.0
25+
- hie-bios-0.16.0
2626
- implicit-hie-0.1.4.0
2727
- lsp-2.7.0.0
2828
- lsp-test-0.17.1.0

‎stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extra-deps:
2424
- floskell-0.11.1
2525
- hiedb-0.7.0.0
2626
- implicit-hie-0.1.4.0
27-
- hie-bios-0.15.0
27+
- hie-bios-0.16.0
2828
- hw-fingertree-0.1.2.1
2929
- monad-dijkstra-0.1.1.5
3030
- retrie-1.2.3

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /