change to many up to newline, and update tests

comby-tools · Sep 17, 2019 · a8ee915 · a8ee915
1 parent 40998ca
commit a8ee915
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/matchers/matcher.ml b/lib/matchers/matcher.ml
@@ -522,7 +522,7 @@ module Make (Syntax : Syntax.S) (Info : Info.S) = struct
 
             | Hole Line (identifier, _dimension) ->
               let allowed =
-                let allowed = many1 (is_not (char '\n')) in
+                let allowed = many (is_not (char '\n')) in
                 allowed >>= fun x -> return [(String.of_char_list x)^"\n"]
               in
               let hole_semantics = allowed << char '\n' in

diff --git a/test/test_hole_extensions.ml b/test/test_hole_extensions.ml
@@ -41,12 +41,25 @@ derp
   let match_template = {|:[x\n]|} in
   let rewrite_template = {|{:[x]}|} in
   run source match_template rewrite_template;
-  [%expect_exact {|
-{foo.
+  [%expect_exact {|{
+}{foo.
 }{foo.bar.quux
 }{derp
 }|}]
 
+let%expect_test "match_empty_in_newline_hole" =
+  let run = run_all in
+  let source =
+    {|stuff
+after
+|} in
+  let match_template = {|stuff:[x\n]|} in
+  let rewrite_template = {|{->:[x]<-}|} in
+  run source match_template rewrite_template;
+  [%expect_exact {|{->
+<-}after
+|}]
+
 let%expect_test "leading_indentation" =
   let run = run_all in
   let source =