fix issue #3 support parameter is anther method call, fix issue #4 support pipeline call.

Vanco · Vanco · commit 3c0e47fe6994 · 2016-04-11T00:14:39.000+08:00
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -4,14 +4,16 @@
     Simple Sequence Diagram Generator. fixed version of SequencePlugin , work from 13.x. <br />
     The original version SequencePlugin come from ksibilev@yahoo.com. <br />
     For more info, please visit: http://vanco.github.io/SequencePlugin/]]></description>
-    <version>1.0.9</version>
+    <version>1.1</version>
     <vendor>fanhuagang@gmail.com</vendor>
     <idea-version since-build="IU-123.72" />
 
     <depends>com.intellij.modules.java</depends>
 
     <change-notes><![CDATA[
         <dl>
+        <dt>1.1</dt>
+        <dd>fix issue #3 support parameter is anther method call, fix issue #4 support pipeline call.</dd>
         <dt>1.0.9</dt>
         <dd>fix issue #1 recognise more generic method definition, fix issue #2 show popup menu on mac and linux.</dd>
         <dt>1.0.8</dt>
diff --git a/README.md b/README.md
@@ -34,6 +34,8 @@ Place the cursor in side the method, trigger it from context menu > Sequence Dia
 
 ## Version History
 <dl>
+        <dt>1.1</dt>
+        <dd>fix issue #3 support parameter is anther method call, fix issue #4 support pipeline call.</dd>
         <dt>1.0.9</dt>
         <dd>fix issue #1 recognise more generic method definition, fix issue #2 show popup menu on mac and linux.</dd>
         <dt>1.0.8</dt>
diff --git a/src/org/intellij/sequencer/config/Configuration.form b/src/org/intellij/sequencer/config/Configuration.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.intellij.sequencer.config.ConfigurationUI">
-  <grid id="60330" binding="_mainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="60330" binding="_mainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="10" y="38" width="579" height="311"/>
+      <xy x="10" y="38" width="579" height="286"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -13,7 +13,8 @@
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
-          <text value="Kesh Sibilev ksibilev@yahoo.com"/>
+          <foreground color="-6842473"/>
+          <text value="Orginal: Kesh Sibilev(ksibilev@yahoo.com), Now: Evan Fan (fanhuagang@gmail.com)"/>
         </properties>
       </component>
       <grid id="de5e2" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -222,14 +223,6 @@
           </grid>
         </children>
       </grid>
-      <component id="5c79e" class="javax.swing.JLabel">
-        <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Evan Fan fanhuagang@gmail.com"/>
-        </properties>
-      </component>
     </children>
   </grid>
 </form>
diff --git a/src/org/intellij/sequencer/diagram/Parser.java b/src/org/intellij/sequencer/diagram/Parser.java
@@ -170,6 +170,8 @@ else if (c == '\\') {
                         if (deep == 0)
                             isGeneric = false;
                         sb.append(tmp.toString());
+                    } else {
+                        sb.append(tmp.toString());
                     }
                 }
             }
diff --git a/src/org/intellij/sequencer/generator/SequenceGenerator.java b/src/org/intellij/sequencer/generator/SequenceGenerator.java
@@ -2,6 +2,7 @@
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.*;
+import com.intellij.util.containers.Stack;
 import org.intellij.sequencer.diagram.Info;
 import org.intellij.sequencer.util.PsiUtil;
 
@@ -10,6 +11,8 @@
 import java.util.List;
 
 public class SequenceGenerator extends JavaElementVisitor {
+    private final Stack<PsiCallExpression> _exprStack = new Stack<PsiCallExpression>();
+    private final Stack<CallStack> _callStack = new Stack<CallStack>();
     private static final Logger LOGGER = Logger.getInstance(SequenceGenerator.class.getName());
 
     private CallStack topStack;
@@ -22,7 +25,7 @@ public SequenceGenerator(SequenceParams params) {
     }
 
     public void visitElement(PsiElement psiElement) {
-        PsiUtil.acceptChildren(psiElement, this);
+        psiElement.acceptChildren(this);
     }
 
     public void visitClass(PsiClass psiClass) {
@@ -35,35 +38,43 @@ public CallStack generate(PsiMethod psiMethod) {
 
     public void visitMethod(PsiMethod psiMethod) {
         MethodDescription method = createMethod(psiMethod);
-        if(topStack == null) {
+        if (topStack == null) {
             topStack = new CallStack(method);
             currentStack = topStack;
         } else {
-            if(!params.isAllowRecursion() && currentStack.isReqursive(method))
+            if (!params.isAllowRecursion() && currentStack.isReqursive(method))
                 return;
             currentStack = currentStack.methodCall(method);
         }
         super.visitMethod(psiMethod);
     }
 
-    public void visitNewExpression(PsiNewExpression psiNewExpression) {
-        PsiMethod psiMethod = psiNewExpression.resolveConstructor();
-        methodCall(psiMethod);
-        super.visitNewExpression(psiNewExpression);
-    }
-
-    public void visitMethodCallExpression(PsiMethodCallExpression psiMethodCallExpression) {
-        PsiMethod psiMethod = psiMethodCallExpression.resolveMethod();
-        methodCall(psiMethod);
-        super.visitMethodCallExpression(psiMethodCallExpression);
+    @Override
+    public void visitCallExpression(PsiCallExpression callExpression) {
+        if (!(PsiUtil.isComplexCall(callExpression) || PsiUtil.isPipeline(callExpression))) {
+            PsiMethod psiMethod = callExpression.resolveMethod();
+            methodCall(psiMethod);
+        } else {
+            _exprStack.push(callExpression);
+            _callStack.push(currentStack);
+        }
+        super.visitCallExpression(callExpression);
+        if ((PsiUtil.isPipeline(callExpression) || PsiUtil.isComplexCall(callExpression)))
+            if (!_exprStack.isEmpty()) {
+                CallStack old = currentStack;
+                PsiCallExpression pop = _exprStack.pop();
+                currentStack = _callStack.pop();
+                methodCall(pop.resolveMethod());
+                currentStack = old;
+            }
     }
 
     private void methodCall(PsiMethod psiMethod) {
-        if(psiMethod == null)
+        if (psiMethod == null)
             return;
-        if(!params.getMethodFilter().allow(psiMethod))
+        if (!params.getMethodFilter().allow(psiMethod))
             return;
-        else if(depth < params.getMaxDepth() - 1) {
+        else if (depth < params.getMaxDepth() - 1) {
             CallStack oldStack = currentStack;
             depth++;
             LOGGER.debug("+ depth = " + depth + " method = " + psiMethod.getName());
@@ -79,7 +90,7 @@ private MethodDescription createMethod(PsiMethod psiMethod) {
         PsiParameter[] parameters = psiMethod.getParameterList().getParameters();
         List argNames = new ArrayList();
         List argTypes = new ArrayList();
-        for(int i = 0; i < parameters.length; i++) {
+        for (int i = 0; i < parameters.length; i++) {
             PsiParameter parameter = parameters[i];
             argNames.add(parameter.getName());
             PsiType psiType = parameter.getType();
@@ -90,35 +101,36 @@ private MethodDescription createMethod(PsiMethod psiMethod) {
         if (containingClass == null) {
             containingClass = (PsiClass) psiMethod.getParent().getContext();
         }
-        if(psiMethod.isConstructor())
+        if (psiMethod.isConstructor())
             return MethodDescription.createConstructorDescription(
-                  createClassDescription(containingClass),
-                  attributes, argNames, argTypes);
+                    createClassDescription(containingClass),
+                    attributes, argNames, argTypes);
         return MethodDescription.createMethodDescription(
-              createClassDescription(containingClass),
-              attributes, psiMethod.getName(), psiMethod.getReturnType().getCanonicalText(),
-              argNames, argTypes);
+                createClassDescription(containingClass),
+                attributes, psiMethod.getName(), psiMethod.getReturnType().getCanonicalText(),
+                argNames, argTypes);
     }
 
     private ClassDescription createClassDescription(PsiClass psiClass) {
         return new ClassDescription(psiClass.getQualifiedName(),
-              createAttributes(psiClass.getModifierList()));
+                createAttributes(psiClass.getModifierList()));
     }
 
     private List createAttributes(PsiModifierList psiModifierList) {
-        if(psiModifierList == null)
+        if (psiModifierList == null)
             return Collections.EMPTY_LIST;
         List attributes = new ArrayList();
-        for(int i = 0; i < Info.RECOGNIZED_METHOD_ATTRIBUTES.length; i++) {
+        for (int i = 0; i < Info.RECOGNIZED_METHOD_ATTRIBUTES.length; i++) {
             String attribute = Info.RECOGNIZED_METHOD_ATTRIBUTES[i];
-            if(psiModifierList.hasModifierProperty(attribute))
+            if (psiModifierList.hasModifierProperty(attribute))
                 attributes.add(attribute);
         }
-        if(PsiUtil.isInClassFile(psiModifierList) || PsiUtil.isInJarFileSystem(psiModifierList))
+        if (PsiUtil.isInClassFile(psiModifierList) || PsiUtil.isInJarFileSystem(psiModifierList))
             attributes.add(Info.EXTERNAL_ATTRIBUTE);
         return attributes;
     }
 
     public void visitReferenceExpression(PsiReferenceExpression psiReferenceExpression) {
+        psiReferenceExpression.acceptChildren(this);
     }
 }
diff --git a/src/org/intellij/sequencer/util/CallFinder.java b/src/org/intellij/sequencer/util/CallFinder.java
@@ -1,9 +1,12 @@
 package org.intellij.sequencer.util;
 
 import com.intellij.psi.*;
+import com.intellij.util.containers.Stack;
 import org.intellij.sequencer.generator.filters.MethodFilter;
 
 public class CallFinder extends JavaElementVisitor {
+    private final Stack<PsiCallExpression> _exprStack = new Stack<PsiCallExpression>();
+
     private int _callsLeft;
     private MethodFilter _methodFilter;
     private PsiMethod _psiMethod;
@@ -16,26 +19,29 @@ public CallFinder(int callsLeft, MethodFilter methodFilter, PsiMethod psiMethod)
     }
 
     public void visitElement(PsiElement psiElement) {
-        PsiUtil.acceptChildren(psiElement, this);
+        psiElement.acceptChildren(this);
     }
 
     public void visitReferenceExpression(PsiReferenceExpression psiReferenceExpression) {
+        psiReferenceExpression.acceptChildren(this);
     }
 
     public PsiElement getPsiElement() {
         return _psiElement;
     }
 
-    public void visitNewExpression(PsiNewExpression psiNewExpression) {
-        PsiMethod psiMethod = psiNewExpression.resolveConstructor();
-        checkCurrentPsiElement(psiMethod, psiNewExpression);
-        super.visitNewExpression(psiNewExpression);
-    }
-
-    public void visitMethodCallExpression(PsiMethodCallExpression psiMethodCallExpression) {
-        PsiMethod psiMethod = psiMethodCallExpression.resolveMethod();
-        checkCurrentPsiElement(psiMethod, psiMethodCallExpression);
-        super.visitMethodCallExpression(psiMethodCallExpression);
+    public void visitCallExpression(PsiCallExpression callExpression) {
+        if (!(PsiUtil.isComplexCall(callExpression) || PsiUtil.isPipeline(callExpression))) {
+            PsiMethod psiMethod = callExpression.resolveMethod();
+            checkCurrentPsiElement(psiMethod, callExpression);
+        } else {
+            _exprStack.push(callExpression);
+        }
+        super.visitCallExpression(callExpression);
+        if (!_exprStack.isEmpty() && (PsiUtil.isPipeline(callExpression) || PsiUtil.isComplexCall(callExpression))) {
+            PsiCallExpression pop = _exprStack.pop();
+            checkCurrentPsiElement(pop.resolveMethod(), pop);
+        }
     }
 
     private void checkCurrentPsiElement(PsiMethod psiMethod, PsiElement psiElement) {
diff --git a/src/org/intellij/sequencer/util/PsiUtil.java b/src/org/intellij/sequencer/util/PsiUtil.java
@@ -1,13 +1,9 @@
 package org.intellij.sequencer.util;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.psi.search.searches.AllClassesSearch;
 import com.intellij.psi.util.ClassUtil;
-import com.intellij.util.Query;
 import org.intellij.sequencer.generator.filters.MethodFilter;
 
 import java.util.List;
@@ -115,4 +111,29 @@ public static void acceptChildren(PsiElement psiElement, PsiElementVisitor visit
         psiElement.acceptChildren(visitor);
     }
 
+    public static boolean isPipeline(PsiCallExpression callExpression) {
+        PsiElement[] children = callExpression.getChildren();
+        for (PsiElement child : children) {
+            for (PsiElement psiElement : child.getChildren()) {
+                if (psiElement instanceof PsiMethodCallExpression) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean isComplexCall(PsiCallExpression callExpression) {
+        PsiExpressionList argumentList = callExpression.getArgumentList();
+        if (argumentList != null) {
+            PsiExpression[] expressions = argumentList.getExpressions();
+            for (PsiExpression expression : expressions) {
+                if (expression instanceof PsiCallExpression) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,8 @@ else if (c == '\\') {`
`170`	`170`	`if (deep == 0)`
`171`	`171`	`isGeneric = false;`
`172`	`172`	`sb.append(tmp.toString());`
	`173`	`+ } else {`
	`174`	`+ sb.append(tmp.toString());`
`173`	`175`	`}`
`174`	`176`	`}`
`175`	`177`	`}`