add source location to invalid syntax errors

andimarek · andimarek · commit f0464d256ced · 2015-07-25T09:16:57.000+02:00
diff --git a/src/main/java/graphql/GraphQL.java b/src/main/java/graphql/GraphQL.java
@@ -3,10 +3,10 @@
 
 import graphql.execution.Execution;
 import graphql.language.Document;
+import graphql.language.SourceLocation;
 import graphql.parser.Parser;
 import graphql.schema.GraphQLSchema;
 import graphql.validation.ValidationError;
-import graphql.validation.ValidationErrorType;
 import graphql.validation.Validator;
 import org.antlr.v4.runtime.RecognitionException;
 
@@ -57,8 +57,9 @@ public ExecutionResult execute(String requestString, String operationName, Objec
         try {
             document = parser.parseDocument(requestString);
         } catch (RecognitionException e) {
-            ValidationError validationError = new ValidationError(ValidationErrorType.InvalidSyntax);
-            return new ExecutionResultImpl(Arrays.asList(validationError));
+            SourceLocation sourceLocation = new SourceLocation(e.getOffendingToken().getLine(), e.getOffendingToken().getCharPositionInLine());
+            InvalidSyntaxError invalidSyntaxError = new InvalidSyntaxError(sourceLocation);
+            return new ExecutionResultImpl(Arrays.asList(invalidSyntaxError));
         }
 
         Validator validator = new Validator();
diff --git a/src/main/java/graphql/InvalidSyntaxError.java b/src/main/java/graphql/InvalidSyntaxError.java
@@ -1,7 +1,20 @@
 package graphql;
 
 
+import graphql.language.SourceLocation;
+
 public class InvalidSyntaxError implements GraphQLError {
+
+    public InvalidSyntaxError(SourceLocation sourceLocation) {
+        this.sourceLocation = sourceLocation;
+    }
+
+    private final SourceLocation sourceLocation;
+
+    public SourceLocation getSourceLocation() {
+        return sourceLocation;
+    }
+
     @Override
     public ErrorType geErrorType() {
         return ErrorType.InvalidSyntax;
diff --git a/src/main/java/graphql/language/SourceLocation.java b/src/main/java/graphql/language/SourceLocation.java
@@ -10,4 +10,39 @@ public SourceLocation(int line, int positionInLine) {
         this.line = line;
         this.positionInLine = positionInLine;
     }
+
+    public int getLine() {
+        return line;
+    }
+
+    public int getPositionInLine() {
+        return positionInLine;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        SourceLocation that = (SourceLocation) o;
+
+        if (line != that.line) return false;
+        return positionInLine == that.positionInLine;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = line;
+        result = 31 * result + positionInLine;
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "SourceLocation{" +
+                "line=" + line +
+                ", positionInLine=" + positionInLine +
+                '}';
+    }
 }
diff --git a/src/test/groovy/graphql/GraphQLTest.groovy b/src/test/groovy/graphql/GraphQLTest.groovy
@@ -1,10 +1,10 @@
 package graphql
 
+import graphql.language.SourceLocation
 import graphql.schema.GraphQLArgument
 import graphql.schema.GraphQLFieldDefinition
 import graphql.schema.GraphQLObjectType
 import graphql.schema.GraphQLSchema
-import graphql.validation.ValidationErrorType
 import spock.lang.Specification
 
 import static graphql.Scalars.GraphQLString
@@ -66,7 +66,7 @@ class GraphQLTest extends Specification {
         ).build();
 
         when:
-        def result = new GraphQL(graphQLSchema).execute( '{ simpson { id, name } }').result
+        def result = new GraphQL(graphQLSchema).execute('{ simpson { id, name } }').result
 
         then:
         result == [simpson: [id: '123', name: 'homer']]
@@ -88,7 +88,7 @@ class GraphQLTest extends Specification {
         ).build()
 
         when:
-        def errors = new GraphQL(schema).execute( '{ hello(arg:11) }').errors
+        def errors = new GraphQL(schema).execute('{ hello(arg:11) }').errors
 
         then:
         errors.size() == 1
@@ -103,10 +103,11 @@ class GraphQLTest extends Specification {
         ).build()
 
         when:
-        def errors = new GraphQL(schema).execute( '{ hello(() }').errors
+        def errors = new GraphQL(schema).execute('{ hello(() }').errors
 
         then:
         errors.size() == 1
-        errors[0].validationErrorType == ValidationErrorType.InvalidSyntax
+        errors[0].geErrorType() == ErrorType.InvalidSyntax
+        errors[0].sourceLocation == new SourceLocation(1, 8)
     }
 }
