Eliminate redundant brackets.

Author: peterwicksstringfield

GenChangelogs.hs

@@ -33,4 +33,4 @@ main = do
   forM_ prsAfterLastTag $ \SimplePullRequest{..} ->
     putStrLn $ T.unpack $ "- " <> simplePullRequestTitle <>
       "\n([#" <> T.pack (show $ unIssueNumber simplePullRequestNumber) <> ")](" <> getUrl simplePullRequestHtmlUrl <> ")" <>
-      " by @" <> (untagName (simpleUserLogin simplePullRequestUser))
+      " by @" <> untagName (simpleUserLogin simplePullRequestUser)

exe/Main.hs

@@ -16,7 +16,7 @@ main = withUtf8 $ do
 
     let withExamples =
             case args of
-                LspMode (LspArguments{..}) -> argsExamplePlugin
-                _                          -> False
+                LspMode LspArguments{..} -> argsExamplePlugin
+                _                        -> False
 
     defaultMain args (idePlugins withExamples)

exe/Wrapper.hs

@@ -136,12 +136,11 @@ getRuntimeGhcVersion' cradle = do
 -- of the project that may or may not be accurate.
 findLocalCradle :: FilePath -> IO (Cradle Void)
 findLocalCradle fp = do
-  cradleConf <- (findCradle defaultLoadingOptions) fp
+  cradleConf <- findCradle defaultLoadingOptions fp
   crdl       <- case cradleConf of
     Just yaml -> do
       hPutStrLn stderr $ "Found \"" ++ yaml ++ "\" for \"" ++ fp ++ "\""
       loadCradle yaml
     Nothing -> loadImplicitCradle fp
   hPutStrLn stderr $ "Module \"" ++ fp ++ "\" is loaded by Cradle: " ++ show crdl
   return crdl
-

hie-compat/src-ghc86/Compat/HieBin.hs

@@ -297,7 +297,7 @@ getSymbolTable bh ncu = do
 getSymTabName :: SymbolTable -> BinHandle -> IO Name
 getSymTabName st bh = do
   i :: Word32 <- get bh
-  return $ st A.! (fromIntegral i)
+  return $ st A.! fromIntegral i
 
 putName :: HieSymbolTable -> BinHandle -> Name -> IO ()
 putName (HieSymbolTable next ref) bh name = do

hie-compat/src-ghc86/Compat/HieDebug.hs

@@ -22,7 +22,7 @@ import Data.Function    ( on )
 import Data.List        ( sortOn )
 import Data.Foldable    ( toList )
 
-ppHies :: Outputable a => (HieASTs a) -> SDoc
+ppHies :: Outputable a => HieASTs a -> SDoc
 ppHies (HieASTs asts) = M.foldrWithKey go "" asts
   where
     go k a rest = vcat $
@@ -112,7 +112,7 @@ validAst (Node _ span children) = do
           ]
     checkContainment [] = return ()
     checkContainment (x:xs)
-      | span `containsSpan` (nodeSpan x) = checkContainment xs
+      | span `containsSpan` nodeSpan x = checkContainment xs
       | otherwise = Left $ hsep
           [ ppr $ span
           , "does not contain"

hie-compat/src-ghc86/Compat/HieTypes.hs

@@ -168,7 +168,7 @@ data HieType a
 type HieTypeFlat = HieType TypeIndex
 
 -- | Roughly isomorphic to the original core 'Type'.
-newtype HieTypeFix = Roll (HieType (HieTypeFix))
+newtype HieTypeFix = Roll (HieType HieTypeFix)
 
 instance Binary (HieType TypeIndex) where
   put_ bh (HTyVarTy n) = do
@@ -200,7 +200,7 @@ instance Binary (HieType TypeIndex) where
   put_ bh (HCastTy a) = do
     putByte bh 7
     put_ bh a
-  put_ bh (HCoercionTy) = putByte bh 8
+  put_ bh HCoercionTy = putByte bh 8
 
   get bh = do
     (t :: Word8) <- get bh
@@ -228,7 +228,7 @@ instance Binary (HieArgs TypeIndex) where
 
 -- | Mapping from filepaths (represented using 'FastString') to the
 -- corresponding AST
-newtype HieASTs a = HieASTs { getAsts :: (M.Map FastString (HieAST a)) }
+newtype HieASTs a = HieASTs { getAsts :: M.Map FastString (HieAST a) }
   deriving (Functor, Foldable, Traversable)
 
 instance Binary (HieASTs TypeIndex) where
@@ -276,9 +276,9 @@ instance Binary (NodeInfo TypeIndex) where
     put_ bh $ nodeType ni
     put_ bh $ M.toList $ nodeIdentifiers ni
   get bh = NodeInfo
-    <$> fmap (S.fromDistinctAscList) (get bh)
+    <$> fmap S.fromDistinctAscList (get bh)
     <*> get bh
-    <*> fmap (M.fromList) (get bh)
+    <*> fmap M.fromList (get bh)
 
 type Identifier = Either ModuleName Name
 
@@ -309,7 +309,7 @@ instance Binary (IdentifierDetails TypeIndex) where
     put_ bh $ S.toAscList $ identInfo dets
   get bh =  IdentifierDetails
     <$> get bh
-    <*> fmap (S.fromDistinctAscList) (get bh)
+    <*> fmap S.fromDistinctAscList (get bh)
 
 
 -- | Different contexts under which identifiers exist
@@ -419,7 +419,7 @@ data IEType
 
 instance Binary IEType where
   put_ bh b = putByte bh (fromIntegral (fromEnum b))
-  get bh = do x <- getByte bh; pure $! (toEnum (fromIntegral x))
+  get bh = do x <- getByte bh; pure $! toEnum (fromIntegral x)
 
 
 data RecFieldContext
@@ -431,7 +431,7 @@ data RecFieldContext
 
 instance Binary RecFieldContext where
   put_ bh b = putByte bh (fromIntegral (fromEnum b))
-  get bh = do x <- getByte bh; pure $! (toEnum (fromIntegral x))
+  get bh = do x <- getByte bh; pure $! toEnum (fromIntegral x)
 
 
 data BindType
@@ -441,7 +441,7 @@ data BindType
 
 instance Binary BindType where
   put_ bh b = putByte bh (fromIntegral (fromEnum b))
-  get bh = do x <- getByte bh; pure $! (toEnum (fromIntegral x))
+  get bh = do x <- getByte bh; pure $! toEnum (fromIntegral x)
 
 
 data DeclType
@@ -456,7 +456,7 @@ data DeclType
 
 instance Binary DeclType where
   put_ bh b = putByte bh (fromIntegral (fromEnum b))
-  get bh = do x <- getByte bh; pure $! (toEnum (fromIntegral x))
+  get bh = do x <- getByte bh; pure $! toEnum (fromIntegral x)
 
 
 data Scope

hie-compat/src-ghc86/Compat/HieUtils.hs

@@ -62,11 +62,11 @@ resolveVisibility kind ty_args
         ts' = go (extendTvSubst env tv t) res ts
 
     go env (FunTy _ res) (t:ts) -- No type-class args in tycon apps
-      = (True,t) : (go env res ts)
+      = (True,t) : go env res ts
 
     go env (TyVarTy tv) ts
       | Just ki <- lookupTyVar env tv = go env ki ts
-    go env kind (t:ts) = (True, t) : (go env kind ts) -- Ill-kinded
+    go env kind (t:ts) = (True, t) : go env kind ts -- Ill-kinded
 
 foldType :: (HieType a -> a) -> HieTypeFix -> a
 foldType f (Roll t) = f $ fmap (foldType f) t
@@ -114,7 +114,7 @@ compressTypes
   -> (HieASTs TypeIndex, A.Array TypeIndex HieTypeFlat)
 compressTypes asts = (a, arr)
   where
-    (a, (HTS _ m i)) = flip runState initialHTS $
+    (a, HTS _ m i) = flip runState initialHTS $
       for asts $ \typ -> do
         i <- getTypeIndex typ
         return i

plugins/default/src/Ide/Plugin/Example.hs

@@ -128,7 +128,7 @@ codeLens _lf ideState plId CodeLensParams{_textDocument=TextDocumentIdentifier u
           -- edit = WorkspaceEdit (Just $ Map.singleton uri $ List tedit) Nothing
           range = Range (Position 3 0) (Position 4 0)
         let cmdParams = AddTodoParams uri "do abc"
-        cmd <- mkLspCommand plId "codelens.todo" title (Just [(toJSON cmdParams)])
+        cmd <- mkLspCommand plId "codelens.todo" title (Just [toJSON cmdParams])
         pure $ Right $ List [ CodeLens range (Just cmd) Nothing ]
       Nothing -> pure $ Right $ List []
 

plugins/hls-eval-plugin/src/Ide/Plugin/Eval/Parse/Option.hs

@@ -30,4 +30,4 @@ langOptions = runParser (many space *> languageOpts <* many space)
 -- >>> runParser languageOpts ":set -XBinaryLiterals -XOverloadedStrings"
 -- Right ["BinaryLiterals","OverloadedStrings"]
 languageOpts :: Parser Char [[Char]]
-languageOpts = string ":set" *> many (many space *> string "-X" *> (many letterChar))
+languageOpts = string ":set" *> many (many space *> string "-X" *> many letterChar)

plugins/hls-explicit-imports-plugin/src/Ide/Plugin/ExplicitImports.hs

@@ -189,10 +189,10 @@ minimalImportsRule = define $ \MinimalImports nfp -> do
 
 -- | Use the ghc api to extract a minimal, explicit set of imports for this module
 extractMinimalImports ::
-  Maybe (HscEnvEq) ->
-  Maybe (TcModuleResult) ->
+  Maybe HscEnvEq ->
+  Maybe TcModuleResult ->
   IO ([LImportDecl GhcRn], Maybe [LImportDecl GhcRn])
-extractMinimalImports (Just (hsc)) (Just (TcModuleResult {..})) = do
+extractMinimalImports (Just hsc) (Just TcModuleResult {..}) = do
   -- extract the original imports and the typechecking environment
   let tcEnv = tmrTypechecked
       (_, imports, _, _) = tmrRenamed

plugins/hls-retrie-plugin/src/Ide/Plugin/Retrie.hs

@@ -227,7 +227,7 @@ suggestBindRewrites ::
   GHC.Module ->
   HsBindLR GhcRn GhcRn ->
   [(T.Text, CodeActionKind, RunRetrieParams)]
-suggestBindRewrites originatingFile pos ms_mod (FunBind {fun_id = L l' rdrName})
+suggestBindRewrites originatingFile pos ms_mod FunBind {fun_id = L l' rdrName}
   | pos `isInsideSrcSpan` l' =
     let pprName = prettyPrint rdrName
         pprNameText = T.pack pprName
@@ -253,7 +253,7 @@ suggestTypeRewrites ::
   GHC.Module ->
   TyClDecl pass ->
   [(T.Text, CodeActionKind, RunRetrieParams)]
-suggestTypeRewrites originatingFile ms_mod (SynDecl {tcdLName = L _ rdrName}) =
+suggestTypeRewrites originatingFile ms_mod SynDecl {tcdLName = L _ rdrName} =
     let pprName = prettyPrint rdrName
         pprNameText = T.pack pprName
         unfoldRewrite restrictToOriginatingFile =
@@ -273,7 +273,7 @@ suggestRuleRewrites ::
   GHC.Module ->
   LRuleDecls pass ->
   [(T.Text, CodeActionKind, RunRetrieParams)]
-suggestRuleRewrites originatingFile pos ms_mod (L _ (HsRules {rds_rules})) =
+suggestRuleRewrites originatingFile pos ms_mod (L _ HsRules {rds_rules}) =
     concat
         [ [ forwardRewrite   ruleName True
           , forwardRewrite   ruleName False

plugins/tactics/src/Ide/Plugin/Tactic/Naming.hs

@@ -22,7 +22,7 @@ mkTyName :: Type -> String
 mkTyName (tcSplitFunTys -> ([a@(isFunTy -> False)], b))
   = "f" ++ mkTyName a ++ mkTyName b
 -- eg. mkTyName (a -> b -> C) = "f_C"
-mkTyName (tcSplitFunTys -> ((_:_), b))
+mkTyName (tcSplitFunTys -> (_:_, b))
   = "f_" ++ mkTyName b
 -- eg. mkTyName (Either A B) = "eab"
 mkTyName (splitTyConApp_maybe -> Just (c, args))
@@ -31,7 +31,7 @@ mkTyName (splitTyConApp_maybe -> Just (c, args))
 mkTyName (getTyVar_maybe -> Just tv)
   = occNameString $ occName tv
 -- eg. mkTyName (forall x. y) = "y"
-mkTyName (tcSplitSigmaTy -> ((_:_), _, t))
+mkTyName (tcSplitSigmaTy -> (_:_, _, t))
   = mkTyName t
 mkTyName _ = "x"
 
@@ -90,4 +90,3 @@ mkManyGoodNames hy args =
 -- | Which names are in scope?
 getInScope :: Map OccName a -> [OccName]
 getInScope = M.keys
-

plugins/tactics/src/Ide/Plugin/Tactic/Types.hs

@@ -77,7 +77,7 @@ instance Show Class where
 data TacticState = TacticState
     { ts_skolems   :: !(Set TyVar)
       -- ^ The known skolems.
-    , ts_unifier   :: !(TCvSubst)
+    , ts_unifier   :: !TCvSubst
       -- ^ The current substitution of univars.
     , ts_used_vals :: !(Set OccName)
       -- ^ Set of values used by tactics.
@@ -236,10 +236,10 @@ overProvenance f (HyInfo prv ty) = HyInfo (f prv) ty
 -- | The current bindings and goal for a hole to be filled by refinery.
 data Judgement' a = Judgement
   { _jHypothesis :: !(Map OccName (HyInfo a))
-  , _jBlacklistDestruct :: !(Bool)
-  , _jWhitelistSplit :: !(Bool)
+  , _jBlacklistDestruct :: !Bool
+  , _jWhitelistSplit :: !Bool
   , _jIsTopHole    :: !Bool
-  , _jGoal         :: !(a)
+  , _jGoal         :: !a
   }
   deriving stock (Eq, Generic, Functor, Show)
 
@@ -364,4 +364,3 @@ data RunTacticResults = RunTacticResults
   , rtr_extract     :: LHsExpr GhcPs
   , rtr_other_solns :: [(Trace, LHsExpr GhcPs)]
   } deriving Show
-

src/Ide/Version.hs

@@ -49,7 +49,7 @@ showProgramVersionOfInterest ProgramsOfInterest {..} =
     ]
   where
     showVersionWithDefault :: Maybe Version -> String
-    showVersionWithDefault = maybe ("Not found") showVersion
+    showVersionWithDefault = maybe "Not found" showVersion
 
 findProgramVersions :: IO ProgramsOfInterest
 findProgramVersions = ProgramsOfInterest

test/functional/Completion.hs

@@ -298,7 +298,7 @@ snippetTests = testGroup "snippets" [
     , testCase "respects lsp configuration" $ runSession hlsCommand fullCaps "test/testdata/completion" $ do
         doc <- openDoc "Completion.hs" "haskell"
 
-        let config = object [ "haskell" .= (object ["completionSnippetsOn" .= False])]
+        let config = object [ "haskell" .= object ["completionSnippetsOn" .= False]]
 
         sendNotification WorkspaceDidChangeConfiguration
                         (DidChangeConfigurationParams config)

test/functional/FunctionalCodeAction.hs

@@ -370,7 +370,7 @@ redundantImportTests = testGroup "redundant import code actions" [
         CACommand cmd : _ <- getAllCodeActions doc
         executeCommand cmd
         contents <- documentContents doc
-        liftIO $ (T.lines contents) @?=
+        liftIO $ T.lines contents @?=
                 [ "{-# OPTIONS_GHC -Wunused-imports #-}"
                 , "module MultipleImports where"
                 , "import Data.Maybe"
@@ -435,7 +435,7 @@ signatureTests = testGroup "missing top level signature code actions" [
         _ <- waitForDiagnosticsFromSource doc "typecheck"
         cas <- map fromAction <$> getAllCodeActions doc
 
-        liftIO $ "add signature: main :: IO ()" `elem` (map (^. L.title) cas) @? "Contains code action"
+        liftIO $ "add signature: main :: IO ()" `elem` map (^. L.title) cas @? "Contains code action"
 
         executeCodeAction $ head cas
 
@@ -449,7 +449,7 @@ signatureTests = testGroup "missing top level signature code actions" [
                        , "  return ()"
                        ]
 
-        liftIO $ (T.lines contents) @?= expected
+        liftIO $ T.lines contents @?= expected
     ]
 
 missingPragmaTests :: TestTree
@@ -487,7 +487,7 @@ missingPragmaTests = testGroup "missing pragma warning code actions" [
                         , "           deriving (Generic,Functor,Traversable)"
                         ]
 
-            liftIO $ (T.lines contents) @?= expected
+            liftIO $ T.lines contents @?= expected
 
     , testCase "Adds TypeApplications pragma" $ do
         runSession hlsCommand fullCaps "test/testdata/addPragmas" $ do
@@ -511,7 +511,7 @@ missingPragmaTests = testGroup "missing pragma warning code actions" [
                     , "foo = id @a"
                     ]
 
-            liftIO $ (T.lines contents) @?= expected
+            liftIO $ T.lines contents @?= expected
     ]
 
 unusedTermTests :: TestTree

test/functional/Tactic.hs

@@ -154,7 +154,7 @@ goldenTest input line col tc occ =
       doc <- openDoc input "haskell"
       _ <- waitForDiagnostics
       actions <- getCodeActions doc $ pointRange line col
-      Just (CACodeAction (CodeAction {_command = Just c}))
+      Just (CACodeAction CodeAction {_command = Just c})
         <- pure $ find ((== Just (tacticTitle tc occ)) . codeActionTitle) actions
       executeCommand c
       _resp :: ApplyWorkspaceEditRequest <- skipManyTill anyMessage message
@@ -174,7 +174,7 @@ expectFail input line col tc occ =
       doc <- openDoc input "haskell"
       _ <- waitForDiagnostics
       actions <- getCodeActions doc $ pointRange line col
-      Just (CACodeAction (CodeAction {_command = Just c}))
+      Just (CACodeAction CodeAction {_command = Just c})
         <- pure $ find ((== Just (tacticTitle tc occ)) . codeActionTitle) actions
       resp <- executeCommandWithResp c
       liftIO $ unless (isLeft $ _result resp) $
@@ -190,4 +190,3 @@ executeCommandWithResp cmd = do
   let args = decode $ encode $ fromJust $ cmd ^. arguments
       execParams = ExecuteCommandParams (cmd ^. command) args Nothing
   request WorkspaceExecuteCommand execParams
-