starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-25 09:48:41 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Handle trailing commas in types (#1272)

Browse Source
This commit is contained in:
Islon Scherer
2025-10-30 13:36:56 +01:00
committed by GitHub
parent 7df447924e
commit 9469dd885d
3 changed files with 4 additions and 3 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

@@ -15,4 +15,4 @@ trailingCommaInConstraints: String(isSomethingSomethingSomething, isSomethingEls
trailingCommaInTypeParameters: Mapping<SomethingSomethingSomethingSomething, SomethingSomething | SomethingElse> trailingCommaInTypeParameters: Mapping<SomethingSomethingSomethingSomething, SomethingSomething | SomethingElse>
functionType: (ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType, ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType2,) -> String functionType: (ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType, ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType2, /* comment */) -> String

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

@@ -36,6 +36,6 @@ trailingCommaInTypeParameters: Mapping<
functionType: ( functionType: (
ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType, ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType,
ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType2, ReaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalyLongType2 /* comment */,
) -> ) ->
String String

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

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