Merge pull request #66 from anboralabs/fix-issue

Fixed minor issues with formatting and boolean expressions.

build.gradle

@@ -4,16 +4,13 @@ plugins {
     id 'java'
     id 'org.jetbrains.intellij' version '0.6.5'
     id 'org.jetbrains.kotlin.jvm' version '1.4.10'
-    id "org.jetbrains.grammarkit" version "2020.3.2"
+    id "org.jetbrains.grammarkit" version "2021.1.2"
 }
 
-grammarKit {
-    jflexRelease = '1.7.0-1'
-    grammarKitRelease = 'f75d0d8'
-}
+apply plugin: 'org.jetbrains.grammarkit'
 
 group 'co.anbora.labs'
-version '2.5.5-SNAPSHOT'
+version '2.5.6-SNAPSHOT'
 
 repositories {
     mavenCentral()

src/main/grammar/FirebaseRules.bnf

@@ -127,11 +127,11 @@ private PermissionStatementItem ::= !(':'|';') PermissionKeyWord (',' | &(':'|';
 private Permission_recover ::= !(':' |';' | GET_KEYWORD | READ_KEYWORD | WRITE_KEYWORD | LIST_KEYWORD
                                      | CREATE_KEYWORD | UPDATE_KEYWORD | DELETE_KEYWORD)
 
-ConditionalStatement ::= IF_KEYWORD ConditionalExpression {
+ConditionalStatement ::= IF_KEYWORD ConditionalBlock {
     pin=1
 }
 
-ConditionalExpression ::= Expression (BooleanOperator Expression)*
+ConditionalBlock ::= Expression
 //Allow Statement End
 
 FullBuiltInParameterStatement ::= (SLASH PathBuiltInParameterStatement)+
@@ -140,6 +140,8 @@ PathBuiltInParameterStatement ::= (DOT? IDENTIFIER|PATH_BUILT_IN)
 
 BuiltInFunctionStatement ::= (GET_KEYWORD|EXITS_KEYWORD)
 
+BuiltInTypes ::= LIST_KEYWORD
+
 //Function Definition Begin
 FunctionDef ::= FUNCTION_KEYWORD IDENTIFIER FunctionParameterList FunctionBlock
 {
@@ -179,7 +181,7 @@ ParameterStatement ::= Expression(COMMA Expression)*
 ReturnStatement ::= RETURN_KEYWORD ReturnBlock {
     pin=1
 }
-ReturnBlock ::= ConditionalExpression DOT_COMMA
+ReturnBlock ::= Expression DOT_COMMA
 
 Expression ::=
         OrExpr
@@ -205,6 +207,7 @@ LiteralExpr ::= LiteralStatement
         | BooleanStatement
         | NullStatement
         | BuiltInFunctionStatement
+        | BuiltInTypes
         | IdentifierExpr
         | FullBuiltInParameterStatement
 
@@ -219,6 +222,10 @@ private AtomExpr ::=
 private MulExprItem ::= DivExpr | MulExpr | ModExpr
 private AddExprItem ::= PlusExpr | MinusExpr
 private LogicalEqExprItem ::= EqualsExpr | NotEqualsExpr | LessEqualsExpr | LessExpr | GreaterEqualsExpr | GreaterExpr
+                                | InExpr | IsExpr
+
+InExpr ::= Expression IN_KEYWORD Expression
+IsExpr ::= Expression IS_KEYWORD Expression
 
 EqualsExpr ::= Expression EQEQ Expression
 NotEqualsExpr ::= Expression NE Expression
@@ -244,12 +251,8 @@ private ArrayExpr ::= LB (ParameterStatement) RB
 
 LiteralStatement ::= (number|string)
 
-VariableStatement ::= LET_KEYWORD IDENTIFIER EQ ConditionalExpression (DOT_COMMA?)
+VariableStatement ::= LET_KEYWORD IDENTIFIER EQ Expression (DOT_COMMA?)
 
 NullStatement ::= NULL_KEYWORD
 
-BooleanOperator ::= (PathOperator|OROR|ANDAND|LT|LE|GT|GE|IN_KEYWORD|IS_KEYWORD)
-
-PathOperator ::= (EQEQ|NE)
-
 BooleanStatement ::= (TRUE_KEYWORD|FALSE_KEYWORD)

src/main/html/change-notes.html

@@ -1,11 +1,19 @@
 Versions:
 <ul>
-    <li>All Intellij products support: 2.5.5</li>
-    <li>Android Studio support: 2.5.4</li>
+    <li>All Intellij products support: 2.5.6</li>
+    <li>Android Studio support: 2.5.7</li>
 </ul>
-
+<br>
 Plugin updates:
 <ul>
+    <li><b>2.5.7</b> <em>(2021-05-02)</em> - Fixed minor issues - Android version</li>
+    <ul>
+        <li>Fixed formatting code issues </li>
+    </ul>
+    <li><b>2.5.6</b> <em>(2021-05-02)</em> - Fixed minor issues</li>
+    <ul>
+        <li>Fixed formatting code issues </li>
+    </ul>
     <li><b>2.5.5</b> <em>(2021-04-22)</em> - Fixed minor issues</li>
     <ul>
         <li>Fixed formatting code issues </li>

src/main/html/description.html

@@ -1,5 +1,6 @@
 Provides support for the <a href="https://firebase.google.com/docs/rules/rules-language">Firebase rules</a> language.<br>
-
+<a href="https://www.buymeacoffee.com/dalgarins" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>
+<br>
 Features:<br>
 <ul>
     <li>Syntax highlighting</li>

src/main/kotlin/co/anbora/labs/firebase/ide/formatter/processor.kt

@@ -1,6 +1,7 @@
 package co.anbora.labs.firebase.ide.formatter
 
 import co.anbora.labs.firebase.lang.FirebaseRulesLanguage
+import co.anbora.labs.firebase.lang.core.psi.FirebaseRulesParameterStatement
 import co.anbora.labs.firebase.lang.core.psi.FirebaseRulesTypes.*
 import com.intellij.formatting.*
 import com.intellij.lang.ASTNode
@@ -10,11 +11,14 @@ import com.intellij.psi.tree.IElementType
 
 fun FirebaseFormatterBlock.computeIndent(): Indent? {
     val parent = node.treeParent
+    val psi = node.psi
     return when {
         parent?.treeParent == null -> Indent.getNoneIndent()
         node.areBraces() -> Indent.getNoneIndent()
         node.isBooleanOperator() -> Indent.getNormalIndent()
         parent.isComposeBlock() -> Indent.getNormalIndent()
+        parent.isBooleanExpr() -> Indent.getNormalIndent()
+        parent.isCallExpr() && psi is FirebaseRulesParameterStatement -> Indent.getNormalIndent()
         else -> Indent.getNoneIndent()
     }
 }
@@ -52,7 +56,14 @@ fun createSpacingBuilder(commonSettings: CodeStyleSettings): SpacingBuilder {
         .after(COLON).spacing(1, 1, 0, false, 0)
         .after(IF_KEYWORD).spacing(1, 1, 0, false, 0)
         .after(EXPRESSION).spacing(1, 1, 0, false, 0)
-        .after(BOOLEAN_OPERATOR).spacing(1, 1, 0, false, 0)
+        .after(OROR).spacing(1, 1, 0, false, 0)
+        .after(ANDAND).spacing(1, 1, 0, false, 0)
+        .after(LT).spacing(1, 1, 0, false, 0)
+        .after(GT).spacing(1, 1, 0, false, 0)
+        .after(LE).spacing(1, 1, 0, false, 0)
+        .after(GE).spacing(1, 1, 0, false, 0)
+        .after(EQEQ).spacing(1, 1, 0, false, 0)
+        .after(NE).spacing(1, 1, 0, false, 0)
         .before(DOT_COMMA).spacing(0,0,0,false,0)
 }
 
@@ -66,6 +77,19 @@ fun ASTNode.isBooleanOperator(): Boolean {
             elementType == ANDAND
 }
 
+fun ASTNode.isCallExpr(): Boolean {
+    return this.elementType == CALL_EXPR
+}
+
+fun ASTNode.isBooleanExpr(): Boolean {
+    return this.elementType == OR_EXPR
+            || this.elementType == AND_EXPR
+}
+
+fun ASTNode.isParenthesisBlock(): Boolean {
+    return this.elementType == PARENS_EXPR
+}
+
 fun ASTNode.isComposeBlock(): Boolean {
     val elementType: IElementType = this.elementType
     return elementType == SERVICE_BLOCK ||