From 9aa6a55984e5d0563013e6c918b6f787587b3bf8 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Sat, 4 Jun 2016 00:00:15 +0200 Subject: [PATCH] SSR: use PsiTreeUtil.lastChild() instead of own implementation --- .../JavaStructuralSearchProfile.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java index 34a43dac3834..79ef8a6fa955 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/JavaStructuralSearchProfile.java @@ -318,13 +318,13 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile { final PsiElement firstElement = elements[0]; final PsiElement secondElement = elements[1]; - if (firstElement instanceof PsiDeclarationStatement && getLastLeaf(firstElement) instanceof PsiErrorElement) { + if (firstElement instanceof PsiDeclarationStatement && PsiTreeUtil.lastChild(firstElement) instanceof PsiErrorElement) { // might be method return true; } else if (firstElement instanceof PsiErrorElement && secondElement instanceof PsiExpressionStatement && - getLastLeaf(secondElement) instanceof PsiErrorElement) { + PsiTreeUtil.lastChild(secondElement) instanceof PsiErrorElement) { // might be generic method return true; } @@ -336,15 +336,6 @@ public class JavaStructuralSearchProfile extends StructuralSearchProfile { return false; } - private static PsiElement getLastLeaf(PsiElement element) { - PsiElement lastChild = element.getLastChild(); - while (lastChild != null) { - element = lastChild; - lastChild = lastChild.getLastChild(); - } - return element; - } - @NotNull @Override public Editor createEditor(@NotNull SearchContext searchContext,