Skip to content

[2.9-backport] Allow to set up merlin in a variant of the default context (#4145)#4502

Merged
ejgallego merged 1 commit intoocaml:2.9from
voodoos:2.9-merlin-context
Jun 4, 2021
Merged

[2.9-backport] Allow to set up merlin in a variant of the default context (#4145)#4502
ejgallego merged 1 commit intoocaml:2.9from
voodoos:2.9-merlin-context

Conversation

@voodoos
Copy link
Copy Markdown
Collaborator

@voodoos voodoos commented Apr 20, 2021

  • 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

@voodoos voodoos added this to the 2.9 milestone Apr 20, 2021
Copy link
Copy Markdown
Collaborator

@ejgallego ejgallego left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good for 2.9 , thanks!

Can you rebase?

@ejgallego ejgallego self-assigned this Jun 2, 2021
* 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>
@voodoos voodoos force-pushed the 2.9-merlin-context branch from 124bb34 to 3cdb38a Compare June 4, 2021 11:52
@voodoos
Copy link
Copy Markdown
Collaborator Author

voodoos commented Jun 4, 2021

Looks good for 2.9 , thanks!

Can you rebase?

Done !

@ejgallego ejgallego merged commit 8c30c9d into ocaml:2.9 Jun 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants