Fix #229 (#230)

* account for newline characters in block str * fix test and simplify block string line increment logic, fixes #229 * place block str test in correct section Co-authored-by: Ahmad Moudani <[email protected]>
vektah · Jul 20, 2022 · 6d5506b · 6d5506b
1 parent 6498086
commit 6d5506b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/lexer/lexer.go b/lexer/lexer.go
@@ -434,7 +434,6 @@ func (s *Lexer) readBlockString() (Token, *gqlerror.Error) {
 			// skip the close quote
 			s.end += 3
 			s.endRunes += 3
-
 			return t, err
 		}
 
@@ -456,6 +455,8 @@ func (s *Lexer) readBlockString() (Token, *gqlerror.Error) {
 			buf.WriteByte('\n')
 			s.end++
 			s.endRunes++
+			s.line++
+			s.lineStartRunes = s.endRunes
 		} else {
 			var char = rune(r)
 			var w = 1
@@ -467,6 +468,10 @@ func (s *Lexer) readBlockString() (Token, *gqlerror.Error) {
 			s.end += w
 			s.endRunes++
 			buf.WriteRune(char)
+			if r == '\n' {
+				s.line++
+				s.lineStartRunes = s.endRunes
+			}
 		}
 	}
 

diff --git a/lexer/lexer_test.yml b/lexer/lexer_test.yml
@@ -307,6 +307,26 @@ lexes block strings:
         end: 36
         value: "spans\n  multiple\n    lines"
 
+  - name: records correct line and column after block string
+    input: |
+      """
+      
+      some
+      description
+      
+      """ foo
+    tokens:
+      -
+        kind: BLOCK_STRING
+        value: "some\ndescription"
+      -
+        kind: NAME
+        start: 27
+        end: 30
+        line: 6
+        column: 5
+        value: 'foo'
+
 lex reports useful block string errors:
   - name: unterminated string
     input: '"""'

diff --git a/parser/schema_test.yml b/parser/schema_test.yml
@@ -643,4 +643,4 @@ fuzzer:
     input: "\"\"\"\r"
     error:
       message: 'Unexpected <Invalid>'
-      locations: [{ line: 1, column: 5 }]
+      locations: [{ line: 2, column: 1 }]