Merge pull request #204 from cedricziel/fluid-arrays

[Fluid] Parse simple inline arrays

Author: cedricziel

lang-fluid/src/main/grammars/FluidParser.bnf

@@ -145,6 +145,7 @@ Expression ::=   OrExpr
                | TernaryExpr
                | CastExpr
                | ViewHelperGroup
+               | ArrayCreationExpr
                | FieldGroup
                | PrimaryGroup
 
@@ -193,17 +194,15 @@ NumberExpr     ::= NUMBER
 
 ParenthesesExpr     ::= '(' InlineChain ')' { pin=1 }
 
-ArrayCreationExpr   ::= InlineArray  | NestedArray {
-  pin=1
-}
-private InlineArray ::= ArrayElement ( ',' ArrayElement )* {
+ArrayCreationExpr ::= ArrayElement ( ',' ArrayElement )* {
   pin=1
 }
+
 private NestedArray ::= '{' ArrayElement ( ',' ArrayElement )* '}' {
   pin=2
 }
 
-ArrayElement        ::= ArrayKey ':' ArrayValue {
+private ArrayElement        ::= ArrayKey ':' ArrayValue {
   pin=2
 }
 

lang-fluid/src/test/java/com/cedricziel/idea/fluid/lang/parser/ParserTest.java

@@ -3,6 +3,7 @@
 import com.cedricziel.idea.fluid.lang.psi.*;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 
 public class ParserTest extends LightCodeInsightFixtureTestCase {
@@ -43,12 +44,36 @@ public void testCanDetectBooleanLiterals() {
         assertParentElementAtCaretMatchesType("{foo -> f:fo(foo: <caret>false)}", FluidBooleanLiteral.class);
     }
 
+    public void testCanParseArrays() {
+        // Array Keys are discoverable
+        assertParentElementAtCaretMatchesType("{fo<caret>o : bar}", FluidArrayKey.class);
+        assertParentElementAtCaretMatchesType("{'fo<caret>o' : bar}", FluidArrayKey.class, 2);
+        assertParentElementAtCaretMatchesType("{\"fo<caret>o\" : bar}", FluidArrayKey.class, 2);
+
+        // keys can be string literals
+        assertParentElementAtCaretMatchesType("{'fo<caret>o' : bar}", FluidStringLiteral.class);
+        assertParentElementAtCaretMatchesType("{\"fo<caret>o\" : bar}", FluidStringLiteral.class);
+
+        // array values can be literals or field chains
+        assertParentElementAtCaretMatchesType("{foo : b<caret>ar}", FluidFieldChain.class);
+        assertParentElementAtCaretMatchesType("{foo : b<caret>ar}", FluidArrayValue.class, 3);
+        assertParentElementAtCaretMatchesType("{foo : 'b<caret>ar'}", FluidArrayValue.class, 2);
+        assertParentElementAtCaretMatchesType("{foo : \"b<caret>ar\"}", FluidArrayValue.class, 2);
+    }
+
     private void assertParentElementAtCaretMatchesType(String content, Class expected) {
+        assertParentElementAtCaretMatchesType(content, expected, 1);
+    }
+
+    private void assertParentElementAtCaretMatchesType(String content, Class expected, int levelsUp) {
         PsiFile psiFile = myFixture.configureByText("foo.fluid", content);
         int offset = myFixture.getEditor().getCaretModel().getOffset();
 
         PsiElement elementAt = psiFile.findElementAt(offset);
+        for (int i = 0; i< levelsUp; i++) {
+            elementAt = elementAt.getParent();
+        }
 
-        assertInstanceOf(elementAt.getParent(), expected);
+        assertInstanceOf(elementAt, expected);
     }
 }