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

IDEA-98976 Spock: double pipe in table header

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-01-15 18:25:52 +04:00
parent 35737c4acf
commit f4bd91746a
2 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/spock/SpockUtils.java
+17 -19
View File
@@ -2,6 +2,7 @@ package org.jetbrains.plugins.groovy.spock;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -13,11 +14,11 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrLabeledStatement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrOpenBlock;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrBinaryExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.arithmetic.GrShiftExpressionImpl;
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.bitwise.GrBitwiseExpressionImpl;
import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil;
import org.jetbrains.plugins.groovy.util.LightCacheKey;
@@ -198,8 +199,13 @@ public class SpockUtils {
}
private static boolean isOrStatement(PsiElement element) {
return element instanceof GrBitwiseExpressionImpl
&& ((GrBitwiseExpressionImpl)element).getOperationTokenType() == GroovyTokenTypes.mBOR;
if (element instanceof GrBinaryExpression) {
IElementType type = ((GrBinaryExpression)element).getOperationTokenType();
return type == GroovyTokenTypes.mBOR || type == GroovyTokenTypes.mLOR;
}
return false;
}
@Nullable
@@ -233,23 +239,15 @@ public class SpockUtils {
return ref.getName();
}
// See org.spockframework.compiler.WhereBlockRewriter#splitRow()
private static void splitOr(List<GrExpression> res, GrExpression element) {
GrExpression e = element;
while (true) {
if (e instanceof GrBitwiseExpressionImpl) {
GrBitwiseExpressionImpl be = (GrBitwiseExpressionImpl)e;
if (be.getOperationTokenType() == GroovyTokenTypes.mBOR) {
res.add(be.getRightOperand());
e = be.getLeftOperand();
continue;
}
}
res.add(e);
break;
if (isOrStatement(element)) {
GrBinaryExpression be = (GrBinaryExpression)element;
splitOr(res, be.getLeftOperand());
splitOr(res, be.getRightOperand());
}
else {
res.add(element);
}
Collections.reverse(res);
}
}
plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy
+2 -2
View File
@@ -56,8 +56,8 @@ class FooSpec extends spock.lang.Specification {
varShl << ['aaa', 'bbb']
[varShl1, varShl2, varShl3] << [['aaa', 'bbb', 'ccc'], ['aaa', 'bbb', 'ccc'], ['aaa', 'bbb', 'ccc']]
varTable1|varTable2|varTable3|varTable4
""|""|""|""
varTable1|varTable2|varTable3||varTable4
""|""|""||""
}
}
""")