Skip to content
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

Exclude the implicit prelude import (#2798) #3277

Merged
merged 2 commits into from
Oct 9, 2022
Merged

Exclude the implicit prelude import (#2798) #3277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c9c968
Exclude the implicit prelude import (#2798)
ChristophHochrainer Oct 9, 2022
8db4fc7
Merge branch 'master' into bug/2798_unexpected_implicit_import_code_lens
pepeiborra Oct 9, 2022
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
12 changes: 11 additions & 1 deletion plugins/hls-explicit-imports-plugin/src/Ide/Plugin/ExplicitImports.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ lensProvider
-- haskell-lsp provides conversion functions
| Just nfp <- uriToNormalizedFilePath $ toNormalizedUri _uri = liftIO $
do
mbMinImports <- runAction "" state $ useWithStale MinimalImports nfp
mbMinImports <- runAction "MinimalImports" state $ useWithStale MinimalImports nfp
case mbMinImports of
-- Implement the provider logic:
-- for every import, if it's lacking a explicit list, generate a code lens
Expand Down Expand Up @@ -212,13 +212,23 @@ minimalImportsRule recorder = define (cmapWithPrio LogShake recorder) $ \Minimal
Map.fromList
[ (realSrcSpanStart l, printOutputable i)
| L (locA -> RealSrcSpan l _) i <- fromMaybe [] mbMinImports
, not (isImplicitPrelude i)
]
res =
[ (i, Map.lookup (realSrcSpanStart l) importsMap)
| i <- imports
, RealSrcSpan l _ <- [getLoc i]
]
return ([], MinimalImportsResult res <$ mbMinImports)
where
isImplicitPrelude :: (Outputable a) => a -> Bool
isImplicitPrelude importDecl =
T.isPrefixOf implicitPreludeImportPrefix (printOutputable importDecl)

-- | This is the prefix of an implicit prelude import which should be ignored,
-- when considering the minimal imports rule
implicitPreludeImportPrefix :: T.Text
implicitPreludeImportPrefix = "import (implicit) Prelude"

--------------------------------------------------------------------------------

Expand Down