From 9b81c21305f952da8c7721cc9aabf893af69a453 Mon Sep 17 00:00:00 2001 From: Fendor Date: Sun, 10 Mar 2024 16:08:33 +0100 Subject: [PATCH 1/2] Fix references to old names --- test/utils/Test/Hls/Flags.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/utils/Test/Hls/Flags.hs b/test/utils/Test/Hls/Flags.hs index 7ff17af076..8e60ebb93e 100644 --- a/test/utils/Test/Hls/Flags.hs +++ b/test/utils/Test/Hls/Flags.hs @@ -10,7 +10,7 @@ import Test.Hls (TestTree, ignoreTestBecause) -- | Disable test unless the eval flag is set requiresEvalPlugin :: TestTree -> TestTree -#if eval +#if hls_eval requiresEvalPlugin = id #else requiresEvalPlugin = ignoreTestBecause "Eval plugin disabled" @@ -19,7 +19,7 @@ requiresEvalPlugin = ignoreTestBecause "Eval plugin disabled" -- * Formatters -- | Disable test unless the floskell flag is set requiresFloskellPlugin :: TestTree -> TestTree -#if floskell +#if hls_floskell requiresFloskellPlugin = id #else requiresFloskellPlugin = ignoreTestBecause "Floskell plugin disabled" @@ -27,7 +27,7 @@ requiresFloskellPlugin = ignoreTestBecause "Floskell plugin disabled" -- | Disable test unless the fourmolu flag is set requiresFourmoluPlugin :: TestTree -> TestTree -#if fourmolu +#if hls_fourmolu requiresFourmoluPlugin = id #else requiresFourmoluPlugin = ignoreTestBecause "Fourmolu plugin disabled" @@ -35,7 +35,7 @@ requiresFourmoluPlugin = ignoreTestBecause "Fourmolu plugin disabled" -- | Disable test unless the ormolu flag is set requiresOrmoluPlugin :: TestTree -> TestTree -#if ormolu +#if hls_ormolu requiresOrmoluPlugin = id #else requiresOrmoluPlugin = ignoreTestBecause "Ormolu plugin disabled" From d7bd37cb8b81d8c4849d2c06b8a0fe6cce3bc75f Mon Sep 17 00:00:00 2001 From: Fendor Date: Sun, 10 Mar 2024 18:14:50 +0100 Subject: [PATCH 2/2] WIP --- haskell-language-server.cabal | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 613323b361..385d50c534 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -1778,6 +1778,10 @@ test-suite func-test , warnings , pedantic , refactor + , eval + , fourmolu + , ormolu + , floskell type: exitcode-stdio-1.0 build-tool-depends: haskell-language-server:haskell-language-server,