@@ -265,19 +265,11 @@ fn gen_block_quote(block_quote: &BlockQuote, context: &mut Context) -> PrintItem
265
265
for print_item in gen_nodes ( & block_quote. children , context) . iter ( ) {
266
266
match print_item {
267
267
PrintItem :: String ( text) => {
268
- items. push_condition ( if_true (
269
- "angleBracketIfStartOfLine" ,
270
- condition_resolvers:: is_start_of_line ( ) ,
271
- "> " . into ( ) ,
272
- ) ) ;
268
+ items. push_condition ( if_true ( "angleBracketIfStartOfLine" , condition_resolvers:: is_start_of_line ( ) , "> " . into ( ) ) ) ;
273
269
items. push_item ( PrintItem :: String ( text) ) ;
274
270
}
275
271
PrintItem :: Signal ( Signal :: NewLine ) => {
276
- items. push_condition ( if_true (
277
- "angleBracketIfStartOfLine" ,
278
- condition_resolvers:: is_start_of_line ( ) ,
279
- ">" . into ( ) ,
280
- ) ) ;
272
+ items. push_condition ( if_true ( "angleBracketIfStartOfLine" , condition_resolvers:: is_start_of_line ( ) , ">" . into ( ) ) ) ;
281
273
items. push_signal ( Signal :: NewLine ) ;
282
274
}
283
275
_ => items. push_item ( print_item) ,
@@ -624,14 +616,14 @@ fn gen_list(list: &List, is_alternate: bool, context: &mut Context) -> PrintItem
624
616
let indent_increment = ( prefix_text. chars ( ) . count ( ) + 1 ) as u32 ;
625
617
context. indent_level += indent_increment;
626
618
items. push_string ( prefix_text) ;
627
- let after_child = Info :: new ( "afterChild" ) ;
619
+ let after_child = LineAndColumn :: new ( "afterChild" ) ;
628
620
items. push_condition ( if_true (
629
621
"spaceIfHasChild" ,
630
- Rc :: new ( move |context| Some ( !condition_helpers:: is_at_same_position ( context, & after_child) ?) ) ,
622
+ Rc :: new ( move |context| Some ( !condition_helpers:: is_at_same_position ( context, after_child) ?) ) ,
631
623
Signal :: SpaceIfNotTrailing . into ( ) ,
632
624
) ) ;
633
625
items. extend ( with_indent_times ( generate ( child, context) , indent_increment) ) ;
634
- items. push_info ( after_child) ;
626
+ items. push_line_and_column ( after_child) ;
635
627
context. indent_level -= indent_increment;
636
628
}
637
629
0 commit comments