Drop the superseded export quick-fix from hls-refactor-plugin

The hls-export-plugin Export action replaces it.

Author: crtschin

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

@@ -19,7 +19,6 @@ module Development.IDE.Plugin.CodeAction
 
 import           Control.Applicative                               ((<|>))
 import           Control.Arrow                                     (second,
-                                                                    (&&&),
                                                                     (>>>))
 import           Control.Concurrent.STM.Stats                      (atomically)
 import           Control.Monad.Extra
@@ -37,7 +36,6 @@ import           Data.List.NonEmpty                                (NonEmpty ((:
 import qualified Data.List.NonEmpty                                as NE
 import qualified Data.Map.Strict                                   as M
 import           Data.Maybe
-import           Data.Ord                                          (comparing)
 import qualified Data.Set                                          as S
 import qualified Data.Text                                         as T
 import qualified Data.Text.Encoding                                as T
@@ -151,9 +149,8 @@ codeAction state _ (CodeActionParams _ _ (TextDocumentIdentifier uri) range _) =
 iePluginDescriptor :: Recorder (WithPriority E.Log) -> PluginId -> PluginDescriptor IdeState
 iePluginDescriptor recorder plId =
   let old =
-        mkGhcideCAsPlugin [
-            wrap suggestExportUnusedTopBinding
-          , wrap suggestModuleTypo
+        mkGhcideCAsPlugin
+          [ wrap suggestModuleTypo
           , wrap suggestFixConstructorImport
           , wrap suggestExtendImport
           , wrap suggestImportDisambiguation
@@ -710,100 +707,9 @@ suggestDeleteUnusedBinding
       isSameName :: IdP GhcPs -> String -> Bool
       isSameName x name = T.unpack (printOutputable x) == name
 
-data ExportsAs = ExportName | ExportPattern | ExportFamily | ExportAll
-  deriving (Eq)
-
 getLocatedRange :: HasSrcSpan a => a -> Maybe Range
 getLocatedRange = srcSpanToRange . getLoc
 
-suggestExportUnusedTopBinding :: Maybe T.Text -> ParsedModule -> Diagnostic -> Maybe (T.Text, TextEdit)
-suggestExportUnusedTopBinding srcOpt ParsedModule{pm_parsed_source = L _ HsModule{..}} Diagnostic{..}
--- Foo.hs:4:1: warning: [-Wunused-top-binds] Defined but not used: ‘f’
--- Foo.hs:5:1: warning: [-Wunused-top-binds] Defined but not used: type constructor or class ‘F’
--- Foo.hs:6:1: warning: [-Wunused-top-binds] Defined but not used: data constructor ‘Bar’
-  | Just source <- srcOpt
-  , Just [_, name] <-
-      matchRegexUnifySpaces
-        _message
-        ".*Defined but not used: (type constructor or class |data constructor )?‘([^ ]+)’"
-  , Just (exportType, _) <-
-      find (matchWithDiagnostic _range . snd)
-      . mapMaybe (\(L l b) -> if isTopLevel (locA l) then exportsAs b else Nothing)
-      $ hsmodDecls
-  , Just exports       <- fmap (fmap reLoc) . reLoc <$> hsmodExports
-  , Just exportsEndPos <- _end <$> getLocatedRange exports
-  , let name'          = printExport exportType name
-        sep            = exportSep source $ map getLocatedRange <$> exports
-        exportName     = case sep of
-          Nothing -> (if needsComma source exports then ", " else "") <> name'
-          Just  s -> s <> name'
-        exportsEndPos' = exportsEndPos { _character = pred $ _character exportsEndPos }
-        insertPos      = fromMaybe exportsEndPos' $ case (sep, unLoc exports) of
-          (Just _, exports'@(_:_)) -> fmap _end . getLocatedRange $ last exports'
-          _                        -> Nothing
-  = Just ("Export ‘" <> name <> "’", TextEdit (Range insertPos insertPos) exportName)
-  | otherwise = Nothing
-  where
-    exportSep :: T.Text -> Located [Maybe Range] -> Maybe T.Text
-    exportSep src (L (RealSrcSpan _ _) xs@(_ : tl@(_ : _))) =
-      case mapMaybe (\(e, s) -> (,) <$> e <*> s) $ zip (fmap _end <$> xs) (fmap _start <$> tl) of
-        []     -> Nothing
-        bounds -> Just smallestSep
-          where
-            smallestSep
-              = snd
-              $ minimumBy (comparing fst)
-              $ map (T.length &&& id)
-              $ nubOrd
-              $ map (\(prevEnd, nextStart) -> textInRange (Range prevEnd nextStart) src) bounds
-    exportSep _   _ = Nothing
-
-    -- We get the last export and the closing bracket and check for comma in that range.
-    needsComma :: T.Text -> Located [Located (IE GhcPs)] -> Bool
-    needsComma _ (L _ []) = False
-    needsComma source (L (RealSrcSpan l _) exports) =
-      let closeParen = _end $ realSrcSpanToRange l
-          lastExport = fmap _end . getLocatedRange $ last exports
-      in
-      case lastExport of
-        Just lastExport ->
-          not $ T.any (== ',') $ textInRange (Range lastExport closeParen) source
-        _ -> False
-    needsComma _ _ = False
-
-    opLetter :: T.Text
-    opLetter = ":!#$%&*+./<=>?@\\^|-~"
-
-    parenthesizeIfNeeds :: Bool -> T.Text -> T.Text
-    parenthesizeIfNeeds needsTypeKeyword x
-      | T.any (c ==) opLetter = (if needsTypeKeyword then "type " else "") <> "(" <> x <> ")"
-      | otherwise = x
-      where
-        c = T.head x
-
-    matchWithDiagnostic :: Range -> Located (IdP GhcPs) -> Bool
-    matchWithDiagnostic Range{_start=l,_end=r} x =
-      let loc = fmap _start . getLocatedRange $ x
-       in loc >= Just l && loc <= Just r
-
-    printExport :: ExportsAs -> T.Text -> T.Text
-    printExport ExportName x    = parenthesizeIfNeeds False x
-    printExport ExportPattern x = "pattern " <> parenthesizeIfNeeds False x
-    printExport ExportFamily x  = parenthesizeIfNeeds True x
-    printExport ExportAll x     = parenthesizeIfNeeds True x <> "(..)"
-
-    isTopLevel :: SrcSpan -> Bool
-    isTopLevel span = fmap (_character . _start) (srcSpanToRange span) == Just 0
-
-    exportsAs :: HsDecl GhcPs -> Maybe (ExportsAs, Located (IdP GhcPs))
-    exportsAs (ValD _ FunBind {fun_id})          = Just (ExportName, reLoc fun_id)
-    exportsAs (ValD _ (PatSynBind _ PSB {psb_id})) = Just (ExportPattern, reLoc psb_id)
-    exportsAs (TyClD _ SynDecl{tcdLName})      = Just (ExportName, reLoc tcdLName)
-    exportsAs (TyClD _ DataDecl{tcdLName})     = Just (ExportAll, reLoc tcdLName)
-    exportsAs (TyClD _ ClassDecl{tcdLName})    = Just (ExportAll, reLoc tcdLName)
-    exportsAs (TyClD _ FamDecl{tcdFam})        = Just (ExportFamily, reLoc $ fdLName tcdFam)
-    exportsAs _                                = Nothing
-
 suggestAddTypeAnnotationToSatisfyConstraints :: Maybe T.Text -> Diagnostic -> [(T.Text, [TextEdit])]
 suggestAddTypeAnnotationToSatisfyConstraints sourceOpt Diagnostic{_range=_range,..}
 -- File.hs:52:41: warning: