Add method for create an array by square bracket expression (#1926)

* create Array via [...] * add more tests * more test on array create and index access * fix a typo
microsoft · Mar 23, 2020 · 32b751e · 32b751e
1 parent e346703
commit 32b751e
Show file tree

Hide file tree

Showing 10 changed files with 2,240 additions and 2,143 deletions.
diff --git a/libraries/adaptive-expressions/src/parser/ExpressionAntlrLexer.g4 b/libraries/adaptive-expressions/src/parser/ExpressionAntlrLexer.g4
@@ -65,7 +65,7 @@ NEWLINE : '\r'? '\n' -> skip;
 
 STRING : ('\'' (~'\'')* '\'') | ('"' (~'"')* '"');
 
-CONSTANT : ('[' WHITESPACE* ']') | ('{' WHITESPACE* '}');
+CONSTANT : ('{' WHITESPACE* '}');
 
 INVALID_TOKEN_DEFAULT_MODE : . ;
 
@@ -77,6 +77,4 @@ TEMPLATE : '$' '{' (STRING | ~[\r\n{}'"])*? '}';
 
 ESCAPE_CHARACTER : '\\' ~[\r\n]?;
 
-TEXT_CONTENT :  '\\`' | ~[\r\n];
-
-
+TEXT_CONTENT :  '\\`' | ~[\r\n];
diff --git a/libraries/adaptive-expressions/src/parser/ExpressionAntlrParser.g4 b/libraries/adaptive-expressions/src/parser/ExpressionAntlrParser.g4
@@ -19,13 +19,14 @@ expression
 
 primaryExpression 
     : OPEN_BRACKET expression CLOSE_BRACKET                                  #parenthesisExp
+    | OPEN_SQUARE_BRACKET argsList? CLOSE_SQUARE_BRACKET                     #arrayCreationExp
     | CONSTANT                                                               #constantAtom
     | NUMBER                                                                 #numericAtom
     | STRING                                                                 #stringAtom
     | IDENTIFIER                                                             #idAtom
     | stringInterpolation                                                    #stringInterpolationAtom
     | primaryExpression DOT IDENTIFIER                                       #memberAccessExp
-    | primaryExpression NON? OPEN_BRACKET argsList? CLOSE_BRACKET                 #funcInvokeExp
+    | primaryExpression NON? OPEN_BRACKET argsList? CLOSE_BRACKET            #funcInvokeExp
     | primaryExpression OPEN_SQUARE_BRACKET expression CLOSE_SQUARE_BRACKET  #indexAccessExp
     ;
 

diff --git a/libraries/adaptive-expressions/src/parser/expressionParser.ts b/libraries/adaptive-expressions/src/parser/expressionParser.ts
@@ -111,6 +111,11 @@ export class ExpressionParser implements ExpressionParserInterface {
 
         public visitParenthesisExp = (context: ep.ParenthesisExpContext): Expression => this.visit(context.expression());
 
+        public visitArrayCreationExp(context: ep.ArrayCreationExpContext): Expression {
+            const parameters: Expression[] = this.processArgsList(context.argsList());
+            return this.makeExpression(ExpressionType.CreateArray, ...parameters);
+        } 
+
         public visitStringAtom(context: ep.StringAtomContext): Expression {
             const text: string = context.text;
             if (text.startsWith('\'')) {

diff --git a/libraries/adaptive-expressions/src/parser/generated/ExpressionAntlrLexer.ts b/libraries/adaptive-expressions/src/parser/generated/ExpressionAntlrLexer.ts