🐛 Fix backslash parser allowing multiple newlines per single backslash

SpyglassMC · May 20, 2024 · 059a825 · 059a825
1 parent ec8760d
commit 059a825
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 43 deletions.
diff --git a/__snapshots__/packages/core/test-out/parser/util.spec.js b/__snapshots__/packages/core/test-out/parser/util.spec.js
diff --git a/...ts__/packages/java-edition/test-out/mcfunction/parser/argument/minecraftComponent.spec.js b/...ts__/packages/java-edition/test-out/mcfunction/parser/argument/minecraftComponent.spec.js
diff --git a/__snapshots__/packages/mcfunction/test-out/parser/command.spec.js b/__snapshots__/packages/mcfunction/test-out/parser/command.spec.js
diff --git a/packages/core/src/parser/util.ts b/packages/core/src/parser/util.ts
@@ -547,12 +547,11 @@ export function concatOnTrailingBackslash<N extends Returnable>(
 				continue
 			}
 
-			// Create an index map that skips the trailing backslash + whitespace
+			// Create an index map that skips from the trailing backslash to the
+			// next line's first non-whitespace character
 			const from = src.getCharRange()
-			// skip the `\`
-			src.skip()
-			// skip trailing whitespace + newline + preceding whitespace on the next line
-			src.skipWhitespace()
+			src.nextLine()
+			src.skipSpace()
 			const to = src.getCharRange(-1)
 			indexMap.push({
 				inner: Range.create(wrappedStr.length),