From fec608ae3437ea3028714058ebc7bcb9665e6ea8 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 24 Feb 2012 19:52:23 +0400 Subject: [PATCH] getText is expensive --- .../intentions/control/InvertIfIntention.java | 7 +++---- .../intentions/control/SplitIfIntention.java | 16 +++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java index 4407678fa92c..7253ca59e6d9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/InvertIfIntention.java @@ -93,10 +93,6 @@ public class InvertIfIntention extends Intention { return new PsiElementPredicate() { @Override public boolean satisfiedBy(PsiElement element) { - - if (!"if".equals(element.getText())) { - return false; - } PsiElement parent = element.getParent(); if (!(parent instanceof GrIfStatement)) { return false; @@ -105,6 +101,9 @@ public class InvertIfIntention extends Intention { if (((GrIfStatement)parent).getCondition() == null) { return false; } + if (!"if".equals(element.getText())) { + return false; + } return true; } }; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitIfIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitIfIntention.java index a55704fa829f..5eab33700ecf 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitIfIntention.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/control/SplitIfIntention.java @@ -64,17 +64,11 @@ public class SplitIfIntention extends Intention { return new PsiElementPredicate() { @Override public boolean satisfiedBy(PsiElement element) { - if ("&&".equals(element.getText()) && - element.getParent() instanceof GrBinaryExpression && - ((GrBinaryExpression)element.getParent()).getRightOperand() != null && - element.getParent().getParent() instanceof GrIfStatement && - ((GrIfStatement) element.getParent().getParent()).getElseBranch() == null - ) { - return true; - - } - - return false; + return element.getParent() instanceof GrBinaryExpression && + ((GrBinaryExpression)element.getParent()).getRightOperand() != null && + element.getParent().getParent() instanceof GrIfStatement && + ((GrIfStatement)element.getParent().getParent()).getElseBranch() == null + && "&&".equals(element.getText()); } }; }