Skip to content

Commit 7e603ab

Browse files
Added additional return type parsing level
1 parent de85f20 commit 7e603ab

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/com/magento/idea/magento2plugin/actions/generation/util/FillTextBufferWithPluginMethods.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@
88
import com.intellij.openapi.util.Key;
99
import com.intellij.psi.PsiElement;
1010
import com.jetbrains.php.lang.documentation.phpdoc.psi.PhpDocComment;
11+
import com.jetbrains.php.lang.psi.PhpPsiElementFactory;
1112
import com.jetbrains.php.lang.psi.elements.Method;
1213
import com.jetbrains.php.lang.psi.elements.Parameter;
1314
import com.jetbrains.php.lang.psi.elements.PhpReturnType;
1415
import com.magento.idea.magento2plugin.actions.generation.data.code.PluginMethodData;
1516
import com.magento.idea.magento2plugin.actions.generation.references.PhpClassReferenceResolver;
17+
import com.magento.idea.magento2plugin.util.php.PhpTypeMetadataParserUtil;
1618
import java.util.ArrayList;
1719
import java.util.Arrays;
1820
import java.util.Collection;
@@ -53,7 +55,17 @@ public void execute(
5355
final PsiElement targetClass = (PsiElement) pluginMethod.getTargetMethod()
5456
.getUserData(targetClassKey);
5557
resolver.processElement(targetClass);
56-
final PhpReturnType returnType = targetMethod.getReturnType();
58+
PhpReturnType returnType = targetMethod.getReturnType();
59+
final String returnTypeFqn =
60+
PhpTypeMetadataParserUtil.getMethodReturnType(targetMethod);
61+
62+
if (returnType == null && returnTypeFqn != null) {
63+
returnType = PhpPsiElementFactory.createReturnType(
64+
pluginMethod.getTargetMethod().getProject(),
65+
returnTypeFqn
66+
);
67+
}
68+
5769
if (returnType != null) {
5870
resolver.processElement(returnType);
5971
}

0 commit comments

Comments
 (0)