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

Fix stream double-consumption in CommandSpecParser (#1448)

Browse Source 
The `choices` stream was consumed eagerly for metavar construction, then
captured in a lambda for later validation—which promptly fell over with
`IllegalStateException`. Materialise to a `List` straightaway.
This commit is contained in:
Kushal Pisavadia
2026-02-27 10:04:32 +00:00
committed by GitHub
parent cac3e483b5
commit 64ea7951db
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkl-core/src/main/java/org/pkl/core/runtime/CommandSpecParser.java
View File

@@ -32,7 +32,6 @@ import java.util.Set;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.graalvm.collections.EconomicMap;
import org.pkl.core.CommandSpec;
import org.pkl.core.CommandSpec.Argument;
@@ -771,18 +770,18 @@ public final class CommandSpecParser {
return true;
} else if (typeNode
instanceof TypeNode.UnionOfStringLiteralsTypeNode unionOfStringLiteralsTypeNode) {
var choices = unionOfStringLiteralsTypeNode.getStringLiterals().stream().sorted();
var choices = unionOfStringLiteralsTypeNode.getStringLiterals().stream().sorted().toList();
if (each == null)
each =
(rawValue, workingDirUri) -> {
if (!unionOfStringLiteralsTypeNode.getStringLiterals().contains(rawValue)) {
throw BadValue.invalidChoice(rawValue, choices.toList());
throw BadValue.invalidChoice(rawValue, choices);
}
return rawValue;
};
if (all == null) all = this::allChooseLast;
if (multiple == null) multiple = false;
if (metavar == null) metavar = "[" + choices.collect(Collectors.joining(", ")) + "]";
if (metavar == null) metavar = "[" + String.join(", ", choices) + "]";
if (completionCandidates == null)
completionCandidates = new Fixed(unionOfStringLiteralsTypeNode.getStringLiterals());
return true;