supporting type resolving in closures Haehnchen#38

Author: Haehnchen

src/main/java/de/espend/idea/php/phpunit/utils/ChainVisitorUtil.java

@@ -58,11 +58,18 @@ private static void visit(@Nullable PsiElement psiElement, @NotNull ChainProcess
  }
  }
 
+ /**
+ * Find variables inside a function scope, ignoring closures
+ */
  @NotNull
  private static Collection<PhpPsiElement> resolveVariable(@NotNull Variable variable) {
  String name = variable.getName();
 
- Function methodScope = PhpPsiUtil.getParentByCondition(variable, Function.INSTANCEOF);
+ Function methodScope = PhpPsiUtil.getParentByCondition(
+ variable,
+ psiElement -> psiElement instanceof Function && !((Function) psiElement).isClosure()
+ );
+
  if(methodScope == null) {
  return Collections.emptyList();
  }

src/test/java/de/espend/idea/php/phpunit/tests/type/ProphecyTypeProviderTest.java

@@ -33,6 +33,22 @@ public void testThatProphesizeForVariableIsResolved() {
  );
  }
 
+ public void testThatProphesizeForVariableIsResolvedForClosure() {
+ assertPhpReferenceResolveTo(PhpFileType.INSTANCE, "<?php\n" +
+ "class FooTest extends \\PHPUnit\\Framework\\TestCase\n" +
+ " {\n" +
+ " public function testFoobar()\n" +
+ " {\n" +
+ " $foo = $this->prophesize(Foo::class);\n" +
+ " $closure = function() use ($class) {\n" +
+ " $foo->getBar()->will<caret>Return();\n" +
+ " };" +
+ " }\n" +
+ " }",
+ PlatformPatterns.psiElement(Method.class).withName("willReturn")
+ );
+ }
+
  public void testThatProphesizeForVariableInPropertyIsResolved() {
  assertPhpReferenceResolveTo(PhpFileType.INSTANCE, "<?php\n" +
  "class FooTest extends \\PHPUnit\\Framework\\TestCase\n" +