Skip to content

Commit ac065fc

Browse files
author
Dart CI
committed
Version 3.11.0-90.0.dev
Merge b1c2b78 into dev
2 parents 1ec6335 + b1c2b78 commit ac065fc

File tree

253 files changed

+755
-500
lines changed

Some content is hidden

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

253 files changed

+755
-500
lines changed

pkg/analysis_server/test/shared/shared_code_actions_fixes_tests.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import 'package:analysis_server/lsp_protocol/protocol.dart';
88
import 'package:analysis_server/src/lsp/constants.dart';
99
import 'package:analysis_server/src/lsp/extensions/code_action.dart';
1010
import 'package:analysis_server/src/services/correction/fix_internal.dart';
11+
import 'package:analyzer/analysis_rule/analysis_rule.dart';
1112
import 'package:analyzer/analysis_rule/rule_state.dart';
1213
import 'package:analyzer/error/error.dart';
13-
import 'package:analyzer/src/lint/linter.dart';
1414
import 'package:analyzer/src/lint/registry.dart';
1515
import 'package:analyzer/src/test_utilities/test_code_format.dart';
1616
import 'package:linter/src/rules.dart';
@@ -869,7 +869,7 @@ $lintsYaml
869869
}
870870

871871
/// A version of `camel_case_types` that is deprecated.
872-
class _DeprecatedCamelCaseTypes extends LintRule {
872+
class _DeprecatedCamelCaseTypes extends AnalysisRule {
873873
static const LintCode code = LintCode(
874874
'camel_case_types',
875875
"The type name '{0}' isn't an UpperCamelCase identifier.",

pkg/analysis_server/test/src/services/completion/yaml/analysis_options_generator_test.dart

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

55
import 'package:analysis_server/src/services/completion/yaml/analysis_options_generator.dart';
6+
import 'package:analyzer/analysis_rule/analysis_rule.dart';
67
import 'package:analyzer/analysis_rule/rule_state.dart';
78
import 'package:analyzer/error/error.dart';
89
import 'package:analyzer/src/analysis_options/analysis_options_file.dart';
9-
import 'package:analyzer/src/lint/linter.dart';
1010
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
1111
import 'package:collection/collection.dart';
1212
import 'package:linter/src/rules.dart';
@@ -320,7 +320,7 @@ li^
320320
}
321321
}
322322

323-
class InternalRule extends LintRule {
323+
class InternalRule extends AnalysisRule {
324324
static const LintCode code = LintCode(
325325
'internal_rule',
326326
'Internal rule.',
@@ -338,7 +338,7 @@ class InternalRule extends LintRule {
338338
DiagnosticCode get diagnosticCode => code;
339339
}
340340

341-
class _RemovedLint extends LintRule {
341+
class _RemovedLint extends AnalysisRule {
342342
static const LintCode _code = LintCode('removed_lint', 'Removed rule.');
343343

344344
_RemovedLint()

pkg/analysis_server/test/src/services/correction/fix/analysis_options/remove_lint_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
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/analysis_rule/analysis_rule.dart';
56
import 'package:analyzer/analysis_rule/rule_state.dart';
67
import 'package:analyzer/error/error.dart';
7-
import 'package:analyzer/src/lint/linter.dart';
88
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
99
import 'package:linter/src/rules.dart';
1010
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -17,7 +17,7 @@ void main() {
1717
});
1818
}
1919

20-
class DeprecatedRule extends LintRule {
20+
class DeprecatedRule extends AnalysisRule {
2121
static const LintCode code = LintCode(
2222
'deprecated_rule',
2323
'Deprecated rule.',
@@ -35,7 +35,7 @@ class DeprecatedRule extends LintRule {
3535
DiagnosticCode get diagnosticCode => code;
3636
}
3737

38-
class RemovedRule extends LintRule {
38+
class RemovedRule extends AnalysisRule {
3939
static const LintCode code = LintCode(
4040
'removed_rule',
4141
'Removed rule.',

pkg/analyzer/lib/src/dart/ast/utilities.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
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-
/// @docImport 'package:analyzer/src/lint/linter.dart';
65
/// @docImport 'package:analyzer/src/lint/linter_visitor.dart';
76
library;
87

pkg/analyzer/lib/src/test_utilities/lint_registration_mixin.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
// Copyright (c) 2025, rights reserved. Use of this source code is governed by a
22
// BSD-style license that can be found in the LICENSE file.
33

4-
import 'package:analyzer/src/lint/linter.dart';
4+
import 'package:analyzer/analysis_rule/analysis_rule.dart';
55
import 'package:analyzer/src/lint/registry.dart';
66

77
/// A mixin for test classes that interact with the global lint
88
/// [Registry.ruleRegistry].
99
mixin LintRegistrationMixin {
10-
final _registeredRules = <LintRule>{};
10+
final _registeredRules = <AnalysisRule>{};
1111

1212
/// Register the given [rule] with the global lint [Registry.ruleRegistry],
1313
/// caching it so that it can be unregistered by a call to [unregisterLintRules].
14-
void registerLintRule(LintRule rule) {
14+
void registerLintRule(AnalysisRule rule) {
1515
_registeredRules.add(rule);
1616
Registry.ruleRegistry.registerLintRule(rule);
1717
}
1818

1919
/// Register the given [rules] with the global lint [Registry.ruleRegistry],
2020
/// caching each so that it can be unregistered by a call to [unregisterLintRules].
21-
void registerLintRules(List<LintRule> rules) {
21+
void registerLintRules(List<AnalysisRule> rules) {
2222
rules.forEach(registerLintRule);
2323
}
2424

pkg/analyzer/test/src/dart/analysis/driver_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import 'dart:async';
66

7+
import 'package:analyzer/analysis_rule/analysis_rule.dart';
78
import 'package:analyzer/analysis_rule/rule_context.dart';
89
import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
910
import 'package:analyzer/dart/analysis/results.dart';
@@ -20,7 +21,6 @@ import 'package:analyzer/src/dart/analysis/status.dart';
2021
import 'package:analyzer/src/dart/ast/ast.dart';
2122
import 'package:analyzer/src/dart/element/element.dart';
2223
import 'package:analyzer/src/error/codes.dart';
23-
import 'package:analyzer/src/lint/linter.dart';
2424
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
2525
import 'package:analyzer/src/utilities/extensions/async.dart';
2626
import 'package:analyzer/utilities/package_config_file_builder.dart';
@@ -101304,7 +101304,7 @@ void f(A _) {}
101304101304
}
101305101305

101306101306
/// A lint that is always reported for all linted files.
101307-
class _AlwaysReportedLint extends LintRule {
101307+
class _AlwaysReportedLint extends AnalysisRule {
101308101308
static final instance = _AlwaysReportedLint();
101309101309

101310101310
static const LintCode code = LintCode(
@@ -101329,7 +101329,7 @@ class _AlwaysReportedLint extends LintRule {
101329101329

101330101330
/// A visitor for [_AlwaysReportedLint] that reports the lint for all files.
101331101331
class _AlwaysReportedLintVisitor extends SimpleAstVisitor<void> {
101332-
final LintRule rule;
101332+
final AnalysisRule rule;
101333101333

101334101334
_AlwaysReportedLintVisitor(this.rule);
101335101335

pkg/analyzer/test/src/diagnostics/removed_lint_use_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
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/analysis_rule/analysis_rule.dart';
56
import 'package:analyzer/analysis_rule/rule_state.dart';
67
import 'package:analyzer/error/error.dart';
78
import 'package:analyzer/src/error/codes.dart';
8-
import 'package:analyzer/src/lint/linter.dart';
99
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
1010
import 'package:test_reflective_loader/test_reflective_loader.dart';
1111

@@ -17,7 +17,7 @@ main() {
1717
});
1818
}
1919

20-
class RemovedLint extends LintRule {
20+
class RemovedLint extends AnalysisRule {
2121
RemovedLint()
2222
: super(
2323
name: 'removed_lint',

pkg/analyzer/test/src/diagnostics/replaced_lint_use_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
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/analysis_rule/analysis_rule.dart';
56
import 'package:analyzer/analysis_rule/rule_state.dart';
67
import 'package:analyzer/error/error.dart';
78
import 'package:analyzer/src/error/codes.dart';
8-
import 'package:analyzer/src/lint/linter.dart';
99
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
1010
import 'package:test_reflective_loader/test_reflective_loader.dart';
1111

@@ -17,7 +17,7 @@ main() {
1717
});
1818
}
1919

20-
class RemovedLint extends LintRule {
20+
class RemovedLint extends AnalysisRule {
2121
RemovedLint()
2222
: super(
2323
name: 'removed_lint',
@@ -75,7 +75,7 @@ void f() { }
7575
}
7676
}
7777

78-
class ReplacingLint extends LintRule {
78+
class ReplacingLint extends AnalysisRule {
7979
ReplacingLint()
8080
: super(
8181
name: 'replacing_lint',

pkg/analyzer/test/src/diagnostics/unignorable_ignore_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
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/analysis_rule/analysis_rule.dart';
56
import 'package:analyzer/analysis_rule/rule_context.dart';
67
import 'package:analyzer/analysis_rule/rule_visitor_registry.dart';
78
import 'package:analyzer/dart/ast/ast.dart';
89
import 'package:analyzer/dart/ast/visitor.dart';
910
import 'package:analyzer/error/error.dart';
1011
import 'package:analyzer/src/error/codes.dart';
11-
import 'package:analyzer/src/lint/linter.dart';
1212
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
1313
import 'package:analyzer_testing/utilities/utilities.dart';
1414
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -88,7 +88,7 @@ int a = 0;
8888
}
8989
}
9090

91-
class _AvoidIntRule extends LintRule {
91+
class _AvoidIntRule extends AnalysisRule {
9292
static const LintCode code = LintCode(
9393
'avoid_int',
9494
'Avoid int.',
@@ -111,7 +111,7 @@ class _AvoidIntRule extends LintRule {
111111
}
112112

113113
class _AvoidIntVisitor extends SimpleAstVisitor {
114-
final LintRule rule;
114+
final AnalysisRule rule;
115115

116116
_AvoidIntVisitor(this.rule);
117117

pkg/analyzer/test/src/options/options_file_validator_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
import 'dart:mirrors';
66

7+
import 'package:analyzer/analysis_rule/analysis_rule.dart';
78
import 'package:analyzer/diagnostic/diagnostic.dart';
89
import 'package:analyzer/error/error.dart';
910
import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
1011
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
1112
import 'package:analyzer/src/error/codes.dart';
1213
import 'package:analyzer/src/file_system/file_system.dart';
1314
import 'package:analyzer/src/generated/source.dart';
14-
import 'package:analyzer/src/lint/linter.dart';
1515
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
1616
import 'package:analyzer_testing/resource_provider_mixin.dart';
1717
import 'package:analyzer_testing/src/analysis_rule/pub_package_resolution.dart';
@@ -916,7 +916,7 @@ version: 0.0.1
916916
}
917917
}
918918

919-
class TestRule extends LintRule {
919+
class TestRule extends AnalysisRule {
920920
static const LintCode code = LintCode(
921921
'fantastic_test_rule',
922922
'Fantastic test rule.',

0 commit comments

Comments
 (0)