Refactor findRelatedSigSpan to avoid inner let

Author: xsebek

plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs

@@ -604,6 +604,7 @@ suggestDeleteUnusedBinding
         in ([("Delete ‘" <> name <> "’", edits) | not (null edits)])
     | otherwise = []
     where
+      hsmodSigs = [L l sig | L l (SigD _ sig) <- hsmodDecls]
       relatedRanges indexedContent name =
         concatMap (findRelatedSpans indexedContent name) hsmodDecls
       toRange = realSrcSpanToRange
@@ -614,11 +615,8 @@ suggestDeleteUnusedBinding
         (L (EpAnn (EpaSpan (RealSrcSpan l _)) _ _) (ValD _ (extractNameAndMatchesFromFunBind -> Just (lname, matches))))
          -> case lname of
           (L nLoc _name) | isTheBinding nLoc ->
-            let findSig (L (EpAnn (EpaSpan (RealSrcSpan l _)) _ c) (SigD _ sig)) = findRelatedSigSpan indexedContent name l c sig
-                findSig _ = []
-            in
-              extendForSpaces indexedContent (toRange l) :
-              concatMap findSig hsmodDecls
+            extendForSpaces indexedContent (toRange l)
+            : concatMap (findRelatedSigSpan' indexedContent name) hsmodSigs
           _ -> concatMap (findRelatedSpanForMatch indexedContent name) matches
         _ -> []
 
@@ -632,13 +630,14 @@ suggestDeleteUnusedBinding
           } = Just (reLoc lname, matches)
       extractNameAndMatchesFromFunBind _ = Nothing
 
-      findRelatedSigSpan :: PositionIndexedString -> String -> RealSrcSpan -> EpAnnComments -> Sig GhcPs -> [Range]
-      findRelatedSigSpan indexedContent name l c sig =
-        let maybeSpan = findRelatedSigSpan1 name sig
-        in case maybeSpan of
-          Just (_span, True) -> pure $ extendForSpaces indexedContent $ toRange $ l `withCommentSpan` c
-          Just (RealSrcSpan span _, False) -> pure $ toRange span
-          _ -> []
+      findRelatedSigSpan' :: PositionIndexedString -> String -> LSig GhcPs -> [Range]
+      findRelatedSigSpan' indexedContent name = \case
+        (L (EpAnn (EpaSpan (RealSrcSpan l _)) _ c) sig) ->
+          case findRelatedSigSpan1 name sig of
+            Just (_span, True) -> [extendForSpaces indexedContent . toRange $ l `withCommentSpan` c]
+            Just (RealSrcSpan span _, False) -> [toRange span]
+            _ -> []
+        _ -> []
 
       -- Second of the tuple means there is only one match
       findRelatedSigSpan1 :: String -> Sig GhcPs -> Maybe (SrcSpan, Bool)
@@ -696,10 +695,8 @@ suggestDeleteUnusedBinding
         lsigs
         (L (locA -> (RealSrcSpan l _)) (extractNameAndMatchesFromFunBind -> Just (lname, matches))) =
         if isTheBinding (getLoc lname)
-        then
-          let findSig (L (EpAnn (EpaSpan (RealSrcSpan l _)) _ c) sig) = findRelatedSigSpan indexedContent name l c sig
-              findSig _ = []
-          in extendForSpaces indexedContent (toRange l) : concatMap findSig lsigs
+        then extendForSpaces indexedContent (toRange l)
+             : concatMap (findRelatedSigSpan' indexedContent name) lsigs
         else concatMap (findRelatedSpanForMatch indexedContent name) matches
       findRelatedSpanForHsBind _ _ _ _ = []