Merge pull request #27 from anboralabs/migration-kotlin

Migration kotlin

Author: dalgarins

build.gradle

@@ -2,7 +2,8 @@ import org.jetbrains.grammarkit.tasks.*
 
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.4.26'
+    id 'org.jetbrains.intellij' version '0.6.5'
+    id 'org.jetbrains.kotlin.jvm' version '1.4.10'
     id "org.jetbrains.grammarkit" version "2020.2.1"
 }
 
@@ -12,21 +13,22 @@ grammarKit {
 }
 
 group 'co.anbora.labs'
-version '1.1.5-SNAPSHOT'
+version '2.0.0-SNAPSHOT'
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib"
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
 task generateFirebaseRulesLexer(type: GenerateLexer) {
     // source flex file
     source = "src/main/grammar/FirebaseRules.flex"
     // target directory for lexer
-    targetDir = "src/main/gen/co/anbora/labs/firebase/syntax/"
+    targetDir = "src/main/gen/co/anbora/labs/firebase/lang/core/lexer/"
     // target classname, target file will be targetDir/targetClass.java
     targetClass = "FirebaseRulesLexer"
     // if set, plugin will remove a lexer output file before generating new one. Default: false
@@ -39,19 +41,29 @@ task generateFirebaseRulesParser(type: GenerateParser) {
     // optional, task-specific root for the generated files. Default: none
     targetRoot = 'src/main/gen'
     // path to a parser file, relative to the targetRoot
-    pathToParser = '/co/anbora/labs/firebase/syntax/parser/FirebaseRulesParser.java'
+    pathToParser = '/co/anbora/labs/firebase/lang/core/parser/FirebaseRulesParser.java'
     // path to a directory with generated psi files, relative to the targetRoot
-    pathToPsiRoot = '/co/anbora/labs/firebase/syntax/psi'
+    pathToPsiRoot = '/co/anbora/labs/firebase/lang/core/psi'
     // if set, plugin will remove a parser output file and psi output directory before generating new ones. Default: false
     purgeOldFiles = true
 }
 
 // Include the generated files in the source set
-sourceSets.main.java.srcDirs 'src/main/gen'
+def genRoot = file('src/main/gen')
+
+sourceSets {
+    main {
+        kotlin.srcDir 'src/main/kotlin'
+        java.srcDir genRoot
+        resources.srcDir 'src/main/resources'
+    }
+}
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij { }
 
+tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+
 buildPlugin {
     dependsOn(generateFirebaseRulesLexer, generateFirebaseRulesParser)
 }
@@ -63,6 +75,13 @@ publishPlugin {
 patchPluginXml {
     changeNotes """
       <ul>
+          <li><b>2.0.0</b> <em>(2020-12-12)</em> - Added support block comments</li>
+              <ul>
+                  <li>Added support for block comments </li>
+                  <li>Added support for keyboard combination: CMD + / </li>
+                  <li>Fixed issue with parenthesis and negation on expressions </li>
+              </ul>
+          </li>
           <li><b>1.1.5</b> <em>(2020-12-02)</em> - Added support for new IDE versions</li>
               <ul>
                   <li>Added support for IDE version from build 192 </li>

src/main/grammar/FirebaseRules.bnf

@@ -1,25 +1,24 @@
 // Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 {
-  parserClass="co.anbora.labs.firebase.syntax.parser.FirebaseRulesParser"
-  parserUtilClass="co.anbora.labs.firebase.syntax.parser.FirebaseRulesParserUtil"
+  parserClass="co.anbora.labs.firebase.lang.core.parser.FirebaseRulesParser"
+  parserUtilClass="co.anbora.labs.firebase.lang.core.parser.FirebaseParserUtil"
   extends="com.intellij.extapi.psi.ASTWrapperPsiElement"
 
   psiClassPrefix="FirebaseRules"
   psiImplClassSuffix="Impl"
-  psiPackage="co.anbora.labs.firebase.syntax.psi"
-  psiImplPackage="co.anbora.labs.firebase.syntax.psi.impl"
+  psiPackage="co.anbora.labs.firebase.lang.core.psi"
+  psiImplPackage="co.anbora.labs.firebase.lang.core.psi.impl"
 
-  elementTypeHolderClass="co.anbora.labs.firebase.syntax.psi.FirebaseRulesTypes"
-  elementTypeClass="co.anbora.labs.firebase.syntax.psi.FirebaseRulesElementType"
-  tokenTypeClass="co.anbora.labs.firebase.syntax.psi.FirebaseRulesTokenType"
+  elementTypeHolderClass="co.anbora.labs.firebase.lang.core.psi.FirebaseRulesTypes"
+  elementTypeClass="co.anbora.labs.firebase.lang.core.psi.FirebaseElementType"
+  tokenTypeClass="co.anbora.labs.firebase.lang.core.psi.FirebaseTokenType"
 
   tokens = [
           WHITE_SPACE='regexp:\s+'
           LP = '('
           RP = ')'
           LB = '['
           RB = ']'
-          LINE_COMMENT='LINE_COMMENT'
           number='regexp:\d+(\.\d*)?'
           string="regexp:('([^'\\]|\\.)*'|\"([^\"\\]|\\.)*\")"
           op = '->'
@@ -28,6 +27,8 @@
           EQ = '='
           DOT = '.'
           char = 'regexp:[\n\r\u2028\u2029]'
+          LINE_COMMENT='LINE_COMMENT'
+          BLOCK_COMMENT='BLOCK_COMMENT'
       ]
 
 }
@@ -36,15 +37,13 @@ root ::= root_item
 
 private root_item ::= !<<eof>> property
 
-property ::= RuleVersionStatement? (LINE_COMMENT|FunctionStatement)* ServiceStatement
-
-private comment ::= LINE_COMMENT*
+property ::= RuleVersionStatement? (FunctionStatement)* ServiceStatement
 
 RuleVersionStatement ::= RULES_VERSION EQ VERSIONS DOT_COMMA
 
-ServiceStatement ::= SERVICE_KEYWORD SERVICE_NAME LEFT_BRACE (comment MatchStatement)+ RIGHT_BRACE
+ServiceStatement ::= SERVICE_KEYWORD SERVICE_NAME LEFT_BRACE (MatchStatement)+ RIGHT_BRACE
 
-MatchStatement ::= MATCH_KEYWORD FullPathStatement LEFT_BRACE (comment AllowStatement|comment MatchStatement|comment FunctionStatement)+ RIGHT_BRACE
+MatchStatement ::= MATCH_KEYWORD FullPathStatement LEFT_BRACE (AllowStatement|MatchStatement|FunctionStatement)+ RIGHT_BRACE
 
 FullPathStatement ::= (SLASH PathStatement)+
 
@@ -79,7 +78,7 @@ ExistBuiltInFunctionStatement ::= EXITS_KEYWORD LP FullBuiltInParameterStatement
 
 BuiltInFunctionStatement ::= (GetBuiltInFunctionStatement|ExistBuiltInFunctionStatement)
 
-FunctionStatement ::= FUNCTION_KEYWORD CallFunctionStatement LEFT_BRACE comment ReturnStatement RIGHT_BRACE
+FunctionStatement ::= FUNCTION_KEYWORD CallFunctionStatement LEFT_BRACE ReturnStatement RIGHT_BRACE
 
 ReturnStatement ::= RETURN_KEYWORD ConditionalExpression DOT_COMMA
 
@@ -90,6 +89,14 @@ Expression ::= BooleanStatement
         | LiteralStatement
         | NullStatement
         | ArrayLiteralStatement
+        | ParenthesizedExpression
+        | NegatedExpression
+
+ParenthesizedExpression ::=
+    LP ConditionalExpression RP
+
+NegatedExpression ::=
+    NEGATE Expression
 
 ArrayLiteralStatement ::= LB (ParameterStatement|ArrayLiteralStatement) RB
 

src/main/grammar/FirebaseRules.flex

@@ -1,16 +1,16 @@
 // Copyright 2000-2020 JetBrains s.r.o. and other contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package co.anbora.labs.firebase.syntax;
+package co.anbora.labs.firebase.lang.core.lexer;
 
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
-import static co.anbora.labs.firebase.syntax.psi.FirebaseRulesTypes.*;
+import static co.anbora.labs.firebase.lang.core.psi.FirebaseRulesTypes.*;
 import com.intellij.psi.TokenType;
 
 %%
 
 %{
   public FirebaseRulesLexer() {
-    this((java.io.Reader)null);
+    this(null);
   }
 %}
 
@@ -21,6 +21,19 @@ import com.intellij.psi.TokenType;
 %type IElementType
 %unicode
 
+%{
+    private int commentLevel = 0;
+    private int charLength = 0;
+    private boolean docComment = false;
+
+    private void startComment() {
+        commentLevel = 1;
+        yybegin(COMMENT);
+    }
+%}
+
+%xstate COMMENT
+
 EOL="\r"|"\n"|"\r\n"
 LINE_WS=[\ \t\f]
 WHITE_SPACE=({LINE_WS}|{EOL})+
@@ -38,9 +51,29 @@ PATH_VARIABLE=[{][a-zA-Z_\-0-9]+(=\*\*)?[}]
 PATH_BUILT_IN=[$][(][a-zA-Z_\-0-9]+[a-zA-Z_\.\-0-9]*[)]
 
 %%
+
+<COMMENT> {
+    "/*" {
+        commentLevel++;
+    }
+    "*/" {
+            if (--commentLevel == 0) {
+                yybegin(YYINITIAL);
+                return BLOCK_COMMENT;
+            }
+        }
+
+    <<EOF>> { commentLevel = 0; yybegin(YYINITIAL); return BLOCK_COMMENT; }
+
+    [^] { }
+}
+
 <YYINITIAL> {
   {WHITE_SPACE}      { return com.intellij.psi.TokenType.WHITE_SPACE; }
   {LINE_COMMENT}     { return LINE_COMMENT; }
+  "/*" {
+      startComment();
+  }
 
   {PATH_BUILT_IN}    { return PATH_BUILT_IN; }
   {PATH_VARIABLE}    { return PATH_VARIABLE; }
@@ -76,6 +109,7 @@ PATH_BUILT_IN=[$][(][a-zA-Z_\-0-9]+[a-zA-Z_\.\-0-9]*[)]
   "<="               { return LE; }
   ">"                { return GT; }
   ">="               { return GE; }
+  "!"                { return NEGATE; }
 
   "+"                { return PLUS_OP; }
   "-"                { return MINUS_OP; }