Highlight not/and/or tokens as keywords

Author: adamwojs

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

@@ -21,8 +21,10 @@
     false="regexp:FALSE|false"
     id='regexp:\p{Alpha}\w*'
     string="regexp:('([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")"
-    OP_OR="regexp:or|\|\|"
-    OP_AND="regexp:and|&&"
+    OP_OR="||"
+    OP_OR_KW="or"
+    OP_AND="&&"
+    OP_AND_KW="and"
     OP_BIT_OR="|"
     OP_BIT_XOR="^"
     OP_BIT_AND="&"
@@ -45,7 +47,8 @@
     OP_DIV="/"
     OP_MOD="%"
     OP_POW="**"
-    OP_NOT='regexp:not|\!'
+    OP_NOT='!'
+    OP_NOT_KW='not'
 
     L_ROUND_BRACKET="("
     R_ROUND_BRACKET=")"
@@ -97,7 +100,7 @@ private rel_group ::= eq_strict_expr
 
 private primary_group ::= simple_ref_expr | literal_expr | array_expr | hash_expr | call_expr | paren_expr
 
-not_expr            ::= OP_NOT expr
+not_expr            ::= (OP_NOT|OP_NOT_KW) expr
 unary_min_expr      ::= OP_MINUS expr
 unary_plus_expr     ::= OP_PLUS expr
 div_expr            ::= expr OP_DIV expr
@@ -118,8 +121,8 @@ lte_expr            ::= expr OP_LTE expr
 not_in_expr         ::= expr OP_NOT_IN expr
 in_expr             ::= expr OP_IN expr
 matches_expr        ::= expr OP_MATCHES expr
-or_expr             ::= expr OP_OR expr
-and_expr            ::= expr OP_AND expr
+or_expr             ::= expr (OP_OR|OP_OR_KW) expr
+and_expr            ::= expr (OP_AND|OP_AND_KW) expr
 bit_and_expr        ::= expr OP_BIT_AND expr
 bit_or_expr         ::= expr OP_BIT_OR expr
 bit_xor_expr        ::= expr OP_BIT_XOR expr

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

@@ -32,15 +32,16 @@ TRUE=TRUE|true
 FALSE=FALSE|false
 ID=[:letter:][a-zA-Z_0-9]*
 STRING=('([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")
-OP_OR=or|\|\|
-OP_AND=and|&&
-OP_NOT=not|\!
 SYNTAX=[?:.,]
 
 %%
 <YYINITIAL> {
   {WHITE_SPACE}      { return WHITE_SPACE; }
 
+  "||"               { return OP_OR; }
+  "or"               { return OP_OR_KW; }
+  "&&"               { return OP_AND; }
+  "and"              { return OP_AND_KW; }
   "|"                { return OP_BIT_OR; }
   "^"                { return OP_BIT_XOR; }
   "&"                { return OP_BIT_AND; }
@@ -63,6 +64,8 @@ SYNTAX=[?:.,]
   "/"                { return OP_DIV; }
   "%"                { return OP_MOD; }
   "**"               { return OP_POW; }
+  "!"                { return OP_NOT; }
+  "not"              { return OP_NOT_KW; }
   "("                { return L_ROUND_BRACKET; }
   ")"                { return R_ROUND_BRACKET; }
   "{"                { return L_CURLY_BRACKET; }
@@ -77,9 +80,6 @@ SYNTAX=[?:.,]
   {FALSE}            { return FALSE; }
   {ID}               { return ID; }
   {STRING}           { return STRING; }
-  {OP_OR}            { return OP_OR; }
-  {OP_AND}           { return OP_AND; }
-  {OP_NOT}           { return OP_NOT; }
   {SYNTAX}           { return SYNTAX; }
 
 }

src/main/java/fr/adrienbrault/idea/symfony2plugin/expressionLanguage/ExpressionLanguageSyntaxHighlighter.java

@@ -50,6 +50,12 @@ public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
             return KEYWORD_KEYS;
         } else if (tokenType.equals(ExpressionLanguageTypes.OP_MATCHES)) {
             return KEYWORD_KEYS;
+        } else if (tokenType.equals(ExpressionLanguageTypes.OP_AND_KW)) {
+            return KEYWORD_KEYS;
+        } else if (tokenType.equals(ExpressionLanguageTypes.OP_OR_KW)) {
+            return KEYWORD_KEYS;
+        } else if (tokenType.equals(ExpressionLanguageTypes.OP_NOT_KW)) {
+            return KEYWORD_KEYS;
         }
 
         return EMPTY_KEYS;

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/expressionLanguage/ExpressionLanguageParsingTest.java

@@ -13,6 +13,10 @@ public void testNotExpr() {
         doTest(true);
     }
 
+    public void testNotKwExpr() {
+        doTest(true);
+    }
+
     public void testUnaryMinus() {
         doTest(true);
     }

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

@@ -1 +1 @@
-a && b
+a && b and c

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

@@ -1,11 +1,18 @@
 Expression Language File
   ExpressionLanguageAndExprImpl(AND_EXPR)
-    ExpressionLanguageRefExprImpl(REF_EXPR)
-      ExpressionLanguageIdentifierImpl(IDENTIFIER)
-        PsiElement( ExpressionLanguageType.id)('a')
+    ExpressionLanguageAndExprImpl(AND_EXPR)
+      ExpressionLanguageRefExprImpl(REF_EXPR)
+        ExpressionLanguageIdentifierImpl(IDENTIFIER)
+          PsiElement( ExpressionLanguageType.id)('a')
+      PsiWhiteSpace(' ')
+      PsiElement( ExpressionLanguageType.&&)('&&')
+      PsiWhiteSpace(' ')
+      ExpressionLanguageRefExprImpl(REF_EXPR)
+        ExpressionLanguageIdentifierImpl(IDENTIFIER)
+          PsiElement( ExpressionLanguageType.id)('b')
     PsiWhiteSpace(' ')
-    PsiElement( ExpressionLanguageType.OP_AND)('&&')
+    PsiElement( ExpressionLanguageType.and)('and')
     PsiWhiteSpace(' ')
     ExpressionLanguageRefExprImpl(REF_EXPR)
       ExpressionLanguageIdentifierImpl(IDENTIFIER)
-        PsiElement( ExpressionLanguageType.id)('b')
+        PsiElement( ExpressionLanguageType.id)('c')

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

@@ -1,6 +1,6 @@
 Expression Language File
   ExpressionLanguageNotExprImpl(NOT_EXPR)
-    PsiElement( ExpressionLanguageType.OP_NOT)('!')
+    PsiElement( ExpressionLanguageType.!)('!')
     ExpressionLanguageRefExprImpl(REF_EXPR)
       ExpressionLanguageIdentifierImpl(IDENTIFIER)
         PsiElement( ExpressionLanguageType.id)('a')

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

@@ -0,0 +1 @@
+not a

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

@@ -0,0 +1,7 @@
+Expression Language File
+  ExpressionLanguageNotExprImpl(NOT_EXPR)
+    PsiElement( ExpressionLanguageType.not)('not')
+    PsiWhiteSpace(' ')
+    ExpressionLanguageRefExprImpl(REF_EXPR)
+      ExpressionLanguageIdentifierImpl(IDENTIFIER)
+        PsiElement( ExpressionLanguageType.id)('a')

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

@@ -1 +1 @@
-a || b
+a || b or c