Skip to content

Commit ed4d061

Browse files
sgillespiesgillespie
committed
fix: stylish-haskell
1 parent ff6b8d8 commit ed4d061

File tree

2 files changed

+46
-50
lines changed

2 files changed

+46
-50
lines changed

‎plugins/hls-change-type-signature-plugin/src/Ide/Plugin/ChangeTypeSignature.hs

Lines changed: 43 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{-# LANGUAGE CPP #-}
1+
{-# LANGUAGE CPP #-}
22
{-# LANGUAGE LambdaCase #-}
33
{-# LANGUAGE ViewPatterns #-}
44
-- | An HLS plugin to provide code actions to change type signatures
@@ -9,53 +9,49 @@ module Ide.Plugin.ChangeTypeSignature (descriptor
99
) where
1010

1111
import Control.Lens
12-
import Control.Monad (guard)
13-
import Control.Monad.IO.Class (MonadIO)
14-
import Control.Monad.Trans.Class (MonadTrans(lift))
15-
import Control.Monad.Trans.Except (ExceptT (..))
16-
import Control.Monad.Trans.Maybe (MaybeT(..), hoistMaybe)
17-
import Data.Foldable (asum)
18-
import qualified Data.Map as Map
19-
import Data.Maybe (catMaybes)
20-
import Data.Text (Text)
21-
import qualified Data.Text as T
22-
import Development.IDE (realSrcSpanToRange,
23-
IdeState (..),
24-
FileDiagnostic,
25-
fdLspDiagnosticL,
26-
fdStructuredMessageL,
27-
logWith,
28-
Pretty (..),
29-
Priority (..),
30-
Recorder,
31-
WithPriority)
12+
import Control.Monad (guard)
13+
import Control.Monad.IO.Class (MonadIO)
14+
import Control.Monad.Trans.Class (MonadTrans (lift))
15+
import Control.Monad.Trans.Except (ExceptT (..))
16+
import Control.Monad.Trans.Maybe (MaybeT (..), hoistMaybe)
17+
import Data.Foldable (asum)
18+
import qualified Data.Map as Map
19+
import Data.Maybe (catMaybes)
20+
import Data.Text (Text)
21+
import qualified Data.Text as T
22+
import Development.IDE (FileDiagnostic,
23+
IdeState (..), Pretty (..),
24+
Priority (..), Recorder,
25+
WithPriority,
26+
fdLspDiagnosticL,
27+
fdStructuredMessageL,
28+
logWith, realSrcSpanToRange)
3229
import Development.IDE.Core.PluginUtils
33-
import Development.IDE.Core.RuleTypes (GetParsedModule (GetParsedModule))
34-
import Development.IDE.GHC.Compat hiding (vcat)
35-
import Development.IDE.GHC.Util (printOutputable)
30+
import Development.IDE.Core.RuleTypes (GetParsedModule (GetParsedModule))
31+
import Development.IDE.GHC.Compat hiding (vcat)
32+
import Development.IDE.GHC.Compat.Error (_TcRnMessage,
33+
msgEnvelopeErrorL)
34+
import Development.IDE.GHC.Util (printOutputable)
3635
import Development.IDE.Types.Diagnostics (_SomeStructuredMessage)
37-
import Development.IDE.GHC.Compat.Error (msgEnvelopeErrorL, _TcRnMessage)
38-
import Generics.SYB (extQ, something)
39-
import GHC.Tc.Errors.Types (TcSolverReportMsg(..),
40-
TcRnMessage (..),
41-
TcRnMessage (..),
42-
SolverReportWithCtxt (..),
43-
TcRnMessageDetailed (..),
44-
MismatchMsg (..),
45-
ErrInfo (..))
46-
import qualified Ide.Logger as Logger
47-
import Ide.Plugin.Error (PluginError,
48-
getNormalizedFilePathE)
49-
import Ide.Types (PluginDescriptor (..),
50-
PluginId (PluginId),
51-
PluginMethodHandler,
52-
defaultPluginDescriptor,
53-
mkPluginHandler,
54-
HandlerM,
55-
Config)
36+
import Generics.SYB (extQ, something)
37+
import GHC.Tc.Errors.Types (ErrInfo (..),
38+
MismatchMsg (..),
39+
SolverReportWithCtxt (..),
40+
TcRnMessage (..),
41+
TcRnMessageDetailed (..),
42+
TcSolverReportMsg (..))
43+
import qualified Ide.Logger as Logger
44+
import Ide.Plugin.Error (PluginError,
45+
getNormalizedFilePathE)
46+
import Ide.Types (Config, HandlerM,
47+
PluginDescriptor (..),
48+
PluginId (PluginId),
49+
PluginMethodHandler,
50+
defaultPluginDescriptor,
51+
mkPluginHandler)
5652
import Language.LSP.Protocol.Message
5753
import Language.LSP.Protocol.Types
58-
import Text.Regex.TDFA ((=~))
54+
import Text.Regex.TDFA ((=~))
5955

6056
data Log
6157
= LogErrInfoCtxt ErrInfo
@@ -169,7 +165,7 @@ findSolverReport :: TcRnMessage -> Maybe (TcSolverReportMsg, Maybe ErrInfo)
169165
findSolverReport (TcRnMessageWithInfo _ (TcRnMessageDetailed errInfo msg)) =
170166
case findSolverReport msg of
171167
Just (mismatch, _) -> Just (mismatch, Just errInfo)
172-
_ -> Nothing
168+
_ -> Nothing
173169
#if MIN_VERSION_ghc(9,10,0)
174170
findSolverReport (TcRnSolverReport (SolverReportWithCtxt _ mismatch) _) =
175171
Just (mismatch, Nothing)
@@ -181,9 +177,9 @@ findSolverReport _ = Nothing
181177

182178
-- TODO: Make this a prism?
183179
findMismatchMessage :: TcSolverReportMsg -> Maybe MismatchMsg
184-
findMismatchMessage (Mismatch m _ _ _) = Just m
180+
findMismatchMessage (Mismatch m _ _ _) = Just m
185181
findMismatchMessage (CannotUnifyVariable m _) = Just m
186-
findMismatchMessage _ = Nothing
182+
findMismatchMessage _ = Nothing
187183

188184
-- TODO: Make this a prism?
189185
findTypeEqMismatch :: MismatchMsg -> Maybe (Type, Type)

‎plugins/hls-change-type-signature-plugin/test/Main.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Data.Either (rights)
55
import Data.Text (Text)
66
import qualified Data.Text as T
77
import qualified Data.Text.IO as TIO
8-
import Ide.Plugin.ChangeTypeSignature (Log(..), errorMessageRegexes)
8+
import Ide.Plugin.ChangeTypeSignature (Log (..), errorMessageRegexes)
99
import qualified Ide.Plugin.ChangeTypeSignature as ChangeTypeSignature
1010
import System.FilePath ((<.>), (</>))
1111
import Test.Hls (CodeAction (..), Command,
@@ -21,11 +21,11 @@ import Test.Hls (CodeAction (..), Command,
2121
getCodeActions,
2222
goldenWithHaskellDoc,
2323
knownBrokenForGhcVersions,
24-
liftIO,
24+
liftIO, mkPluginTestDescriptor,
2525
openDoc, runSessionWithServer,
2626
testCase, testGroup, toEither,
2727
type (|?), waitForBuildQueue,
28-
waitForDiagnostics, (@?=), mkPluginTestDescriptor)
28+
waitForDiagnostics, (@?=))
2929
import Text.Regex.TDFA ((=~))
3030

3131
main :: IO ()

0 commit comments

Comments
 (0)