Skip to content

Strip prefixes added by DuplicateRecordFields #4593

Merged
fendor merged 4 commits into
haskell:masterfrom
kozak:drf-support-for-explicit-record-fields
May 24, 2025
Merged

Strip prefixes added by DuplicateRecordFields #4593
fendor merged 4 commits into
haskell:masterfrom
kozak:drf-support-for-explicit-record-fields

Conversation

@kozak

@kozak kozak commented May 17, 2025

Copy link
Copy Markdown
Contributor

Fix for: #4547

DuplicateRecordFields adds $sel:...:fieldName to disambiguate record selectors. The selectors are included in the inlay hints making them slightly confusing:

image

@kozak
kozak requested a review from ozkutuk as a code owner May 17, 2025 17:25

@fendor fendor left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM, thanks for taking care of this issue!

Just one comment.

Comment thread plugins/hls-explicit-record-fields-plugin/src/Ide/Plugin/ExplicitFields.hs Outdated
Comment thread plugins/hls-explicit-record-fields-plugin/src/Ide/Plugin/ExplicitFields.hs Outdated
@kozak
kozak requested a review from wz1000 as a code owner May 19, 2025 07:43
@kozak

kozak commented May 19, 2025

Copy link
Copy Markdown
Contributor Author

Thanks for the review. Applied your comments.

@fendor
fendor enabled auto-merge (squash) May 22, 2025 13:24
@fendor
fendor disabled auto-merge May 23, 2025 13:53
@fendor

fendor commented May 23, 2025

Copy link
Copy Markdown
Collaborator

@kozak Sorry, #4586 caused conflicts, could you rebase the PR?

Apologies for merging master into your branch, I thought this PR would get merged already,

@kozak
kozak force-pushed the drf-support-for-explicit-record-fields branch from 8d209ea to 0519351 Compare May 24, 2025 06:43
@kozak
kozak requested a review from michaelpj as a code owner May 24, 2025 06:43
@kozak
kozak force-pushed the drf-support-for-explicit-record-fields branch from 0519351 to deb8901 Compare May 24, 2025 06:52
@kozak

kozak commented May 24, 2025

Copy link
Copy Markdown
Contributor Author

Done. No problem, thanks for helping :)

I thought this PR would get merged already

Is there anything I need to do ?

@fendor
fendor merged commit 63e03b9 into haskell:master May 24, 2025
@fendor

fendor commented May 24, 2025

Copy link
Copy Markdown
Collaborator

Thank you for your PR and your work, it is much appreciated!

Is there anything I need to do ?

Choosing another issue to fix? ;D

dukefong8 pushed a commit to dukefong8/haskell-language-server that referenced this pull request May 25, 2025
* Strip prefixes added by DuplicateRecordFields to disambiguate record selectors from inlay hints

* Fix style

* Extract stripPrefixes to a common utility, convert comment to haddoc

* Move to GHC Util
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants