starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-03-18 15:23:58 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Fix newline checks in parser (#1328)

Browse Source
This commit is contained in:
Spencer Phillip Young
2025-11-24 05:40:54 -08:00
committed by GitHub
parent f4938dccca
commit cc02b6b685
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkl-parser/src/main/java/org/pkl/parser/Parser.java
View File

@@ -1811,11 +1811,13 @@ public class Parser {
private FullToken forceNext() {
var tk = lexer.next();
precededBySemicolon = false;
var newLines = lexer.newLinesBetween;
while (tk.isAffix()) {
precededBySemicolon = precededBySemicolon || tk == Token.SEMICOLON;
tk = lexer.next();
newLines += lexer.newLinesBetween;
}
return new FullToken(tk, lexer.span(), lexer.newLinesBetween);
return new FullToken(tk, lexer.span(), newLines);
}
// Like next, but don't ignore comments

1
pkl-parser/src/test/kotlin/org/pkl/parser/ParserComparisonTest.kt
View File

@@ -93,6 +93,7 @@ class ParserComparisonTest {
"stringError1.pkl",
"annotationIsNotExpression2.pkl",
"amendsRequiresParens.pkl",
"errors/binopDifferentLine.pkl",
"errors/parser18.pkl",
"errors/nested1.pkl",
"errors/invalidCharacterEscape.pkl",