Skip to content

Commit bd9ab13

Browse files
srawlinsCommit Queue
authored andcommitted
Remove underused exports from analyzer.dart
Work towards #50986 The few rules that need this or that can import it themselves; this helps us understand what parts of private API are needed more and less; plugin authors should not be importing private API; this gives us signal about which private API should maybe be offered as public API. Change-Id: Id5ac0e48132d7e10e67e1f122ab63e5c2287f226 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429060 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 70c4bcd commit bd9ab13

14 files changed

+16
-13
lines changed

pkg/linter/lib/src/analyzer.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
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-
export 'package:analyzer/dart/element/type_system.dart';
6-
export 'package:analyzer/source/line_info.dart';
7-
export 'package:analyzer/src/dart/element/inheritance_manager3.dart'
8-
show InheritanceManager3, Name;
95
export 'package:analyzer/src/dart/error/lint_codes.dart';
10-
export 'package:analyzer/src/lint/analysis_rule_timers.dart';
116
export 'package:analyzer/src/lint/linter.dart'
127
show
138
dart2_12,

pkg/linter/lib/src/rules/avoid_type_to_string.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/dart/element/type.dart';
9+
import 'package:analyzer/dart/element/type_system.dart';
910
import 'package:analyzer/error/error.dart';
1011

1112
import '../analyzer.dart';

pkg/linter/lib/src/rules/collection_methods_unrelated_type.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/dart/element/type.dart';
99
import 'package:analyzer/dart/element/type_provider.dart';
10+
import 'package:analyzer/dart/element/type_system.dart';
1011
import 'package:analyzer/error/error.dart';
1112

1213
import '../analyzer.dart';

pkg/linter/lib/src/rules/invalid_runtime_check_with_js_interop_types.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/dart/element/nullability_suffix.dart';
99
import 'package:analyzer/dart/element/type.dart';
10+
import 'package:analyzer/dart/element/type_system.dart';
1011
import 'package:analyzer/error/error.dart';
1112
// ignore: implementation_imports
1213
import 'package:analyzer/src/dart/element/type.dart';

pkg/linter/lib/src/rules/leading_newlines_in_multiline_strings.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/error/error.dart';
8+
import 'package:analyzer/source/line_info.dart';
89

910
import '../analyzer.dart';
1011

@@ -36,7 +37,7 @@ class LeadingNewlinesInMultilineStrings extends LintRule {
3637
class _Visitor extends SimpleAstVisitor<void> {
3738
final LintRule rule;
3839

39-
LineInfo? lineInfo;
40+
late LineInfo lineInfo;
4041

4142
_Visitor(this.rule);
4243

@@ -59,13 +60,9 @@ class _Visitor extends SimpleAstVisitor<void> {
5960
}
6061

6162
void _visitSingleStringLiteral(SingleStringLiteral node, String lexeme) {
62-
var nodeLineInfo = lineInfo;
63-
if (nodeLineInfo == null) {
64-
return;
65-
}
6663
if (node.isMultiline &&
67-
nodeLineInfo.getLocation(node.offset).lineNumber !=
68-
nodeLineInfo.getLocation(node.end).lineNumber) {
64+
lineInfo.getLocation(node.offset).lineNumber !=
65+
lineInfo.getLocation(node.end).lineNumber) {
6966
bool startWithNewLine(int index) =>
7067
lexeme.startsWith('\n', index) || lexeme.startsWith('\r', index);
7168
if (!startWithNewLine(node.isRaw ? 4 : 3)) {

pkg/linter/lib/src/rules/lines_longer_than_80_chars.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/token.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
88
import 'package:analyzer/error/error.dart';
9+
import 'package:analyzer/source/line_info.dart';
910

1011
import '../analyzer.dart';
1112

pkg/linter/lib/src/rules/require_trailing_commas.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/token.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
88
import 'package:analyzer/error/error.dart';
9+
import 'package:analyzer/source/line_info.dart';
910
import 'package:pub_semver/pub_semver.dart';
1011

1112
import '../analyzer.dart';

pkg/linter/lib/src/rules/unnecessary_await_in_return.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/dart/element/type.dart';
8+
import 'package:analyzer/dart/element/type_system.dart';
89
import 'package:analyzer/error/error.dart';
910

1011
import '../analyzer.dart';

pkg/linter/lib/src/rules/unnecessary_lambdas.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/analysis/features.dart';
66
import 'package:analyzer/dart/ast/ast.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
88
import 'package:analyzer/dart/element/element.dart';
9+
import 'package:analyzer/dart/element/type_system.dart';
910
import 'package:analyzer/error/error.dart';
1011

1112
import '../analyzer.dart';

pkg/linter/lib/src/rules/unnecessary_parenthesis.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:analyzer/dart/ast/token.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
88
import 'package:analyzer/dart/element/element.dart';
99
import 'package:analyzer/dart/element/type.dart';
10+
import 'package:analyzer/dart/element/type_system.dart';
1011
import 'package:analyzer/error/error.dart';
1112

1213
import '../analyzer.dart';

pkg/linter/lib/src/rules/unrelated_type_equality_checks.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/token.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
88
import 'package:analyzer/dart/element/type.dart';
9+
import 'package:analyzer/dart/element/type_system.dart';
910
import 'package:analyzer/error/error.dart';
1011

1112
import '../analyzer.dart';

pkg/linter/lib/src/rules/void_checks.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/visitor.dart';
77
import 'package:analyzer/dart/element/element.dart';
88
import 'package:analyzer/dart/element/type.dart';
9+
import 'package:analyzer/dart/element/type_system.dart';
910
import 'package:analyzer/error/error.dart';
1011

1112
import '../analyzer.dart';

pkg/linter/test/formatter_test.dart

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

55
import 'package:analyzer/diagnostic/diagnostic.dart';
6-
import 'package:linter/src/analyzer.dart';
6+
import 'package:analyzer/source/line_info.dart';
77
import 'package:linter/src/test_utilities/analysis_error_info.dart';
88
import 'package:test/test.dart';
99
import 'package:test_descriptor/test_descriptor.dart' as d;

pkg/linter/tool/benchmark.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'dart:async';
66
import 'dart:io';
77
import 'dart:math' as math;
88

9+
import 'package:analyzer/src/lint/analysis_rule_timers.dart';
910
import 'package:analyzer/src/lint/config.dart';
1011
import 'package:analyzer/src/lint/io.dart';
1112
import 'package:analyzer/src/lint/registry.dart';

0 commit comments

Comments
 (0)