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.

Sign up for GitHub

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

Jump to bottom

(vim) Split the ocaml filetype into several filetypes #1340

Merged
merged 1 commit into from
Jan 29, 2024
Merged

(vim) Split the ocaml filetype into several filetypes #1340

merged 1 commit into from
Jan 29, 2024

Conversation

undu
Copy link
Contributor

@undu undu commented May 16, 2021 •
edited
Loading

Now ocamlinterface ocamllex and menhir types must be taken into account as well.

The filetypes are introduced by ocaml/vim-ocaml#61

This is a draft PR to attract comments and suggestions on how to adapt the code to the change, Merlin loads under the new filetypes and syntastic works as well, ctrlp and neomake code is untested.

@undu undu mentioned this pull request May 17, 2021
Open
10 tasks
@undu undu force-pushed the ocaml_interface branch 4 times, most recently from b60b10d to d2cf766 Compare May 19, 2021 19:29
@undu undu force-pushed the ocaml_interface branch 2 times, most recently from 3d3fe95 to d24acb0 Compare June 19, 2021 09:25
@undu undu marked this pull request as ready for review May 14, 2022 17:24
@undu undu force-pushed the ocaml_interface branch 2 times, most recently from d2e0927 to 39c2520 Compare May 14, 2022 17:29
@copy
Copy link
Contributor

copy commented Jan 2, 2024 •
edited
Loading

ctrlp and neomake code is untested

Perhaps it should be included in another PR, so that users of those plugins can test it.

Besides that, this looks like a pretty safe change (the old filetypes are still recognized), and I would like to gently nudge for this to get merged. It's required so that progress on ocaml/vim-ocaml#61 can be made.

@voodoos
Copy link
Collaborator

voodoos commented Jan 18, 2024

@undu thanks for that contribution, and sorry about the long answer delay.

Would you have some time to test or remove the "untested ctrlp and neomake code" ?

@undu
Copy link
Contributor Author

undu commented Jan 19, 2024

Sure, I'll remove the code later today

voodoos
voodoos approved these changes Jan 29, 2024
View reviewed changes
Copy link
Collaborator

@voodoos voodoos left a comment

Choose a reason for hiding this comment

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

Thanks @undu

Could you add a change entry ?

vim/merlin/dune Show resolved Hide resolved
@undu
Split the ocaml filetype into several filetypes
bd4d3a3 
Now ocamlinterface ocamllex and menhir types must be taken into account
as well. Menhir filetype is not included as there seem to be no plans to
include it and even then it would take a big effort.

The filetypes are introduced by
ocaml/vim-ocaml#61
@voodoos
Copy link
Collaborator

voodoos commented Jan 29, 2024

Thank you @undu !

@voodoos voodoos merged commit 8f773db into ocaml:master Jan 29, 2024
1 check passed
voodoos added a commit to voodoos/merlin that referenced this pull request Feb 20, 2024
@voodoos
[B] (vim) Split the ocaml filetype into several filetypes (ocaml#1340)
c00aeb3 
from undu/ocaml_interface
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin (3 packages) (4.14-414)
1e53e68 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin, merlin-lib and dot-merlin-reader (4.14-500)
7905af8 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin (3 packages) (4.14-501)
613d86e 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
voodoos added a commit to voodoos/opam-repository that referenced this pull request Feb 22, 2024
@voodoos
[new release] merlin-lib, merlin (4.14-501/500/414)
6b881a5 
CHANGES:

Thu Feb 22 14:00:42 CET 2024

  + merlin binary
    - Add a "heap_mbytes" field to Merlin server responses to report heap usage (ocaml/merlin#1717)
    - Add cache stats to telemetry (ocaml/merlin#1711)
    - Add new SyntaxDocument command to find information about the node under the cursor (ocaml/merlin#1706)
    - Fix `FLG -pp ppx.exe -as-pp/-dump-ast` use of invalid shell redirection when
    direct process launch on Windows. (ocaml/merlin#1723, fixes ocaml/merlin#1722)
    - Add a query_num field to the `ocamlmerlin` responses to detect server crashes (ocaml/merlin#1716)
    - Jump to cases within a match statement (ocaml/merlin#1726)
    - Jump to `module-type` (ocaml/merlin#1728, partially fixes ocaml/merlin#1656)
    - Exposes stable functions for configuration handling and pattern variable
      destruction. (ocaml/merlin#1730)
  + editor modes
    - vim: load merlin under the ocamlinterface and ocamllex filetypes (ocaml/merlin#1340)
    - Fix merlinpp not using binary file open (ocaml/merlin#1725, fixes ocaml/merlin#1724)
@voodoos voodoos mentioned this pull request Feb 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@voodoos voodoos voodoos approved these changes

Assignees
No one assigned
Labels
Area/Vim
Projects
Backport to 501
Status: 4.14-500
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@undu @copy @voodoos