1515{-# LANGUAGE ScopedTypeVariables #-}
1616{-# LANGUAGE StrictData #-}
1717{-# LANGUAGE TupleSections #-}
18+ {-# LANGUAGE TypeApplications #-}
1819{-# LANGUAGE TypeFamilies #-}
1920{-# LANGUAGE ViewPatterns #-}
20-
2121{-# OPTIONS_GHC -Wno-orphans #-}
2222
2323-- On 9.4 we get a new redundant constraint warning, but deleting the
@@ -422,7 +422,7 @@ codeActionProvider ideState _pluginId (CodeActionParams _ _ documentId _ context
422422
423423 where
424424 applyAllAction verTxtDocId =
425- let args = Just $ toJSON (AA verTxtDocId)
425+ let args = Just $ toJSON (ApplyHint verTxtDocId Nothing )
426426 in LSP. CodeAction" Apply all hints" Just LSP. CodeActionKind_QuickFixNothing Nothing Nothing Nothing Nothing args
427427
428428 -- | Some hints do not have an associated refactoring
@@ -437,14 +437,10 @@ resolveProvider :: Recorder (WithPriority Log) -> ResolveFunction IdeState Hlint
437437resolveProvider recorder ideState _plId ca uri resolveValue = pluginResponse $ do
438438 file <- getNormalizedFilePath uri
439439 case resolveValue of
440- (AA verTxtDocId) -> do
441- edit <- ExceptT $ liftIO $ applyHint recorder ideState file Nothing verTxtDocId
442- pure $ ca & LSP. edit ?~ edit
443- (AO verTxtDocId pos hintTitle) -> do
444- let oneHint = OneHint pos hintTitle
445- edit <- ExceptT $ liftIO $ applyHint recorder ideState file (Just oneHint) verTxtDocId
440+ (ApplyHint verTxtDocId oneHint) -> do
441+ edit <- ExceptT $ liftIO $ applyHint recorder ideState file oneHint verTxtDocId
446442 pure $ ca & LSP. edit ?~ edit
447- (IH verTxtDocId hintTitle ) -> do
443+ (IgnoreHint verTxtDocId hintTitle ) -> do
448444 edit <- ExceptT $ liftIO $ ignoreHint recorder ideState file verTxtDocId hintTitle
449445 pure $ ca & LSP. edit ?~ edit
450446
@@ -456,13 +452,13 @@ diagnosticToCodeActions verTxtDocId diagnostic
456452 , let isHintApplicable = " refact:" `T.isPrefixOf` code
457453 , let hint = T. replace " refact:" " "
458454 , let suppressHintTitle = " Ignore hint \" " <> hint <> " \" in this module"
459- , let suppressHintArguments = IH verTxtDocId hint
455+ , let suppressHintArguments = IgnoreHint verTxtDocId hint
460456 = catMaybes
461457 -- Applying the hint is marked preferred because it addresses the underlying error.
462458 -- Disabling the rule isn't, because less often used and configuration can be adapted.
463459 [ if | isHintApplicable
464460 , let applyHintTitle = " Apply hint \" " <> hint <> " \" "
465- applyHintArguments = AO verTxtDocId start hint ->
461+ applyHintArguments = ApplyHint verTxtDocId ( Just $ OneHint start hint) ->
466462 Just (mkCodeAction applyHintTitle diagnostic (Just (toJSON applyHintArguments)) True
467463 | otherwise -> Nothing
468464 , Just (mkCodeAction suppressHintTitle diagnostic (Just (toJSON suppressHintArguments)) False
@@ -520,22 +516,25 @@ ignoreHint _recorder ideState nfp verTxtDocId ignoreHintTitle = do
520516 Nothing -> pure $ Left " Unable to get fileContents"
521517
522518-- ---------------------------------------------------------------------
523- data HlintResolveCommands = AA { verTxtDocId :: VersionedTextDocumentIdentifier }
524- | AO { verTxtDocId :: VersionedTextDocumentIdentifier
525- , start_pos :: Position
526- -- | There can be more than one hint suggested at the same position, so HintTitle is used to distinguish between them.
527- , hintTitle :: HintTitle
528- }
529- | IH { verTxtDocId :: VersionedTextDocumentIdentifier
530- , ignoreHintTitle :: HintTitle
531- } deriving (Generic , ToJSON , FromJSON )
519+ data HlintResolveCommands =
520+ ApplyHint
521+ { verTxtDocId :: VersionedTextDocumentIdentifier
522+ -- | If Nothing, apply all hints, otherise only apply
523+ -- the given hint
524+ , oneHint :: Maybe OneHint
525+ }
526+ | IgnoreHint
527+ { verTxtDocId :: VersionedTextDocumentIdentifier
528+ , ignoreHintTitle :: HintTitle
529+ } deriving (Generic , ToJSON , FromJSON )
532530
533531type HintTitle = T. Text
534532
535- data OneHint = OneHint
536- { oneHintPos :: Position
537- , oneHintTitle :: HintTitle
538- } deriving (Eq , Show )
533+ data OneHint =
534+ OneHint
535+ { oneHintPos :: Position
536+ , oneHintTitle :: HintTitle
537+ } deriving (Generic , Eq , Show , ToJSON , FromJSON )
539538
540539applyHint :: Recorder (WithPriority Log ) -> IdeState -> NormalizedFilePath -> Maybe OneHint -> VersionedTextDocumentIdentifier -> IO Either String WorkspaceEdit )
541540applyHint recorder ide nfp mhint verTxtDocId =
0 commit comments