use existing CorrectionUtils instance

Change-Id: Ia9c20fb70cd665b6c4a024c2f83d6e7ca5b0220a
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/296422
Commit-Queue: Phil Quitslund <pquitslund@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
pq 2023-04-20 00:05:02 +00:00 committed by Commit Queue
parent 27ef9f0762
commit 76f76b05bb

View file

@ -6,7 +6,6 @@ import 'package:analysis_server/src/protocol_server.dart' hide Element;
import 'package:analysis_server/src/services/correction/assist.dart';
import 'package:analysis_server/src/services/correction/dart/abstract_producer.dart';
import 'package:analysis_server/src/services/correction/name_suggestion.dart';
import 'package:analysis_server/src/services/correction/util.dart';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
@ -56,19 +55,17 @@ class DestructureLocalVariableAssignment extends CorrectionProducer {
var namesInScope = <String>{};
namesInScope.addAll(scopedNameFinder.locals);
var correctionUtils = CorrectionUtils(resolvedResult);
var varMap = <ObjectFieldName, List<AstNode>>{};
for (var propertyReference in propertyReferences.entries) {
var excludes =
correctionUtils.findPossibleLocalVariableConflicts(node.offset);
var excludes = utils.findPossibleLocalVariableConflicts(node.offset);
excludes.addAll(namesInScope);
var references = propertyReference.value;
for (var reference in references) {
if (reference.inSetterContext) return;
excludes.addAll(correctionUtils
.findPossibleLocalVariableConflicts(reference.offset));
excludes
.addAll(utils.findPossibleLocalVariableConflicts(reference.offset));
}
var fieldName = ObjectFieldName.forName(propertyReference.key, excludes);