diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 20:40:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-18 20:40:22 +0000 |
| commit | 07d35c37ce79a64bdd905b394d40fc9bbb18fa60 (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /plugins/junit/src/com/intellij/execution/ConfigurationUtil.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | b5fb31ef6a38f19404859755dbd2e345215b97bf (diff) | |
| download | idea-07d35c37ce79a64bdd905b394d40fc9bbb18fa60.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'plugins/junit/src/com/intellij/execution/ConfigurationUtil.java')
| -rw-r--r-- | plugins/junit/src/com/intellij/execution/ConfigurationUtil.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java b/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java index 274c2797540d..3d8da3aac313 100644 --- a/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java +++ b/plugins/junit/src/com/intellij/execution/ConfigurationUtil.java @@ -95,7 +95,13 @@ public class ConfigurationUtil { //allScope is used to find all abstract test cases which probably have inheritors in the current 'scope' AnnotatedMembersSearch.search(testAnnotation, GlobalSearchScope.allScope(manager.getProject())).forEach(new Processor<PsiMember>() { public boolean process(final PsiMember annotated) { - final PsiClass containingClass = annotated instanceof PsiClass ? (PsiClass)annotated : annotated.getContainingClass(); + final PsiClass containingClass = annotated instanceof PsiClass ? (PsiClass)annotated : ApplicationManager.getApplication() + .runReadAction(new Computable<PsiClass>() { + @Override + public PsiClass compute() { + return annotated.getContainingClass(); + } + }); if (containingClass != null && annotated instanceof PsiMethod == isMethod) { if (ApplicationManager.getApplication().runReadAction( new Computable<Boolean>() { |