linter 0.1.113

Change-Id: I75cc9478171de15df24bc5addfa0aca4dcf7e97a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/139660
Commit-Queue: Phil Quitslund <pquitslund@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
pq 2020-03-16 19:48:00 +00:00 committed by commit-bot@chromium.org
parent 2cfa00791a
commit 0e0d4fb76b
3 changed files with 18 additions and 19 deletions

View file

@ -152,13 +152,13 @@ additional details see the [announcement].
#### Linter #### Linter
The Linter was updated to `0.1.112`, which includes: The Linter was updated to `0.1.113`, which includes:
* new lint: `use_raw_strings` * updated documentation links
* new lint: `unnecessary_raw_strings` * `one_member_abstracts` updated to not lint classes with mixins or implementing interfaces
* new lint: `avoid_escaping_inner_quotes` * `unnecessary_getters_setters` fixed to ignore cases where a getter/setter is deprecated
* new lint: `unnecessary_string_escapes` * new lint: `leading_newlines_in_multiline_strings`
* incompatible rule documentation improvements * improved highlight ranges for `avoid_private_typedef_functions` and `avoid_returning_null_for_future`
#### Analyzer #### Analyzer

2
DEPS
View file

@ -102,7 +102,7 @@ vars = {
"intl_tag": "0.15.7", "intl_tag": "0.15.7",
"jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1", "jinja2_rev": "2222b31554f03e62600cd7e383376a7c187967a1",
"json_rpc_2_tag": "2.0.9", "json_rpc_2_tag": "2.0.9",
"linter_tag": "0.1.112", "linter_tag": "0.1.113",
"logging_tag": "0.11.3+2", "logging_tag": "0.11.3+2",
"markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783", "markupsafe_rev": "8f45f5cfa0009d2a70589bcda0349b8cb2b72783",
"markdown_tag": "2.1.1", "markdown_tag": "2.1.1",

View file

@ -28,20 +28,19 @@ class InlineTypedef extends CorrectionProducer {
TypeAnnotation returnType; TypeAnnotation returnType;
TypeParameterList typeParameters; TypeParameterList typeParameters;
List<FormalParameter> parameters; List<FormalParameter> parameters;
if (node is FunctionTypeAlias) { var parent = node.parent;
var typedef = node as FunctionTypeAlias; if (parent is FunctionTypeAlias) {
returnType = typedef.returnType; returnType = parent.returnType;
name = typedef.name.name; name = parent.name.name;
typeParameters = typedef.typeParameters; typeParameters = parent.typeParameters;
parameters = typedef.parameters.parameters; parameters = parent.parameters.parameters;
} else if (node is GenericTypeAlias) { } else if (parent is GenericTypeAlias) {
var typedef = node as GenericTypeAlias; if (parent.typeParameters != null) {
if (typedef.typeParameters != null) {
return; return;
} }
var functionType = typedef.functionType; var functionType = parent.functionType;
returnType = functionType.returnType; returnType = functionType.returnType;
name = typedef.name.name; name = parent.name.name;
typeParameters = functionType.typeParameters; typeParameters = functionType.typeParameters;
parameters = functionType.parameters.parameters; parameters = functionType.parameters.parameters;
} else { } else {
@ -57,7 +56,7 @@ class InlineTypedef extends CorrectionProducer {
// Build the edit. // Build the edit.
// //
await builder.addFileEdit(file, (DartFileEditBuilder builder) { await builder.addFileEdit(file, (DartFileEditBuilder builder) {
builder.addDeletion(utils.getLinesRange(range.node(node))); builder.addDeletion(utils.getLinesRange(range.node(parent)));
builder.addReplacement(range.node(finder.reference), builder.addReplacement(range.node(finder.reference),
(DartEditBuilder builder) { (DartEditBuilder builder) {
if (returnType != null) { if (returnType != null) {