Merge pull request #84 from Workiva/fixed_cascade_references

FEA-2496: Fixed Cascade Indexing
Workiva · Sep 12, 2023 · d8e02c4 · d8e02c4
2 parents e6ec7a2 + d533b6b
commit d8e02c4
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/lib/src/scip_visitor.dart b/lib/src/scip_visitor.dart
@@ -115,9 +115,12 @@ class ScipVisitor extends GeneralizingAstVisitor {
     // is a `CompoundAssignmentExpression`, we know this node is referring
     // to an assignment line. In that case, use the read/write element attached
     // to this node instead of the [node]'s element
-    if (node.parent is CompoundAssignmentExpression) {
-      final assignmentNode = node.parent as CompoundAssignmentExpression;
-      element = assignmentNode.readElement ?? assignmentNode.writeElement;
+    if (element == null) {
+      final assignmentExpr =
+          node.thisOrAncestorOfType<CompoundAssignmentExpression>();
+      if (assignmentExpr == null) return;
+
+      element = assignmentExpr.readElement ?? assignmentExpr.writeElement;
     }
 
     // When the identifier is a field, the analyzer creates synthetic getters/

diff --git a/snapshots/input/basic-project/lib/other.dart b/snapshots/input/basic-project/lib/other.dart
@@ -2,6 +2,9 @@ import 'more.dart' deferred as more;
 
 class Foo {
   int _far;
+  bool value;
+  String value2;
+  double value3;
   Foo(this._far);
 }
 
@@ -19,4 +22,12 @@ void main() {
   more.loadLibrary().then((_) => {
     Bar('a').someMethod.call()
   });
+
+  Foo()..value = false;
+
+  final someStr = 'someStr';
+  Foo()
+    ..value = true
+    ..value2 = someStr
+    ..value3 = 2.15
 }
diff --git a/snapshots/output/basic-project/lib/other.dart b/snapshots/output/basic-project/lib/other.dart
@@ -10,6 +10,18 @@
 //  ^^^ reference scip-dart pub dart:core 2.18.0 dart:core/int.dart/int#
 //      ^^^^ definition local 0
 //      documentation ```dart
+    bool value;
+//  ^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/bool.dart/bool#
+//       ^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value.
+//       documentation ```dart
+    String value2;
+//  ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/string.dart/String#
+//         ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value2.
+//         documentation ```dart
+    double value3;
+//  ^^^^^^ reference scip-dart pub dart:core 2.18.0 dart:core/double.dart/double#
+//         ^^^^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value3.
+//         documentation ```dart
     Foo(this._far);
 //  ^^^ definition scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#<constructor>().
 //  documentation ```dart
@@ -57,4 +69,21 @@
 //    ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#
 //             ^^^^^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Bar#someMethod().
     });
+
+    Foo()..value = false;
+//  ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#
+//         ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value.
+
+    final someStr = 'someStr';
+//        ^^^^^^^ definition local 5
+//        documentation ```dart
+    Foo()
+//  ^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#
+      ..value = true
+//      ^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value.
+      ..value2 = someStr
+//      ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value2.
+//               ^^^^^^^ reference local 5
+      ..value3 = 2.15
+//      ^^^^^^ reference scip-dart pub dart_test 1.0.0 lib/other.dart/Foo#value3.
   }