Eliminate redundant $.

Author: peterwicksstringfield

exe/Wrapper.hs

@@ -73,7 +73,7 @@ launchHaskellLanguageServer LspArguments{..} = do
   hPutStrLn stderr $ showProgramVersionOfInterest programsOfInterest
   hPutStrLn stderr ""
   -- Get the ghc version -- this might fail!
-  hPutStrLn stderr $ "Consulting the cradle to get project GHC version..."
+  hPutStrLn stderr "Consulting the cradle to get project GHC version..."
   ghcVersion <- getRuntimeGhcVersion' cradle
   hPutStrLn stderr $ "Project GHC version: " ++ ghcVersion
 

ghcide/test/src/Development/IDE/Test.hs

@@ -168,7 +168,7 @@ checkDiagnosticsForDoc :: TextDocumentIdentifier -> [(DiagnosticSeverity, Cursor
 checkDiagnosticsForDoc TextDocumentIdentifier {_uri} expected obtained = do
     let expected' = Map.fromList [(nuri, map (\(ds, c, t) -> (ds, c, t, Nothing)) expected)]
         nuri = toNormalizedUri _uri
-    expectDiagnosticsWithTags' (return $ (_uri, List obtained)) expected'
+    expectDiagnosticsWithTags' (return (_uri, List obtained)) expected'
 
 canonicalizeUri :: Uri -> IO Uri
 canonicalizeUri uri = filePathToUri <$> canonicalizePath (fromJust (uriToFilePath uri))

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

@@ -97,7 +97,7 @@ writeHieFile hie_file_path hiefile = do
   -- hieVersion and the GHC version used to generate this file
   mapM_ (putByte bh0) hieMagic
   putBinLine bh0 $ BSC.pack $ show hieVersion
-  putBinLine bh0 $ ghcVersion
+  putBinLine bh0 ghcVersion
 
   -- remember where the dictionary pointer will go
   dict_p_p <- tellBin bh0

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

@@ -25,7 +25,7 @@ import Data.Foldable    ( toList )
 ppHies :: Outputable a => HieASTs a -> SDoc
 ppHies (HieASTs asts) = M.foldrWithKey go "" asts
   where
-    go k a rest = vcat $
+    go k a rest = vcat
       [ "File: " <> ppr k
       , ppHie a
       , rest
@@ -114,7 +114,7 @@ validAst (Node _ span children) = do
     checkContainment (x:xs)
       | span `containsSpan` nodeSpan x = checkContainment xs
       | otherwise = Left $ hsep
-          [ ppr $ span
+          [ ppr span
           , "does not contain"
           , ppr $ nodeSpan x
           ]
@@ -139,7 +139,7 @@ validateScopes asts = M.foldrWithKey (\k a b -> valid k a ++ b) [] refMap
               [] -> []
               _ -> if any (`scopeContainsSpan` sp) scopes
                    then []
-                   else return $ hsep $
+                   else return $ hsep
                      [ "Name", ppr n, "at position", ppr sp
                      , "doesn't occur in calculated scope", ppr scopes]
           | otherwise = []

install/src/Cabal.hs

@@ -46,7 +46,7 @@ getGhcPathOfOrThrowError versionNumber =
 
 cabalInstallHls :: VersionNumber -> [String] -> Action ()
 cabalInstallHls versionNumber args = do
-  localBin <- liftIO $ getInstallDir
+  localBin <- liftIO getInstallDir
   cabalVersion <- getCabalVersion args
   ghcPath <- getGhcPathOfOrThrowError versionNumber
 

install/src/HlsInstall.hs

@@ -38,7 +38,7 @@ defaultMain = do
     let args = [verbosityArg (shakeVerbosity shakeOptionsRules)]
 
     phony "show-options" $ do
-      putNormal $ "Options:"
+      putNormal "Options:"
       putNormal $ "    Verbosity level: " ++ show (shakeVerbosity shakeOptionsRules)
 
     want ["short-help"]
@@ -51,7 +51,7 @@ defaultMain = do
     phony "data" $ do
       need ["show-options"]
       need ["check"]
-      liftIO $ putStrLn "Generation of hoogle data files is disabled for now."  
+      liftIO $ putStrLn "Generation of hoogle data files is disabled for now."
       -- if isRunFromStack then stackBuildData args else cabalBuildData args
 
     forM_
@@ -90,7 +90,7 @@ defaultMain = do
       need ["icu-macos-fix-build"]
 
     phony "icu-macos-fix-install" (command_ [] "brew" ["install", "icu4c"])
-    phony "icu-macos-fix-build" $ mapM_ (flip buildIcuMacosFix $ args) versions
+    phony "icu-macos-fix-build" $ mapM_ (flip buildIcuMacosFix args) versions
 
 
 buildIcuMacosFix :: VersionNumber -> [String] -> Action ()

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

@@ -121,7 +121,7 @@ runRetrieCmd lsp state RunRetrieParams{originatingFile = uri, ..} =
         nfp <- MaybeT $ return $ uriToNormalizedFilePath $ toNormalizedUri uri
         (session, _) <- MaybeT $
             runAction "Retrie.GhcSessionDeps" state $
-                useWithStale GhcSessionDeps $
+                useWithStale GhcSessionDeps
                 nfp
         (ms, binds, _, _, _) <- MaybeT $ runAction "Retrie.getBinds" state $ getBinds nfp
         let importRewrites = concatMap (extractImports ms binds) rewrites

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

@@ -178,7 +178,7 @@ destructLambdaCase' f jdg = do
   let g  = jGoal jdg
   case splitFunTy_maybe (unCType g) of
     Just (arg, _) | isAlgType arg ->
-      fmap (fmap noLoc $ lambdaCase) <$>
+      fmap (fmap noLoc lambdaCase) <$>
         destructMatches f Nothing (CType arg) jdg
     _ -> throwError $ GoalMismatch "destructLambdaCase'" g
 
@@ -214,7 +214,7 @@ mkCon dcon (fmap unLoc -> args)
   , (lhs : rhs : args') <- args =
       noLoc $ foldl' (@@) (op lhs (coerceName dcon_name) rhs) args'
   | otherwise =
-      noLoc $ foldl' (@@) (bvar' $ occName $ dcon_name) args
+      noLoc $ foldl' (@@) (bvar' $ occName dcon_name) args
   where
     dcon_name = dataConName dcon
 
@@ -259,4 +259,3 @@ infixCall s = flip op (fromString s)
 -- | Like '(@@)', but uses a dollar instead of parentheses.
 appDollar :: HsExpr GhcPs -> HsExpr GhcPs -> HsExpr GhcPs
 appDollar = infixCall "$"
-

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

@@ -89,8 +89,7 @@ getFunBindId _ = []
 
 
 getCurrentDefinitions :: MonadReader Context m => m [(OccName, CType)]
-getCurrentDefinitions = asks $ ctxDefiningFuncs
+getCurrentDefinitions = asks ctxDefiningFuncs
 
 getModuleHypothesis :: MonadReader Context m => m [(OccName, CType)]
 getModuleHypothesis = asks ctxModuleFuncs
-

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

@@ -78,7 +78,7 @@ freshTyvars t = do
   reps <- fmap M.fromList
         $ for tvs $ \tv -> do
             uniq <- freshUnique
-            pure $ (tv, setTyVarUnique tv uniq)
+            pure (tv, setTyVarUnique tv uniq)
   pure $
     everywhere
       (mkT $ \tv ->
@@ -153,4 +153,4 @@ dataConExTys :: DataCon -> [TyCoVar]
 dataConExTys = DataCon.dataConExTyCoVars
 #else
 dataConExTys = DataCon.dataConExTyVars
-#endif
+#endif

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

@@ -92,7 +92,7 @@ runTactic ctx jdg t =
           . flip runReader ctx
           . unExtractM
           $ runTacticT t jdg tacticState of
-      (errs, []) -> Left $ take 50 $ errs
+      (errs, []) -> Left $ take 50 errs
       (_, fmap assoc23 -> solns) -> do
         let sorted =
               flip sortBy solns $ comparing $ \((_, ext), (jdg, holes)) ->
@@ -174,7 +174,7 @@ scoreSolution ext TacticState{..} holes
     , Penalize $ S.size ts_unused_top_vals
     , Penalize $ S.size ts_intro_vals
     , Reward   $ S.size ts_used_vals
-    , Penalize $ ts_recursion_count
+    , Penalize ts_recursion_count
     , Penalize $ solutionSize ext
     )
 
@@ -251,4 +251,3 @@ requireConcreteHole m = do
   case S.size $ vars S.\\ skolems of
     0 -> m
     _ -> throwError TooPolymorphic
-

src/Ide/Version.hs

@@ -67,7 +67,7 @@ findVersionOf tool =
     Just path ->
       readProcessWithExitCode path ["--numeric-version"] "" >>= \case
         (ExitSuccess, sout, _) -> pure $ consumeParser myVersionParser sout
-        _ -> pure $ Nothing
+        _ -> pure Nothing
   where
     myVersionParser = do
       skipSpaces