From 837dbc1739258d72a5e7c4adb37ffe6aff847672 Mon Sep 17 00:00:00 2001 From: Pedro Liberal Fernandez Date: Thu, 18 Aug 2016 14:13:01 +0000 Subject: Fixes order of keyword arguments in the error message printed when a Java method cannot be found when called from Skylark. PAIR=laurentlb -- MOS_MIGRATED_REVID=130636387 --- .../java/com/google/devtools/build/lib/syntax/FuncallExpression.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java index 6ce3e780b8..1e49c91330 100644 --- a/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java +++ b/src/main/java/com/google/devtools/build/lib/syntax/FuncallExpression.java @@ -46,6 +46,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -754,7 +755,7 @@ public final class FuncallExpression extends Expression { posargs.add(objValue); // We copy this into an ImmutableMap in the end, but we can't use an ImmutableMap.Builder, or // we'd still have to have a HashMap on the side for the sake of properly handling duplicates. - Map kwargs = new HashMap<>(); + Map kwargs = new LinkedHashMap<>(); evalArguments(posargs, kwargs, env); return invokeObjectMethod( func.getName(), posargs.build(), ImmutableMap.copyOf(kwargs), this, env); -- cgit v1.2.3