Allow to set up merlin in a variant of the default context by voodoos · Pull Request #4145 · ocaml/dune

voodoos · 2021-01-21T16:27:17Z

This is a "reopening" of #4132 from @TheLortex rebased on master.

I added a test case, bumped dune lang version to 2.9 and removed what I think was a redundant test (72df296).

voodoos · 2021-01-21T16:29:41Z

DCO is failing because the first commit is not signed by myself but @TheLortex

emillon · 2021-01-22T11:53:35Z

I think you can fix that by changing the commit author for that particular commit (cherry-pick should be doing that?).

dune-project

doc/dune-files.rst

rgrinberg · 2021-01-22T16:38:09Z

What happens when we select more than one context as (merlin)?

voodoos · 2021-01-25T10:59:59Z

What happens when we select more than one context as (merlin)?

It fails at parsing-time. I added a test to illustrate it.
The check is done here:

dune/src/dune_rules/workspace.ml

Lines 421 to 429 in 4e01186

    
           match (ctx, acc) with 
        
           | Opam { base = { merlin = true; _ }; _ }, Some _ 
        
           | Default { merlin = true; _ }, Some _ -> 
        
             User_error.raise ~loc:(Context.loc ctx) 
        
               [ Pp.text "you can only have one context for merlin" ] 
        
           | Opam { base = { merlin = true; _ }; _ }, None 
        
           | Default { merlin = true; _ }, None -> 
        
             Some name 
        
           | _ -> acc)

rgrinberg

LGTM. Needs a CHANGES entry.

Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>

Signed-off-by: Lucas Pluvinage <lucas@tarides.com>

Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>

* Add test * Test with parsing failure on mutltiple merlin contexts * Allow to set up merlin in a variant of the default context. * Add changelog entry Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com> Co-authored-by: Lucas Pluvinage <lucas@tarides.com>

…4502) * Add test * Test with parsing failure on mutltiple merlin contexts * Allow to set up merlin in a variant of the default context. * Add changelog entry Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com> Co-authored-by: Lucas Pluvinage <lucas@tarides.com> Co-authored-by: Lucas Pluvinage <lucas@tarides.com>

@emillon

…ator, dune-private-libs, dune and dune-build-info (2.9-rc1) CHANGES: - Add `(enabled_if ...)` to `(mdx ...)` (ocaml/dune#4434, @emillon) - Add support for instrumentation dependencies (ocaml/dune#4210, fixes ocaml/dune#3983, @nojb) - Add the possibility to use `locks` with the cram tests stanza (ocaml/dune#4480, @voodoos) - Allow to set up merlin in a variant of the default context (ocaml/dune#4145, @TheLortex, @voodoos) - Add `(package ...)` to `(mdx ...)` (ocaml/dune#4691, fixes ocaml/dune#3756, @emillon) - Handle renaming of `coq.kernel` library to `coq-core.kernel` in Coq 8.14 (ocaml/dune#4713, @proux01) - Fix generation of merlin configuration when using `(include_subdirs unqualified)` on Windows (ocaml/dune#4745, @nojb) - Fix bug for the install of Coq native files when using `(include_subdirs qualified)` (ocaml/dune#4753, @ejgallego) - Allow users to specify install target directories for `doc` and `etc` sections. We add new options `--docdir` and `--etcdir` to both Dune's configure and `dune install` command. (ocaml/dune#4744, fixes ocaml/dune#4723, @ejgallego, thanks to @JasonGross for reporting this issue) - Handle renaming of `coq.kernel` library to `coq-core.kernel` in Coq 8.14 (ocaml/dune#4713, @proux01) - Fix issue where Dune would ignore `(env ... (coq (flags ...)))` declarations appearing in `dune` files (ocaml/dune#4749, fixes ocaml/dune#4566, @ejgallego @rgrinberg) - Disable some warnings on Coq 8.14 and `(lang coq (>= 0.3))` due to the rework of the Coq "native" compilation system (ocaml/dune#4760, @ejgallego)

@emillon

…ator, dune-private-libs, dune and dune-build-info (2.9.0) CHANGES: - Add `(enabled_if ...)` to `(mdx ...)` (ocaml/dune#4434, @emillon) - Add support for instrumentation dependencies (ocaml/dune#4210, fixes ocaml/dune#3983, @nojb) - Add the possibility to use `locks` with the cram tests stanza (ocaml/dune#4480, @voodoos) - Allow to set up merlin in a variant of the default context (ocaml/dune#4145, @TheLortex, @voodoos) - Add `(package ...)` to `(mdx ...)` (ocaml/dune#4691, fixes ocaml/dune#3756, @emillon) - Handle renaming of `coq.kernel` library to `coq-core.kernel` in Coq 8.14 (ocaml/dune#4713, @proux01) - Fix generation of merlin configuration when using `(include_subdirs unqualified)` on Windows (ocaml/dune#4745, @nojb) - Fix bug for the install of Coq native files when using `(include_subdirs qualified)` (ocaml/dune#4753, @ejgallego) - Allow users to specify install target directories for `doc` and `etc` sections. We add new options `--docdir` and `--etcdir` to both Dune's configure and `dune install` command. (ocaml/dune#4744, fixes ocaml/dune#4723, @ejgallego, thanks to @JasonGross for reporting this issue) - Fix issue where Dune would ignore `(env ... (coq (flags ...)))` declarations appearing in `dune` files (ocaml/dune#4749, fixes ocaml/dune#4566, @ejgallego @rgrinberg) - Disable some warnings on Coq 8.14 and `(lang coq (>= 0.3))` due to the rework of the Coq "native" compilation system (ocaml/dune#4760, @ejgallego) - Fix a bug where instrumentation flags would be added even if the instrumentatation was disabled (@nojb, ocaml/dune#4770) - Fix ocaml/dune#4682: option `-p` takes now precedence on environement variable `DUNE_PROFILE` (ocaml/dune#4730, ocaml/dune#4774, @bobot, reported by @dra27 ocaml/dune#4632) - Fix installation with opam of package with dune sites. The `.install` file is now produced by a local `dune install` during the build phase (ocaml/dune#4730, ocaml/dune#4645, @bobot, reported by @kit-ty-kate ocaml/dune#4198) - Fix multiple issues in the sites feature (ocaml/dune#4730, ocaml/dune#4645 @bobot, reported by @Lelio-Brun ocaml/dune#4219, by @Kakadu ocaml/dune#4325, by @toots ocaml/dune#4415)

@emillon

…ator, dune-private-libs, dune and dune-build-info (2.9.0) CHANGES: - Add `(enabled_if ...)` to `(mdx ...)` (ocaml/dune#4434, @emillon) - Add support for instrumentation dependencies (ocaml/dune#4210, fixes ocaml/dune#3983, @nojb) - Add the possibility to use `locks` with the cram tests stanza (ocaml/dune#4480, @voodoos) - Allow to set up merlin in a variant of the default context (ocaml/dune#4145, @TheLortex, @voodoos) - Add `(package ...)` to `(mdx ...)` (ocaml/dune#4691, fixes ocaml/dune#3756, @emillon) - Handle renaming of `coq.kernel` library to `coq-core.kernel` in Coq 8.14 (ocaml/dune#4713, @proux01) - Fix generation of merlin configuration when using `(include_subdirs unqualified)` on Windows (ocaml/dune#4745, @nojb) - Fix bug for the install of Coq native files when using `(include_subdirs qualified)` (ocaml/dune#4753, @ejgallego) - Allow users to specify install target directories for `doc` and `etc` sections. We add new options `--docdir` and `--etcdir` to both Dune's configure and `dune install` command. (ocaml/dune#4744, fixes ocaml/dune#4723, @ejgallego, thanks to @JasonGross for reporting this issue) - Fix issue where Dune would ignore `(env ... (coq (flags ...)))` declarations appearing in `dune` files (ocaml/dune#4749, fixes ocaml/dune#4566, @ejgallego @rgrinberg) - Disable some warnings on Coq 8.14 and `(lang coq (>= 0.3))` due to the rework of the Coq "native" compilation system (ocaml/dune#4760, @ejgallego) - Fix a bug where instrumentation flags would be added even if the instrumentatation was disabled (@nojb, ocaml/dune#4770) - Fix ocaml/dune#4682: option `-p` takes now precedence on environement variable `DUNE_PROFILE` (ocaml/dune#4730, ocaml/dune#4774, @bobot, reported by @dra27 ocaml/dune#4632) - Fix installation with opam of package with dune sites. The `.install` file is now produced by a local `dune install` during the build phase (ocaml/dune#4730, ocaml/dune#4645, @bobot, reported by @kit-ty-kate ocaml/dune#4198) - Fix multiple issues in the sites feature (ocaml/dune#4730, ocaml/dune#4645 @bobot, reported by @Lelio-Brun ocaml/dune#4219, by @Kakadu ocaml/dune#4325, by @toots ocaml/dune#4415)

voodoos requested review from emillon, nojb and rgrinberg as code owners January 21, 2021 16:27

voodoos changed the title ~~Merlin default field~~ Allow to set up merlin in a variant of the default context Jan 21, 2021

voodoos force-pushed the merlin-default-field branch from 5bede91 to 492c2b5 Compare January 21, 2021 16:28

voodoos added this to the 2.9 milestone Jan 21, 2021

emillon reviewed Jan 22, 2021

View reviewed changes

dune-project Outdated Show resolved Hide resolved

doc/dune-files.rst Outdated Show resolved Hide resolved

voodoos force-pushed the merlin-default-field branch 3 times, most recently from 2494b55 to b8cf576 Compare April 9, 2021 14:51

rgrinberg approved these changes Apr 9, 2021

View reviewed changes

voodoos force-pushed the merlin-default-field branch from b8cf576 to 858d41f Compare April 14, 2021 11:55

voodoos and others added 4 commits April 14, 2021 15:19

Add test

36a845c

Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>

Test with parsing failure on mutltiple merlin contexts

9f8ece6

Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>

Allow to set up merlin in a variant of the default context.

3cbee3f

Signed-off-by: Lucas Pluvinage <lucas@tarides.com>

Add changelog entry

1ceb155

Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>

voodoos force-pushed the merlin-default-field branch from 371209a to 1ceb155 Compare April 14, 2021 13:19

voodoos merged commit c48b997 into ocaml:main Apr 14, 2021

ejgallego mentioned this pull request Jun 21, 2021

[new release] dune-action-plugin, dune-glob, dune-site, dune-configurator, dune-private-libs, dune and dune-build-info (2.9.0) ocaml/opam-repository#18904

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow to set up merlin in a variant of the default context#4145

Allow to set up merlin in a variant of the default context#4145
voodoos merged 4 commits intoocaml:mainfrom
voodoos:merlin-default-field

voodoos commented Jan 21, 2021

Uh oh!

voodoos commented Jan 21, 2021

Uh oh!

emillon commented Jan 22, 2021

Uh oh!

Uh oh!

Uh oh!

rgrinberg commented Jan 22, 2021

Uh oh!

voodoos commented Jan 25, 2021 •

edited

Loading

Uh oh!

rgrinberg left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

voodoos commented Jan 21, 2021

Uh oh!

voodoos commented Jan 21, 2021

Uh oh!

emillon commented Jan 22, 2021

Uh oh!

Uh oh!

Uh oh!

rgrinberg commented Jan 22, 2021

Uh oh!

voodoos commented Jan 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rgrinberg left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

voodoos commented Jan 25, 2021 •

edited

Loading