Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: kill dune ocaml-merlin in a friendlier way #1124

Merged

Conversation

rgrinberg
Copy link
Member

@rgrinberg rgrinberg commented Jun 8, 2023

kill didn't use to work because of buggy versions of dune ocaml-version. Those have been fixed, so sigterm should work fine.

@rgrinberg rgrinberg force-pushed the ps/rr/fix__kill_dune_ocaml_merlin_in_a_friendlier_way branch from bf3d1ae to c0bf37e Compare June 8, 2023 15:44
@rgrinberg rgrinberg added this to the 1.16.0 milestone Jun 8, 2023
@coveralls
Copy link

coveralls commented Jun 8, 2023

Pull Request Test Coverage Report for Build 3806

Warning: This coverage report may be inaccurate.

This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.

Details

  • 0 of 1 (0.0%) changed or added relevant line in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 17.36%

Changes Missing Coverage Covered Lines Changed/Added Lines %
ocaml-lsp-server/src/merlin_config.ml 0 1 0.0%
Totals Coverage Status
Change from base Build 3804: 0.0%
Covered Lines: 4073
Relevant Lines: 23462

💛 - Coveralls

Signed-off-by: Rudi Grinberg <me@rgrinberg.com>

<!-- ps-id: d1282157-d8a9-41b4-93c2-572b4f2be978 -->
@rgrinberg rgrinberg force-pushed the ps/rr/fix__kill_dune_ocaml_merlin_in_a_friendlier_way branch from c0bf37e to f146607 Compare June 10, 2023 10:12
@rgrinberg rgrinberg merged commit f83459b into master Jun 10, 2023
10 of 13 checks passed
@rgrinberg rgrinberg deleted the ps/rr/fix__kill_dune_ocaml_merlin_in_a_friendlier_way branch June 10, 2023 16:39
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jun 18, 2023
CHANGES:

## Fixes

- Disable code lens by default. The support can be re-enabled by explicitly
  setting it in the configuration. (ocaml/ocaml-lsp#1134)

- Fix initilization of `ocamlformat-rpc` in some edge cases when ocamlformat is
  initialized concurrently (ocaml/ocaml-lsp#1132)

- Kill unnecessary `$ dune ocaml-merlin` with SIGTERM rather than SIGKILL
  (ocaml/ocaml-lsp#1124)

- Refactor comment parsing to use `odoc-parser` and `cmarkit` instead of
  `octavius` and `omd` (ocaml/ocaml-lsp#1088)

  This allows users who migrated to omd 2.X to install ocaml-lsp-server in the
  same opam switch.

  We also slightly improved markdown generation support and fixed a couple in
  the generation of inline heading and module types.

- Allow opening documents that were already open. This is a workaround for
  neovim's lsp client (ocaml/ocaml-lsp#1067)

- Disable type annotation for functions (ocaml/ocaml-lsp#1054)

- Respect codeActionLiteralSupport capability (ocaml/ocaml-lsp#1046)

- Fix a document syncing issue when utf-16 is the position encoding (ocaml/ocaml-lsp#1004)

- Disable "Type-annotate" action for code that is already annotated.
  ([ocaml/ocaml-lsp#1037](ocaml/ocaml-lsp#1037)), fixes
  [ocaml/ocaml-lsp#1036](ocaml/ocaml-lsp#1036)

- Fix semantic highlighting of long identifiers when using preprocessors
  ([ocaml/ocaml-lsp#1049](ocaml/ocaml-lsp#1049), fixes
  [ocaml/ocaml-lsp#1034](ocaml/ocaml-lsp#1034))

- Fix the type of DocumentSelector in cram document registration (ocaml/ocaml-lsp#1068)

- Accept the `--clientProcessId` command line argument. (ocaml/ocaml-lsp#1074)

- Accept `--port` as a synonym for `--socket`. (ocaml/ocaml-lsp#1075)

- Fix connecting to dune rpc on Windows. (ocaml/ocaml-lsp#1080)

## Features

- Add "Remove type annotation" code action. (ocaml/ocaml-lsp#1039)

- Support settings through `didChangeConfiguration` notification (ocaml/ocaml-lsp#1103)

- Add "Extract local" and "Extract function" code actions. (ocaml/ocaml-lsp#870)

- Depend directly on `merlin-lib` 4.9 (ocaml/ocaml-lsp#1070)
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.

None yet

2 participants