Merge pull request #69 from anboralabs/ternary-operator

Added ternary operator.

Author: dalgarins

build.gradle

@@ -10,7 +10,7 @@ plugins {
 apply plugin: 'org.jetbrains.grammarkit'
 
 group 'co.anbora.labs'
-version '2.5.6-SNAPSHOT'
+version '2.5.8'
 
 repositories {
     mavenCentral()

src/main/grammar/FirebaseRules.bnf

@@ -34,6 +34,7 @@
           COMMA = ','
           EQ = '='
           DOT = '.'
+          Q_MARK = '?'
           DOT_COMMA = ';'
           MODULO         =  '%'
           char = 'regexp:[\n\r\u2028\u2029]'
@@ -189,6 +190,7 @@ Expression ::=
         | LogicalEqExprItem
         | AddExprItem
         | MulExprItem
+        | TernaryExpr
         | NegateExpr
         | AtomExpr
 //{ name="expr" }
@@ -198,6 +200,8 @@ NegateExpr ::= NEGATE Expression
 IndexExpr ::= Expression '[' (RangeExpr|Expression) ']'
 private RangeExpr ::= Expression ':' Expression
 
+TernaryExpr ::= Expression '?' Expression ':' Expression
+
 
 IdentifierExpr ::= IDENTIFIER
 DotExpr ::= Expression DOT Expression

src/main/grammar/FirebaseRules.flex

@@ -113,6 +113,7 @@ PathBuiltIn=[$][(][a-zA-Z_\-0-9]+[a-zA-Z_\.\-0-9]*[)]
   ">"                { return GT; }
   ">="               { return GE; }
   "!"                { return NEGATE; }
+  "?"                { return Q_MARK; }
 
   "+"                { return PLUS_OP; }
   "-"                { return MINUS_OP; }

src/main/html/change-notes.html

@@ -1,11 +1,19 @@
 Versions:
 <ul>
-    <li>All Intellij products support: 2.5.6</li>
-    <li>Android Studio support: 2.5.7</li>
+    <li>All Intellij products support: 2.5.8</li>
+    <li>Android Studio support: 2.5.9</li>
 </ul>
 <br>
 Plugin updates:
 <ul>
+    <li><b>2.5.9</b> <em>(2021-05-27)</em> - Fixed minor issues - Android version</li>
+    <ul>
+        <li>Added ternary operator </li>
+    </ul>
+    <li><b>2.5.8</b> <em>(2021-05-27)</em> - Fixed minor issues</li>
+    <ul>
+        <li>Added ternary operator </li>
+    </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>

src/main/resources/implicitCode/Functions.java

@@ -0,0 +1,22 @@
+interface Functions {
+
+    path(String value);
+
+    exists(Object path);
+
+    existsAfter(Object path);
+
+    get(Object path);
+
+    getAfter(Object path);
+
+    bool(String value);
+
+    float(String value);
+
+    float(Integer value);
+
+    int(String value);
+
+    int(Integer value);
+}