forked from ocaml/merlin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract
commands
of new protocol in merlin-lib
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
Showing
6 changed files
with
86 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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)) |
29 changes: 29 additions & 0 deletions
29
src/frontend/ocamlmerlin/new/new_commands.ml → src/commands/new_commands.ml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.