Fix lexing of EOF in unterminated string

Author: SimonSapin

crates/apollo-parser/CHANGELOG.md

@@ -25,11 +25,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   Stack overflow was observed with little more than 2000
   nesting levels or repetitions in the new test.
   Defaulting to a quarter of that leaves a comfortable margin.
-- **fixes lexing of plus and minus signs in numbers - [SimonSapin], [pull/646]**
-  Plus signs are errors in GraphQL syntax.
-  Minus signs are errors if they’re not followed by a digit, even if followed by EOF.
+- **fix various lexer bugs - [SimonSapin], [pull/646], [pull/652]**
+  The lexer was too permissive in emitting tokens instead of errors
+  in various cases around numbers, strings, and EOF.
 
 [pull/646]: https://github.com/apollographql/apollo-rs/pull/646
+[pull/652]: https://github.com/apollographql/apollo-rs/pull/652
 [pull/662]: https://github.com/apollographql/apollo-rs/pull/662
 [Issue 666]: https://github.com/apollographql/apollo-rs/issues/666
 

crates/apollo-parser/src/lexer/mod.rs

@@ -535,7 +535,11 @@ impl<'a> Cursor<'a> {
                     curr.to_string(),
                 ))
             }
-            State::StringLiteral | State::BlockStringLiteral => {
+            State::StringLiteral
+            | State::BlockStringLiteral
+            | State::StringLiteralEscapedUnicode(_)
+            | State::BlockStringLiteralBackslash
+            | State::StringLiteralBackslash => {
                 let curr = self.drain();
 
                 Err(Error::with_loc(
@@ -556,9 +560,6 @@ impl<'a> Cursor<'a> {
                 ))
             }
             State::Ident
-            | State::StringLiteralEscapedUnicode(_)
-            | State::BlockStringLiteralBackslash
-            | State::StringLiteralBackslash
             | State::LeadingZero
             | State::IntegerPart
             | State::FractionalPart

crates/apollo-parser/test_data/lexer/err/0023_eof_string_1.graphql

@@ -1,2 +1 @@
-` # Artificial error
 "\

crates/apollo-parser/test_data/lexer/err/0023_eof_string_1.txt

@@ -1,6 +1,2 @@
-ERROR@0:1 "Unexpected character \"`\"" `
-WHITESPACE@1:2 " "
-COMMENT@2:20 "# Artificial error"
-WHITESPACE@20:21 "\n"
-STRING_VALUE@21:23 "\"\\"
-EOF@23:23
+ERROR@0:2 "unterminated string value" "\
+EOF@2:2

crates/apollo-parser/test_data/lexer/err/0024_eof_string_2.graphql

@@ -1,2 +1 @@
-` # Artificial error
 "\u

crates/apollo-parser/test_data/lexer/err/0024_eof_string_2.txt

@@ -1,6 +1,2 @@
-ERROR@0:1 "Unexpected character \"`\"" `
-WHITESPACE@1:2 " "
-COMMENT@2:20 "# Artificial error"
-WHITESPACE@20:21 "\n"
-STRING_VALUE@21:24 "\"\\u"
-EOF@24:24
+ERROR@0:3 "unterminated string value" "\u
+EOF@3:3

crates/apollo-parser/test_data/lexer/err/0025_eof_string_3.graphql

@@ -1,2 +1 @@
-` # Artificial error
 "\u222

crates/apollo-parser/test_data/lexer/err/0025_eof_string_3.txt

@@ -1,6 +1,2 @@
-ERROR@0:1 "Unexpected character \"`\"" `
-WHITESPACE@1:2 " "
-COMMENT@2:20 "# Artificial error"
-WHITESPACE@20:21 "\n"
-STRING_VALUE@21:27 "\"\\u222"
-EOF@27:27
+ERROR@0:6 "unterminated string value" "\u222
+EOF@6:6

crates/apollo-parser/test_data/lexer/err/0027_eof_block_string_2.graphql

@@ -1,2 +1 @@
-` # Artificial error
 """\

crates/apollo-parser/test_data/lexer/err/0027_eof_block_string_2.txt

@@ -1,6 +1,2 @@
-ERROR@0:1 "Unexpected character \"`\"" `
-WHITESPACE@1:2 " "
-COMMENT@2:20 "# Artificial error"
-WHITESPACE@20:21 "\n"
-STRING_VALUE@21:25 "\"\"\"\\"
-EOF@25:25
+ERROR@0:4 "unterminated string value" """\
+EOF@4:4