diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /java/java-impl/src/com/intellij/slicer/SliceUtil.java | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'java/java-impl/src/com/intellij/slicer/SliceUtil.java')
| -rw-r--r-- | java/java-impl/src/com/intellij/slicer/SliceUtil.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/slicer/SliceUtil.java b/java/java-impl/src/com/intellij/slicer/SliceUtil.java index 6d556b5f9681..014bbdd0ce71 100644 --- a/java/java-impl/src/com/intellij/slicer/SliceUtil.java +++ b/java/java-impl/src/com/intellij/slicer/SliceUtil.java @@ -138,7 +138,8 @@ public class SliceUtil { } } if (expression instanceof PsiMethodCallExpression) { // ctr call can't return value or be container get, so don't use PsiCall here - Flow anno = isMethodFlowAnnotated(((PsiMethodCallExpression)expression).resolveMethod()); + PsiMethod method = ((PsiMethodCallExpression)expression).resolveMethod(); + Flow anno = isMethodFlowAnnotated(method); if (anno != null) { String target = anno.target(); if (target.equals(Flow.DEFAULT_TARGET)) target = Flow.RETURN_METHOD_TARGET; |