Skip to content

Fix -Wunused-imports #4037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 3, 2024
+86 −130
Merged

Fix -Wunused-imports #4037

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a149fc9
Fix -Wunused-imports
jhrcek Feb 3, 2024
d78b653
Merge branch 'master' into jhrcek/fix-unused-imports
michaelpj Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ghcide-bench/src/Experiments.hs
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@ import Control.Lens.Extras (is)
import Control.Monad.Extra (allM, forM, forM_, forever,
unless, void, when,
whenJust, (&&^))
import Control.Monad.Fail (MonadFail)
import Control.Monad.IO.Class
import Data.Aeson (Value (Null),
eitherDecodeStrict',
1 change: 0 additions & 1 deletion hls-graph/src/Development/IDE/Graph/Internal/Profile.hs
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ import Data.List.Extra (nubOrd)
import Data.Maybe
import Data.Time (getCurrentTime)
import Data.Time.Format.ISO8601 (iso8601Show)
import Development.IDE.Graph.Classes
import Development.IDE.Graph.Internal.Database (getDirtySet)
import Development.IDE.Graph.Internal.Paths
import Development.IDE.Graph.Internal.Types
4 changes: 3 additions & 1 deletion hls-graph/src/Development/IDE/Graph/Internal/Types.hs
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@

module Development.IDE.Graph.Internal.Types where

import Control.Applicative
import Control.Monad.Catch
import Control.Monad.IO.Class
import Control.Monad.Trans.Reader
@@ -37,6 +36,9 @@ import System.IO.Unsafe
import System.Time.Extra (Seconds)
import UnliftIO (MonadUnliftIO)

#if !MIN_VERSION_base(4,18,0)
import Control.Applicative (liftA2)
#endif

unwrapDynamic :: forall a . Typeable a => Dynamic -> a
unwrapDynamic x = fromMaybe (error msg) $ fromDynamic x
3 changes: 1 addition & 2 deletions plugins/hls-module-name-plugin/src/Ide/Plugin/ModuleName.hs
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,7 @@
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ViewPatterns #-}

{-# OPTIONS_GHC -Wall -Wwarn -fno-warn-type-defaults #-}
{-# OPTIONS_GHC -Wno-name-shadowing #-}
{-# OPTIONS_GHC -Wwarn -fno-warn-type-defaults #-}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing per-file warnings flags that are enabled for all plugins universally via import warnings in haskell-language-server.cabal


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

18 changes: 5 additions & 13 deletions plugins/hls-qualify-imported-names-plugin/src/Ide/Plugin/QualifyImportedNames.hs
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,11 @@ module Ide.Plugin.QualifyImportedNames (descriptor) where

import Control.Lens ((^.))
import Control.Monad (foldM)
import Control.Monad.IO.Class (MonadIO (liftIO))
import Control.Monad.Trans.State.Strict (State)
import qualified Control.Monad.Trans.State.Strict as State
import Data.DList (DList)
import qualified Data.DList as DList
import Data.Foldable (Foldable (foldl'), find)
import qualified Data.HashMap.Strict as HashMap
import Data.List (sortOn)
import qualified Data.List as List
import qualified Data.Map.Strict as Map
@@ -28,8 +26,7 @@ import Development.IDE.Core.RuleTypes (GetFileContents (GetFileConte
HieAstResult (HAR, refMap),
TcModuleResult (TcModuleResult, tmrParsed, tmrTypechecked),
TypeCheck (TypeCheck))
import Development.IDE.Core.Service (runAction)
import Development.IDE.Core.Shake (IdeState, use)
import Development.IDE.Core.Shake (IdeState)
import Development.IDE.GHC.Compat (ContextInfo (Use),
GenLocated (..), GhcPs,
GlobalRdrElt, GlobalRdrEnv,
@@ -55,14 +52,11 @@ import Development.IDE.GHC.Compat (ContextInfo (Use),
srcSpanEndLine,
srcSpanStartCol,
srcSpanStartLine, unitUFM)
import Development.IDE.GHC.Error (isInsideSrcSpan)
import Development.IDE.Types.Location (NormalizedFilePath,
Position (Position),
Range (Range), Uri,
toNormalizedUri)
import Development.IDE.Types.Location (Position (Position),
Range (Range), Uri)
import Ide.Plugin.Error (PluginError (PluginRuleFailed),
getNormalizedFilePathE,
handleMaybe, handleMaybeM)
handleMaybe)
import Ide.Types (PluginDescriptor (pluginHandlers),
PluginId,
PluginMethodHandler,
@@ -74,11 +68,9 @@ import Language.LSP.Protocol.Message (Method (Method_TextDocumentCo
import Language.LSP.Protocol.Types (CodeAction (CodeAction, _command, _data_, _diagnostics, _disabled, _edit, _isPreferred, _kind, _title),
CodeActionKind (CodeActionKind_QuickFix),
CodeActionParams (CodeActionParams),
TextDocumentIdentifier (TextDocumentIdentifier),
TextEdit (TextEdit),
WorkspaceEdit (WorkspaceEdit, _changeAnnotations, _changes, _documentChanges),
type (|?) (InL, InR),
uriToNormalizedFilePath)
type (|?) (InL, InR))

thenCmp :: Ordering -> Ordering -> Ordering
{-# INLINE thenCmp #-}
11 changes: 4 additions & 7 deletions plugins/hls-qualify-imported-names-plugin/test/Main.hs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{-# LANGUAGE BlockArguments #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}

@@ -10,9 +9,7 @@ import Data.Text (Text)
import qualified Ide.Plugin.QualifyImportedNames as QualifyImportedNames
import System.FilePath ((</>))
import Test.Hls (CodeAction (CodeAction, _title),
Command (Command), IdeState,
MonadIO (liftIO),
PluginDescriptor,
Command, MonadIO (liftIO),
PluginTestDescriptor,
Position (Position),
Range (Range), Session,
@@ -24,10 +21,9 @@ import Test.Hls (CodeAction (CodeAction, _title
getCodeActions,
goldenWithHaskellDoc,
mkPluginTestDescriptor',
openDoc, rename,
runSessionWithServer,
openDoc, runSessionWithServer,
testCase, testGroup,
type (|?) (InR), (@?=))
type (|?) (InR))

import Prelude

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

makePoint :: Int -> Int -> Point
makePoint line column
| line >= 1 && column >= 1 = Point line column
| otherwise = error "Line or column is less than 1."
31 changes: 15 additions & 16 deletions plugins/hls-refactor-plugin/src/Development/IDE/GHC/ExactPrint.hs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE TypeFamilies #-}

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

import Control.Applicative (Alternative)
import Control.Arrow (right, (***))
import Control.Arrow ((***))
import Control.DeepSeq
import Control.Monad
import qualified Control.Monad.Fail as Fail
@@ -56,14 +56,11 @@ import Data.Bool (bool)
import Data.Default (Default)
import qualified Data.DList as DL
import Data.Either.Extra (mapLeft)
import Data.Foldable (Foldable (fold))
import Data.Functor.Classes
import Data.Functor.Contravariant
import Data.Monoid (All (All), getAll)
import qualified Data.Text as T
import Data.Traversable (for)
import Development.IDE.Core.RuleTypes
import Development.IDE.Core.Service (runAction)
import Development.IDE.Core.Shake hiding (Log)
import qualified Development.IDE.Core.Shake as Shake
import Development.IDE.GHC.Compat hiding (parseImport,
@@ -72,14 +69,13 @@ import Development.IDE.GHC.Compat hiding (parseImport,
import Development.IDE.GHC.Compat.ExactPrint
import Development.IDE.Graph (RuleResult, Rules)
import Development.IDE.Graph.Classes
import Development.IDE.Types.Location
import Ide.Logger (Pretty (pretty),
Recorder,
WithPriority,
cmapWithPrio)
import Generics.SYB
import Generics.SYB.GHC
import qualified GHC.Generics as GHC
import Ide.Logger (Pretty (pretty),
Recorder,
WithPriority,
cmapWithPrio)
import Ide.PluginUtils
import Language.Haskell.GHC.ExactPrint.Parsers
import Language.LSP.Protocol.Types
@@ -100,16 +96,19 @@ import GHC (EpAnn (..),
emptyComments,
spanAsAnchor)
import GHC.Parser.Annotation (AnnContext (..),
DeltaPos (SameLine),
EpaLocation (EpaDelta),
deltaPos)
#endif

import Data.List (partition)
import GHC (Anchor(..), realSrcSpan, AnchorOperation, DeltaPos(..), SrcSpanAnnN)
import GHC.Types.SrcLoc (generatedSrcSpan)
import Control.Lens ((&), _last)
import Control.Lens.Operators ((%~))
import Control.Lens (_last, (&))
import Control.Lens.Operators ((%~))
import Data.List (partition)
import GHC (Anchor (..),
AnchorOperation,
DeltaPos (..),
SrcSpanAnnN,
realSrcSpan)
import GHC.Types.SrcLoc (generatedSrcSpan)

setPrecedingLines :: Default t => LocatedAn t a -> Int -> Int -> LocatedAn t a
setPrecedingLines ast n c = setEntryDP ast (deltaPos n c)
16 changes: 6 additions & 10 deletions plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs
View file
Original file line number Diff line number Diff line change
@@ -68,23 +68,18 @@ import Development.IDE.Plugin.TypeLenses (suggestSigna
import Development.IDE.Types.Exports
import Development.IDE.Types.Location
import Development.IDE.Types.Options
import GHC.Exts (fromList)
import qualified GHC.LanguageExtensions as Lang
import Ide.Logger hiding
(group)
import qualified Text.Regex.Applicative as RE
#if MIN_VERSION_ghc(9,4,0)
import GHC.Parser.Annotation (TokenLocation (..))
#endif
import GHC (AddEpAnn (AddEpAnn),
Anchor (anchor_op),
AnchorOperation (..),
AnnsModule (am_main),
DeltaPos (..),
EpAnn (..),
EpaLocation (..),
LEpaComment,
hsmodAnn)
LEpaComment)
import GHC.Exts (fromList)
import qualified GHC.LanguageExtensions as Lang
import Ide.Logger hiding
(group)
import Ide.PluginUtils (extractTextInRange,
subRange)
import Ide.Types
@@ -110,6 +105,7 @@ import qualified Language.LSP.Server as LSP
import Language.LSP.VFS (VirtualFile,
_file_text)
import qualified Text.Fuzzy.Parallel as TFP
import qualified Text.Regex.Applicative as RE
import Text.Regex.TDFA ((=~), (=~~))

-------------------------------------------------------------------------------------------------
45 changes: 25 additions & 20 deletions plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction/ExactPrint.hs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE TypeFamilies #-}
module Development.IDE.Plugin.CodeAction.ExactPrint (
Rewrite (..),
rewriteToEdit,
@@ -17,35 +17,40 @@ module Development.IDE.Plugin.CodeAction.ExactPrint (

import Control.Monad
import Control.Monad.Trans
import Data.Char (isAlphaNum)
import Data.Data (Data)
import Data.Generics (listify)
import qualified Data.Text as T
import Development.IDE.GHC.Compat hiding (Annotation)
import Data.Char (isAlphaNum)
import Data.Data (Data)
import Data.Generics (listify)
import qualified Data.Text as T
import Development.IDE.GHC.Compat hiding (Annotation)
import Development.IDE.GHC.Error
import Development.IDE.GHC.ExactPrint
import Development.IDE.GHC.Util
import Development.IDE.Spans.Common
import GHC.Exts (IsList (fromList))
import GHC.Stack (HasCallStack)
import GHC.Exts (IsList (fromList))
import GHC.Stack (HasCallStack)
import Language.Haskell.GHC.ExactPrint
import Language.LSP.Protocol.Types

import Development.IDE.Plugin.CodeAction.Util

-- GHC version specific imports. For any supported GHC version, make sure there is no warning in imports.
import Control.Lens (_head, _last, over)
import Data.Bifunctor (first)
import Data.Default (Default (..))
import Data.Maybe (fromJust, fromMaybe, mapMaybe)
import GHC (AddEpAnn (..), AnnContext (..), AnnList (..),
AnnParen (..), DeltaPos (SameLine), EpAnn (..),
EpaLocation (EpaDelta),
IsUnicodeSyntax (NormalSyntax),
NameAdornment (NameParens),
TrailingAnn (AddCommaAnn), addAnns, ann,
emptyComments, noSrcSpanA, reAnnL)
import Language.Haskell.GHC.ExactPrint.ExactPrint (makeDeltaAst, showAst)
import Control.Lens (_head, _last, over)
import Data.Bifunctor (first)
import Data.Default (Default (..))
import Data.Maybe (fromJust, fromMaybe,
mapMaybe)
import GHC (AddEpAnn (..),
AnnContext (..),
AnnList (..),
AnnParen (..),
DeltaPos (SameLine),
EpAnn (..),
EpaLocation (EpaDelta),
IsUnicodeSyntax (NormalSyntax),
NameAdornment (NameParens),
TrailingAnn (AddCommaAnn),
addAnns, ann,
emptyComments, reAnnL)


------------------------------------------------------------------------------
Loading