Skip to content

Commit 6a09342

Browse files
committed
Pre-commit: Fix ignored files
It looks like `ExactPrint` was ignored before, but since absolute paths are used and weren't adapted it wasn't ignored afterwards.
1 parent b62284e commit 6a09342

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"hooks": [
55
{
66
"entry": "stylish-haskell --inplace",
7-
"exclude": "(^Setup.hs$|test/testdata/.*$|test/data/.*$|test/manual/lhs/.*$|^hie-compat/.*$|^plugins/hls-tactics-plugin/.*$|^ghcide/src/Development/IDE/GHC/Compat.hs$|^ghcide/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$|^ghcide/src/Development/IDE/Spans/Pragmas.hs$|^ghcide/src/Development/IDE/LSP/Outline.hs$|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$|^ghcide/test/exe/Main.hs$|ghcide/src/Development/IDE/Core/Rules.hs|^hls-test-utils/src/Test/Hls/Util.hs$)",
7+
"exclude": "(^Setup.hs$|test/testdata/.*$|test/data/.*$|test/manual/lhs/.*$|^hie-compat/.*$|^plugins/hls-tactics-plugin/.*$|^ghcide/src/Development/IDE/GHC/Compat.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/Compat/ExactPrint.hs$|^ghcide/src/Development/IDE/GHC/Compat/Core.hs$|^ghcide/src/Development/IDE/Spans/Pragmas.hs$|^ghcide/src/Development/IDE/LSP/Outline.hs$|^plugins/hls-splice-plugin/src/Ide/Plugin/Splice.hs$|^ghcide/test/exe/Main.hs$|^ghcide/src/Development/IDE/Core/Rules.hs$|^hls-test-utils/src/Test/Hls/Util.hs$|^ghcide/src/Development/IDE/Core/Compile.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs$|^plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs$)",
88
"files": "\\.l?hs$",
99
"id": "stylish-haskell",
1010
"language": "system",

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE ExistentialQuantification #-}
23
{-# LANGUAGE RankNTypes #-}
34
{-# LANGUAGE TypeFamilies #-}
4-
{-# LANGUAGE CPP #-}
55

66
{-|
77
The logic for setting up a ghcide session by tapping into hie-bios.
@@ -67,15 +67,16 @@ import Development.IDE.Types.Location
6767
import Development.IDE.Types.Logger (Pretty (pretty),
6868
Priority (Debug, Error, Info, Warning),
6969
Recorder, WithPriority,
70-
logWith, nest, vcat,
71-
viaShow, (<+>),
72-
toCologActionWithPrio, cmapWithPrio)
70+
cmapWithPrio, logWith,
71+
nest,
72+
toCologActionWithPrio,
73+
vcat, viaShow, (<+>))
7374
import Development.IDE.Types.Options
7475
import GHC.Check
7576
import qualified HIE.Bios as HieBios
76-
import qualified HIE.Bios.Types as HieBios
7777
import HIE.Bios.Environment hiding (getCacheDir)
7878
import HIE.Bios.Types hiding (Log)
79+
import qualified HIE.Bios.Types as HieBios
7980
import Hie.Implicit.Cradle (loadImplicitHieCradle)
8081
import Language.LSP.Server
8182
import Language.LSP.Types
@@ -90,6 +91,8 @@ import Data.Void
9091
import Control.Concurrent.STM.Stats (atomically, modifyTVar',
9192
readTVar, writeTVar)
9293
import Control.Concurrent.STM.TQueue
94+
import Control.DeepSeq
95+
import Control.Exception (evaluate)
9396
import Control.Monad.IO.Unlift (MonadUnliftIO)
9497
import Data.Foldable (for_)
9598
import Data.HashMap.Strict (HashMap)
@@ -103,9 +106,6 @@ import HieDb.Types
103106
import HieDb.Utils
104107
import qualified System.Random as Random
105108
import System.Random (RandomGen)
106-
import Control.Monad.IO.Unlift (MonadUnliftIO)
107-
import Control.Exception (evaluate)
108-
import Control.DeepSeq
109109

110110
data Log
111111
= LogSettingInitialDynFlags

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import Control.Monad.Trans.Class (lift)
77
import Control.Monad.Trans.Maybe (MaybeT (MaybeT), runMaybeT)
88
import Data.Default
99
import Data.Foldable (toList)
10-
import qualified Data.HashMap.Strict as HM
1110
import Data.Hashable (Hashable)
11+
import qualified Data.HashMap.Strict as HM
1212
import qualified Data.Map as Map
1313
import Data.Maybe (fromJust, mapMaybe)
1414
import qualified Data.Text as T
1515
import Development.IDE
16-
import Development.IDE.Core.RuleTypes (HieAstResult (..))
1716
import Development.IDE.Core.Rules (getHieFile,
1817
getSourceFileSource)
18+
import Development.IDE.Core.RuleTypes (HieAstResult (..))
1919
import qualified Development.IDE.Core.Shake as Shake
2020
import Development.IDE.GHC.Compat (HieASTs (HieASTs),
2121
RealSrcSpan (..), mkHieFile',

0 commit comments

Comments
 (0)