Chromium Code Reviews| Index: pkg/front_end/test/scanner_fasta_test.dart |
| diff --git a/pkg/front_end/test/scanner_fasta_test.dart b/pkg/front_end/test/scanner_fasta_test.dart |
| index 52c459557b53ed20b6b3569abd93f20e6323b587..23fcf936b3014ef131e1b778a5b7e7cf5e411926 100644 |
| --- a/pkg/front_end/test/scanner_fasta_test.dart |
| +++ b/pkg/front_end/test/scanner_fasta_test.dart |
| @@ -209,8 +209,9 @@ main() {} |
| // and inserts synthetic closers as needed. |
| // r'"${({(}}"' is parsed as r'"${({()})}"' |
| // where both ')' are synthetic |
| - var stringStart = _scan(r'"${({(}}"'); |
| - var interpolationStart = stringStart.next as BeginToken; |
| + ErrorListener listener = new ErrorListener(); |
| + var interpolationStart = |
| + scanWithListener(r'"${({(}}"', listener).next as BeginToken; |
|
ahe
2017/06/06 10:17:16
Use:
BeginToken interpolationStart
and remove ca
danrubel
2017/06/06 11:50:41
Good suggestion. Done here and elsewhere in this C
|
| var openParen1 = interpolationStart.next as BeginToken; |
| var openBrace = openParen1.next as BeginToken; |
| var openParen2 = openBrace.next as BeginToken; |
| @@ -224,6 +225,10 @@ main() {} |
| expect(openParen1.endToken, same(closeParen1)); |
| expect(openBrace.endToken, same(closeBrace)); |
| expect(openParen2.endToken, same(closeParen2)); |
| + listener.assertErrors([ |
| + new TestError(3, ScannerErrorCode.EXPECTED_TOKEN, [')']), |
| + new TestError(5, ScannerErrorCode.EXPECTED_TOKEN, [')']), |
| + ]); |
| } |
| void test_next_previous() { |
| @@ -245,7 +250,8 @@ main() {} |
| @override |
| void test_unmatched_openers() { |
| - var openBrace = _scan('{[(') as BeginToken; |
| + ErrorListener listener = new ErrorListener(); |
| + var openBrace = scanWithListener('{[(', listener) as BeginToken; |
|
ahe
2017/06/06 10:17:16
Ditto.
|
| var openBracket = openBrace.next as BeginToken; |
| var openParen = openBracket.next as BeginToken; |
| var closeParen = openParen.next; |
| @@ -255,17 +261,11 @@ main() {} |
| expect(openBrace.endToken, same(closeBrace)); |
| expect(openBracket.endToken, same(closeBracket)); |
| expect(openParen.endToken, same(closeParen)); |
| - } |
| - |
| - Token _scan(String source, |
| - {bool genericMethodComments: false, |
| - bool lazyAssignmentOperators: false}) { |
| - ErrorListener listener = new ErrorListener(); |
| - Token token = scanWithListener(source, listener, |
| - genericMethodComments: genericMethodComments, |
| - lazyAssignmentOperators: lazyAssignmentOperators); |
| - listener.assertNoErrors(); |
| - return token; |
| + listener.assertErrors([ |
| + new TestError(0, ScannerErrorCode.EXPECTED_TOKEN, ['}']), |
| + new TestError(1, ScannerErrorCode.EXPECTED_TOKEN, [']']), |
| + new TestError(2, ScannerErrorCode.EXPECTED_TOKEN, [')']), |
| + ]); |
| } |
| } |