fix merge errors

PizieDust · Dec 6, 2024 · faa6de6 · faa6de6
1 parent e78f4b3
commit faa6de6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -315,6 +315,7 @@
           "type": "boolean",
           "default": false,
           "markdownDescription": "When enabled, list values that can fill a typed hole after navigating to it."
+        },
         "ocaml.commands.construct.recursiveCalls": {
           "type": "boolean",
           "default": true,

diff --git a/src/settings.ml b/src/settings.ml
@@ -146,6 +146,8 @@ let server_typedHolesConstructAfterNavigate_setting =
   create_setting
     ~scope:ConfigurationTarget.Workspace
     ~key:"ocaml.commands.typedHoles.constructAfterNavigate"
+    ~of_json:Jsonoo.Decode.bool
+    ~to_json:Jsonoo.Encode.bool
 
 let server_constructRecursiveCalls_setting =
   create_setting