Skip to content

Keep type lenses stable #3558

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

Merged
merged 15 commits into from
May 5, 2023
Merged

Keep type lenses stable #3558

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
01f823c
Use stale type lens
July541 Apr 7, 2023
e83b282
Query position mapping if available
July541 Apr 16, 2023
d955cfa
Remove redundant code
July541 Apr 17, 2023
5b7ada6
Merge branch 'master' into stale-type-lens
July541 Apr 19, 2023
79d4965
Generate from diag doesn't depend on position mapping
July541 Apr 22, 2023
732864f
No stale diagnostic
July541 Apr 22, 2023
c40ea4e
Remove diagnostic chain
July541 Apr 22, 2023
b2270bc
indent
July541 Apr 22, 2023
87acc31
Merge branch 'master' into stale-type-lens
July541 Apr 22, 2023
3be1d46
Return Nothing if toCurrentRange failed
July541 Apr 22, 2023
5971783
Merge branch 'master' into stale-type-lens
July541 Apr 22, 2023
21d6836
Comment some suspicious code
July541 Apr 23, 2023
8210de5
Merge branch 'master' into stale-type-lens
mergify[bot] Apr 26, 2023
d41d06e
lens should work if mmp is Nothing
July541 May 4, 2023
c2fcf50
Merge branch 'master' into stale-type-lens
mergify[bot] May 5, 2023
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
5 changes: 3 additions & 2 deletions ghcide/src/Development/IDE/Plugin/TypeLenses.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,9 @@ gblBindingTypeSigToEdit GlobalBindingTypeSig{..} mmp
| Just Range{..} <- srcSpanToRange $ getSrcSpan gbName
, startOfLine <- Position (_line _start) 0
, beforeLine <- Range startOfLine startOfLine
, Just mp <- mmp
, Just range <- toCurrentRange mp beforeLine
-- If `mmp` is `Nothing`, return the original range, it used by lenses from diagnostic,
-- otherwise we apply `toCurrentRange`, and the guard should fail if `toCurrentRange` failed.
, Just range <- maybe (Just beforeLine) (flip toCurrentRange beforeLine) mmp
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mixed the scene if mmp is Nothing, thanks ci halt this 😅

= Just $ TextEdit range $ T.pack gbRendered <> "\n"
| otherwise = Nothing

Expand Down