[DAS] Fixes refactor rename wrong conflict error

Fixes: #60315
Change-Id: I1974580be8805dd83c9d2895860fb6eed825ccca
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/415941
Auto-Submit: Felipe Morschel <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/search/hierarchy.dart

@@ -11,7 +11,7 @@ import 'package:analyzer/src/util/performance/operation_performance.dart';
 List<Element2> getChildren(Element2 parent, [String? name]) {
   var children = <Element2>[];
   visitChildren(parent, (element) {
-    if (name == null || _getBaseName(element) == name) {
+    if (name == null || element.name3 == name) {
       children.add(element);
     }
     return false;
@@ -278,14 +278,6 @@ Element2 getSyntheticAccessorVariable(Element2 element) {
   return element;
 }
 
-String? _getBaseName(Element2 element) {
-  if (element is SetterElement) {
-    var name = element.name3;
-    return name?.substring(0, name.length - 1);
-  }
-  return element.name3;
-}
-
 extension on MethodElement2 {
   int? parameterIndex(FormalParameterElement parameter) {
     var index = 0;

pkg/analysis_server/test/services/refactoring/legacy/rename_class_member_test.dart

@@ -1590,6 +1590,32 @@ class Sub2 extends Base {
 }
 ''');
   }
+
+  Future<void> test_trailingNumber_add() async {
+    await indexTestUnit('''
+class A {
+  int? foo;
+}
+''');
+    createRenameRefactoringAtString('foo');
+    // check status
+    refactoring.newName = 'foo2';
+    var status = await refactoring.checkFinalConditions();
+    assertRefactoringStatusOK(status);
+  }
+
+  Future<void> test_trailingNumber_remove() async {
+    await indexTestUnit('''
+class A {
+  int? foo2;
+}
+''');
+    createRenameRefactoringAtString('foo2');
+    // check status
+    refactoring.newName = 'foo';
+    var status = await refactoring.checkFinalConditions();
+    assertRefactoringStatusOK(status);
+  }
 }
 
 @reflectiveTest