re

Author: codingforkind

mirror-common/src/main/java/cn/com/mirror/analyser/visitor/VariableVisitor.java

@@ -36,7 +36,7 @@ public class VariableVisitor extends ASTVisitor {
     private final Set<Method> targetMethods;
 
     private Set<Variable> variableSet = new HashSet<>(); // all element defined in this project file
-    private Map<Integer, Statement> variableInFile = new TreeMap<>();
+    private Map<Integer, Statement> varStatMap = new TreeMap<>();
 
     public VariableVisitor(String file,
                            String packageName,
@@ -97,11 +97,14 @@ public boolean visit(MethodDeclaration node) {
 
     @Override
     public boolean visit(SimpleName node) {
+        // TODO xyz the statement of "return this;" and "return null" can not be visited
+        // return statement directly control dependence on the method it belongs.
+
         IBinding binding = node.resolveBinding();
         if (binding instanceof IVariableBinding) {
             IVariableBinding iVariableBinding = (IVariableBinding) binding;
             Variable variable = genVariable(node, iVariableBinding);
-            addVariable(AstUtils.getStartLine(node), variable, node);
+            addVariable(AstUtils.getStartLine(node), variable);
 
             variableSet.add(variable);
         }
@@ -111,20 +114,24 @@ public boolean visit(SimpleName node) {
 
     // private methods
     private void addVariable(Integer lineNum,
-                             Variable variable,
-                             SimpleName node) {
+                             Variable variable) {
+
+        if ("/home/piggy/work/mirror/mirror-common/src/main/java/cn/com/mirror/project/unit/element/Method.java"
+                .equals(variable.getFile()) && (lineNum == 49 || lineNum == 51)) {
+            log.debug("a;lsjd;lfjsajdlfjalsjd;lf");
+        }
 
-        if (!variableInFile.containsKey(lineNum)) {
+        if (!varStatMap.containsKey(lineNum)) {
             Statement statement = new Statement(this.file,
                     lineNum,
                     lineNum,
                     FileUtils.listCodeLines(this.file).get(lineNum - 1),
                     this.packageName);
 
             statement.addVariable(variable);
-            variableInFile.put(lineNum, statement);
+            varStatMap.put(lineNum, statement);
         } else {
-            variableInFile.get(lineNum).addVariable(variable);
+            varStatMap.get(lineNum).addVariable(variable);
         }
     }
 

mirror-common/src/main/java/cn/com/mirror/project/unit/UnitFactory.java

@@ -35,7 +35,7 @@ public Unit newUnit(String url) {
                     unit.getPackages().get(targetPath), unit.getClasses(), unit.getMethods().get(targetPath));
             compilationUnit.accept(variableVisitor);
             unit.addVariables(targetPath, variableVisitor.getVariableSet());
-            unit.addMappedVars(targetPath, variableVisitor.getVariableInFile());
+            unit.addMappedVars(targetPath, variableVisitor.getVarStatMap());
         }
 
         return unit;

mirror-common/src/test/cn/com/mirror/pair/PairAnalyserTests.java

@@ -16,7 +16,7 @@
 @Slf4j
 public class PairAnalyserTests {
 
-    private final String TEST_FILE =
+    private static final String TEST_FILE =
             "/home/piggy/work/mirror/mirror-common/src/main/java/cn/com/mirror/project/unit/element/Method.java";
 
     @Test