Fix a few more hints and some mistakes made during merge.

Author: peterwicksstringfield

ghcide/session-loader/Development/IDE/Session.hs

@@ -120,7 +120,7 @@ setInitialDynFlags = do
         hPutStrLn stderr $ "Couldn't load cradle for libdir: " ++ show (err,dir,hieYaml,cradle)
         pure Nothing
       CradleNone -> do
-        hPutStrLn stderr $ "Couldn't load cradle (CradleNone)"
+        hPutStrLn stderr "Couldn't load cradle (CradleNone)"
         pure Nothing
   dynFlags <- mapM dynFlagsForPrinting libdir
   mapM_ setUnsafeGlobalDynFlags dynFlags

ghcide/src/Development/IDE/Spans/AtPoint.hs

@@ -266,12 +266,12 @@ typeLocationsAtPoint hiedb lookupModule _ideOptions pos (HAR _ ast _ _ hieKind)
             HQualTy a b -> getTypes [a,b]
             HCastTy a -> getTypes [a]
             _ -> []
-        in fmap nubOrd $ concatMapM (fmap (maybe [] id) . nameToLocation hiedb lookupModule) (getTypes ts)
+        in fmap nubOrd $ concatMapM (fmap (fromMaybe []) . nameToLocation hiedb lookupModule) (getTypes ts)
     HieFresh ->
       let ts = concat $ pointCommand ast pos getts
           getts x = nodeType ni  ++ (mapMaybe identType $ M.elems $ nodeIdentifiers ni)
             where ni = nodeInfo x
-        in fmap nubOrd $ concatMapM (fmap (maybe [] id) . nameToLocation hiedb lookupModule) (getTypes ts)
+        in fmap nubOrd $ concatMapM (fmap (fromMaybe []) . nameToLocation hiedb lookupModule) (getTypes ts)
 
 namesInType :: Type -> [Name]
 namesInType (TyVarTy n)      = [Var.varName n]

hls-plugin-api/src/Ide/Types.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE ViewPatterns #-}

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

@@ -1,5 +1,3 @@
-{-# LANGUAGE DeriveAnyClass        #-}
-{-# LANGUAGE DeriveGeneric         #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings     #-}
 {-# LANGUAGE ViewPatterns          #-}

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

@@ -1,8 +1,6 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE LambdaCase #-}
-{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE ExtendedDefaultRules #-}
 {-# LANGUAGE FlexibleContexts #-}

plugins/hls-hlint-plugin/src/Ide/Plugin/Hlint.hs

@@ -278,7 +278,7 @@ codeActionProvider ideState plId (CodeActionParams _ _ docId _ context) = Right
         in LSP.CodeAction "Apply all hints" (Just LSP.CodeActionQuickFix) Nothing Nothing Nothing Nothing (Just cmd)
 
     applyOneActions :: [LSP.CodeAction]
-    applyOneActions = catMaybes $ map mkHlintAction (filter validCommand diags)
+    applyOneActions = mapMaybe mkHlintAction (filter validCommand diags)
 
     -- |Some hints do not have an associated refactoring
     validCommand (LSP.Diagnostic _ _ (Just (InR code)) (Just "hlint") _ _ _) =

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

@@ -147,14 +147,14 @@ extractImports ModSummary{ms_mod} topLevelBinds (Unfold thing)
   , names <- listify p fun_matches
   =
     [ AddImport {..}
-    | name <- names,
-        Just ideclNameString <-
-        [moduleNameString . GHC.moduleName <$> nameModule_maybe name],
-        let ideclSource = False,
+    | let ideclSource = False,
+        name <- names,
         let r = nameRdrName name,
         let ideclQualifiedBool = isQual r,
         let ideclAsString = moduleNameString . fst <$> isQual_maybe r,
-        let ideclThing = Just (IEVar $ occNameString $ rdrNameOcc r)
+        let ideclThing = Just (IEVar $ occNameString $ rdrNameOcc r),
+        Just ideclNameString <-
+        [moduleNameString . GHC.moduleName <$> nameModule_maybe name]
     ]
     where
         p name = nameModule_maybe name /= Just ms_mod
@@ -179,8 +179,8 @@ provider state plId (CodeActionParams _ _ (TextDocumentIdentifier uri) range ca)
           ++ [ r
                | TyClGroup {group_tyclds} <- hs_tyclds,
                  L l g <- group_tyclds,
-                 r <- suggestTypeRewrites uri ms_mod g,
-                 pos `isInsideSrcSpan` l
+                 pos `isInsideSrcSpan` l,
+                 r <- suggestTypeRewrites uri ms_mod g
 
              ]
 

plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic.hs

@@ -235,7 +235,7 @@ filterBindingType p tp dflags plId uri range jdg =
       g  = jGoal jdg
    in fmap join $ for (unHypothesis hy) $ \hi ->
         let ty = unCType $ hi_type hi
-         in if $ p (unCType g) ty
+         in if p (unCType g) ty
               then tp (hi_name hi) ty dflags plId uri range jdg
               else pure []
 

plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/CodeGen.hs

@@ -1,7 +1,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE TupleSections    #-}
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE ViewPatterns     #-}
 
 module Ide.Plugin.Tactic.CodeGen
   ( module Ide.Plugin.Tactic.CodeGen
@@ -202,4 +201,3 @@ buildDataCon jdg dc tyapps = do
   pure
     . (rose (show dc) $ pure tr,)
     $ mkCon dc sgs
-

plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Judgements.hs

@@ -273,7 +273,7 @@ introducingPat scrutinee dc ns jdg
 disallowing :: DisallowReason -> [OccName] -> Judgement' a -> Judgement' a
 disallowing reason (S.fromList -> ns) =
   field @"_jHypothesis" %~ (\z -> Hypothesis . flip fmap (unHypothesis z) $ \hi ->
-    if $ hi_name hi `S.member` ns
+    if hi_name hi `S.member` ns
       then overProvenance (DisallowedPrv reason) hi
       else hi
                            )

plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Naming.hs

@@ -71,9 +71,9 @@ mkGoodName
     -> OccName
 mkGoodName in_scope t =
   let tn = mkTyName t
-   in if $ mkVarOcc $ case S.member (mkVarOcc tn) in_scope
-        then tn ++ show (length in_scope)
-        else tn
+   in mkVarOcc $ if S.member (mkVarOcc tn) in_scope
+                 then tn ++ show (length in_scope)
+                 else tn
 
 
 ------------------------------------------------------------------------------

plugins/hls-tactics-plugin/src/Ide/Plugin/Tactic/Simplify.hs

@@ -41,8 +41,7 @@ pattern Lambda pats body <-
 -- | Simlify an expression.
 simplify :: LHsExpr GhcPs -> LHsExpr GhcPs
 simplify
-  = head
-  . drop 3   -- Do three passes; this should be good enough for the limited
+  = (!! 3)   -- Do three passes; this should be good enough for the limited
              -- amount of gas we give to auto
   . iterate (everywhere $ foldEndo
     [ simplifyEtaReduce
@@ -78,7 +77,7 @@ simplifyEtaReduce = mkT $ \case
       (HsVar _ (L _ a)) | pat == a ->
     var "id"
   Lambda
-      (unsnoc -> Just (pats, (VarPat _ (L _ pat))))
+      (unsnoc -> Just (pats, VarPat _ (L _ pat)))
       (HsApp _ (L _ f) (L _ (HsVar _ (L _ a))))
       | pat == a
         -- We can only perform this simplifiation if @pat@ is otherwise unused.
@@ -93,8 +92,8 @@ simplifyEtaReduce = mkT $ \case
 simplifyCompose :: GenericT
 simplifyCompose = mkT $ \case
   Lambda
-      (unsnoc -> Just (pats, (VarPat _ (L _ pat))))
-      (unroll -> (fs@(_:_), (HsVar _ (L _ a))))
+      (unsnoc -> Just (pats, VarPat _ (L _ pat)))
+      (unroll -> (fs@(_:_), HsVar _ (L _ a)))
       | pat == a
         -- We can only perform this simplifiation if @pat@ is otherwise unused.
       , not (containsHsVar pat fs) ->
@@ -119,4 +118,3 @@ unroll (HsApp _ (L _ f) (L _ a)) =
   let (fs, r) = unroll a
    in (f : fs, r)
 unroll x = ([], x)
-

plugins/hls-tactics-plugin/test/AutoTupleSpec.hs

@@ -3,7 +3,6 @@
 module AutoTupleSpec where
 
 import           Data.Either (isRight)
-import qualified Data.Map as M
 import           Ide.Plugin.Tactic.Debug
 import           Ide.Plugin.Tactic.Judgements (mkFirstJudgement)
 import           Ide.Plugin.Tactic.Machinery
@@ -48,11 +47,8 @@ spec = describe "auto for tuple" $ do
             (auto' $ n * 2) `shouldSatisfy` isRight
 
 
-{- HLINT ignore randomGroups "Redundant <$>"-}
-
 randomGroups :: [a] -> Gen [[a]]
 randomGroups [] = pure []
 randomGroups as = do
   n <- choose (1, length as)
-  (:) <$> pure (take n as)
-      <*> randomGroups (drop n as)
+  (take n as:) <$> randomGroups (drop n as)

src/Ide/Main.hs

@@ -5,10 +5,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE ViewPatterns #-}
-{-# LANGUAGE NamedFieldPuns #-}
 
 module Ide.Main(defaultMain, runLspMode) where
 

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-14.27 # Last 8.6.5
+resolver: nightly-2020-12-09
 
 packages:
   - .
@@ -18,79 +18,37 @@ packages:
 ghc-options:
   "$everything": -haddock
 
-
-
 extra-deps:
-  - aeson-1.5.2.0
   - apply-refact-0.9.0.0
-  - ansi-terminal-0.10.3
-  - base-compat-0.10.5
   - brittany-0.13.1.0
-  - butcher-1.3.3.1
   - Cabal-3.0.2.0
-  - cabal-plan-0.6.2.0
   - clock-0.7.2
-  - Diff-0.4.0
+  - data-tree-print-0.1.0.2@rev:2
   - floskell-0.10.4
   - fourmolu-0.3.0.0
-  - fuzzy-0.1.0.0
-  - ghc-check-0.5.0.1
-  - ghc-events-0.13.0
   - ghc-exactprint-0.6.3.4
   - ghc-lib-8.10.3.20201220
   - ghc-lib-parser-8.10.3.20201220
-  - ghc-lib-parser-ex-8.10.0.17
-  - ghc-source-gen-0.4.0.0
-  - ghc-trace-events-0.1.2.1
-  - haddock-api-2.22.0@rev:1
-  - haddock-library-1.8.0
-  - hashable-1.3.0.0
+  - lsp-1.1.0.0
+  - lsp-types-1.1.0.0
+  - lsp-test-0.13.0.0
   - heapsize-0.3.0
-  - hie-bios-0.7.1
-  - hlint-3.2.3
-  - HsYAML-0.2.1.0@rev:1
-  - HsYAML-aeson-0.2.0.0@rev:2
   - implicit-hie-cradle-0.3.0.2
   - implicit-hie-0.1.2.5
-  - indexed-profunctors-0.1
-  - lens-4.18
-  - megaparsec-9.0.1
   - monad-dijkstra-0.1.1.2
-  - opentelemetry-0.6.1
-  - opentelemetry-extra-0.6.1
-  - optics-core-0.2
-  - optparse-applicative-0.15.1.0
-  - ormolu-0.1.4.1
-  - parser-combinators-1.2.1
-  - primitive-0.7.1.0
   - refinery-0.3.0.0
-  - regex-base-0.94.0.0
-  - regex-pcre-builtin-0.95.1.1.8.43
-  - regex-tdfa-1.3.1.0
   - retrie-0.1.1.1
-  - semialign-1.1
   - stylish-haskell-0.12.2.0
-  - tasty-rerun-1.1.17
+  - semigroups-0.18.5
   - temporary-1.2.1.1
-  - these-1.1.1.1
-  - type-equality-1
-  - topograph-1
-  - uniplate-1.6.13
-  - with-utf8-1.0.2.1@sha256:95c02fffa643ddbeb092359802a512007c3e644cd509809f4716ad54592c437b,3057
-  - th-env-0.1.0.2@sha256:d8f1f37f42a8f1a22404d7d0579528af18f5dac7232cca6bdbd5117c115a0ad5,1370
   - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727
   - hiedb-0.3.0.1
-  - extra-1.7.9@sha256:f1dec740f0f2025790c540732bfd52c556ec55bde4f5dfd7cf18e22bd44ff3d0,2683
-  - lsp-1.1.0.0
-  - lsp-types-1.1.0.0
-  - lsp-test-0.13.0.0
   - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
   - dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
   - dependent-sum-template-0.1.0.3@sha256:0bbbacdfbd3abf2a15aaf0cf2c27e5bdd159b519441fec39e1e6f2f54424adde,1682
   - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
   - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
   - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082
-  - resourcet-1.2.3
 
 configure-options:
   ghcide:
@@ -106,8 +64,6 @@ flags:
   retrie:
     BuildExecutable: false
 
-# allow-newer: true
-
 nix:
   packages: [icu libcxx zlib]
 

test/functional/Progress.hs

@@ -3,7 +3,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE GADTs #-}
 
 module Progress (tests) where
@@ -106,9 +105,9 @@ expectProgressReports xs = expectProgressReports' [] xs
                 EndM msg -> do
                     liftIO $ token msg `expectElem` tokens
                     expectProgressReports' (delete (token msg) tokens) expectedTitles
-    title msg = msg ^. L.value ^. L.title
+    title msg = msg ^. L.value . L.title
     token msg = msg ^. L.token
-    create = CreateM . view L.params <$> (message SWindowWorkDoneProgressCreate)
+    create = CreateM . view L.params <$> message SWindowWorkDoneProgressCreate
     begin = BeginM <$> satisfyMaybe (\case
       FromServerMess SProgress (NotificationMessage _ _ (ProgressParams t (Begin x))) -> Just (ProgressParams t x)
       _ -> Nothing)

test/functional/Reference.hs

@@ -25,7 +25,7 @@ tests = testGroup "references" [
             , mkRange 4 14 4 17
             , mkRange 4 0 4 3
             , mkRange 2 6 2 9
-            ] `isInfixOf` (coerce refs) @? "Contains references"
+            ] `isInfixOf` coerce refs @? "Contains references"
     -- TODO: Respect withDeclaration parameter
     -- ignoreTestBecause "Broken" $ testCase "works without definitions" $ runSession hlsCommand fullCaps "test/testdata" $ do
     --   doc <- openDoc "References.hs" "haskell"