-
Notifications
You must be signed in to change notification settings - Fork 8
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
Project wide occurrences #77
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
liam923
force-pushed
the
project-wide-occurrences
branch
2 times, most recently
from
August 1, 2024 19:00
a4371fe
to
760cad8
Compare
liam923
force-pushed
the
project-wide-occurrences
branch
from
August 1, 2024 21:33
d780ba6
to
ea2abdd
Compare
liam923
force-pushed
the
project-wide-occurrences
branch
from
August 2, 2024 17:14
3a96989
to
e96df16
Compare
poechsel
reviewed
Aug 6, 2024
liam923
force-pushed
the
project-wide-occurrences
branch
from
August 6, 2024 13:36
e96df16
to
938637d
Compare
Merged
Sorry I took a while to get to this but it's ready for re-review. @poechsel |
This reverts commit fa1e8b1.
…eds parenthesis Doing that properly require compiler support for located longidents. cherry picked from upstream commit 1850cbe
cherry picked from upstream commit 082a1ac
cherry picked from upstream commit 02959ba
cherry picked from upstream commit a1547db
cherry picked from upstream commit a687b15
It's always correct to have a space after the parenthesis and it is sometimes necessary, for infix operators that start with `*` for example. cherry picked from upstream commit ab56eea
cherry picked from upstream commit ee41c4d
cherry picked from upstream commit 9f8cbf4
This reparsing has very bad performances. The correct way to deal with issue is to have the compiler store precise locations in longidents. cherry picked from upstream commit df27557
dune 2.9.0 is not compatible with OCaml 5.2 anyway. cherry picked from upstream commit 617a91d
cherry picked from upstream commit b77b724
cherry picked from upstream commit dd23fbd
cherry picked from upstream commit 34e2688
cherry picked from upstream commit a34cc1c
cherry picked from upstream commit 1577d8f
cherry picked from upstream commit 4d5560e
cherry picked from upstream commit a4bb508
cherry picked from upstream commit 139272e
cherry picked from upstream commit a0dbfb2
We don't have a way to identify uids in interfaces with uids in implementations. This might lead to mixing up results that share the same uid. cherry picked from upstream commit 38c28f2
Labels and constructors are not highlighted correctly when the cursor is on their declaration cherry picked from upstream commit af14a1f
cherry picked from upstream commit 7bd03f0
cherry picked from upstream commit 5b96c62
This reverts commit 24ba67e.
liam923
force-pushed
the
project-wide-occurrences
branch
from
August 14, 2024 16:04
34e5a90
to
685d444
Compare
poechsel
approved these changes
Aug 15, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR backports a large number of occurrence-related changes from upstream. This backport was done by:
occurrences.ml
between Merlin-jst and upstream.After the backport,
occurrences.ml
's only difference from upstream are Merlin-jst specific.The backporting commit descriptions include the upstream PR or commit hash.
The first commit of this PR is not a backport but instead reverts fa1e8b1. This is because is substantially differs from its upstream counterpart, 34e2688. Thus, the decision was made to revert fa1e8b1 and then cherry-pick 34e2688.
There was a similar issue with 9e90e47 and 3c4d858, which are substantially different from the corresponding upstream commit 80f29ff. This differences in
occurrences.ml
were fixed while merging. I may make a future PR to resolve other differences.Note that this PR targets the branch
backport-shape-reduce
. That is becuase this PR builds on PR #78, which uses that branch.Also note that the project-wide occurrences tests aren't run because ocaml-index hasn't yet been imported. I intend to import it and fix the tests in a follow-up PR.