Merge pull request graphql-java#3071 from graphql-java/directives-antlr

dondonz · web-flow · commit 640d2826f850 · 2023-01-14T15:25:02.000+11:00
Fix extend schema directives ANTLR rule
diff --git a/src/main/antlr/GraphqlSDL.g4 b/src/main/antlr/GraphqlSDL.g4
@@ -16,7 +16,7 @@ schemaDefinition : description? SCHEMA directives? '{' operationTypeDefinition+
 
 schemaExtension :
     EXTEND SCHEMA directives? '{' operationTypeDefinition+ '}' |
-    EXTEND SCHEMA directives+
+    EXTEND SCHEMA directives
 ;
 
 operationTypeDefinition : description? operationType ':' typeName;
diff --git a/src/main/java/graphql/parser/GraphqlAntlrToLanguage.java b/src/main/java/graphql/parser/GraphqlAntlrToLanguage.java
@@ -407,10 +407,10 @@ private SDLDefinition creationSchemaExtension(GraphqlParser.SchemaExtensionConte
         addCommonData(def, ctx);
 
         List<Directive> directives = new ArrayList<>();
-        List<GraphqlParser.DirectivesContext> directivesCtx = ctx.directives();
-        for (GraphqlParser.DirectivesContext directiveCtx : directivesCtx) {
-            directives.addAll(createDirectives(directiveCtx));
-        }
+
+        GraphqlParser.DirectivesContext directivesCtx = ctx.directives();
+        directives.addAll(createDirectives(directivesCtx));
+
         def.directives(directives);
 
         List<OperationTypeDefinition> operationTypeDefs = map(ctx.operationTypeDefinition(), this::createOperationTypeDefinition);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ schemaDefinition : description? SCHEMA directives? '{' operationTypeDefinition+`
`16`	`16`
`17`	`17`	`schemaExtension :`
`18`	`18`	`EXTEND SCHEMA directives? '{' operationTypeDefinition+ '}' \|`
`19`		`- EXTEND SCHEMA directives+`
	`19`	`+ EXTEND SCHEMA directives`
`20`	`20`	`;`
`21`	`21`
`22`	`22`	`operationTypeDefinition : description? operationType ':' typeName;`