starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-01-11 22:30:54 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Correctly handle trailing commas in function type literals in the generic parser (#1267)

Browse Source
This commit is contained in:
Jen Basch
2025-10-29 15:08:26 -07:00
committed by GitHub
parent 72874ec34a
commit 1d6261b263
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkl-formatter/src/test/files/FormatterSnippetTests/input/comma-termination.pkl vendored
View File

@@ -14,3 +14,5 @@ trailingCommaInLambdas = (fooooooooooooooooooooooooooooooooo, baaaaaaaaaaaaaaaaa
trailingCommaInConstraints: String(isSomethingSomethingSomething, isSomethingElse, isSomethingSomethingSomethingElse) trailingCommaInConstraints: String(isSomethingSomethingSomething, isSomethingElse, isSomethingSomethingSomethingElse)
trailingCommaInTypeParameters: Mapping<SomethingSomethingSomethingSomething, SomethingSomething | SomethingElse> trailingCommaInTypeParameters: Mapping<SomethingSomethingSomethingSomething, SomethingSomething | SomethingElse>
functionType: (ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType, ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType2,) -> String

6
pkl-formatter/src/test/files/FormatterSnippetTests/output/comma-termination.pkl vendored
View File

@@ -33,3 +33,9 @@ trailingCommaInTypeParameters: Mapping<
SomethingSomethingSomethingSomething, SomethingSomethingSomethingSomething,
SomethingSomething | SomethingElse, SomethingSomething | SomethingElse,
> >
functionType: (
ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType,
ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType2,
) ->
String

6
pkl-parser/src/main/java/org/pkl/parser/GenericParser.java
View File

@@ -1169,7 +1169,11 @@ public class GenericParser {
elements.add(parseType(")")); elements.add(parseType(")"));
ff(elements); ff(elements);
while (lookahead == Token.COMMA) { while (lookahead == Token.COMMA) {
elements.add(makeTerminal(next())); var comma = next();
if (lookahead == Token.RPAREN) {
break;
}
elements.add(makeTerminal(comma));
ff(elements); ff(elements);
elements.add(parseType(")")); elements.add(parseType(")"));
totalTypes++; totalTypes++;