diff options
Diffstat (limited to 'src/main/java/com/google/devtools')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java b/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java index ecfd963529..a2d43ae528 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkinterface/processor/SkylarkCallableProcessor.java @@ -265,17 +265,15 @@ public final class SkylarkCallableProcessor extends AbstractProcessor { List<? extends VariableElement> methodSignatureParams = methodElement.getParameters(); int numExtraInterpreterParams = numExpectedExtraInterpreterParams(annotation); - if (annotation.parameters().length > 0 || annotation.mandatoryPositionals() >= 0) { - int numDeclaredArgs = - annotation.parameters().length + Math.max(0, annotation.mandatoryPositionals()); - if (methodSignatureParams.size() != numDeclaredArgs + numExtraInterpreterParams) { - throw new SkylarkCallableProcessorException( - methodElement, - String.format( - "@SkylarkCallable annotated method has %d parameters, but annotation declared " - + "%d user-supplied parameters and %d extra interpreter parameters.", - methodSignatureParams.size(), numDeclaredArgs, numExtraInterpreterParams)); - } + int numDeclaredArgs = + annotation.parameters().length + Math.max(0, annotation.mandatoryPositionals()); + if (methodSignatureParams.size() != numDeclaredArgs + numExtraInterpreterParams) { + throw new SkylarkCallableProcessorException( + methodElement, + String.format( + "@SkylarkCallable annotated method has %d parameters, but annotation declared " + + "%d user-supplied parameters and %d extra interpreter parameters.", + methodSignatureParams.size(), numDeclaredArgs, numExtraInterpreterParams)); } if (annotation.structField()) { if (methodSignatureParams.size() != numExtraInterpreterParams) { |