MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

condition of while and if statements are allowed to separate from left parenth by space and comments

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-09-06 14:00:10 +04:00
parent 681ece69cd
commit f53c46e85b
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrIfStatementImpl.java
+3 -6
View File
@@ -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;
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrWhileStatementImpl.java
+3 -2
View File
@@ -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;
}