Move Typed_holes to Merlin

.github/workflows/build-and-test.yml

@@ -49,7 +49,7 @@ jobs:
 
       # Remove this pin once a compatible version of Merlin has been released
       - name: Pin dev Merlin
-        run: opam --cli=2.1 pin --with-version=5.4-503 https://github.com/ocaml/merlin.git#main
+        run: opam --cli=2.1 pin --with-version=5.4-503 https://github.com/liam923/merlin.git#rename-holes
 
       - name: Build and install dependencies
         run: opam install .

ocaml-lsp-server/src/code_actions/action_construct.ml

@@ -14,7 +14,7 @@ let code_action pipeline doc (params : CodeActionParams.t) =
       let src = Document.source doc in
       Compl.prefix_of_position ~short_path:false src pos
     in
-    if not (Typed_hole.can_be_hole prefix)
+    if not (Merlin_analysis.Typed_hole.can_be_hole prefix)
     then None
     else (
       let structures =
@@ -25,7 +25,7 @@ let code_action pipeline doc (params : CodeActionParams.t) =
         let pos = Mpipeline.get_lexing_pos pipeline pos in
         Mbrowse.enclosing pos [ Mbrowse.of_typedtree typedtree ]
       in
-      if not (Typed_hole.is_a_hole structures)
+      if not (Merlin_analysis.Typed_hole.is_a_hole structures)
       then None
       else (
         (* ocaml-lsp can provide [Construct] values as completion entries, so

ocaml-lsp-server/src/compl.ml

@@ -315,7 +315,7 @@ let complete
                 let* item = completion_item_capability in
                 item.deprecatedSupport)
            in
-           if not (Typed_hole.can_be_hole prefix)
+           if not (Merlin_analysis.Typed_hole.can_be_hole prefix)
            then Complete_by_prefix.complete merlin prefix pos ~resolve ~deprecated
            else (
              let reindex_sortText completion_items =