---

yaml
---
r: 361499
b: refs/heads/main
c: a1eec6b
h: refs/heads/main
i:
  361497: 6cabe8d
  361495: 959e2e1

Author: asashour

[refs]

@@ -1988,7 +1988,7 @@ refs/tags/2.14.0-96.0.dev: 1eee24e50fc3028754d9a8e98852b949c04da4e4
 refs/tags/2.14.0-97.0.dev: ba9c1636e87fbdcc02b8bc4a584455c32f8378b4
 refs/tags/2.14.0-98.0.dev: f2d370c93582bbf4da42b5dd4c906d6145b01ea9
 refs/tags/2.14.0-99.0.dev: e722f62b48fb382534efc1f20735def68848006f
-refs/heads/main: 5b119191a5162c46d4ae666a4e123b49a218c87e
+refs/heads/main: a1eec6be31509a213d60244764f22f3f907a5017
 refs/heads/TedSander-patch-1: 739563c962fea6f5e2883a8d84f8638c48f2aa40
 refs/tags/2.13.1: 53a67a7b0650edb435535a50b5c430abbc68bc60
 refs/tags/2.13.3: a77223333944631f8f48a76e7f4697a4877e29d7

trunk/pkg/analysis_server/lib/src/services/correction/dart/remove_leading_underscore.dart

@@ -57,9 +57,22 @@ class RemoveLeadingUnderscore extends CorrectionProducer {
     // Find references to the identifier.
     List<SimpleIdentifier>? references;
     if (element is LocalVariableElement) {
-      var root = node.thisOrAncestorOfType<Block>();
-      if (root != null) {
-        references = findLocalElementReferences(root, element);
+      var block = node.thisOrAncestorOfType<Block>();
+      if (block != null) {
+        references = findLocalElementReferences(block, element);
+
+        var declaration = block.thisOrAncestorOfType<MethodDeclaration>() ??
+            block.thisOrAncestorOfType<FunctionDeclaration>();
+
+        if (declaration != null) {
+          if (isDeclaredIn(declaration, newName)) {
+            var suffix = -1;
+            do {
+              suffix++;
+            } while (isDeclaredIn(declaration, '$newName$suffix'));
+            newName = '$newName$suffix';
+          }
+        }
       }
     } else if (element is ParameterElement) {
       if (!element.isNamed) {

trunk/pkg/analysis_server/lib/src/services/correction/util.dart

@@ -466,6 +466,33 @@ bool hasDisplayName(Element? element, String name) {
   return element?.displayName == name;
 }
 
+/// Return whether the specified [name] is declared inside the [root] node
+/// or not.
+bool isDeclaredIn(AstNode root, String name) {
+  bool isDeclaredIn(FormalParameterList? parameters) {
+    if (parameters != null) {
+      for (var parameter in parameters.parameters) {
+        if (parameter.name?.lexeme == name) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  if (root is MethodDeclaration && isDeclaredIn(root.parameters)) {
+    return true;
+  }
+  if (root is FunctionDeclaration &&
+      isDeclaredIn(root.functionExpression.parameters)) {
+    return true;
+  }
+
+  var collector = _DeclarationCollector(name);
+  root.accept(collector);
+  return collector.isDeclared;
+}
+
 /// Checks if given [DartNode] is the left hand side of an assignment, or a
 /// declaration of a variable.
 bool isLeftHandOfAssignment(SimpleIdentifier node) {
@@ -1542,6 +1569,20 @@ class _CollectReferencedUnprefixedNames extends RecursiveAstVisitor {
   }
 }
 
+class _DeclarationCollector extends RecursiveAstVisitor<void> {
+  final String name;
+  bool isDeclared = false;
+
+  _DeclarationCollector(this.name);
+
+  @override
+  void visitVariableDeclaration(VariableDeclaration node) {
+    if (node.name.lexeme == name) {
+      isDeclared = true;
+    }
+  }
+}
+
 class _ElementReferenceCollector extends RecursiveAstVisitor<void> {
   final Element element;
   final List<SimpleIdentifier> references = [];

trunk/pkg/analysis_server/test/src/services/correction/fix/remove_leading_underscore_test.dart

@@ -89,6 +89,69 @@ void f() {
 ''');
   }
 
+  Future<void> test_localVariable_conflictWithParameter() async {
+    await resolveTestCode('''
+class A {
+  void m({int? foo}) {
+    var _foo = 1;
+    print(foo);
+    print(_foo);
+  }
+}
+''');
+    await assertHasFix('''
+class A {
+  void m({int? foo}) {
+    var foo0 = 1;
+    print(foo);
+    print(foo0);
+  }
+}
+''');
+  }
+
+  Future<void> test_localVariable_conflictWithVariable() async {
+    await resolveTestCode('''
+void f() {
+  var _foo = 1;
+  var foo = true;
+  print(_foo);
+  print(foo);
+}
+''');
+    await assertHasFix('''
+void f() {
+  var foo0 = 1;
+  var foo = true;
+  print(foo0);
+  print(foo);
+}
+''');
+  }
+
+  Future<void> test_localVariable_conflictWithVariable_existing() async {
+    await resolveTestCode('''
+void f() {
+  var _foo = 1;
+  var foo = true;
+  var foo0 = true;
+  print(_foo);
+  print(foo);
+  print(foo0);
+}
+''');
+    await assertHasFix('''
+void f() {
+  var foo1 = 1;
+  var foo = true;
+  var foo0 = true;
+  print(foo1);
+  print(foo);
+  print(foo0);
+}
+''');
+  }
+
   Future<void> test_parameter_closure() async {
     await resolveTestCode('''
 void f() {