Skip to content

Commit aefad28

Browse files
committed
Pass the source unit to the additional directive parser calls
1 parent 567cc65 commit aefad28

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

pipeline-model-api/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/model/DeclarativeDirectiveDescriptor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
import hudson.ExtensionList;
2828
import hudson.model.Descriptor;
2929
import org.codehaus.groovy.ast.stmt.Statement;
30+
import org.codehaus.groovy.control.SourceUnit;
3031
import org.jenkinsci.plugins.pipeline.modeldefinition.shaded.com.fasterxml.jackson.databind.JsonNode;
3132
import org.jenkinsci.plugins.pipeline.modeldefinition.shaded.com.github.fge.jsonschema.tree.JsonTree;
3233
import org.jenkinsci.plugins.pipeline.modeldefinition.shaded.com.github.fge.jsonschema.util.JsonLoader;
34+
import org.jenkinsci.plugins.pipeline.modeldefinition.validator.ErrorCollector;
3335

3436
import javax.annotation.CheckForNull;
3537
import javax.annotation.Nonnull;
@@ -89,7 +91,7 @@ protected final JsonNode jsonNodeFromString(@Nonnull String s) {
8991
}
9092
}
9193

92-
public abstract D parseDirectiveFromGroovy(Statement st);
94+
public abstract D parseDirectiveFromGroovy(Statement st, SourceUnit sourceUnit);
9395

9496
public abstract D parseDirectiveFromJSON(JsonTree json);
9597

pipeline-model-definition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/parser/ModelParser.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1278,7 +1278,7 @@ class ModelParser implements Parser {
12781278
@CheckForNull
12791279
DeclarativeDirective parseAdditionalDirective(@Nonnull Statement st,
12801280
@Nonnull DeclarativeDirectiveDescriptor directiveDescriptor) {
1281-
return directiveDescriptor.parseDirectiveFromGroovy(st)
1281+
return directiveDescriptor.parseDirectiveFromGroovy(st, sourceUnit)
12821282
}
12831283

12841284
protected String parseStringLiteral(Expression exp) {

0 commit comments

Comments
 (0)