Skip to content

Commit e4743f9

Browse files
jhrcekjhrcek
committed
Fix -Wunused-imports
1 parent a3da824 commit e4743f9

File tree

17 files changed

+87
-132
lines changed

17 files changed

+87
-132
lines changed

Diff for: ‎ghcide-bench/src/Experiments.hs

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ import Control.Lens.Extras (is)
3131
import Control.Monad.Extra (allM, forM, forM_, forever,
3232
unless, void, when,
3333
whenJust, (&&^))
34-
import Control.Monad.Fail (MonadFail)
3534
import Control.Monad.IO.Class
3635
import Data.Aeson (Value (Null),
3736
eitherDecodeStrict',

Diff for: ‎hls-graph/src/Development/IDE/Graph/Internal/Profile.hs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import Data.List.Extra (nubOrd)
2121
import Data.Maybe
2222
import Data.Time (getCurrentTime)
2323
import Data.Time.Format.ISO8601 (iso8601Show)
24-
import Development.IDE.Graph.Classes
2524
import Development.IDE.Graph.Internal.Database (getDirtySet)
2625
import Development.IDE.Graph.Internal.Paths
2726
import Development.IDE.Graph.Internal.Types

Diff for: ‎hls-graph/src/Development/IDE/Graph/Internal/Types.hs

+3-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
module Development.IDE.Graph.Internal.Types where
99

10-
import Control.Applicative
1110
import Control.Monad.Catch
1211
import Control.Monad.IO.Class
1312
import Control.Monad.Trans.Reader
@@ -37,6 +36,9 @@ import System.IO.Unsafe
3736
import System.Time.Extra (Seconds)
3837
import UnliftIO (MonadUnliftIO)
3938

39+
#if !MIN_VERSION_base(4,18,0)
40+
import Control.Applicative (liftA2)
41+
#endif
4042

4143
unwrapDynamic :: forall a . Typeable a => Dynamic -> a
4244
unwrapDynamic x = fromMaybe (error msg) $ fromDynamic x

Diff for: ‎hls-plugin-api/src/Ide/Plugin/RangeMap.hs

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ import Language.LSP.Protocol.Types (Range, isSubrangeOf)
2020
import Data.Bifunctor (first)
2121
import Data.Foldable (foldl')
2222
import qualified HaskellWorks.Data.IntervalMap.FingerTree as IM
23-
import Language.LSP.Protocol.Types (Position,
24-
Range (Range))
23+
import Language.LSP.Protocol.Types (Position, Range(Range))
2524
#endif
2625

2726
-- | A map from code ranges to values.

Diff for: ‎plugins/hls-module-name-plugin/src/Ide/Plugin/ModuleName.hs

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
{-# LANGUAGE RecordWildCards #-}
55
{-# LANGUAGE ViewPatterns #-}
66

7-
{-# OPTIONS_GHC -Wall -Wwarn -fno-warn-type-defaults #-}
8-
{-# OPTIONS_GHC -Wno-name-shadowing #-}
7+
{-# OPTIONS_GHC -Wwarn -fno-warn-type-defaults #-}
98

109
{- | Keep the module name in sync with its file path.
1110

Diff for: ‎plugins/hls-qualify-imported-names-plugin/src/Ide/Plugin/QualifyImportedNames.hs

+5-13
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ module Ide.Plugin.QualifyImportedNames (descriptor) where
88

99
import Control.Lens ((^.))
1010
import Control.Monad (foldM)
11-
import Control.Monad.IO.Class (MonadIO (liftIO))
1211
import Control.Monad.Trans.State.Strict (State)
1312
import qualified Control.Monad.Trans.State.Strict as State
1413
import Data.DList (DList)
1514
import qualified Data.DList as DList
1615
import Data.Foldable (Foldable (foldl'), find)
17-
import qualified Data.HashMap.Strict as HashMap
1816
import Data.List (sortOn)
1917
import qualified Data.List as List
2018
import qualified Data.Map.Strict as Map
@@ -28,8 +26,7 @@ import Development.IDE.Core.RuleTypes (GetFileContents (GetFileConte
2826
HieAstResult (HAR, refMap),
2927
TcModuleResult (TcModuleResult, tmrParsed, tmrTypechecked),
3028
TypeCheck (TypeCheck))
31-
import Development.IDE.Core.Service (runAction)
32-
import Development.IDE.Core.Shake (IdeState, use)
29+
import Development.IDE.Core.Shake (IdeState)
3330
import Development.IDE.GHC.Compat (ContextInfo (Use),
3431
GenLocated (..), GhcPs,
3532
GlobalRdrElt, GlobalRdrEnv,
@@ -55,14 +52,11 @@ import Development.IDE.GHC.Compat (ContextInfo (Use),
5552
srcSpanEndLine,
5653
srcSpanStartCol,
5754
srcSpanStartLine, unitUFM)
58-
import Development.IDE.GHC.Error (isInsideSrcSpan)
59-
import Development.IDE.Types.Location (NormalizedFilePath,
60-
Position (Position),
61-
Range (Range), Uri,
62-
toNormalizedUri)
55+
import Development.IDE.Types.Location (Position (Position),
56+
Range (Range), Uri)
6357
import Ide.Plugin.Error (PluginError (PluginRuleFailed),
6458
getNormalizedFilePathE,
65-
handleMaybe, handleMaybeM)
59+
handleMaybe)
6660
import Ide.Types (PluginDescriptor (pluginHandlers),
6761
PluginId,
6862
PluginMethodHandler,
@@ -74,11 +68,9 @@ import Language.LSP.Protocol.Message (Method (Method_TextDocumentCo
7468
import Language.LSP.Protocol.Types (CodeAction (CodeAction, _command, _data_, _diagnostics, _disabled, _edit, _isPreferred, _kind, _title),
7569
CodeActionKind (CodeActionKind_QuickFix),
7670
CodeActionParams (CodeActionParams),
77-
TextDocumentIdentifier (TextDocumentIdentifier),
7871
TextEdit (TextEdit),
7972
WorkspaceEdit (WorkspaceEdit, _changeAnnotations, _changes, _documentChanges),
80-
type (|?) (InL, InR),
81-
uriToNormalizedFilePath)
73+
type (|?) (InL, InR))
8274

8375
thenCmp :: Ordering -> Ordering -> Ordering
8476
{-# INLINE thenCmp #-}

Diff for: ‎plugins/hls-qualify-imported-names-plugin/test/Main.hs

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE BlockArguments #-}
2-
{-# LANGUAGE MultiWayIf #-}
32
{-# LANGUAGE OverloadedStrings #-}
43
{-# LANGUAGE RecordWildCards #-}
54

@@ -10,9 +9,7 @@ import Data.Text (Text)
109
import qualified Ide.Plugin.QualifyImportedNames as QualifyImportedNames
1110
import System.FilePath ((</>))
1211
import Test.Hls (CodeAction (CodeAction, _title),
13-
Command (Command), IdeState,
14-
MonadIO (liftIO),
15-
PluginDescriptor,
12+
Command, MonadIO (liftIO),
1613
PluginTestDescriptor,
1714
Position (Position),
1815
Range (Range), Session,
@@ -24,10 +21,9 @@ import Test.Hls (CodeAction (CodeAction, _title
2421
getCodeActions,
2522
goldenWithHaskellDoc,
2623
mkPluginTestDescriptor',
27-
openDoc, rename,
28-
runSessionWithServer,
24+
openDoc, runSessionWithServer,
2925
testCase, testGroup,
30-
type (|?) (InR), (@?=))
26+
type (|?) (InR))
3127

3228
import Prelude
3329

@@ -37,6 +33,7 @@ data Point = Point {
3733
column :: !Int
3834
}
3935

36+
makePoint :: Int -> Int -> Point
4037
makePoint line column
4138
| line >= 1 && column >= 1 = Point line column
4239
| otherwise = error "Line or column is less than 1."

Diff for: ‎plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{-# LANGUAGE TypeFamilies #-}
21
{-# LANGUAGE GADTs #-}
2+
{-# LANGUAGE TypeFamilies #-}
33

44
-- | This module hosts various abstractions and utility functions to work with ghc-exactprint.
55
module Development.IDE.GHC.ExactPrint
@@ -43,7 +43,7 @@ module Development.IDE.GHC.ExactPrint
4343
where
4444

4545
import Control.Applicative (Alternative)
46-
import Control.Arrow (right, (***))
46+
import Control.Arrow ((***))
4747
import Control.DeepSeq
4848
import Control.Monad
4949
import qualified Control.Monad.Fail as Fail
@@ -56,14 +56,11 @@ import Data.Bool (bool)
5656
import Data.Default (Default)
5757
import qualified Data.DList as DL
5858
import Data.Either.Extra (mapLeft)
59-
import Data.Foldable (Foldable (fold))
6059
import Data.Functor.Classes
6160
import Data.Functor.Contravariant
6261
import Data.Monoid (All (All), getAll)
6362
import qualified Data.Text as T
64-
import Data.Traversable (for)
6563
import Development.IDE.Core.RuleTypes
66-
import Development.IDE.Core.Service (runAction)
6764
import Development.IDE.Core.Shake hiding (Log)
6865
import qualified Development.IDE.Core.Shake as Shake
6966
import Development.IDE.GHC.Compat hiding (parseImport,
@@ -72,14 +69,13 @@ import Development.IDE.GHC.Compat hiding (parseImport,
7269
import Development.IDE.GHC.Compat.ExactPrint
7370
import Development.IDE.Graph (RuleResult, Rules)
7471
import Development.IDE.Graph.Classes
75-
import Development.IDE.Types.Location
76-
import Ide.Logger (Pretty (pretty),
77-
Recorder,
78-
WithPriority,
79-
cmapWithPrio)
8072
import Generics.SYB
8173
import Generics.SYB.GHC
8274
import qualified GHC.Generics as GHC
75+
import Ide.Logger (Pretty (pretty),
76+
Recorder,
77+
WithPriority,
78+
cmapWithPrio)
8379
import Ide.PluginUtils
8480
import Language.Haskell.GHC.ExactPrint.Parsers
8581
import Language.LSP.Protocol.Types
@@ -100,16 +96,19 @@ import GHC (EpAnn (..),
10096
emptyComments,
10197
spanAsAnchor)
10298
import GHC.Parser.Annotation (AnnContext (..),
103-
DeltaPos (SameLine),
10499
EpaLocation (EpaDelta),
105100
deltaPos)
106101
#endif
107102

108-
import Data.List (partition)
109-
import GHC (Anchor(..), realSrcSpan, AnchorOperation, DeltaPos(..), SrcSpanAnnN)
110-
import GHC.Types.SrcLoc (generatedSrcSpan)
111-
import Control.Lens ((&), _last)
112-
import Control.Lens.Operators ((%~))
103+
import Control.Lens (_last, (&))
104+
import Control.Lens.Operators ((%~))
105+
import Data.List (partition)
106+
import GHC (Anchor (..),
107+
AnchorOperation,
108+
DeltaPos (..),
109+
SrcSpanAnnN,
110+
realSrcSpan)
111+
import GHC.Types.SrcLoc (generatedSrcSpan)
113112

114113
setPrecedingLines :: Default t => LocatedAn t a -> Int -> Int -> LocatedAn t a
115114
setPrecedingLines ast n c = setEntryDP ast (deltaPos n c)

Diff for: ‎plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs

+6-10
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,18 @@ import Development.IDE.Plugin.TypeLenses (suggestSigna
6868
import Development.IDE.Types.Exports
6969
import Development.IDE.Types.Location
7070
import Development.IDE.Types.Options
71-
import GHC.Exts (fromList)
72-
import qualified GHC.LanguageExtensions as Lang
73-
import Ide.Logger hiding
74-
(group)
75-
import qualified Text.Regex.Applicative as RE
76-
#if MIN_VERSION_ghc(9,4,0)
77-
import GHC.Parser.Annotation (TokenLocation (..))
78-
#endif
7971
import GHC (AddEpAnn (AddEpAnn),
8072
Anchor (anchor_op),
8173
AnchorOperation (..),
8274
AnnsModule (am_main),
8375
DeltaPos (..),
8476
EpAnn (..),
8577
EpaLocation (..),
86-
LEpaComment,
87-
hsmodAnn)
78+
LEpaComment)
79+
import GHC.Exts (fromList)
80+
import qualified GHC.LanguageExtensions as Lang
81+
import Ide.Logger hiding
82+
(group)
8883
import Ide.PluginUtils (extractTextInRange,
8984
subRange)
9085
import Ide.Types
@@ -110,6 +105,7 @@ import qualified Language.LSP.Server as LSP
110105
import Language.LSP.VFS (VirtualFile,
111106
_file_text)
112107
import qualified Text.Fuzzy.Parallel as TFP
108+
import qualified Text.Regex.Applicative as RE
113109
import Text.Regex.TDFA ((=~), (=~~))
114110

115111
-------------------------------------------------------------------------------------------------

Diff for: ‎plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs

+25-20
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{-# LANGUAGE TypeFamilies #-}
21
{-# LANGUAGE GADTs #-}
2+
{-# LANGUAGE TypeFamilies #-}
33
module Development.IDE.Plugin.CodeAction.ExactPrint (
44
Rewrite (..),
55
rewriteToEdit,
@@ -17,35 +17,40 @@ module Development.IDE.Plugin.CodeAction.ExactPrint (
1717

1818
import Control.Monad
1919
import Control.Monad.Trans
20-
import Data.Char (isAlphaNum)
21-
import Data.Data (Data)
22-
import Data.Generics (listify)
23-
import qualified Data.Text as T
24-
import Development.IDE.GHC.Compat hiding (Annotation)
20+
import Data.Char (isAlphaNum)
21+
import Data.Data (Data)
22+
import Data.Generics (listify)
23+
import qualified Data.Text as T
24+
import Development.IDE.GHC.Compat hiding (Annotation)
2525
import Development.IDE.GHC.Error
2626
import Development.IDE.GHC.ExactPrint
2727
import Development.IDE.GHC.Util
2828
import Development.IDE.Spans.Common
29-
import GHC.Exts (IsList (fromList))
30-
import GHC.Stack (HasCallStack)
29+
import GHC.Exts (IsList (fromList))
30+
import GHC.Stack (HasCallStack)
3131
import Language.Haskell.GHC.ExactPrint
3232
import Language.LSP.Protocol.Types
3333

3434
import Development.IDE.Plugin.CodeAction.Util
3535

3636
-- GHC version specific imports. For any supported GHC version, make sure there is no warning in imports.
37-
import Control.Lens (_head, _last, over)
38-
import Data.Bifunctor (first)
39-
import Data.Default (Default (..))
40-
import Data.Maybe (fromJust, fromMaybe, mapMaybe)
41-
import GHC (AddEpAnn (..), AnnContext (..), AnnList (..),
42-
AnnParen (..), DeltaPos (SameLine), EpAnn (..),
43-
EpaLocation (EpaDelta),
44-
IsUnicodeSyntax (NormalSyntax),
45-
NameAdornment (NameParens),
46-
TrailingAnn (AddCommaAnn), addAnns, ann,
47-
emptyComments, noSrcSpanA, reAnnL)
48-
import Language.Haskell.GHC.ExactPrint.ExactPrint (makeDeltaAst, showAst)
37+
import Control.Lens (_head, _last, over)
38+
import Data.Bifunctor (first)
39+
import Data.Default (Default (..))
40+
import Data.Maybe (fromJust, fromMaybe,
41+
mapMaybe)
42+
import GHC (AddEpAnn (..),
43+
AnnContext (..),
44+
AnnList (..),
45+
AnnParen (..),
46+
DeltaPos (SameLine),
47+
EpAnn (..),
48+
EpaLocation (EpaDelta),
49+
IsUnicodeSyntax (NormalSyntax),
50+
NameAdornment (NameParens),
51+
TrailingAnn (AddCommaAnn),
52+
addAnns, ann,
53+
emptyComments, reAnnL)
4954

5055

5156
------------------------------------------------------------------------------

0 commit comments

Comments
 (0)