Merge pull request #48 from AndreasHeiberg/patch-1

Add lines to json LOC

Author: swolchok

JsonVisitor.cpp

@@ -89,8 +89,11 @@ void JsonVisitor::NodeFieldPrinter::printLocation(
     std::ostringstream &out,
     const yy::location &location)
 {
-  out << "{\"start\":" << location.begin.column
-       << ",\"end\":" << location.end.column  << '}';
+  out << "{\"start\": {\"line\": " << location.begin.line
+       << ",\"column\":" << location.begin.column
+       << "}, \"end\": {\"line\":" << location.end.line
+       << ",\"column\":" << location.end.column
+       << "}}";
 }
 
 void JsonVisitor::NodeFieldPrinter::printChildList(

test/JsonVisitorTests.cpp

@@ -24,7 +24,8 @@ TEST(JsonVisitorTests, NullValueEmitsValidJSONWithoutTrailingComma) {
 
   EXPECT_STREQ(
     json,
-    "{\"kind\":\"Document\",\"loc\":{\"start\":1,\"end\":19},\"definitions\":[{\"kind\":\"OperationDefinition\",\"loc\":{\"start\":1,\"end\":19},\"operation\":\"query\",\"name\":null,\"variableDefinitions\":null,\"directives\":null,\"selectionSet\":{\"kind\":\"SelectionSet\",\"loc\":{\"start\":1,\"end\":19},\"selections\":[{\"kind\":\"Field\",\"loc\":{\"start\":2,\"end\":18},\"alias\":null,\"name\":{\"kind\":\"Name\",\"loc\":{\"start\":2,\"end\":7},\"value\":\"field\"},\"arguments\":[{\"kind\":\"Argument\",\"loc\":{\"start\":8,\"end\":17},\"name\":{\"kind\":\"Name\",\"loc\":{\"start\":8,\"end\":11},\"value\":\"arg\"},\"value\":{\"kind\":\"NullValue\",\"loc\":{\"start\":13,\"end\":17}}}],\"directives\":null,\"selectionSet\":null}]}}]}");
+    "{\"kind\":\"Document\",\"loc\":{\"start\": {\"line\": 1,\"column\":1}, \"end\": {\"line\":1,\"column\":19}},\"definitions\":[{\"kind\":\"OperationDefinition\",\"loc\":{\"start\": {\"line\": 1,\"column\":1}, \"end\": {\"line\":1,\"column\":19}},\"operation\":\"query\",\"name\":null,\"variableDefinitions\":null,\"directives\":null,\"selectionSet\":{\"kind\":\"SelectionSet\",\"loc\":{\"start\": {\"line\": 1,\"column\":1}, \"end\": {\"line\":1,\"column\":19}},\"selections\":[{\"kind\":\"Field\",\"loc\":{\"start\": {\"line\": 1,\"column\":2}, \"end\": {\"line\":1,\"column\":18}},\"alias\":null,\"name\":{\"kind\":\"Name\",\"loc\":{\"start\": {\"line\": 1,\"column\":2}, \"end\": {\"line\":1,\"column\":7}},\"value\":\"field\"},\"arguments\":[{\"kind\":\"Argument\",\"loc\":{\"start\": {\"line\": 1,\"column\":8}, \"end\": {\"line\":1,\"column\":17}},\"name\":{\"kind\":\"Name\",\"loc\":{\"start\": {\"line\": 1,\"column\":8}, \"end\": {\"line\":1,\"column\":11}},\"value\":\"arg\"},\"value\":{\"kind\":\"NullValue\",\"loc\":{\"start\": {\"line\": 1,\"column\":13}, \"end\": {\"line\":1,\"column\":17}}}}],\"directives\":null,\"selectionSet\":null}]}}]}"
+  );
 
   free((void *)json);
 }

test/ParserTests.cpp

@@ -296,7 +296,8 @@ static void testCorrectOutputForStockFile(
   ss << ifs.rdbuf();
   EXPECT_STREQ(
     json,
-    ss.str().c_str());
+    ss.str().c_str()
+  );
   free((void *)json);
 }