print_location: Use vertical bar as number column delimiter

Replicates graphql/graphql-js@e171bbc

Author: Cito

graphql/language/print_location.py

@@ -1,6 +1,5 @@
 import re
-from functools import reduce
-from typing import List, Optional, Tuple
+from typing import List, Optional, Tuple, cast
 
 from .ast import Location
 from .location import SourceLocation, get_location
@@ -40,20 +39,20 @@ def get_line(index: int) -> Optional[str]:
 
     return f"{source.name}:{line_num}:{column_num}\n" + print_prefixed_lines(
         [
-            (f"{line_num - 1}: ", get_line(line_index - 1)),
-            (f"{line_num}: ", get_line(line_index)),
+            (f"{line_num - 1}", get_line(line_index - 1)),
+            (f"{line_num}", get_line(line_index)),
             ("", " " * (column_num - 1) + "^"),
-            (f"{line_num + 1}: ", get_line(line_index + 1)),
+            (f"{line_num + 1}", get_line(line_index + 1)),
         ]
     )
 
 
 def print_prefixed_lines(lines: List[Tuple[str, Optional[str]]]) -> str:
-    """Print lines specified like this: ["prefix", "string"]"""
-    existing_lines = [line for line in lines if line[1] is not None]
-    pad_len = reduce(lambda pad, line: max(pad, len(line[0])), existing_lines, 0)
+    """Print lines specified like this: ("prefix", "string")"""
+    existing_lines = [
+        cast(Tuple[str, str], line) for line in lines if line[1] is not None
+    ]
+    pad_len = max(len(line[0]) for line in existing_lines)
     return "\n".join(
-        map(
-            lambda line: line[0].rjust(pad_len) + line[1], existing_lines  # type:ignore
-        )
+        map(lambda line: line[0].rjust(pad_len) + " | " + line[1], existing_lines)
     )

tests/error/test_graphql_error.py

@@ -197,16 +197,16 @@ def prints_an_error_with_nodes_from_different_sources():
             Example error with two nodes
 
             SourceA:2:10
-            1: type Foo {
-            2:   field: String
-                        ^
-            3: }
+            1 | type Foo {
+            2 |   field: String
+              |          ^
+            3 | }
 
             SourceB:2:10
-            1: type Foo {
-            2:   field: Int
-                        ^
-            3: }
+            1 | type Foo {
+            2 |   field: Int
+              |          ^
+            3 | }
             """
         )
         assert str(error) == printed_error

tests/error/test_print_location.py

@@ -11,8 +11,8 @@ def prints_single_digit_line_number_with_no_padding():
         assert result + "\n" == dedent(
             """
             Test:9:1
-            9: *
-               ^
+            9 | *
+              | ^
             """
         )
 
@@ -24,8 +24,8 @@ def prints_line_numbers_with_correct_padding():
         assert result + "\n" == dedent(
             """
             Test:9:1
-             9: *
-                ^
-            10:\x20
+             9 | *
+               | ^
+            10 |\x20
             """
         )

tests/language/test_lexer.py

@@ -66,10 +66,10 @@ def errors_respect_whitespace():
             Syntax Error: Cannot parse the unexpected character '?'.
 
             GraphQL request:3:5
-            2:\x20
-            3:     ?
-                   ^
-            4:\x20
+            2 |\x20
+            3 |     ?
+              |     ^
+            4 |\x20
             """
         )
 
@@ -83,10 +83,10 @@ def updates_line_numbers_in_error_for_file_context():
             Syntax Error: Cannot parse the unexpected character '?'.
 
             foo.js:13:6
-            12:\x20
-            13:      ?
-                     ^
-            14:\x20
+            12 |\x20
+            13 |      ?
+               |      ^
+            14 |\x20
             """
         )
 
@@ -99,8 +99,8 @@ def updates_column_numbers_in_error_for_file_context():
             Syntax Error: Cannot parse the unexpected character '?'.
 
             foo.js:1:5
-            1:     ?
-                   ^
+            1 |     ?
+              |     ^
             """
         )
 

tests/language/test_parser.py

@@ -72,8 +72,8 @@ def parse_provides_useful_errors():
             Syntax Error: Expected Name, found <EOF>
 
             GraphQL request:1:2
-            1: {
-                ^
+            1 | {
+              |  ^
             """
         )
         assert_syntax_error(
@@ -91,9 +91,14 @@ def parse_provides_useful_error_when_using_source():
         with raises(GraphQLSyntaxError) as exc_info:
             parse(Source("query", "MyQuery.graphql"))
         error = exc_info.value
-        assert str(error) + "\n" == (
-            "Syntax Error: Expected {, found <EOF>\n\n"
-            "MyQuery.graphql:1:6\n1: query\n        ^\n"
+        assert str(error) + "\n" == dedent(
+            """
+            Syntax Error: Expected {, found <EOF>
+            
+            MyQuery.graphql:1:6
+            1 | query
+              |      ^
+            """
         )
 
     def parses_variable_inline_values():

tests/utilities/test_strip_ignored_characters.py

@@ -131,9 +131,9 @@ def report_document_with_invalid_token():
             Syntax Error: Unterminated string.
 
             GraphQL request:1:13
-            1: { foo(arg: "
-                           ^
-            2: "
+            1 | { foo(arg: "
+              |             ^
+            2 | "
             """
         )