Skip to content

Commit 6372704

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer: move io utils out of analyzer/lib, into linter/tool
Change-Id: Iacbb37db605f831a11277d1933db0a8d2274a195 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/445103 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]> Auto-Submit: Samuel Rawlins <[email protected]>
1 parent 23a63f2 commit 6372704

13 files changed

+26
-51
lines changed

pkg/linter/lib/src/utils.dart

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:analyzer/dart/ast/token.dart';
6-
import 'package:analyzer/src/lint/io.dart'; // ignore: implementation_imports
76

87
// A camel case string here is defined as:
98
// * An arbitrary number of optional leading `_`s or `$`s,
@@ -88,12 +87,6 @@ bool isValidPackageName(String id) =>
8887
_isIdentifier(id) &&
8988
!_isReservedWord(id);
9089

91-
/// Write the given [object] to the console.
92-
/// Uses the shared [outSink] for redirecting in tests.
93-
void printToConsole(Object? object) {
94-
outSink.writeln(object);
95-
}
96-
9790
bool _isCamelCase(String name) => _camelCasePattern.hasMatch(name);
9891

9992
/// Whether this [name] is a legal Dart identifier.

pkg/linter/test/all.dart

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
import 'package:analyzer/src/lint/io.dart';
6-
75
import 'ascii_utils_test.dart' as ascii_utils;
86
import 'doc_test.dart' as doc;
97
import 'formatter_test.dart' as formatter;
108
import 'integration_test.dart' as integration;
119
import 'lint_code_test.dart' as lint_code;
12-
import 'mocks.dart';
1310
import 'pubspec_test.dart' as pubspec;
1411
import 'rules/all.dart' as rules;
1512
import 'scope_util_test.dart' as scope_util;
@@ -25,9 +22,6 @@ import 'verify_reflective_test_suites_test.dart'
2522
as verify_reflective_test_suites;
2623

2724
void main() {
28-
// Redirect output.
29-
outSink = MockIOSink();
30-
3125
ascii_utils.main();
3226
doc.main();
3327
formatter.main();

pkg/linter/test/doc_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
import 'package:linter/src/rules.dart';
56
import 'package:test/test.dart';
67

78
import '../tool/machine.dart';
8-
import 'util/test_utils.dart';
99

1010
void main() {
1111
group('doc generation', () {
12-
setUp(setUpSharedTestEnvironment);
12+
setUp(registerLintRules);
1313
test('fixStatus (sanity)', () {
1414
var fixStatusMap = readFixStatusMap();
1515
// Doc generation reads the fix status map to associate fix status

pkg/linter/test/util/test_utils.dart

Lines changed: 0 additions & 20 deletions
This file was deleted.

pkg/linter/test/utils_test.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import 'package:linter/src/utils.dart';
66
import 'package:test/test.dart';
77

8-
import 'util/test_utils.dart';
9-
108
void main() {
119
group('isDartFileName', () {
1210
testEach(['foo.dart'], isDartFileName, isTrue);
@@ -165,3 +163,9 @@ void main() {
165163
testEach(bad, isUpperCase, isFalse);
166164
});
167165
}
166+
167+
void testEach<T>(Iterable<T> values, bool Function(T s) f, Matcher m) {
168+
for (var s in values) {
169+
test('"$s"', () => expect(f(s), m));
170+
}
171+
}

pkg/linter/test/validate_rule_description_format_test.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:analyzer/src/lint/registry.dart';
6+
import 'package:linter/src/rules.dart';
67
import 'package:test/test.dart';
78

8-
import 'util/test_utils.dart';
9-
109
void main() {
1110
group('rule doc format', () {
12-
setUpSharedTestEnvironment();
11+
registerLintRules();
1312
var rules = Registry.ruleRegistry.rules;
1413

1514
test('(setup)', () {

pkg/linter/tool/benchmark.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import 'package:analyzer/analysis_rule/analysis_rule.dart';
1010
import 'package:analyzer/diagnostic/diagnostic.dart';
1111
import 'package:analyzer/src/lint/analysis_rule_timers.dart';
1212
import 'package:analyzer/src/lint/config.dart';
13-
import 'package:analyzer/src/lint/io.dart';
1413
import 'package:analyzer/src/lint/registry.dart';
1514
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
1615
import 'package:args/args.dart';
@@ -21,6 +20,7 @@ import 'package:yaml/yaml.dart';
2120

2221
import 'lint_sets.dart';
2322
import 'test_linter.dart';
23+
import 'util/io.dart';
2424

2525
/// Benchmarks lint rules.
2626
Future<void> main(List<String> args) async {

pkg/linter/tool/checks/check_all_yaml.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import 'dart:io';
66

7-
import 'package:analyzer/src/lint/io.dart';
87
import 'package:analyzer/src/lint/registry.dart';
98
import 'package:linter/src/rules.dart';
109
import 'package:yaml/yaml.dart';
@@ -27,7 +26,7 @@ void main() {
2726
/// there are errors, and `null` otherwise.
2827
String? checkAllYaml() {
2928
var allYamlPath = pathRelativeToPackageRoot(['example', 'all.yaml']);
30-
var src = readFile(allYamlPath);
29+
var src = File(allYamlPath).readAsStringSync();
3130

3231
var options = _getOptionsFromString(src);
3332
var linterSection = options['linter'] as YamlMap?;

pkg/linter/tool/lint_sets.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import 'dart:async';
66

77
import 'package:analyzer/src/lint/config.dart';
88
import 'package:http/http.dart' as http;
9-
import 'package:linter/src/utils.dart';
109
import 'package:yaml/yaml.dart';
1110

11+
import 'util/io.dart';
12+
1213
Future<List<String>> get dartCoreLints =>
1314
_fetchRulesFromGitHub('/dart-lang/core/main/pkgs/lints/lib/core.yaml');
1415

pkg/linter/tool/machine.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import 'package:analyzer/src/lint/registry.dart';
1010
import 'package:args/args.dart';
1111
import 'package:collection/collection.dart';
1212
import 'package:linter/src/rules.dart';
13-
import 'package:linter/src/utils.dart';
1413
import 'package:pub_semver/pub_semver.dart';
1514
import 'package:yaml/yaml.dart';
1615

1716
import 'messages_info.dart';
17+
import 'util/io.dart';
1818
import 'util/path_utils.dart';
1919

2020
/// Generates a list of built-in lint rules in JSON suitable for

0 commit comments

Comments
 (0)