Allow -pp to return an AST by let-def · Pull Request #1394 · ocaml/merlin

let-def · 2021-10-26T00:36:11Z

Merlin expects a source preprocessor -pp to return sources.
However, some existing preprocessors return marshalled ASTs.
This patch adds support for this situation, and should fix:

Merlin functionalities will be reduced:

recovery is up to -pp
no support for placeholder insertion for completion
lexer_ident will fallback to the unpreprocessed source to reconstruct
identifiers

Merlin functionalities will be reduced: - recovery is up to -pp - no support for placeholder insertion for completion - lexer_ident will fallback to the unpreprocessed source to reconstruct identifiers

…from Merlin Std)

Kakadu · 2021-10-26T10:23:49Z

If I want to test your PR with ocaml-lsp, what should I do?

voodoos · 2021-10-26T11:38:05Z

If I want to test your PR with ocaml-lsp, what should I do?

That is not an easy task because ocaml-lsp is vendoring merlin.
But maybe you can test using merlin directly ?

For example you can ask for the type of the expression at line 3 column 5 in file test.ml by calling the following command:

ocamlmerlin single type-enclosing -position 3:5 -filename test.ml < test.ml

Kakadu · 2021-10-26T11:50:18Z

For example you can ask for the type of the expression at line 3 column 5 in file test.ml by calling the following command:

ocamlmerlin single type-enclosing -position 3:5 -filename test.ml < test.ml

The issue being discussed involves preprocessing of input files by external tools, so (I'm afraid) it will not be so easy to test it from command line. And recent abandoning of .merlin files should complicate everything too.

voodoos · 2021-10-26T12:33:07Z

If you use Dune to build your project then just build it before starting ocamlmerlin and the configuration should be read as usual.

let-def · 2021-10-27T11:33:37Z

I confirm, I tested from the command line with:

ocamlmerlin server check-configuration -filename src/core/Core.mli   < src/core/Core.mli

Kakadu · 2021-10-27T12:12:46Z

I confirm, I tested from the command line with:
ocamlmerlin server check-configuration -filename src/core/Core.mli   < src/core/Core.mli

I tried your branch and nothing changes comparately from opam's merlin

➜  pat-match git:(master) ✗ ocamlmerlin server -vnum                                                                                           
v4.3.1-412-15-g6fb8af9f
➜  pat-match git:(master) ✗ ocamlmerlin server check-configuration -filename OCanren/src/core/Core.mli   < OCanren/src/core/Core.mli         
{"class":"failure","value":"Empty file","notifications":[],"timing":{"clock":52,"cpu":52,"query":0,"pp":21,"reader":30,"ppx":0,"typer":0,"error":0}}

let-def · 2021-10-28T02:33:10Z

It works here.
Can you give more information on your setup? OS, versions of compiler and packages (camlp5).
Also, try using single instead of server: ocamlmerlin single check-configuration...

Kakadu · 2021-10-28T11:30:52Z

I tested again, rebased ocaml-lsp-server to use new merlin and the issue is fixed. Thanks!

@antalsz

CHANGES: Mon Jul 26 11:12:21 PM CET 2021 + merlin binary - Mbrowse.select_leaf: correctly ignore merlin.hide (ocaml/merlin#1376) - enable `occurences` to work when looking for locally abstract types (ocaml/merlin#1382) - handle `-alert` compiler flag (ocaml/merlin#1401) - avoid a race condition when the process started to read a configuration file crashes/is not found (ocaml/merlin#1378, @antalsz) - log the backtrace even when the exception is a Failure (ocaml/merlin#1377, @antalsz) - ignore `-error-style` compiler flag (ocaml/merlin#1402, @nojb) - fix handling of record field expressions (ocaml/merlin#1375) - allow -pp to return an AST (ocaml/merlin#1394) - fix merlin crashing due to short-paths (ocaml/merlin#1334, fixes ocaml/merlin#1322) + editor modes - update quick setup instructions for emacs (ocaml/merlin#1380, @ScriptDevil) + test suite - improve record field destruction testing (ocaml/merlin#1375)

@antalsz

CHANGES: Mon Jul 26 11:12:21 PM CET 2021 + ocaml support - add support for 4.13 - stopped actively supporting version older than 4.12 + merlin binary - Mbrowse.select_leaf: correctly ignore merlin.hide (ocaml/merlin#1376) - enable `occurences` to work when looking for locally abstract types (ocaml/merlin#1382) - handle `-alert` compiler flag (ocaml/merlin#1401) - avoid a race condition when the process started to read a configuration file crashes/is not found (ocaml/merlin#1378, @antalsz) - log the backtrace even when the exception is a Failure (ocaml/merlin#1377, @antalsz) - ignore `-error-style` compiler flag (ocaml/merlin#1402, @nojb) - fix handling of record field expressions (ocaml/merlin#1375) - allow -pp to return an AST (ocaml/merlin#1394) - fix merlin crashing due to short-paths (ocaml/merlin#1334, fixes ocaml/merlin#1322) + editor modes - update quick setup instructions for emacs (ocaml/merlin#1380, @ScriptDevil) + test suite - improve record field destruction testing (ocaml/merlin#1375)

@antalsz

CHANGES: Mon Jul 26 11:12:21 PM CET 2021 + merlin binary - Mbrowse.select_leaf: correctly ignore merlin.hide (ocaml/merlin#1376) - enable `occurences` to work when looking for locally abstract types (ocaml/merlin#1382) - handle `-alert` compiler flag (ocaml/merlin#1401) - avoid a race condition when the process started to read a configuration file crashes/is not found (ocaml/merlin#1378, @antalsz) - log the backtrace even when the exception is a Failure (ocaml/merlin#1377, @antalsz) - ignore `-error-style` compiler flag (ocaml/merlin#1402, @nojb) - fix handling of record field expressions (ocaml/merlin#1375) - allow -pp to return an AST (ocaml/merlin#1394) - fix merlin crashing due to short-paths (ocaml/merlin#1334, fixes ocaml/merlin#1322) + editor modes - update quick setup instructions for emacs (ocaml/merlin#1380, @ScriptDevil) + test suite - improve record field destruction testing (ocaml/merlin#1375)

@antalsz

CHANGES: Tue Nov 23 11:45:21 PM CET 2021 + merlin binary - Mbrowse.select_leaf: correctly ignore merlin.hide (ocaml/merlin#1376) - make `occurences` work when looking for locally abstract types (ocaml/merlin#1382) - handle `-alert` compiler flag - improve destruct calls on record fields (ocaml/merlin#1375) - avoid a race condition when the process started to read a configuration file crashes/is not found (ocaml/merlin#1378, @antalsz) - log the backtrace even when the exception is a Failure (ocaml/merlin#1377, @antalsz) - allow -pp to return an AST (ocaml/merlin#1394) - ignore `-error-style` compiler flag (ocaml/merlin#1402, @nojb) - fix handling of record field expressions (ocaml/merlin#1375) + test suite - improve record field destruction testing (ocaml/merlin#1375)

let-def added 2 commits October 26, 2021 09:25

Allow -pp to return an AST

5ca0216

Merlin functionalities will be reduced: - recovery is up to -pp - no support for placeholder insertion for completion - lexer_ident will fallback to the unpreprocessed source to reconstruct identifiers

Replace String.starts_with (available in OCaml 4.13) by is_prefixed (…

6fb8af9

…from Merlin Std)

trefis approved these changes Nov 17, 2021

View reviewed changes

voodoos merged commit eb8df3e into master Nov 18, 2021

voodoos added a commit that referenced this pull request Nov 18, 2021

Update Changes for #1394

6468e1b

voodoos added a commit that referenced this pull request Nov 22, 2021

Update Changes for #1394

35d9057

voodoos mentioned this pull request Nov 23, 2021

Release merlin v4.4-413/412/411 and v3.7.0 ocaml/opam-repository#20090

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow -pp to return an AST#1394

Allow -pp to return an AST#1394
voodoos merged 2 commits intomasterfrom
ast-in-pp

let-def commented Oct 26, 2021 •

edited

Loading

Uh oh!

Kakadu commented Oct 26, 2021

Uh oh!

voodoos commented Oct 26, 2021 •

edited

Loading

Uh oh!

Kakadu commented Oct 26, 2021

Uh oh!

voodoos commented Oct 26, 2021

Uh oh!

let-def commented Oct 27, 2021

Uh oh!

Kakadu commented Oct 27, 2021

Uh oh!

let-def commented Oct 28, 2021 •

edited

Loading

Uh oh!

Kakadu commented Oct 28, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

let-def commented Oct 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kakadu commented Oct 26, 2021

Uh oh!

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

Uh oh!

Uh oh!

Kakadu commented Oct 26, 2021

Uh oh!

voodoos commented Oct 26, 2021

Uh oh!

let-def commented Oct 27, 2021

Uh oh!

Kakadu commented Oct 27, 2021

Uh oh!

let-def commented Oct 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Kakadu commented Oct 28, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

let-def commented Oct 26, 2021 •

edited

Loading

voodoos commented Oct 26, 2021 •

edited

Loading

let-def commented Oct 28, 2021 •

edited

Loading