[merlin] Handle relative paths and perform case insensitive path comparison on Windows#4221
Merged
voodoos merged 4 commits intoocaml:mainfrom Feb 15, 2021
Merged
Conversation
rgrinberg
approved these changes
Feb 13, 2021
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
f9cee32 to
bdf2eda
Compare
This was referenced Feb 16, 2021
voodoos
added a commit
to voodoos/dune
that referenced
this pull request
Feb 22, 2021
…ns on windows (ocaml#4221) * Handle both absolute and relative links * Make path comparison case insensitive on Windows * Update test suite Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
rgrinberg
pushed a commit
that referenced
this pull request
Mar 7, 2021
…ns on windows (#4221) * Handle both absolute and relative links * Make path comparison case insensitive on Windows * Update test suite Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 a part of #4217
This PR improve the flexibility of the
dune ocaml-merlincommand.initial_cwdof thedune ocaml-merlincommand. This should solves issues where symlinks were confusing the communication between Dune and Merlin.\on Windows (on master).The first change need Merlin to switch to sending relative paths instead of absolute ones. However to maintain the best compatibility possible future releases of Merlin will always retry using an absolute path if no configuration was found with a relative path.
CC @nojb @emillon