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.

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

Distinguish identical files #130

Merged
merged 6 commits into from
Feb 10, 2025
Merged

Distinguish identical files #130

merged 6 commits into from
Feb 10, 2025

Conversation

liam923
Copy link
Contributor

@liam923 liam923 commented Feb 7, 2025

This PR backports upstream PR ocaml/merlin#1882, which enables Merlin to distinguish between files with identical contents when jumping to definitions.

The tests rely on dune, which we can't use in Merlin-jst tests, so I've disabled them. But I've created tests on our internal codebase.

@liam923 liam923 requested a review from goldfirere February 7, 2025 16:06
@liam923 liam923 merged commit d0a4a19 into main Feb 10, 2025
1 of 2 checks passed
@liam923 liam923 deleted the distinguish-files branch February 10, 2025 21:16
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.

3 participants