[DAS] Fixes navigation to pattern variable with multiple declarations

Bug: #60398
Change-Id: Ibdb1681075c4a097a50483628af50da055cc751d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/417905
Reviewed-by: Samuel Rawlins <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>

Author: FMorschel

pkg/analysis_server/test/lsp/definition_test.dart

@@ -874,6 +874,45 @@ void otherUnrelatedFunction() {}
     expect(loc.targetSelectionRange, equals(rangeOfString(partCode, 'add')));
   }
 
+  Future<void> test_patternVariable_ifCase_logicalOr() async {
+    setLocationLinkSupport();
+
+    var code = TestCode.parse('''
+void f(Object? x) {
+  if (x case int /*[0*//*0*/test/*0]*/ || [int /*[1*/test/*1]*/] when test > 0) {
+    /*[2*//*1*/test/*2]*/ = 1;
+  }
+}
+''', positionShorthand: false);
+
+    await initialize();
+    await openFile(mainFileUri, code.code);
+
+    // Selecting on the first declaration of `test`
+    var res = await getDefinitionAsLocationLinks(
+      mainFileUri,
+      code.positions.first.position,
+    );
+    expect(res, hasLength(2));
+    for (var (index, loc) in res.indexed) {
+      expect(loc.originSelectionRange, equals(code.ranges.first.range));
+      expect(loc.targetRange, equals(code.ranges[index].range));
+      expect(loc.targetSelectionRange, equals(code.ranges[index].range));
+    }
+
+    // Selecting on the assignment of `test = 1`
+    res = await getDefinitionAsLocationLinks(
+      mainFileUri,
+      code.positions.last.position,
+    );
+    expect(res, hasLength(2));
+    for (var (index, loc) in res.indexed) {
+      expect(loc.originSelectionRange, equals(code.ranges.last.range));
+      expect(loc.targetRange, equals(code.ranges[index].range));
+      expect(loc.targetSelectionRange, equals(code.ranges[index].range));
+    }
+  }
+
   Future<void> test_sameLine() async {
     var contents = '''
 int plusOne(int [!value!]) => 1 + val^ue;

pkg/analyzer_plugin/lib/src/utilities/navigation/navigation_dart.dart

@@ -376,7 +376,13 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
 
   @override
   void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
-    computer._addRegionForElement(node.name, node.declaredElement2);
+    if (node.declaredElement2 case BindPatternVariableElement2(:var join2?)) {
+      for (var variable in join2.variables2) {
+        computer._addRegionForElement(node.name, variable);
+      }
+    } else {
+      computer._addRegionForElement(node.name, node.declaredElement2);
+    }
     super.visitDeclaredVariablePattern(node);
   }
 
@@ -581,6 +587,10 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor<void> {
           fragment,
         );
       }
+    } else if (element case JoinPatternVariableElement2(:var variables2)) {
+      for (var variable in variables2) {
+        computer._addRegionForElement(node, variable);
+      }
     } else {
       computer._addRegionForElement(node, element);
     }