Skip to content

Commit fd35afc

Browse files
pqCommit Queue
authored andcommitted
[element model] migrate use_string_buffers
Bug: https://github.com/dart-lang/linter/issues/5099 Change-Id: If08bf48b2d7caa9e54868f383b94cdccd5766197 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/393060 Commit-Queue: Brian Wilkerson <[email protected]> Auto-Submit: Phil Quitslund <[email protected]> Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 5ef250a commit fd35afc

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

pkg/linter/analyzer_use_new_elements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ lib/src/rules/avoid_dynamic_calls.dart
2323
lib/src/rules/avoid_empty_else.dart
2424
lib/src/rules/avoid_equals_and_hash_code_on_mutable_classes.dart
2525
lib/src/rules/avoid_escaping_inner_quotes.dart
26+
lib/src/rules/avoid_field_initializers_in_const_classes.dart
2627
lib/src/rules/avoid_final_parameters.dart
2728
lib/src/rules/avoid_function_literals_in_foreach_calls.dart
2829
lib/src/rules/avoid_futureor_void.dart
@@ -56,6 +57,7 @@ lib/src/rules/camel_case_types.dart
5657
lib/src/rules/cancel_subscriptions.dart
5758
lib/src/rules/cast_nullable_to_non_nullable.dart
5859
lib/src/rules/close_sinks.dart
60+
lib/src/rules/collection_methods_unrelated_type.dart
5961
lib/src/rules/combinators_ordering.dart
6062
lib/src/rules/comment_references.dart
6163
lib/src/rules/conditional_uri_does_not_exist.dart
@@ -212,6 +214,7 @@ lib/src/rules/use_is_even_rather_than_modulo.dart
212214
lib/src/rules/use_named_constants.dart
213215
lib/src/rules/use_raw_strings.dart
214216
lib/src/rules/use_rethrow_when_possible.dart
217+
lib/src/rules/use_string_buffers.dart
215218
lib/src/rules/use_string_in_part_of_directives.dart
216219
lib/src/rules/use_super_parameters.dart
217220
lib/src/rules/use_test_throws_matchers.dart

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
import 'package:analyzer/dart/ast/ast.dart';
66
import 'package:analyzer/dart/ast/token.dart';
77
import 'package:analyzer/dart/ast/visitor.dart';
8-
import 'package:analyzer/dart/element/element.dart';
8+
import 'package:analyzer/dart/element/element2.dart';
99
import 'package:analyzer/dart/element/type.dart';
1010

1111
import '../analyzer.dart';
12-
import '../extensions.dart';
1312

1413
const _desc = r'Use string buffers to compose strings.';
1514

@@ -67,7 +66,7 @@ class _IdentifierIsPrefixVisitor extends SimpleAstVisitor<void> {
6766

6867
@override
6968
void visitSimpleIdentifier(SimpleIdentifier node) {
70-
if (node.staticElement == identifier.staticElement) {
69+
if (node.element == identifier.element) {
7170
rule.reportLint(identifier);
7271
}
7372
}
@@ -83,7 +82,7 @@ class _IdentifierIsPrefixVisitor extends SimpleAstVisitor<void> {
8382

8483
class _UseStringBufferVisitor extends SimpleAstVisitor<void> {
8584
final LintRule rule;
86-
final localElements = <Element?>{};
85+
final localElements = <Element2?>{};
8786

8887
_UseStringBufferVisitor(this.rule);
8988

@@ -100,7 +99,7 @@ class _UseStringBufferVisitor extends SimpleAstVisitor<void> {
10099
writeType is InterfaceType &&
101100
writeType.isDartCoreString) {
102101
if (node.operator.type == TokenType.PLUS_EQ &&
103-
!localElements.contains(node.writeElement?.canonicalElement)) {
102+
!localElements.contains(node.writeElement2)) {
104103
rule.reportLint(node);
105104
}
106105
if (node.operator.type == TokenType.EQ) {
@@ -128,7 +127,7 @@ class _UseStringBufferVisitor extends SimpleAstVisitor<void> {
128127
@override
129128
void visitVariableDeclarationStatement(VariableDeclarationStatement node) {
130129
for (var variable in node.variables.variables) {
131-
localElements.add(variable.declaredElement);
130+
localElements.add(variable.declaredElement2);
132131
}
133132
}
134133
}

0 commit comments

Comments
 (0)