214cdbdc81
Previously it tested if it was at the end of file (defined as _currentLine >= _lines.length), if it was not it would try to read the _next_ line (_peek(1)), meaning that if _currentLine = _lines.length - 1 it would _peek(1) and try to read _lines[lines.length] and crash with a range error. This CL fixes it by actually checking if it can safely peek the amount it wants to. Change-Id: I2e66c539e823f0b39bd0da39e2b2277a9e6c9501 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/150624 Commit-Queue: Bob Nystrom <rnystrom@google.com> Reviewed-by: Bob Nystrom <rnystrom@google.com>
380 lines
8.0 KiB
Dart
380 lines
8.0 KiB
Dart
// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
import 'package:expect/expect.dart';
|
|
|
|
import 'package:test_runner/src/static_error.dart';
|
|
import 'package:test_runner/src/update_errors.dart';
|
|
|
|
import 'utils.dart';
|
|
|
|
// Note: This test file validates how some of the special markers used by the
|
|
// test runner are parsed. But this test is also run *by* that same test
|
|
// runner, and we don't want it to see the markers inside the string literals
|
|
// here as significant, so we obfuscate them using seemingly-pointless string
|
|
// escapes here like `\/`.
|
|
|
|
Future<void> main() async {
|
|
// Inserts analyzer, CFE, and both errors.
|
|
expectUpdate("""
|
|
int i = "bad";
|
|
|
|
int another = "wrong";
|
|
|
|
int third = "boo";
|
|
""", errors: [
|
|
makeError(line: 1, column: 9, length: 5, analyzerError: "some.error"),
|
|
makeError(line: 3, column: 15, length: 7, cfeError: "Bad."),
|
|
makeError(
|
|
line: 5,
|
|
column: 13,
|
|
length: 5,
|
|
analyzerError: "an.error",
|
|
cfeError: "Wrong.\nLine.\nAnother."),
|
|
], expected: """
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] some.error
|
|
|
|
int another = "wrong";
|
|
/\/ ^^^^^^^
|
|
/\/ [cfe] Bad.
|
|
|
|
int third = "boo";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] an.error
|
|
/\/ [cfe] Wrong.
|
|
/\/ Line.
|
|
/\/ Another.
|
|
""");
|
|
|
|
// Removes only analyzer errors.
|
|
expectUpdate(
|
|
"""
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] some.error
|
|
|
|
int another = "wrong";
|
|
/\/ ^^^^^^^
|
|
/\/ [cfe] Bad.
|
|
|
|
int third = "boo";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] an.error
|
|
/\/ [cfe] Wrong.
|
|
""",
|
|
removeCfe: false,
|
|
expected: """
|
|
int i = "bad";
|
|
|
|
int another = "wrong";
|
|
/\/ ^^^^^^^
|
|
/\/ [cfe] Bad.
|
|
|
|
int third = "boo";
|
|
/\/ ^^^^^
|
|
/\/ [cfe] Wrong.
|
|
""");
|
|
|
|
// Removes only CFE errors.
|
|
expectUpdate(
|
|
"""
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] some.error
|
|
|
|
int another = "wrong";
|
|
/\/ ^^^^^^^
|
|
/\/ [cfe] Bad.
|
|
|
|
int third = "boo";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] an.error
|
|
/\/ [cfe] Wrong.
|
|
""",
|
|
removeAnalyzer: false,
|
|
expected: """
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] some.error
|
|
|
|
int another = "wrong";
|
|
|
|
int third = "boo";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] an.error
|
|
""");
|
|
|
|
// Preserves previous error's indentation if possible.
|
|
expectUpdate("""
|
|
int i = "bad";
|
|
/\/ ^^
|
|
/\/ [analyzer] previous.error
|
|
""", errors: [
|
|
makeError(
|
|
line: 1,
|
|
column: 9,
|
|
length: 5,
|
|
analyzerError: "updated.error",
|
|
cfeError: "Long.\nError.\nMessage."),
|
|
], expected: """
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] updated.error
|
|
/\/ [cfe] Long.
|
|
/\/ Error.
|
|
/\/ Message.
|
|
""");
|
|
|
|
// Uses previous line's indentation if there was no existing error
|
|
// expectation.
|
|
expectUpdate("""
|
|
main() {
|
|
int i = "bad";
|
|
}
|
|
""", errors: [
|
|
makeError(line: 2, column: 11, length: 5, analyzerError: "updated.error"),
|
|
], expected: """
|
|
main() {
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] updated.error
|
|
}
|
|
""");
|
|
|
|
// Discards indentation if it would collide with carets.
|
|
expectUpdate("""
|
|
int i = "bad";
|
|
/\/ ^^
|
|
/\/ [analyzer] previous.error
|
|
|
|
main() {
|
|
int i =
|
|
"bad";
|
|
}
|
|
""", errors: [
|
|
makeError(line: 1, column: 9, length: 5, cfeError: "Error."),
|
|
makeError(line: 7, column: 3, length: 5, analyzerError: "new.error"),
|
|
], expected: """
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [cfe] Error.
|
|
|
|
main() {
|
|
int i =
|
|
"bad";
|
|
/\/^^^^^
|
|
/\/ [analyzer] new.error
|
|
}
|
|
""");
|
|
|
|
// Uses an explicit error location if there's no room for the carets.
|
|
expectUpdate("""
|
|
int i =
|
|
"bad";
|
|
/\/ ^^
|
|
/\/ [analyzer] previous.error
|
|
|
|
int j =
|
|
"bad";
|
|
""", errors: [
|
|
makeError(line: 2, column: 1, length: 5, analyzerError: "updated.error"),
|
|
makeError(line: 7, column: 1, length: 5, cfeError: "Error."),
|
|
], expected: """
|
|
int i =
|
|
"bad";
|
|
/\/ [error line 2, column 1, length 5]
|
|
/\/ [analyzer] updated.error
|
|
|
|
int j =
|
|
"bad";
|
|
/\/ [error line 7, column 1, length 5]
|
|
/\/ [cfe] Error.
|
|
""");
|
|
|
|
// Uses length one if there's no length.
|
|
expectUpdate("""
|
|
int i = "bad";
|
|
""", errors: [makeError(line: 1, column: 9, cfeError: "Error.")], expected: """
|
|
int i = "bad";
|
|
/\/ ^
|
|
/\/ [cfe] Error.
|
|
""");
|
|
|
|
// Explicit error location handles null length.
|
|
expectUpdate("""
|
|
int i =
|
|
"bad";
|
|
""", errors: [makeError(line: 2, column: 1, cfeError: "Error.")], expected: """
|
|
int i =
|
|
"bad";
|
|
/\/ [error line 2, column 1]
|
|
/\/ [cfe] Error.
|
|
""");
|
|
|
|
// Handles shifted line numbers in explicit error locations.
|
|
// Note that the reported line is line 6, but the output is line 3 to take
|
|
// into account the three removed lines.
|
|
expectUpdate("""
|
|
main() {
|
|
/\/ ^^
|
|
/\/ [analyzer] ERROR.CODE
|
|
/\/ [cfe] Error.
|
|
}
|
|
Error here;
|
|
""", errors: [
|
|
makeError(line: 6, column: 1, length: 5, analyzerError: "NEW.ERROR"),
|
|
makeError(line: 6, column: 2, length: 3, cfeError: "Error."),
|
|
], expected: """
|
|
main() {
|
|
}
|
|
Error here;
|
|
/\/ [error line 3, column 1, length 5]
|
|
/\/ [analyzer] NEW.ERROR
|
|
/\/ [error line 3, column 2, length 3]
|
|
/\/ [cfe] Error.
|
|
""");
|
|
|
|
// Inserts a blank line if a subsequent line comment would become part of the
|
|
// error message.
|
|
expectUpdate("""
|
|
int i = "bad";
|
|
// Line comment.
|
|
""", errors: [
|
|
makeError(line: 1, column: 9, length: 5, cfeError: "Wrong."),
|
|
], expected: """
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [cfe] Wrong.
|
|
|
|
// Line comment.
|
|
""");
|
|
|
|
// Inserts a blank line if a subsequent line comment would become part of the
|
|
// error message.
|
|
expectUpdate("""
|
|
int i = "bad";
|
|
// Line comment.
|
|
""", errors: [
|
|
makeError(line: 1, column: 9, length: 5, analyzerError: "ERR.CODE"),
|
|
], expected: """
|
|
int i = "bad";
|
|
/\/ ^^^^^
|
|
/\/ [analyzer] ERR.CODE
|
|
|
|
// Line comment.
|
|
""");
|
|
|
|
// Multiple errors on the same line are ordered by column then length.
|
|
expectUpdate("""
|
|
someBadCode();
|
|
""", errors: [
|
|
makeError(line: 1, column: 9, length: 5, cfeError: "Wrong 1."),
|
|
makeError(line: 1, column: 9, length: 4, cfeError: "Wrong 2."),
|
|
makeError(line: 1, column: 6, length: 3, cfeError: "Wrong 3."),
|
|
makeError(line: 1, column: 5, length: 5, cfeError: "Wrong 4."),
|
|
], expected: """
|
|
someBadCode();
|
|
/\/ ^^^^^
|
|
/\/ [cfe] Wrong 4.
|
|
/\/ ^^^
|
|
/\/ [cfe] Wrong 3.
|
|
/\/ ^^^^
|
|
/\/ [cfe] Wrong 2.
|
|
/\/ ^^^^^
|
|
/\/ [cfe] Wrong 1.
|
|
""");
|
|
|
|
// Don't crash with RangeError.
|
|
expectUpdate("""
|
|
x
|
|
// [error line 1, column 1, length 0]
|
|
// [cfe] Whatever""", errors: [
|
|
makeError(line: 1, column: 1, length: 0, cfeError: "Foo"),
|
|
], expected: """
|
|
x
|
|
// [error line 1, column 1, length 0]
|
|
// [cfe] Foo""");
|
|
|
|
regression();
|
|
}
|
|
|
|
void regression() {
|
|
// https://github.com/dart-lang/sdk/issues/37990.
|
|
expectUpdate(
|
|
"""
|
|
int get xx => 3;
|
|
int get yy => 3;
|
|
|
|
class A {
|
|
void test() {
|
|
xx = 1;
|
|
/\/ ^^^^^^^^^^^^^^
|
|
/\/ [cfe] unspecified
|
|
/\/ ^^^^^^^^^^^^^^
|
|
/\/ [analyzer] unspecified
|
|
|
|
|
|
yy(4);
|
|
/\/ ^^^^^^^^^^^^^^
|
|
/\/ [cfe] unspecified
|
|
/\/ ^^^^^^^^^^^^^^
|
|
/\/ [analyzer] unspecified
|
|
|
|
}
|
|
}
|
|
""",
|
|
removeAnalyzer: false,
|
|
errors: [
|
|
makeError(
|
|
line: 6,
|
|
column: 5,
|
|
length: 14,
|
|
cfeError: "Setter not found: 'xx'."),
|
|
makeError(
|
|
line: 16,
|
|
column: 7,
|
|
cfeError: "The method 'call' isn't defined for the class 'int'.")
|
|
],
|
|
expected: """
|
|
int get xx => 3;
|
|
int get yy => 3;
|
|
|
|
class A {
|
|
void test() {
|
|
xx = 1;
|
|
/\/ ^^^^^^^^^^^^^^
|
|
/\/ [analyzer] unspecified
|
|
/\/ [cfe] Setter not found: 'xx'.
|
|
|
|
|
|
yy(4);
|
|
/\/ ^^^^^^^^^^^^^^
|
|
/\/ [analyzer] unspecified
|
|
/\/ ^
|
|
/\/ [cfe] The method 'call' isn't defined for the class 'int'.
|
|
|
|
}
|
|
}
|
|
""");
|
|
}
|
|
|
|
void expectUpdate(String original,
|
|
{List<StaticError> errors,
|
|
bool removeAnalyzer = true,
|
|
bool removeCfe = true,
|
|
String expected}) {
|
|
errors ??= const [];
|
|
|
|
var actual = updateErrorExpectations(original, errors,
|
|
removeAnalyzer: removeAnalyzer, removeCfe: removeCfe);
|
|
if (actual != expected) {
|
|
// Not using Expect.equals() because the diffs it shows aren't helpful for
|
|
// strings this large.
|
|
Expect.fail("Output did not match expectation. Expected:\n$expected"
|
|
"\n\nWas:\n$actual");
|
|
}
|
|
}
|