Skip to content

Commit 3482915

Browse files
committed
Fixed elvis expr parsing
1 parent 260a6e9 commit 3482915

File tree

2 files changed

+2
-4
lines changed
  • src
    • main/java/fr/adrienbrault/idea/symfony2plugin/expressionLanguage
    • test/java/fr/adrienbrault/idea/symfony2plugin/tests/expressionLanguage/testData

2 files changed

+2
-4
lines changed

src/main/java/fr/adrienbrault/idea/symfony2plugin/expressionLanguage/ExpressionLanguage.bnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ expr ::= ternary_group
8484
private sign_group ::= unary_plus_expr | unary_min_expr
8585
private mul_group ::= mul_expr | div_expr | mod_expr
8686
private add_group ::= plus_expr | minus_expr
87-
private ternary_group ::= ternary_expr | elvis_expr
87+
private ternary_group ::= elvis_expr | ternary_expr
8888

8989
private rel_group ::= identical_expr
9090
| eq_expr

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/expressionLanguage/testData/ElvisExpr.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
Expression Language File
2-
ExpressionLanguageTernaryExprImpl(TERNARY_EXPR)
2+
ExpressionLanguageElvisExprImpl(ELVIS_EXPR)
33
ExpressionLanguageRefExprImpl(REF_EXPR)
44
ExpressionLanguageIdentifierImpl(IDENTIFIER)
55
PsiElement( ExpressionLanguageType.id)('a')
66
PsiWhiteSpace(' ')
77
PsiElement( ExpressionLanguageType.syntax)('?')
8-
PsiErrorElement:<expr> expected, got ':'
9-
<empty list>
108
PsiElement( ExpressionLanguageType.syntax)(':')
119
PsiWhiteSpace(' ')
1210
ExpressionLanguageRefExprImpl(REF_EXPR)

0 commit comments

Comments
 (0)