Backport 1727 #56
Merged
Backport 1727 #56
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
poechsel
force-pushed
the
backport-1727-v2
branch
from
c26f1d5
to
4469629
Compare
liam923
approved these changes
Apr 30, 2024
| @@ -31,261 +31,20 @@ open Std | |||
| let last_location = ref Location.none | |||
|
|
|||
| let {Logger. log} = Logger.for_section "locate" | |||
| module File : sig | |||
There was a problem hiding this comment.
Is there a technical reason for moving these modules into separate files or is it just for better code structuring? If the latter, I'm hesitant to diverge from upstream.
There was a problem hiding this comment.
Reverted the commit adding Artifact.ml / File.ml and instead exposed Artifact in Locate's mli
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
…nces. Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
This reverts commit 7f98ceb. Signed-off-by: Pierre Oechsel <[email protected]>
Signed-off-by: Pierre Oechsel <[email protected]>
poechsel
force-pushed
the
backport-1727-v2
branch
from
060e06d
to
c261e98
Compare
Merged
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.
"Backport" ocaml/merlin#1727 which is a pre-requisite of getting occurences working.
This backport was done by cherry-picking each commit of 1727 one after the other. Tests outputs were manually inspected to check if the final diff is consistent with the one of the upstream PR.
The main difference with upstream PR resides in the last two commits: one is moving some code in its own files, the other is making sure that occurrences can rely on cms files.