From 122f9a282c8faba738ff8b55920d45161bef3d6c Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Wed, 26 Sep 2018 16:44:52 +0300 Subject: [PATCH] Uast: drop `findContainingUClass` --- .../testDiscovery/actions/ShowAffectedTestsAction.java | 2 +- uast/uast-common/src/org/jetbrains/uast/UastUtils.kt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java index b8b9d1ba0811..2942574415c8 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/ShowAffectedTestsAction.java @@ -216,7 +216,7 @@ public class ShowAffectedTestsAction extends AnAction { @Nullable private static PsiClass findClassAtCaret(@NotNull AnActionEvent e) { - UClass uClass = UastUtils.findContainingUClass(findElementAtCaret(e)); + UClass uClass = UastUtils.findContaining(findElementAtCaret(e), UClass.class); return uClass == null ? null : ObjectUtils.tryCast(uClass.getJavaPsi(), PsiClass.class); } diff --git a/uast/uast-common/src/org/jetbrains/uast/UastUtils.kt b/uast/uast-common/src/org/jetbrains/uast/UastUtils.kt index ea54a5013463..c835b6e59caf 100644 --- a/uast/uast-common/src/org/jetbrains/uast/UastUtils.kt +++ b/uast/uast-common/src/org/jetbrains/uast/UastUtils.kt @@ -115,8 +115,6 @@ fun UElement.getContainingVariable(): PsiVariable? = getContainingUVariable()?.p replaceWith = ReplaceWith("PsiTreeUtil.getParentOfType(this, PsiClass::class.java)")) fun PsiElement?.getContainingClass(): PsiClass? = this?.let { PsiTreeUtil.getParentOfType(it, PsiClass::class.java) } -fun PsiElement?.findContainingUClass(): UClass? = findContaining(UClass::class.java) - fun PsiElement?.findContaining(clazz: Class): T? { var element = this while (element != null && element !is PsiFileSystemItem) {