Skip to content

User a looser comparison to match Diagnostic objects #4051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

User a looser comparison to match Diagnostic objects #4051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions plugins/hls-refactor-plugin/src/Development/IDE/Plugin/CodeAction.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,16 @@ suggestRemoveRedundantImport ParsedModule{pm_parsed_source = L _ HsModule{hsmod
| otherwise = []


-- Using a looser equality check, determines if a given `Diagnostic` is present
-- in a list. Compares using *only* required fields for this type as defined by:
-- https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnostic
-- See https://github.com/haskell/haskell-language-server/issues/3857 for more
-- context.
diagIsElemOf :: Diagnostic -> [Diagnostic] -> Bool
diagIsElemOf d ds = any (requiredFieldsEqual d) ds
where
requiredFieldsEqual Diagnostic{_range=r1, _message=m1} Diagnostic{_range=r2, _message=m2} = r1 == r2 && m1 == m2

-- Note [Removing imports is preferred]
-- It's good to prefer the remove imports code action because an unused import
-- is likely to be removed and less likely the warning will be disabled.
Expand All @@ -453,7 +463,7 @@ caRemoveRedundantImports m contents digs ctxDigs uri
r <- join $ map (\d -> repeat d `zip` suggestRemoveRedundantImport pm contents d) digs,
allEdits <- [ e | (_, (_, edits)) <- r, e <- edits],
caRemoveAll <- removeAll allEdits,
ctxEdits <- [ x | x@(d, _) <- r, d `elem` ctxDigs],
ctxEdits <- [ x | x@(d, _) <- r, d `diagIsElemOf` ctxDigs],
not $ null ctxEdits,
caRemoveCtx <- map (\(d, (title, tedit)) -> removeSingle title tedit d) ctxEdits
= caRemoveCtx ++ [caRemoveAll]
Expand Down Expand Up @@ -488,7 +498,7 @@ caRemoveInvalidExports m contents digs ctxDigs uri
allRanges <- nubOrd $ [ range | (_,_,ranges) <- r, range <- ranges],
allRanges' <- extend txt' allRanges,
Just caRemoveAll <- removeAll allRanges',
ctxEdits <- [ x | x@(_, d, _) <- r, d `elem` ctxDigs],
ctxEdits <- [ x | x@(_, d, _) <- r, d `diagIsElemOf` ctxDigs],
not $ null ctxEdits
= caRemoveCtx ++ [caRemoveAll]
| otherwise = []
Expand Down