Skip to content

Commit 942e914

Browse files
committed
Bump ghc and dependency bounds for stan plugin
Fix ghc bounds for stan plugin Update index-state
1 parent 2cb98aa commit 942e914

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ packages:
3535
./plugins/hls-refactor-plugin
3636
./plugins/hls-overloaded-record-dot-plugin
3737

38-
index-state: 2023-10-06T06:12:29Z
38+
index-state: 2023-10-30T20:39:48Z
3939

4040
tests: True
4141
test-show-details: direct

haskell-language-server.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ common hlint
247247
cpp-options: -Dhls_hlint
248248

249249
common stan
250-
if flag(stan) && (impl(ghc >= 8.10) && impl(ghc < 9.0))
251-
build-depends: hls-stan-plugin == 2.2.0.0
250+
if flag(stan) && (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.8.0))
251+
build-depends: hls-stan-plugin == 2.4.0.0
252252
cpp-options: -Dhls_stan
253253

254254
common moduleName

plugins/hls-stan-plugin/hls-stan-plugin.cabal

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-stan-plugin
3-
version: 2.2.0.0
3+
version: 2.4.0.0
44
synopsis: Stan integration plugin with Haskell Language Server
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -26,10 +26,10 @@ flag pedantic
2626
manual: True
2727

2828
library
29-
if impl(ghc < 8.10) || impl(ghc >= 9.0)
30-
buildable: False
31-
else
29+
if (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.8.0))
3230
buildable: True
31+
else
32+
buildable: False
3333
exposed-modules: Ide.Plugin.Stan
3434
hs-source-dirs: src
3535
build-depends:
@@ -38,6 +38,7 @@ library
3838
, data-default
3939
, deepseq
4040
, hashable
41+
, hie-compat
4142
, hls-plugin-api
4243
, ghc
4344
, ghcide
@@ -58,10 +59,10 @@ library
5859
OverloadedStrings
5960

6061
test-suite test
61-
if impl(ghc < 8.10) || impl(ghc >= 9.0)
62-
buildable: False
63-
else
62+
if (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.8.0))
6463
buildable: True
64+
else
65+
buildable: False
6566
type: exitcode-stdio-1.0
6667
default-language: Haskell2010
6768
hs-source-dirs: test
@@ -74,7 +75,7 @@ test-suite test
7475
, filepath
7576
, hls-stan-plugin
7677
, hls-plugin-api
77-
, hls-test-utils == 2.2.0.0
78+
, hls-test-utils == 2.4.0.0
7879
, lens
7980
, lsp-types
8081
, text

plugins/hls-stan-plugin/src/Ide/Plugin/Stan.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module Ide.Plugin.Stan (descriptor, Log) where
22

3+
import Compat.HieTypes (HieASTs, HieFile)
34
import Control.DeepSeq (NFData)
45
import Control.Monad (void)
56
import Control.Monad.IO.Class (liftIO)
@@ -27,7 +28,6 @@ import Development.IDE.GHC.Compat (HieASTs (HieASTs),
2728
srcSpanStartLine, tcg_exports)
2829
import Development.IDE.GHC.Error (realSrcSpanToRange)
2930
import GHC.Generics (Generic)
30-
import HieTypes (HieASTs, HieFile)
3131
import Ide.Plugin.Config
3232
import Ide.Types (PluginDescriptor (..),
3333
PluginId, configHasDiagnostics,

0 commit comments

Comments
 (0)