mirror of
https://github.com/haskell/haskell-language-server.git
synced 2024-09-11 08:45:35 +03:00
Enable stylish-haskell with ghc 9.10
This commit is contained in:
parent
f523690ada
commit
cc869dd0ae
3
.github/workflows/test.yml
vendored
3
.github/workflows/test.yml
vendored
@ -165,8 +165,7 @@ jobs:
|
||||
name: Test hls-stan-plugin
|
||||
run: cabal test hls-stan-plugin-tests || cabal test hls-stan-plugin-tests
|
||||
|
||||
# TODO enable when it supports 9.10
|
||||
- if: matrix.test && matrix.ghc != '9.10'
|
||||
- if: matrix.test
|
||||
name: Test hls-stylish-haskell-plugin
|
||||
run: cabal test hls-stylish-haskell-plugin-tests || cabal test hls-stylish-haskell-plugin-tests
|
||||
|
||||
|
@ -45,3 +45,8 @@ constraints:
|
||||
if impl(ghc >= 9.9)
|
||||
-- https://github.com/haskell/haskell-language-server/issues/4324
|
||||
benchmarks: False
|
||||
|
||||
source-repository-package
|
||||
type:git
|
||||
location: https://github.com/jhrcek/stylish-haskell.git
|
||||
tag: 6223f45f4fbf36e52781c8661bd8de6842855958
|
||||
|
@ -1563,14 +1563,13 @@ flag stylishHaskell
|
||||
manual: True
|
||||
|
||||
common stylishHaskell
|
||||
if flag(stylishHaskell) && impl(ghc < 9.10)
|
||||
if flag(stylishHaskell)
|
||||
build-depends: haskell-language-server:hls-stylish-haskell-plugin
|
||||
cpp-options: -Dhls_stylishHaskell
|
||||
|
||||
library hls-stylish-haskell-plugin
|
||||
import: defaults, pedantic, warnings
|
||||
-- https://github.com/haskell/stylish-haskell/issues/479
|
||||
if !(flag(stylishHaskell) && impl(ghc < 9.10))
|
||||
if !flag(stylishHaskell)
|
||||
buildable: False
|
||||
exposed-modules: Ide.Plugin.StylishHaskell
|
||||
hs-source-dirs: plugins/hls-stylish-haskell-plugin/src
|
||||
@ -1589,7 +1588,7 @@ library hls-stylish-haskell-plugin
|
||||
|
||||
test-suite hls-stylish-haskell-plugin-tests
|
||||
import: defaults, pedantic, test-defaults, warnings
|
||||
if !(flag(stylishHaskell) && impl(ghc < 9.10))
|
||||
if !flag(stylishHaskell)
|
||||
buildable: False
|
||||
type: exitcode-stdio-1.0
|
||||
hs-source-dirs: plugins/hls-stylish-haskell-plugin/test
|
||||
|
Loading…
Reference in New Issue
Block a user