[merlin] Handle filenames with dot-separated sections#4264
Merged
voodoos merged 5 commits intoocaml:mainfrom Feb 22, 2021
Merged
[merlin] Handle filenames with dot-separated sections#4264voodoos merged 5 commits intoocaml:mainfrom
voodoos merged 5 commits intoocaml:mainfrom
Conversation
rgrinberg
requested changes
Feb 19, 2021
rgrinberg
approved these changes
Feb 19, 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>
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
b15f3a5 to
82693ca
Compare
voodoos
added a commit
to voodoos/dune
that referenced
this pull request
Feb 22, 2021
* Split filename on `.` and use the first part for config matching * Illustrate usage with some tests * Add some documentation about naming preprocessed files. Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
rgrinberg
pushed a commit
that referenced
this pull request
Mar 7, 2021
* Split filename on `.` and use the first part for config matching * Illustrate usage with some tests * Add some documentation about naming preprocessed files. 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 is part of #4217
Fixes ocaml/merlin#1262
It implements the proposed solution n° 2 to handle more gracefully source files with uncommon names.
For example it is somehow regular to have a file
my_module.ccpo.mlthat will be be preprocessed by a rule with targetmy_module.ml.However the user-edited file is
my_module.ccpo.mland we want Merlin to work as expected even if the configuration has been generated by Dune formy_module.ml.This PR implement the simplest solution to that issue: by convention, the first component of a filename whose parts are separated by dots is used to match with the generated configurations.