Fix text with leading whitespace parsing

compiler/frontend/src/string_to_rcst/text.rs

@@ -16,8 +16,18 @@ use tracing::instrument;
 pub fn text(input: &str, indentation: usize) -> Option<(&str, Rcst)> {
  let (input, opening_single_quotes) = parse_multiple(input, single_quote, None)?;
  let (mut input, opening_double_quote) = double_quote(input)?;
- let (new_input, opening_whitespace) = whitespaces_and_newlines(input, indentation + 1, false);
- input = new_input;
+
+ let (new_input, mut opening_whitespace) =
+ whitespaces_and_newlines(input, indentation + 1, false);
+
+ // If the string does not contain any newlines, parse the whitespace in
+ // front of the string as part of the string and not as trailing whitespace.
+ // This fixes https://github.com/candy-lang/candy/issues/896.
+ if opening_whitespace.iter().any(|it| it.is_newline()) {
+ input = new_input;
+ } else {
+ opening_whitespace = vec![];
+ }
 
  let (mut opening_whitespace, mut parts) = if let Some(second_newline_index) = opening_whitespace
  .iter()
@@ -272,6 +282,95 @@ mod test {
  #[test]
  fn test_text() {
  assert_rich_ir_snapshot!(text("foo", 0), @"Nothing was parsed");
+ assert_rich_ir_snapshot!(text("\" foobar \"", 0), @r###"
+ Remaining input: ""
+ Parsed: Text:
+ opening: OpeningText:
+ opening_single_quotes:
+ opening_double_quote: DoubleQuote
+ parts:
+ TextPart " foobar "
+ closing: ClosingText:
+ closing_double_quote: DoubleQuote
+ closing_single_quotes:
+ "###);
+ // issue: https://github.com/candy-lang/candy/issues/1016
+ assert_rich_ir_snapshot!(text("\"\n text\n\"", 0), @r###"
+ Remaining input: ""
+ Parsed: Text:
+ opening: TrailingWhitespace:
+ child: OpeningText:
+ opening_single_quotes:
+ opening_double_quote: DoubleQuote
+ whitespace:
+ Newline "\n"
+ Whitespace " "
+ Whitespace " "
+ parts:
+ TrailingWhitespace:
+ child: TextPart "text"
+ whitespace:
+ Newline "\n"
+ closing: ClosingText:
+ closing_double_quote: DoubleQuote
+ closing_single_quotes:
+ "###);
+ // https://github.com/candy-lang/candy/issues/1016
+ assert_rich_ir_snapshot!(text("\"\n foo\n bar\n\"", 0), @r###"
+ Remaining input: ""
+ Parsed: Text:
+ opening: TrailingWhitespace:
+ child: OpeningText:
+ opening_single_quotes:
+ opening_double_quote: DoubleQuote
+ whitespace:
+ Newline "\n"
+ Whitespace " "
+ parts:
+ TextPart "foo"
+ TrailingWhitespace:
+ child: TextNewline "\n"
+ whitespace:
+ Whitespace " "
+ Whitespace " "
+ TrailingWhitespace:
+ child: TextPart "bar"
+ whitespace:
+ Newline "\n"
+ closing: ClosingText:
+ closing_double_quote: DoubleQuote
+ closing_single_quotes:
+ "###);
+
+ assert_rich_ir_snapshot!(text("\" foobar \"", 0), @r###"
+ Remaining input: ""
+ Parsed: Text:
+ opening: OpeningText:
+ opening_single_quotes:
+ opening_double_quote: DoubleQuote
+ parts:
+ TextPart " foobar "
+ closing: ClosingText:
+ closing_double_quote: DoubleQuote
+ closing_single_quotes:
+ "###);
+ assert_rich_ir_snapshot!(text("\" \n foobar \"", 0), @r###"
+ Remaining input: ""
+ Parsed: Text:
+ opening: TrailingWhitespace:
+ child: OpeningText:
+ opening_single_quotes:
+ opening_double_quote: DoubleQuote
+ whitespace:
+ Whitespace " "
+ Newline "\n"
+ Whitespace " "
+ parts:
+ TextPart "foobar "
+ closing: ClosingText:
+ closing_double_quote: DoubleQuote
+ closing_single_quotes:
+ "###);
  assert_rich_ir_snapshot!(text(r#""foo" bar"#, 0), @r###"
  Remaining input: " bar"
  Parsed: Text: