Move Assignment#computeDependencies(...) to AstBasedPropagation

Author: Seppli11

python-frontend/src/main/java/org/sonar/python/semantic/v2/types/Assignment.java

@@ -16,14 +16,11 @@
  */
 package org.sonar.python.semantic.v2.types;
 
-import java.util.ArrayDeque;
-import java.util.Deque;
 import java.util.Map;
 import java.util.Set;
 import org.sonar.plugins.python.api.tree.Expression;
 import org.sonar.plugins.python.api.tree.Name;
 import org.sonar.python.semantic.v2.SymbolV2;
-import org.sonar.python.types.HasTypeDependencies;
 import org.sonar.python.types.v2.PythonType;
 
 public class Assignment extends Propagation {
@@ -37,22 +34,6 @@ public Assignment(SymbolV2 lhsSymbol, Name lhsName, Expression rhs, Map<SymbolV2
     this.propagationsByLhs = propagationsByLhs;
   }
 
-  void computeDependencies(Set<SymbolV2> trackedVars) {
-    Deque<Expression> workList = new ArrayDeque<>();
-    workList.push(rhs);
-    while (!workList.isEmpty()) {
-      Expression e = workList.pop();
-      if (e instanceof Name name) {
-        SymbolV2 symbol = name.symbolV2();
-        if (symbol != null && trackedVars.contains(symbol)) {
-          variableDependencies.add(symbol);
-          propagationsByLhs.get(symbol).forEach(a -> a.dependents.add(this));
-        }
-      } else if (e instanceof HasTypeDependencies hasTypeDependencies) {
-        workList.addAll(hasTypeDependencies.typeDependencies());
-      }
-    }
-  }
 
   public Name lhsName() {
     return lhsName;

python-frontend/src/main/java/org/sonar/python/semantic/v2/types/AstBasedPropagation.java

@@ -19,6 +19,8 @@
  */
 package org.sonar.python.semantic.v2.types;
 
+import java.util.ArrayDeque;
+import java.util.Deque;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
@@ -36,6 +38,7 @@
 import org.sonar.python.semantic.v2.UsageV2;
 import org.sonar.python.tree.NameImpl;
 import org.sonar.python.tree.TreeUtils;
+import org.sonar.python.types.HasTypeDependencies;
 import org.sonar.python.types.v2.PythonType;
 import org.sonar.python.types.v2.UnionType;
 
@@ -65,11 +68,28 @@ private void computePropagationDependencies(Set<SymbolV2> trackedVars) {
         props.stream()
           .filter(Assignment.class::isInstance)
           .map(Assignment.class::cast)
-          .forEach(a -> a.computeDependencies(trackedVars));
+          .forEach(assignment -> computeDependencies(assignment, trackedVars));
       }
     });
   }
 
+  private void computeDependencies(Assignment assignment, Set<SymbolV2> trackedVars) {
+    Deque<Expression> workList = new ArrayDeque<>();
+    workList.push(assignment.rhs());
+    while (!workList.isEmpty()) {
+      Expression e = workList.pop();
+      if (e instanceof Name name) {
+        SymbolV2 symbol = name.symbolV2();
+        if (symbol != null && trackedVars.contains(symbol)) {
+          assignment.addVariableDependencies(symbol);
+          propagationsByLhs.get(symbol).forEach(propagation -> propagation.addDependent(assignment));
+        }
+      } else if (e instanceof HasTypeDependencies hasTypeDependencies) {
+        workList.addAll(hasTypeDependencies.typeDependencies());
+      }
+    }
+  }
+
   private Set<Propagation> getTrackedPropagation(Set<SymbolV2> trackedVars) {
     Set<Propagation> trackedPropagations = new HashSet<>();
     propagationsByLhs.forEach((lhs, propagations) -> {

python-frontend/src/main/java/org/sonar/python/semantic/v2/types/Propagation.java

@@ -59,4 +59,13 @@ Set<Propagation> dependents() {
   public SymbolV2 lhsSymbol() {
     return lhsSymbol;
   }
+
+  public void addVariableDependencies(SymbolV2 dependency) {
+    variableDependencies.add(dependency);
+  }
+
+  public void addDependent(Propagation dependent) {
+    dependents.add(dependent);
+  }
+
 }