From bec31c50f6236a3e4712418ff57ffffdda304103 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 5 Jun 2017 12:11:43 +0200 Subject: [PATCH] RegExp: some lambdification --- .../psi/impl/RegExpNamedGroupRefImpl.java | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpNamedGroupRefImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpNamedGroupRefImpl.java index 634e069bbbf0..f793abc807ab 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpNamedGroupRefImpl.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpNamedGroupRefImpl.java @@ -22,7 +22,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.tree.TokenSet; -import com.intellij.psi.util.PsiElementFilter; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.intellij.lang.regexp.RegExpTT; @@ -53,15 +52,12 @@ public class RegExpNamedGroupRefImpl extends RegExpElementImpl implements RegExp @Nullable public RegExpGroup resolve() { final PsiElementProcessor.FindFilteredElement processor = new PsiElementProcessor.FindFilteredElement<>( - new PsiElementFilter() { - @Override - public boolean isAccepted(PsiElement element) { - if (!(element instanceof RegExpGroup)) { - return false; - } - final RegExpGroup group = (RegExpGroup)element; - return group.isAnyNamedGroup() && Comparing.equal(getGroupName(), group.getGroupName()); + element -> { + if (!(element instanceof RegExpGroup)) { + return false; } + final RegExpGroup group = (RegExpGroup)element; + return group.isAnyNamedGroup() && Comparing.equal(getGroupName(), group.getGroupName()); } ); PsiTreeUtil.processElements(getContainingFile(), processor); @@ -142,16 +138,7 @@ public class RegExpNamedGroupRefImpl extends RegExpElementImpl implements RegExp @NotNull public Object[] getVariants() { final PsiElementProcessor.CollectFilteredElements processor = new PsiElementProcessor.CollectFilteredElements<>( - new PsiElementFilter() { - @Override - public boolean isAccepted(PsiElement element) { - if (!(element instanceof RegExpGroup)) { - return false; - } - final RegExpGroup regExpGroup = (RegExpGroup)element; - return regExpGroup.isAnyNamedGroup(); - } - } + e -> e instanceof RegExpGroup && ((RegExpGroup)e).isAnyNamedGroup() ); PsiTreeUtil.processElements(getContainingFile(), processor); return processor.toArray();