From 03ea364c4c66158e69e3cefff24eb1bbec8eceba Mon Sep 17 00:00:00 2001 From: "Dmitry.Krasilschikov" Date: Tue, 24 Jan 2017 15:53:53 +0300 Subject: [PATCH 1/1] Revert: RUBY-5449 find class related tests and vise versa for appropriate element (9bd5077e94450cd0b837429e45a3635bf387cb89) --- .../src/com/intellij/testIntegration/TestFinder.java | 5 ----- .../src/com/intellij/testIntegration/TestFinderHelper.java | 6 ++---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/platform/lang-api/src/com/intellij/testIntegration/TestFinder.java b/platform/lang-api/src/com/intellij/testIntegration/TestFinder.java index f62c477a5ab9..d956d465398e 100644 --- a/platform/lang-api/src/com/intellij/testIntegration/TestFinder.java +++ b/platform/lang-api/src/com/intellij/testIntegration/TestFinder.java @@ -35,9 +35,4 @@ public interface TestFinder { Collection findClassesForTest(@NotNull PsiElement element); boolean isTest(@NotNull PsiElement element); - - @Nullable - default PsiElement findSelectedElement(@NotNull final PsiElement element) { - return element; - } } diff --git a/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java b/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java index ed7cafc6c288..8c3e1d790044 100644 --- a/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java +++ b/platform/lang-impl/src/com/intellij/testIntegration/TestFinderHelper.java @@ -40,8 +40,7 @@ public class TestFinderHelper { public static Collection findTestsForClass(@NotNull final PsiElement element) { Collection result = new LinkedHashSet<>(); for (TestFinder each : getFinders()) { - final PsiElement selectedElement = each.findSelectedElement(element); - if (selectedElement != null) result.addAll(each.findTestsForClass(selectedElement)); + result.addAll(each.findTestsForClass(element)); } return result; } @@ -49,8 +48,7 @@ public class TestFinderHelper { public static Collection findClassesForTest(@NotNull final PsiElement element) { Collection result = new LinkedHashSet<>(); for (TestFinder each : getFinders()) { - final PsiElement selectedElement = each.findSelectedElement(element); - if (selectedElement != null) result.addAll(each.findClassesForTest(selectedElement)); + result.addAll(each.findClassesForTest(element)); } return result; } -- 2.23.3