Fix rebase issues

peterzhu2118 · peterzhu2118 · commit 5b1f9d86ae35 · 2021-01-11T10:51:06.000-05:00
diff --git a/ext/liquid_c/block.c b/ext/liquid_c/block.c
@@ -401,18 +401,14 @@ static VALUE block_body_parse_from_source(VALUE self, block_body_t *body, VALUE
         markup = tag_markup_get_markup(unknown_tag);
         block_body_push_tag_markup(body, parse_context_obj, unknown_tag);
 
-        if (RTEST(parse_context.parent_tag)) {
+        if (RTEST(parse_context.parent_tag) && !body->as.intermediate.bound_to_tag) {
+            body->as.intermediate.bound_to_tag = true;
             tag_markup_set_block_body(parse_context.parent_tag, self, body);
         }
     }
 
     VALUE block_ret = rb_yield_values(2, tag_name, markup);
 
-    if (RTEST(parse_context.parent_tag) && !body->as.intermediate.bound_to_tag) {
-        body->as.intermediate.bound_to_tag = true;
-        tag_markup_set_block_body(parse_context.parent_tag, self, body);
-    }
-
     return block_ret;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -401,18 +401,14 @@ static VALUE block_body_parse_from_source(VALUE self, block_body_t *body, VALUE`
`401`	`401`	`markup = tag_markup_get_markup(unknown_tag);`
`402`	`402`	`block_body_push_tag_markup(body, parse_context_obj, unknown_tag);`
`403`	`403`
`404`		`- if (RTEST(parse_context.parent_tag)) {`
	`404`	`+ if (RTEST(parse_context.parent_tag) && !body->as.intermediate.bound_to_tag) {`
	`405`	`+ body->as.intermediate.bound_to_tag = true;`
`405`	`406`	`tag_markup_set_block_body(parse_context.parent_tag, self, body);`
`406`	`407`	`}`
`407`	`408`	`}`
`408`	`409`
`409`	`410`	`VALUE block_ret = rb_yield_values(2, tag_name, markup);`
`410`	`411`
`411`		`- if (RTEST(parse_context.parent_tag) && !body->as.intermediate.bound_to_tag) {`
`412`		`- body->as.intermediate.bound_to_tag = true;`
`413`		`- tag_markup_set_block_body(parse_context.parent_tag, self, body);`
`414`		`- }`
`415`		`-`
`416`	`412`	`return block_ret;`
`417`	`413`	`}`
`418`	`414`