Skip to content

Commit

Permalink
Extract commands of new protocol in merlin-lib
Browse files Browse the repository at this point in the history
Moves the commands in the new protocol to a dedicated library (used by
the binary) which can be used by `ocaml-lsp`.
  • Loading branch information
xvw committed May 13, 2024
1 parent 7af8695 commit 8388ef6
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 11 deletions.
14 changes: 14 additions & 0 deletions src/commands/dune
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
(library
(name merlin_commands)
(public_name merlin-lib.commands)
(flags
:standard
-open Ocaml_parsing
-open Merlin_utils
-open Merlin_kernel)
(libraries
merlin-lib.ocaml_parsing
merlin-lib.utils
merlin-lib.kernel
merlin-lib.query_protocol
merlin-lib.query_commands))
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
(* {{{ COPYING *(
This file is part of Merlin, an helper for ocaml editors
Copyright (C) 2013 - 2015 Frédéric Bour <frederic.bour(_)lakaban.net>
Thomas Refis <refis.thomas(_)gmail.com>
Simon Castellan <simon.castellan(_)iuwt.fr>
Tomasz Kołodziejski <tkolodziejski(_)gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The Software is provided "as is", without warranty of any kind, express or
implied, including but not limited to the warranties of merchantability,
fitness for a particular purpose and noninfringement. In no event shall
the authors or copyright holders be liable for any claim, damages or other
liability, whether in an action of contract, tort or otherwise, arising
from, out of or in connection with the software or the use or other dealings
in the Software.
)* }}} *)

open Std

type command =
Expand Down
38 changes: 38 additions & 0 deletions src/commands/new_commands.mli
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
(* {{{ COPYING *(
This file is part of Merlin, an helper for ocaml editors
Copyright (C) 2013 - 2015 Frédéric Bour <frederic.bour(_)lakaban.net>
Thomas Refis <refis.thomas(_)gmail.com>
Simon Castellan <simon.castellan(_)iuwt.fr>
Tomasz Kołodziejski <tkolodziejski(_)gmail.com>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The Software is provided "as is", without warranty of any kind, express or
implied, including but not limited to the warranties of merchantability,
fitness for a particular purpose and noninfringement. In no event shall
the authors or copyright holders be liable for any claim, damages or other
liability, whether in an action of contract, tort or otherwise, arising
from, out of or in connection with the software or the use or other dealings
in the Software.
)* }}} *)

open Std

type command =
Command : string * Marg.docstring * ([`Mandatory|`Optional|`Many] * 'args Marg.spec) list * 'args *
(Mpipeline.t -> 'args -> json) -> command

val all_commands : command list

val find_command : string -> command list -> command
File renamed without changes.
7 changes: 5 additions & 2 deletions src/frontend/ocamlmerlin/dune
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@
-open Merlin_kernel
-open Merlin_utils
-open Merlin_analysis
-open Merlin_kernel)
-open Merlin_kernel
-open Merlin_commands)
(modules (:standard \ gen_ccflags))
(libraries merlin-lib.config yojson merlin-lib.analysis merlin-lib.kernel
merlin-lib.utils merlin-lib.os_ipc merlin-lib.ocaml_parsing
merlin-lib.query_protocol merlin-lib.query_commands
merlin-lib.ocaml_typing merlin-lib.ocaml_utils unix str))
merlin-lib.ocaml_typing merlin-lib.ocaml_utils
merlin-lib.commands
unix str))

(executable
(name gen_ccflags)
Expand Down
9 changes: 0 additions & 9 deletions src/frontend/ocamlmerlin/new/new_commands.mli

This file was deleted.

0 comments on commit 8388ef6

Please sign in to comment.