dune format-dune-file: use Dune lang version of current Dune project #11865
Conversation
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
bin/workspace_root.mli
Outdated
|
|
||
| val create_exn : default_is_cwd:bool -> specified_by_user:string option -> t | ||
| val create_exn | ||
| : ?from:string |
There was a problem hiding this comment.
How about just always passing this from argument? I don't think there's many callers and it would help us be assured that you didn't forget to set this somewhere.
There was a problem hiding this comment.
Good idea. Fixed, thanks.
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
bin/common.mli
Outdated
| @@ -46,7 +46,7 @@ end | |||
|
|
|||
| Return the [Common.t] and the final configuration, which is the same as the one | |||
| returned in the [config] field of [Dune_rules.Workspace.workspace ()]) *) | |||
| val init : Builder.t -> t * Dune_config_file.Dune_config.t | |||
| val init : ?root:Workspace_root.t -> Builder.t -> t * Dune_config_file.Dune_config.t | |||
There was a problem hiding this comment.
Same for ~root here. Let's just pass it always
There was a problem hiding this comment.
Fixed in 4d7a096. I ended up using a separate function instead of making the argument mandatory, so as to avoid too much code duplication.
…th-project-version
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
|
I added a warning when using |
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
nojb
force-pushed
the
format-dune-file-with-project-version
branch
from
71304a1 to
209091f
Compare
bin/workspace_root.ml
Outdated
| let cwd = Sys.getcwd () in | ||
| let find from = | ||
| let cwd = | ||
| if Filename.is_relative from then Filename.concat (Sys.getcwd ()) from else from |
There was a problem hiding this comment.
How about Fpath.initial_cwd? The old code didn't use it before, but at least it only called getcwd once.
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
nojb
force-pushed
the
format-dune-file-with-project-version
branch
from
ceb3d10 to
cc5a628
Compare
Signed-off-by: Nicolás Ojeda Bär <[email protected]>
|
Tests are failing in this one |
This PR extends
dune format-dune-fileso that the Dune version of the current Dune project is used when formatting. If a file is passed as argument, then it is the Dune project that owns the file that is used. If formatting standard input, it is the Dune project containing the current directory that is used.This fixes the isssue discussed in the thread starting at #10892 (comment).
This also opens the door to honouring the
(formatting)settings of the current Dune project (cc @Khady, cf #3516).