Skip to content

Commit f44923d

Browse files
domesticmousekwalrath
authored andcommitted
Tidying lint warnings (#1691)
1 parent a9c5ac3 commit f44923d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+74
-64
lines changed

deploy/effective-dart-rules/analysis_options.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ linter:
2828
- slash_for_doc_comments
2929
- sort_constructors_first
3030
- sort_unnamed_constructors_first
31-
- super_goes_last
3231
- test_types_in_equals
3332
- throw_in_finally
3433
# - type_annotate_public_apis

deploy/effective-dart-rules/bin/main.dart

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
import 'dart:async';
23
import 'dart:io';
34

@@ -14,13 +15,13 @@ Future<Null> main() async {
1415
"design.md"
1516
];
1617
List<Section> sections =
17-
filenames.map((name) => new Section(dirPath, name)).toList();
18+
filenames.map((name) => Section(dirPath, name)).toList();
1819

1920
for (var section in sections) {
2021
var lines = section.file.readAsLinesSync();
2122
// Ignore the YAML front matter (can lead to false H3 elements.
2223
lines = lines.skip(1).skipWhile((line) => line.trim() != '---').toList();
23-
var document = new md.Document();
24+
var document = md.Document();
2425

2526
// Commented out the following line because the parseRefLinks has
2627
// disappeared. Unfortunately, that means I had to hand-patch the TOC
@@ -32,19 +33,19 @@ Future<Null> main() async {
3233
var nodes = document.parseLines(lines);
3334
for (md.Element element in nodes.where((node) => node is md.Element)) {
3435
if (element.tag == "h2") {
35-
var subsection = new Subsection(element);
36+
var subsection = Subsection(element);
3637
section.subsections.add(subsection);
3738
continue;
3839
}
3940

4041
if (element.tag == "h3") {
41-
var rule = new Rule(element);
42+
var rule = Rule(element);
4243
section.subsections.last.rules.add(rule);
4344
}
4445
}
4546
}
4647

47-
var outFile = new File(path.join(dirPath, "toc.md"));
48+
var outFile = File(path.join(dirPath, "toc.md"));
4849
IOSink out;
4950
try {
5051
out = outFile.openWrite();
@@ -105,12 +106,11 @@ class Section {
105106
final Uri uri;
106107
final File file;
107108
final String name;
108-
List<Subsection> subsections = new List<Subsection>();
109+
List<Subsection> subsections = List<Subsection>();
109110

110111
Section(String dirPath, String filename)
111-
: file = new File(path.join(dirPath, filename)),
112-
uri = Uri
113-
.parse("/guides/language/effective-dart/")
112+
: file = File(path.join(dirPath, filename)),
113+
uri = Uri.parse("/guides/language/effective-dart/")
114114
.resolve(filename.split('.').first),
115115
name = "${filename[0].toUpperCase()}"
116116
"${filename.substring(1).split('.').first}";
@@ -119,7 +119,7 @@ class Section {
119119
class Subsection {
120120
final String name;
121121
final String fragment;
122-
List<Rule> rules = new List<Rule>();
122+
List<Rule> rules = List<Rule>();
123123
Subsection(md.Element element)
124124
: name = _concatenatedText(element),
125125
fragment = generateAnchorHash(element);
@@ -129,15 +129,15 @@ class Subsection {
129129
String generateAnchorHash(md.Element element) => _concatenatedText(element)
130130
.toLowerCase()
131131
.trim()
132-
.replaceFirst(new RegExp(r'^[^a-z]+'), '')
133-
.replaceAll(new RegExp(r'[^a-z0-9 _-]'), '')
134-
.replaceAll(new RegExp(r'\s'), '-');
132+
.replaceFirst(RegExp(r'^[^a-z]+'), '')
133+
.replaceAll(RegExp(r'[^a-z0-9 _-]'), '')
134+
.replaceAll(RegExp(r'\s'), '-');
135135

136136
/// Concatenates the text found in all the children of [element].
137137
String _concatenatedText(md.Element element) => element.children
138138
.map((child) =>
139139
(child is md.Text) ? unescape(child.text) : _concatenatedText(child))
140140
.join('');
141141

142-
final _unescape = new HtmlUnescape();
142+
final _unescape = HtmlUnescape();
143143
String unescape(String input) => _unescape.convert(input);

examples/analysis_options.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ analyzer:
1010

1111
linter:
1212
rules:
13-
avoid_shadowing_type_parameters: false # TODO: reinstate?
1413
- annotate_overrides
1514
- await_only_futures
1615
- camel_case_types

examples/httpserver/bin/basic_writer_server.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ Future main() async {
4040
..statusCode = HttpStatus.methodNotAllowed
4141
..write("Unsupported request: ${req.method}.");
4242
}
43-
response.close();
43+
await response.close();
4444
}
4545
}

examples/httpserver/bin/hello_world_server.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ Future main() async {
1818

1919
// #docregion listen
2020
await for (HttpRequest request in server) {
21-
request.response
22-
..write('Hello, world!')
23-
..close();
21+
request.response.write('Hello, world!');
22+
await request.response.close();
2423
}
2524
// #enddocregion listen
2625
}

examples/httpserver/bin/hello_world_server_secure.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ Future main() async {
2828
);
2929
print('Listening on localhost:${server.port}');
3030
await for (HttpRequest request in server) {
31-
request.response
32-
..write('Hello, world!')
33-
..close();
31+
request.response.write('Hello, world!');
32+
await request.response.close();
3433
}
3534
}

examples/httpserver/bin/mini_file_server.dart

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ Future main() async {
3434
}
3535
} else {
3636
print("Can't open ${targetFile.path}.");
37-
req.response
38-
..statusCode = HttpStatus.notFound
39-
..close();
37+
req.response.statusCode = HttpStatus.notFound;
38+
await req.response.close();
4039
}
4140
}
4241
}

examples/httpserver/bin/note_server.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Future listenForRequests(HttpServer requests) async {
3030
await for (HttpRequest request in requests) {
3131
switch (request.method) {
3232
case 'POST':
33-
handlePost(request);
33+
await handlePost(request);
3434
break;
3535
case 'OPTION':
3636
handleOptions(request);

examples/misc/lib/articles/creating-streams/line_stream.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
import 'dart:async';
23

34
/// Combines incoming strings into a single stream and outputs its lines.

examples/misc/lib/articles/io/io_http_server_file_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'dart:io';
44
Future<void> runServer(String basePath) async {
55
final server = await HttpServer.bind('127.0.0.1', 8082);
66
await for (HttpRequest request in server) {
7-
handleRequest(basePath, request);
7+
await handleRequest(basePath, request);
88
}
99
}
1010

examples/misc/lib/articles/io/io_http_server_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ Future<void> main() async {
55
final server = await HttpServer.bind('127.0.0.1', 8082);
66
await for (HttpRequest request in server) {
77
request.response.write('Hello, world');
8-
request.response.close();
8+
await request.response.close();
99
}
1010
}

examples/misc/lib/effective_dart/design_bad.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: type_annotate_public_apis, unused_element, unused_local_variable, avoid_types_as_parameter_names
1+
// ignore_for_file: type_annotate_public_apis, unused_element, unused_local_variable, avoid_types_as_parameter_names, sort_constructors_first
22

33
import 'dart:async';
44

examples/misc/lib/effective_dart/design_good.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: type_annotate_public_apis, unused_element, unused_local_variable
1+
// ignore_for_file: type_annotate_public_apis, unused_element, unused_local_variable, sort_constructors_first
22

33
import 'dart:async';
44
import 'dart:collection';
@@ -122,7 +122,7 @@ void miscDeclAnalyzedButNotTested() {
122122

123123
// #docregion annotate-declaration
124124
bool isEmpty(String parameter) {
125-
bool result = parameter.length == 0;
125+
bool result = parameter.isEmpty;
126126
return result;
127127
}
128128
// #enddocregion annotate-declaration

examples/misc/lib/effective_dart/style_bad.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: constant_identifier_names, non_constant_identifier_names, type_annotate_public_apis
1+
// ignore_for_file: constant_identifier_names, non_constant_identifier_names, type_annotate_public_apis, curly_braces_in_flow_control_structures
22
import 'dart:math';
33

44
// #docregion const-names

examples/misc/lib/effective_dart/usage_bad.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: avoid_init_to_null, empty_constructor_bodies, final_not_initialized_constructor_1, prefer_is_not_empty, sort_constructors_first, type_annotate_public_apis, type_init_formals, unnecessary_brace_in_string_interps, unnecessary_getters_setters, unused_element, unused_local_variable, prefer_equal_for_default_values, use_rethrow_when_possible
1+
// ignore_for_file: avoid_init_to_null, empty_constructor_bodies, final_not_initialized_constructor_1, prefer_is_not_empty, sort_constructors_first, type_annotate_public_apis, type_init_formals, unnecessary_brace_in_string_interps, unnecessary_getters_setters, unused_element, unused_local_variable, prefer_equal_for_default_values, use_rethrow_when_possible, prefer_is_empty
22
import 'dart:async';
33
import 'dart:io';
44
import 'dart:math';

examples/misc/lib/effective_dart/usage_good.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: type_annotate_public_apis, unused_element, unused_local_variable
1+
// ignore_for_file: type_annotate_public_apis, unused_element, unused_local_variable, sort_constructors_first
22
import 'dart:async';
33
import 'dart:io';
44
import 'dart:math';

examples/misc/lib/language_tour/async.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: unused_element, unused_local_variable
1+
// ignore_for_file: unused_element, unused_local_variable, unawaited_futures
22
typedef Async0 = Future Function();
33
typedef Async1 = Future Function(dynamic);
44
typedef Async2 = Future Function(dynamic, dynamic);

examples/misc/lib/language_tour/classes/employee.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: unnecessary_cast
1+
// ignore_for_file: unnecessary_cast, sort_constructors_first
22

33
Map getDefaultData() => {}; // stub
44

examples/misc/lib/language_tour/classes/immutable_point.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
class ImmutablePoint {
23
static final ImmutablePoint origin =
34
const ImmutablePoint(0, 0);

examples/misc/lib/language_tour/classes/impostor.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: annotate_overrides
1+
// ignore_for_file: sort_constructors_first, annotate_overrides
22
// A person. The implicit interface contains greet().
33
class Person {
44
// In the interface, but visible only in this library.

examples/misc/lib/language_tour/classes/logger.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
// #docregion
23
class Logger {
34
final String name;

examples/misc/lib/language_tour/classes/orchestra.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
// #docregion Musical
23
mixin Musical {
34
bool canPlayPiano = false;

examples/misc/lib/language_tour/classes/point.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
// #docregion class-with-distanceTo
23
import 'dart:math';
34

examples/misc/lib/language_tour/classes/point_alt.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
/// Example of:
23
///
34
/// - A constructor initializing fields in the body "the long way"

examples/misc/lib/language_tour/classes/point_redirecting.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
class Point {
23
num x, y;
34

examples/misc/lib/language_tour/classes/point_with_distance_field.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
import 'dart:math';
23

34
class Point {

examples/misc/lib/language_tour/classes/point_with_distance_method.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
import 'dart:math';
23

34
class Point {

examples/misc/lib/language_tour/classes/rectangle.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
class Rectangle {
23
num left, top, width, height;
34

examples/misc/lib/language_tour/classes/vector.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
// #docregion ''
23
class Vector {
34
final int x, y;

examples/misc/lib/language_tour/metadata/todo.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
library todo;
23

34
class Todo {

examples/misc/lib/language_tour/typedefs/sorted_collection_1.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
class SortedCollection {
23
Function compare;
34

examples/misc/lib/language_tour/typedefs/sorted_collection_2.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
typedef Compare = int Function(Object a, Object b);
23

34
class SortedCollection {

examples/misc/lib/library_tour/core/comparable.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
class Line implements Comparable<Line> {
23
final int length;
34
const Line(this.length);

examples/misc/lib/library_tour/core/exception.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
class FooException implements Exception {
23
final String msg;
34

examples/misc/lib/library_tour/core/hash_code.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: unrelated_type_equality_checks
1+
// ignore_for_file: sort_constructors_first, unrelated_type_equality_checks
22
// #docregion
33
class Person {
44
final String firstName, lastName;

examples/misc/lib/pi_monte_carlo.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: type_annotate_public_apis
1+
// ignore_for_file: sort_constructors_first, type_annotate_public_apis
22

33
// WARNING:
44
//

examples/misc/lib/samples/spacecraft.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
// #docregion class
23
class Spacecraft {
34
String name;

examples/misc/test/language_tour/async_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// ignore_for_file: type_annotate_public_apis
1+
// ignore_for_file: type_annotate_public_apis, curly_braces_in_flow_control_structures
22
import 'package:test/test.dart';
33

44
void main() {

examples/misc/test/library_tour/core_test.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ void main() {
234234

235235
// Remove all elements from a list.
236236
fruits.clear();
237-
assert(fruits.length == 0);
237+
assert(fruits.isEmpty);
238238
// #enddocregion List
239-
assert(vegetables.length == 0);
239+
assert(vegetables.isEmpty);
240240
});
241241

242242
test('indexOf', () {

examples/misc/test/library_tour/io_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void main() {
8787
expect(logFile.readAsStringSync(),
8888
startsWith('FILE ACCESSED'));
8989
} finally {
90-
logFile?.delete();
90+
await logFile?.delete();
9191
}
9292
});
9393

examples/strong/lib/bounded/my_collection.dart

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore_for_file: sort_constructors_first
12
class C<T extends Iterable> {
23
final T collection;
34
C(this.collection);

examples/strong/lib/common_fixes_analysis.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// NOTE: Declarations in this file are analyzed but not tested.
2-
// ignore_for_file: unused_element, unused_local_variable
2+
// ignore_for_file: sort_constructors_first, unused_element, unused_local_variable
33

44
import 'dart:html';
55

examples/strong/lib/common_problems_analysis.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Include in this file only excerpts used to illustrate common problems.
44
// The specific errors generated by the analyzer are included in the markdown.
55
//
6-
// ignore_for_file: unused_element, unused_local_variable
6+
// ignore_for_file: sort_constructors_first, unused_element, unused_local_variable
77

88
import 'dart:html';
99

examples/strong/lib/dart_1_my_list_hello_world.dart

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// ignore_for_file: invalid_override_from_base
55
// ignore_for_file: invalid_override, type_annotate_public_apis
66
// ignore_for_file: conflicting_generic_interfaces
7+
// ignore_for_file: sort_constructors_first
78
// #docregion MyList-and-main
89
import 'dart:collection';
910

0 commit comments

Comments
 (0)