chore: update merlin #942

rgrinberg · 2022-12-01T18:42:04Z

ps-id: ea784131-dd41-4181-add7-fd3e5e304b00

ulugbekna · 2022-12-01T18:53:40Z

There should be breaking changes in the latest merlin, so we can either merge with errors and I fix them in a follow-up PR or I can try upgrading merlin and fixing errors in another PR

ps-id: ea784131-dd41-4181-add7-fd3e5e304b00

rgrinberg · 2022-12-02T03:50:54Z

I made it build at least. A few test failures remaining

ulugbekna · 2022-12-05T12:41:32Z

I can fix tests and push to this branch if you'd like

rgrinberg · 2022-12-05T13:33:11Z

Sure that would be appreciated

ulugbekna · 2022-12-05T19:52:08Z

The test failures are caused by a regression in merlin - ocaml/merlin#1540

Should we wait for a fix (which is likely an easy one and we should be able to rebase and update merlin in olsp again) or I can update our tests to fetch documents for identifiers outside let-definitions, which fixes our tests?

rgrinberg · 2022-12-05T20:54:53Z

No opinion. Shall we ask the merlin team what's the best course of action? Rudi.

…

On Dec 5, 2022, 2:52 PM -0500, Ulugbek Abdullaev ***@***.***>, wrote: The test failures are caused by a regression in merlin - ocaml/merlin#1540 Should we wait for fix (which is likely an easy one and we should be able to rebase and update merlin in olsp again) or I can update our tests to fetch documents for identifiers outside let-definition, which fixes our tests? — Reply to this email directly, view it on GitHub, or unsubscribe. You are receiving this because you authored the thread.Message ID: ***@***.***>

ulugbekna · 2022-12-05T21:34:39Z

I’ll just update the tests then

rgrinberg · 2022-12-05T21:35:56Z

If we update the tests, how would we make sure there are no regressions with this issue?

ulugbekna · 2022-12-05T21:39:54Z

I’ll add a test with a fixme that we’ll update as soon as we get merlin with this issue fixed. Hope this makes sense. This issue is a very minor one, given the documentation isnt shown only for values in let-definitions, meaning the documentation doesn’t need to appear on hover because it’s right there near cursor anyway

rgrinberg · 2022-12-06T00:24:20Z

Sound good to me.

rgrinberg · 2022-12-07T16:33:30Z

The windows tests are still failing. Any idea why?

ulugbekna · 2022-12-08T01:32:00Z

No idea, but I’ll have a look. The current failures are quite cryptic though.

rgrinberg · 2022-12-08T04:55:07Z

We should be able to see better errors if we set OCAMLLSP_TEST_DEBUG

rgrinberg · 2022-12-08T05:03:13Z

ocaml-lsp-server/src/ocaml_lsp_server.ml

@@ -1105,6 +1105,7 @@ let start () =
  Metrics.with_metrics metrics run

 let run ~read_dot_merlin () =
+  Merlin_utils.Lib_config.set_program_name "OCaml-LSP";


How about just using the binary name? ocamllsp.

rgrinberg · 2022-12-08T05:03:37Z

Shall we merge this and address the windows stuff separately?

ulugbekna · 2022-12-08T19:31:51Z

Shall we merge this and address the windows stuff separately?

Sure

CHANGES: ## Fixes - Fix document syncing for ranges that span an entire line (ocaml/ocaml-lsp#927) - Respect the client's completion item resolve and preSelect capabilities (ocaml/ocaml-lsp#925, ocaml/ocaml-lsp#936) - Disable polling for dune's watch mode on Windows and OCaml 4.14.0 (ocaml/ocaml-lsp#935) ## Features - Semantic highlighting support is enabled by default (ocaml/ocaml-lsp#933) - Re-enable `ocamlformat-rpc` for formatting code snippets (but not files) (ocaml/ocaml-lsp#920, ocaml/ocaml-lsp#939) One needs to have either `ocamlformat` version > 0.21.0 or, otherwise, `ocamlformat-rpc` package installed. - Add custom ocamllsp/hoverExtended request (ocaml/ocaml-lsp#561) - Support utf-8 position encoding clients (ocaml/ocaml-lsp#919) - Upgrade to merlin 4.7 and use merlin's `verbosity=smart` by default, which allows unwrapping module alias types (ocaml/ocaml-lsp#942) ## Fixes - Fix semantic highlighting of "long identifiers," e.g., `Foo.Bar.x` (ocaml/ocaml-lsp#932)

CHANGES: ## Features - Add support for OCaml 5.0 - Semantic highlighting support is enabled by default (ocaml/ocaml-lsp#933) - Re-enable `ocamlformat-rpc` for formatting code snippets (but not files) (ocaml/ocaml-lsp#920, ocaml/ocaml-lsp#939) One needs to have either `ocamlformat` version > 0.21.0 or, otherwise, `ocamlformat-rpc` package installed. - Add custom ocamllsp/hoverExtended request (ocaml/ocaml-lsp#561) - Support utf-8 position encoding clients (ocaml/ocaml-lsp#919) - Upgrade to merlin 4.7 and use merlin's `verbosity=smart` by default, which allows unwrapping module alias types (ocaml/ocaml-lsp#942) ## Fixes - Fix document syncing for ranges that span an entire line (ocaml/ocaml-lsp#927) - Respect the client's completion item resolve and preSelect capabilities (ocaml/ocaml-lsp#925, ocaml/ocaml-lsp#936) - Disable polling for dune's watch mode on Windows and OCaml 4.14.0 (ocaml/ocaml-lsp#935) - Fix semantic highlighting of "long identifiers," e.g., `Foo.Bar.x` (ocaml/ocaml-lsp#932)

CHANGES: ## Features - Enable [semantic highlighting](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_semanticTokens) support by default (ocaml/ocaml-lsp#933) - Support connecting over pipes and socket. Pipes on Windows aren't yet supported (ocaml/ocaml-lsp#946) [More](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#implementationConsiderations) about communication channels in LSP specification. - Re-enable `ocamlformat-rpc` for formatting code snippets (but not files and not on Windows) (ocaml/ocaml-lsp#920, ocaml/ocaml-lsp#939) One needs to have installed either `ocamlformat` package version > 0.21.0 or, otherwise, `ocamlformat-rpc` package. Note that previously `ocamlformat-rpc` came in a standalone OPAM package, but since `ocamlformat` version > 0.21.0, it comes within `ocamlformat` package. - Add custom [`ocamllsp/hoverExtended`](https://github.com/ocaml/ocaml-lsp/blob/e165f6a3962c356adc7364b9ca71788e93489dd0/ocaml-lsp-server/docs/ocamllsp/hoverExtended-spec.md#L1) request (ocaml/ocaml-lsp#561) - Support utf-8 position encoding clients (ocaml/ocaml-lsp#919) [More](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#position) about position encoding in LSP specification. - Show unwrapped module alias types on hovering over module names. This is due to upgrading to merlin 4.7 and using merlin's `verbosity=smart` by default (ocaml/ocaml-lsp#942) ## Fixes - Respect the client's completion item resolve and preSelect capabilities (ocaml/ocaml-lsp#925, ocaml/ocaml-lsp#936) - Disable polling for dune's watch mode on Windows and OCaml 4.14.0 (ocaml/ocaml-lsp#935) - Fix semantic highlighting of "long identifiers," e.g., `Foo.Bar.x` (ocaml/ocaml-lsp#932) - Fix syncing of document contents: - For ranges that span an entire line (ocaml/ocaml-lsp#927) - Previously, whole line edits would incorrectly eat the newline characters (ocaml/ocaml-lsp#971)

CHANGES: ## Features - Add support for OCaml 5.0 - Enable [semantic highlighting](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_semanticTokens) support by default (ocaml/ocaml-lsp#933) - Support connecting over pipes and socket. Pipes on Windows aren't yet supported (ocaml/ocaml-lsp#946) [More](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#implementationConsiderations) about communication channels in LSP specification. - Re-enable `ocamlformat-rpc` for formatting code snippets (but not files and not on Windows) (ocaml/ocaml-lsp#920, ocaml/ocaml-lsp#939) One needs to have installed either `ocamlformat` package version > 0.21.0 or, otherwise, `ocamlformat-rpc` package. Note that previously `ocamlformat-rpc` came in a standalone OPAM package, but since `ocamlformat` version > 0.21.0, it comes within `ocamlformat` package. - Add custom [`ocamllsp/hoverExtended`](https://github.com/ocaml/ocaml-lsp/blob/e165f6a3962c356adc7364b9ca71788e93489dd0/ocaml-lsp-server/docs/ocamllsp/hoverExtended-spec.md#L1) request (ocaml/ocaml-lsp#561) - Support utf-8 position encoding clients (ocaml/ocaml-lsp#919) [More](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#position) about position encoding in LSP specification. - Show unwrapped module alias types on hovering over module names. This is due to upgrading to merlin 4.7 and using merlin's `verbosity=smart` by default (ocaml/ocaml-lsp#942) ## Fixes - Respect the client's completion item resolve and preSelect capabilities (ocaml/ocaml-lsp#925, ocaml/ocaml-lsp#936) - Disable polling for dune's watch mode on Windows and OCaml 4.14.0 (ocaml/ocaml-lsp#935) - Fix semantic highlighting of "long identifiers," e.g., `Foo.Bar.x` (ocaml/ocaml-lsp#932) - Fix syncing of document contents: - For ranges that span an entire line (ocaml/ocaml-lsp#927) - Previously, whole line edits would incorrectly eat the newline characters (ocaml/ocaml-lsp#971)

rgrinberg force-pushed the ps/rr/chore__update_merlin branch from c644969 to 7d37f57 Compare December 2, 2022 00:29

chore: update merlin

9b0dc31

ps-id: ea784131-dd41-4181-add7-fd3e5e304b00

rgrinberg force-pushed the ps/rr/chore__update_merlin branch from 7d37f57 to 9b0dc31 Compare December 2, 2022 03:42

ulugbekna approved these changes Dec 2, 2022

View reviewed changes

rgrinberg commented Dec 8, 2022

View reviewed changes

ulugbekna added 4 commits December 9, 2022 00:29

set merlin lib's program name to "ocamllsp"

8dec5d3

initialize merlin docs with verbosity=smart to expand module aliases

dc191f4

fix failing tests because of merlin regression: ocaml/merlin#1540

f9be8da

update changelog

4c66493

ulugbekna force-pushed the ps/rr/chore__update_merlin branch from e84f8b4 to 4c66493 Compare December 8, 2022 19:30

ulugbekna merged commit 52ffe74 into master Dec 9, 2022

ulugbekna deleted the ps/rr/chore__update_merlin branch December 9, 2022 06:44

ulugbekna mentioned this pull request Dec 16, 2022

[new release] ocaml-lsp-server, lsp and jsonrpc (1.14.3) ocaml/opam-repository#22691

Closed

ulugbekna mentioned this pull request Dec 16, 2022

[new release] ocaml-lsp-server, lsp and jsonrpc (1.15.0~5.0preview1) ocaml/opam-repository#22701

Merged

ulugbekna mentioned this pull request Jan 7, 2023

[new release] ocaml-lsp-server, lsp and jsonrpc (1.15.0-4.14) ocaml/opam-repository#22878

Merged

ulugbekna mentioned this pull request Jan 7, 2023

[new release] ocaml-lsp-server, lsp and jsonrpc (1.15.0-5.0) ocaml/opam-repository#22879

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: update merlin #942

chore: update merlin #942

rgrinberg commented Dec 1, 2022

ulugbekna commented Dec 1, 2022

rgrinberg commented Dec 2, 2022

ulugbekna commented Dec 5, 2022 •

edited

Loading

rgrinberg commented Dec 5, 2022

ulugbekna commented Dec 5, 2022 •

edited

Loading

rgrinberg commented Dec 5, 2022 via email

ulugbekna commented Dec 5, 2022

rgrinberg commented Dec 5, 2022

ulugbekna commented Dec 5, 2022

rgrinberg commented Dec 6, 2022

rgrinberg commented Dec 7, 2022

ulugbekna commented Dec 8, 2022

rgrinberg commented Dec 8, 2022

rgrinberg Dec 8, 2022

ulugbekna Dec 8, 2022

rgrinberg commented Dec 8, 2022

ulugbekna commented Dec 8, 2022

chore: update merlin #942

chore: update merlin #942

Conversation

rgrinberg commented Dec 1, 2022

ulugbekna commented Dec 1, 2022

rgrinberg commented Dec 2, 2022

ulugbekna commented Dec 5, 2022 • edited Loading

rgrinberg commented Dec 5, 2022

ulugbekna commented Dec 5, 2022 • edited Loading

rgrinberg commented Dec 5, 2022 via email

ulugbekna commented Dec 5, 2022

rgrinberg commented Dec 5, 2022

ulugbekna commented Dec 5, 2022

rgrinberg commented Dec 6, 2022

rgrinberg commented Dec 7, 2022

ulugbekna commented Dec 8, 2022

rgrinberg commented Dec 8, 2022

rgrinberg Dec 8, 2022

Choose a reason for hiding this comment

ulugbekna Dec 8, 2022

Choose a reason for hiding this comment

rgrinberg commented Dec 8, 2022

ulugbekna commented Dec 8, 2022

ulugbekna commented Dec 5, 2022 •

edited

Loading

ulugbekna commented Dec 5, 2022 •

edited

Loading