From f53c46e85bbbef2056afeb0e2eadf1fab3aa2b2a Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Wed, 5 Sep 2012 16:50:12 +0400 Subject: [PATCH] condition of while and if statements are allowed to separate from left parenth by space and comments --- .../lang/psi/impl/statements/GrIfStatementImpl.java | 9 +++------ .../lang/psi/impl/statements/GrWhileStatementImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrIfStatementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrIfStatementImpl.java index 1d51be93e5f9..965315246430 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrIfStatementImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrIfStatementImpl.java @@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.statements; import com.intellij.lang.ASTNode; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -29,6 +28,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiElementImpl; import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil; +import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; /** * @autor: ilyas @@ -51,12 +51,9 @@ public class GrIfStatementImpl extends GroovyPsiElementImpl implements GrIfState PsiElement lParenth = getLParenth(); if (lParenth == null) return null; - PsiElement afterLParen = lParenth.getNextSibling(); - while (afterLParen != null && StringUtil.isEmptyOrSpaces(afterLParen.getText())) { - afterLParen = afterLParen.getNextSibling(); - } + PsiElement afterLParenth = PsiUtil.skipWhitespaces(lParenth.getNextSibling(), true); - if (afterLParen instanceof GrExpression) return (GrExpression)afterLParen; + if (afterLParenth instanceof GrExpression) return (GrExpression)afterLParenth; return null; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrWhileStatementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrWhileStatementImpl.java index 4ed7e275a08f..f74f211a5e03 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrWhileStatementImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrWhileStatementImpl.java @@ -28,6 +28,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrWhileStatement; import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiElementImpl; import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil; +import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil; /** * @autor: ilyas @@ -50,9 +51,9 @@ public class GrWhileStatementImpl extends GroovyPsiElementImpl implements GrWhil PsiElement lParenth = getLParenth(); if (lParenth == null) return null; - PsiElement afterLParen = lParenth.getNextSibling(); + PsiElement afterLParenth = PsiUtil.skipWhitespaces(lParenth.getNextSibling(), true); - if (afterLParen instanceof GrCondition) return ((GrCondition) afterLParen); + if (afterLParenth instanceof GrCondition) return ((GrCondition) afterLParenth); return null; }