85cf783fe8
Change-Id: Iab61ff9f67b40157657fde2d732e970d67c9fcac Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/290607 Reviewed-by: Bob Nystrom <rnystrom@google.com> Commit-Queue: Devon Carew <devoncarew@google.com>
193 lines
6.6 KiB
Dart
193 lines
6.6 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 'static_error.dart';
|
|
|
|
/// Matches leading indentation in a string.
|
|
final _indentationRegExp = RegExp(r"^(\s*)");
|
|
|
|
/// Matches a line that contains only a line comment.
|
|
final _lineCommentRegExp = RegExp(r"^\s*//");
|
|
|
|
/// Removes existing static error marker comments in [source] and adds markers
|
|
/// for the given [errors].
|
|
///
|
|
/// If [remove] is not empty, then only removes existing errors for the given
|
|
/// sources. If [includeContext] is `true`, then includes context messages in
|
|
/// the output. Otherwise discards them.
|
|
String updateErrorExpectations(String source, List<StaticError> errors,
|
|
{Set<ErrorSource> remove = const {}, bool includeContext = false}) {
|
|
// Split the existing errors into kept and deleted lists.
|
|
var existingErrors = StaticError.parseExpectations(source);
|
|
var keptErrors = <StaticError>[];
|
|
var removedErrors = <StaticError>[];
|
|
for (var error in existingErrors) {
|
|
if (remove.contains(error.source)) {
|
|
removedErrors.add(error);
|
|
} else {
|
|
keptErrors.add(error);
|
|
}
|
|
}
|
|
|
|
var lines = List<String?>.of(source.split("\n"));
|
|
|
|
// Keep track of the indentation on any existing expectation markers. If
|
|
// found, it will try to preserve that indentation.
|
|
var indentation = <int, int>{};
|
|
|
|
// Remove all existing marker comments in the file, even for errors we are
|
|
// preserving. We will regenerate marker comments for those errors too so
|
|
// they can properly share location comments with new errors if needed.
|
|
void removeLine(int line) {
|
|
if (lines[line] == null) return;
|
|
|
|
indentation[line] = _countIndentation(lines[line]!);
|
|
|
|
// Null the line instead of removing it so that line numbers in the
|
|
// reported errors are still correct.
|
|
lines[line] = null;
|
|
}
|
|
|
|
for (var error in existingErrors) {
|
|
error.sourceLines.forEach(removeLine);
|
|
for (var contextMessage in error.contextMessages) {
|
|
contextMessage.sourceLines.forEach(removeLine);
|
|
}
|
|
}
|
|
|
|
// Merge the new errors with the preserved ones.
|
|
errors = [...errors, ...keptErrors];
|
|
|
|
// Group errors by the line where they appear.
|
|
var errorMap = <int, List<StaticError>>{};
|
|
for (var error in errors) {
|
|
// -1 to translate from one-based to zero-based index.
|
|
errorMap.putIfAbsent(error.line - 1, () => []).add(error);
|
|
|
|
// Flatten out and include context messages.
|
|
if (includeContext) {
|
|
for (var context in error.contextMessages) {
|
|
// -1 to translate from one-based to zero-based index.
|
|
errorMap.putIfAbsent(context.line - 1, () => []).add(context);
|
|
}
|
|
}
|
|
}
|
|
|
|
// If there are multiple errors on the same line, order them
|
|
// deterministically.
|
|
for (var errorList in errorMap.values) {
|
|
errorList.sort();
|
|
}
|
|
|
|
var errorNumbers = _numberErrors(errors);
|
|
|
|
// Rebuild the source file a line at a time.
|
|
var previousIndent = 0;
|
|
var result = <String?>[];
|
|
for (var i = 0; i < lines.length; i++) {
|
|
// Keep the code.
|
|
if (lines[i] != null) {
|
|
result.add(lines[i]);
|
|
previousIndent = _countIndentation(lines[i]!);
|
|
}
|
|
|
|
// Add expectations for any errors reported on this line.
|
|
var errorsHere = errorMap[i];
|
|
if (errorsHere == null) continue;
|
|
|
|
var previousColumn = -1;
|
|
var previousLength = -1;
|
|
|
|
for (var error in errorsHere) {
|
|
// Try to indent the line nicely to match either the existing expectation
|
|
// that is being regenerated, or, barring that, the previous line of code.
|
|
var indent = indentation[i + 1] ?? previousIndent;
|
|
|
|
// If the error is to the left of the indent and the "//", sacrifice the
|
|
// indentation.
|
|
if (error.column - 1 < indent + 2) indent = 0;
|
|
var comment = "${" " * indent}//";
|
|
|
|
// Write the location line, unless we already have an identical one. Allow
|
|
// sharing locations between errors with and without explicit lengths.
|
|
if (error.column != previousColumn ||
|
|
(previousLength != 0 &&
|
|
error.length != 0 &&
|
|
error.length != previousLength)) {
|
|
// If the error can't fit in a line comment, or no source location is
|
|
// specified, use an explicit location.
|
|
if (error.column <= 2) {
|
|
if (error.length == 0) {
|
|
result.add("$comment [error column "
|
|
"${error.column}]");
|
|
} else {
|
|
result.add("$comment [error column "
|
|
"${error.column}, length ${error.length}]");
|
|
}
|
|
} else {
|
|
var spacing = " " * (error.column - 1 - 2 - indent);
|
|
// A CFE-only error may not have a length, so treat it as length 1.
|
|
var carets = "^" * (error.length == 0 ? 1 : error.length);
|
|
result.add("$comment$spacing$carets");
|
|
}
|
|
}
|
|
|
|
// If multiple errors share the same location, let them share a location
|
|
// marker.
|
|
previousColumn = error.column;
|
|
previousLength = error.length;
|
|
|
|
var errorLines = error.message.split("\n");
|
|
var line = "$comment [${error.source.marker}";
|
|
if (includeContext && errorNumbers.containsKey(error)) {
|
|
line += " ${errorNumbers[error]}";
|
|
}
|
|
line += "] ${errorLines[0]}";
|
|
result.add(line);
|
|
for (var errorLine in errorLines.skip(1)) {
|
|
result.add("$comment $errorLine");
|
|
}
|
|
|
|
// If the very next line in the source is a line comment, it would
|
|
// become part of the inserted message. To prevent that, insert a blank
|
|
// line.
|
|
if (i < lines.length - 1 &&
|
|
lines[i + 1] != null &&
|
|
_lineCommentRegExp.hasMatch(lines[i + 1]!)) {
|
|
result.add("");
|
|
}
|
|
}
|
|
}
|
|
|
|
return result.join("\n");
|
|
}
|
|
|
|
/// Assigns unique numbers to all [errors] that have context messages, as well
|
|
/// as their context messages.
|
|
Map<StaticError, int> _numberErrors(List<StaticError> errors) {
|
|
// Note: if the same context message appears multiple times at the same
|
|
// location, there will be distinct (non-identical) StaticError instances
|
|
// that compare equal. We use `Map.identity` to ensure that we can associate
|
|
// each with its own context number.
|
|
var result = Map<StaticError, int>.identity();
|
|
var number = 1;
|
|
for (var error in errors) {
|
|
if (error.contextMessages.isEmpty) continue;
|
|
|
|
result[error] = number;
|
|
for (var context in error.contextMessages) {
|
|
result[context] = number;
|
|
}
|
|
|
|
number++;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/// Returns the number of characters of leading spaces in [line].
|
|
int _countIndentation(String line) {
|
|
var match = _indentationRegExp.firstMatch(line)!;
|
|
return match.group(1)!.length;
|
|
}
|