fix pass macro hardbreak mixup

parser/src/line.rs

@@ -3,6 +3,14 @@ use crate::variants::token::*;
 
 #[derive(Debug, Clone)]
 pub struct Line<'arena> {
+  tokens: Deq<'arena, Token<'arena>>,
+  orig_len: u32,
+  pass_macro: bool,
+  pass_pluses: u8,
+}
+
+#[derive(Debug, Clone)]
+pub struct Line1<'arena> {
   tokens: Deq<'arena, Token<'arena>>,
   orig_len: u32,
   pass_tokens: bool,
@@ -13,34 +21,51 @@ impl<'arena> Line<'arena> {
     Line {
       orig_len: tokens.len() as u32,
       tokens,
-      pass_tokens: false,
+      pass_macro: false,
+      pass_pluses: 0,
     }
   }
 
   pub fn empty(bump: &'arena Bump) -> Self {
     Line {
       orig_len: 0,
       tokens: Deq::new(bump),
-      pass_tokens: false,
+      pass_macro: false,
+      pass_pluses: 0,
     }
   }
 
   pub fn with_capacity(capacity: usize, bump: &'arena Bump) -> Self {
     Line {
       orig_len: 0,
       tokens: Deq::with_capacity(capacity, bump),
-      pass_tokens: false,
+      pass_macro: false,
+      pass_pluses: 0,
     }
   }
 
-  pub const fn may_contain_inline_pass(&self) -> bool {
-    self.pass_tokens
+  pub fn may_contain_inline_pass(&self) -> bool {
+    if !self.pass_macro && self.pass_pluses == 0 {
+      false
+    } else if self.pass_macro || self.pass_pluses > 1 {
+      true
+    } else {
+      let last = self.last().unwrap();
+      if last.is_kind_len(Plus, 1) && self.len() > 1 {
+        // NB: line ending ` +` is a hardbreak, cannot be pass
+        !self.nth_token(self.len() - 2).is_whitespaceish()
+      } else {
+        true
+      }
+    }
   }
 
   pub fn push(&mut self, token: Token<'arena>) {
     match token.kind {
-      MacroName if token.lexeme == "pass:" => self.pass_tokens = true,
-      Plus if self.tokens.last().not_kind(Backtick) && token.len() < 4 => self.pass_tokens = true,
+      MacroName if token.lexeme == "pass:" => self.pass_macro = true,
+      Plus if self.tokens.last().not_kind(Backtick) && token.len() < 4 => {
+        self.pass_pluses = self.pass_pluses.saturating_add(1)
+      }
       _ => {}
     }
     self.tokens.push(token);

parser/src/tasks/parse_inlines/inline_utils.rs

@@ -63,10 +63,7 @@ impl<'arena> Accum<'arena> {
           next_token.drop_leading_bytes(1);
         }
       }
-      _ => {
-        dbg!(last_char, next_char);
-        self.push_text_token(&token);
-      }
+      _ => self.push_text_token(&token),
     }
   }
 

parser/tests/all/parse_inlines.rs

@@ -409,6 +409,17 @@ fn test_line_breaks() {
         node!("bar"; 6..9),
       ],
     ),
+    (
+      // not confused as multi-line pass macro
+      "foo +\nbar +\nbaz",
+      nodes![
+        node!("foo"; 0..3),
+        node!(LineBreak, 3..6),
+        node!("bar"; 6..9),
+        node!(LineBreak, 9..12),
+        node!("baz"; 12..15),
+      ],
+    ),
     (
       "foo+\nbar", // not valid linebreak
       nodes![