Merge pull request #237 from cedricziel/type-completion

[Fluid] Complete types of provided variables
cedricziel · Aug 31, 2018 · 3e31896 · 3e31896
2 parents 98c88b7 + 7461a55
commit 3e31896
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/lang-fluid/src/main/java/com/cedricziel/idea/fluid/util/FluidTypeResolver.java b/lang-fluid/src/main/java/com/cedricziel/idea/fluid/util/FluidTypeResolver.java
@@ -1,7 +1,7 @@
 package com.cedricziel.idea.fluid.util;
 
 import com.cedricziel.idea.fluid.extensionPoints.VariableProvider;
-import com.cedricziel.idea.fluid.lang.psi.FluidFieldChain;
+import com.cedricziel.idea.fluid.lang.psi.FluidFieldExpr;
 import com.cedricziel.idea.fluid.lang.psi.FluidInlineChain;
 import com.cedricziel.idea.fluid.lang.psi.FluidTypes;
 import com.cedricziel.idea.fluid.variables.FluidTypeContainer;
@@ -72,7 +72,7 @@ public static String getParentIdentifierAsTextUntil(PsiElement psiElement, Eleme
             }
         }
 
-        for (PsiElement parent = psiElement.getParent(); parent instanceof FluidFieldChain; parent = parent.getParent()) {
+        for (PsiElement parent = psiElement.getParent(); parent instanceof FluidFieldExpr; parent = parent.getParent()) {
             if (pattern.accepts(parent)) {
                 if (includeMatching) {
                     return parent.getText() + prevText;

diff --git a/...id/src/test/java/com/cedricziel/idea/fluid/completion/FluidCompletionContributorTest.java b/...id/src/test/java/com/cedricziel/idea/fluid/completion/FluidCompletionContributorTest.java
@@ -2,6 +2,8 @@
 
 import com.cedricziel.idea.fluid.AbstractFluidTest;
 
+import java.util.List;
+
 public class FluidCompletionContributorTest extends AbstractFluidTest {
     @Override
     protected String getTestDataPath() {
@@ -31,4 +33,16 @@ public void testInlineArgumentsAreCompleted() {
         assertLookupStringOnFluidCaret("{namespace a=App\\ViewHelpers}\n{ a:foo(u<caret>) }", "uid", "uncle");
         assertLookupStringOnFluidCaret("{namespace a=App\\ViewHelpers}\n{ a:foo(u<caret>:) }", "uid", "uncle");
     }
+
+    public void testVariablesFromControllerAndTypesAreCompleted() {
+        myFixture.copyFileToProject("classes.php");
+        myFixture.copyFileToProject("Index.fluid", "Book/Index.fluid");
+
+        myFixture.configureByFile("Book/Index.fluid");
+
+        myFixture.completeBasic();
+
+        List<String> lookupElementStrings = myFixture.getLookupElementStrings();
+        assertContainsElements(lookupElementStrings, "author");
+    }
 }
diff --git a/lang-fluid/testData/com/cedricziel/idea/fluid/completion/Index.fluid b/lang-fluid/testData/com/cedricziel/idea/fluid/completion/Index.fluid
@@ -0,0 +1 @@
+{book.<caret>}
diff --git a/lang-fluid/testData/com/cedricziel/idea/fluid/completion/classes.php b/lang-fluid/testData/com/cedricziel/idea/fluid/completion/classes.php
@@ -358,3 +358,33 @@ public function setRenderChildrenClosure(\Closure $renderChildrenClosure)
         }
     }
 }
+
+namespace My\App\Domain {
+    class Author
+    {
+    }
+
+    class Book
+    {
+        /**
+         * @return Author
+         */
+        public function getAuthor()
+        {
+
+        }
+    }
+}
+
+namespace My\App\Controller {
+
+    use My\App\Domain\Book;
+
+    class BookController
+    {
+        public function indexAction()
+        {
+            $this->view->assign('book', new Book());
+        }
+    }
+}