Skip to content

Commit

Permalink
Update ocamlformat to 0.27.0 (#1668)
Browse files Browse the repository at this point in the history
Signed-off-by: Sora Morimoto <sora@morimoto.io>
  • Loading branch information
smorimoto authored Dec 3, 2024
1 parent a372d9c commit 20d27bc
Show file tree
Hide file tree
Showing 8 changed files with 150 additions and 149 deletions.
4 changes: 2 additions & 2 deletions .ocamlformat
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# upgrading the version, don't forget to update ocamlformat version in `dune-project`
version=0.26.2
version=0.27.0
profile=conventional
ocaml-version=4.14.2
ocaml-version=5.2
break-separators=before
dock-collection-brackets=false
break-sequences=true
Expand Down
4 changes: 2 additions & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
(>= 2.1.2))
(ocamlformat
(and
(= 0.26.2)
(= 0.27.0)
:with-dev-setup))
(ocaml-lsp-server :with-dev-setup)))

Expand All @@ -65,6 +65,6 @@
(>= 0.2.1))
(ocamlformat
(and
(= 0.26.2)
(= 0.27.0)
:with-dev-setup))
(ocaml-lsp-server :with-dev-setup)))
2 changes: 1 addition & 1 deletion src/ast_editor.ml
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ let open_pp_doc instance ~document =
let* doc =
Workspace.openTextDocument
(`Uri
(Uri.parse ("post-ppx: " ^ TextDocument.fileName document ^ "?") ()))
(Uri.parse ("post-ppx: " ^ TextDocument.fileName document ^ "?") ()))
in
Ast_editor_state.associate_origin_and_pp
ast_editor_state
Expand Down
3 changes: 2 additions & 1 deletion src/ocaml_lsp.ml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ module Experimental_capabilities = struct
; handleJump = false
}

(** Creates [t] given a JSON of form [{ 'handleSwitchImplIntf' : true, .... }] *)
(** Creates [t] given a JSON of form [{ 'handleSwitchImplIntf' : true, .... }]
*)
let t_of_json (json : Jsonoo.t) =
let experimental_caps_tbl = Jsonoo.Decode.(dict bool) json in
let has_capability cap =
Expand Down
3 changes: 2 additions & 1 deletion src/odig.ml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ type t = { cache_dir : Path.t }
let make_odig_cmd sandbox = Sandbox.get_command sandbox "odig"

(** TODO: propose to install odig. See
https://github.com/ocamllabs/vscode-ocaml-platform/pull/771#discussion_r765297112 *)
https://github.com/ocamllabs/vscode-ocaml-platform/pull/771#discussion_r765297112
*)
let of_sandbox (sandbox : Sandbox.t) =
let make_odig_cmd = make_odig_cmd sandbox in
let odig_version = make_odig_cmd [ "--version" ] in
Expand Down
3 changes: 2 additions & 1 deletion src/ppx_tools/dumpast.mli
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ open Ppxlib

(** [transform s k] transforms syntactically correct code containted in [s] into
its AST serialized as a [Jsonoo.t] value. The kind [k] specifies if it is an
interface or an implementation. [Error err_msg] is returned on syntax error *)
interface or an implementation. [Error err_msg] is returned on syntax error
*)
val transform : string -> [ `Intf | `Impl ] -> (Jsonoo.t, string) result

(** [from_structure str] serializes [str] as a [Jsonoo.t] value *)
Expand Down
Loading

0 comments on commit 20d27bc

Please sign in to comment.