Merge pull request #185 from mmezhensky/issue-156-with-wrong-namespaces

#156: fix issue with wrong namespaces

Author: Vitaliy

src/com/magento/idea/magento2plugin/actions/generation/generator/code/PluginMethodsGenerator.java

@@ -17,8 +17,10 @@
 import com.jetbrains.php.lang.psi.resolve.types.PhpType;
 import com.magento.idea.magento2plugin.actions.generation.data.code.PluginMethodData;
 import com.magento.idea.magento2plugin.magento.files.Plugin;
+import com.magento.idea.magento2plugin.magento.packages.Package;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+
 import java.util.*;
 import java.util.regex.Pattern;
 
@@ -152,7 +154,17 @@ private String getParameterDoc(Collection<PsiElement> parameters, @NotNull Plugi
             }
 
             sb.append("* @param ");
-            String typeStr = PhpDocUtil.getTypePresentation(project, element.getType(), PhpCodeInsightUtil.findScopeForUseOperator(element));
+
+            String typeStr;
+            if (i == 0) {
+                typeStr = PhpDocUtil.getTypePresentation(project, element.getType(), null);
+            } else {
+                typeStr = PhpDocUtil.getTypePresentation(project, element.getType(), PhpCodeInsightUtil.findScopeForUseOperator(element));
+                if (typeStr.indexOf(Package.FQN_SEPARATOR, 1) > 0) {
+                    String[] fqnArray = typeStr.split("\\\\");
+                    typeStr = fqnArray[fqnArray.length - 1];
+                }
+            }
 
             if (!typeStr.isEmpty()) {
                 sb.append(typeStr).append(' ');
@@ -202,9 +214,15 @@ protected String getParameterList(Collection<PsiElement> parameters, @NotNull Pl
             }
 
             if (element instanceof Parameter) {
-                buf.append(PhpCodeUtil.paramToString(element));
+                String parameterText = PhpCodeUtil.paramToString(element);
+                if (parameterText.indexOf(Package.FQN_SEPARATOR, 1) > 0) {
+                    String[] fqnArray = parameterText.split("\\\\");
+                    parameterText = fqnArray[fqnArray.length - 1];
+                }
+                buf.append(parameterText);
             } else {
-                String typeHint = this.getTypeHint(element);
+                Boolean globalType = i != 0;
+                String typeHint = this.getTypeHint(element, globalType);
                 if (typeHint != null && !typeHint.isEmpty()) {
                     buf.append(typeHint).append(' ');
                 }
@@ -257,21 +275,20 @@ protected String getReturnVariables(@NotNull Plugin.PluginType type) {
     }
 
     @Nullable
-    private String getTypeHint(@NotNull PhpNamedElement element) {
+    private String getTypeHint(@NotNull PhpNamedElement element, Boolean globalType) {
         PhpType filedType = element.getType().global(this.pluginClass.getProject());
         Set<String> typeStrings = filedType.getTypes();
         String typeString = null;
         if (typeStrings.size() == 1) {
-            typeString = this.convertTypeToString(element, typeStrings);
+            typeString = this.convertTypeToString(element, typeStrings, globalType);
         }
 
         if (typeStrings.size() == 2) {
             PhpType filteredNullType = filterNullCaseInsensitive(filedType);
             if (filteredNullType.getTypes().size() == 1) {
+                typeString = this.convertTypeToString(element, filteredNullType.getTypes(), globalType);
                 if (PhpLanguageFeature.NULLABLES.isSupported(element.getProject())) {
-                    typeString = "?" + this.convertTypeToString(element, filteredNullType.getTypes());
-                } else {
-                    typeString = this.convertTypeToString(element, filteredNullType.getTypes());
+                    typeString = "?" + typeString;
                 }
             }
         }
@@ -280,11 +297,11 @@ private String getTypeHint(@NotNull PhpNamedElement element) {
     }
 
     @Nullable
-    private String convertTypeToString(@NotNull PhpNamedElement element, Set<String> typeStrings) {
+    private String convertTypeToString(@NotNull PhpNamedElement element, Set<String> typeStrings, Boolean globalType) {
         String simpleType = typeStrings.iterator().next();
         simpleType = StringUtil.trimStart(simpleType, "\\");
         if (!PhpType.isPrimitiveType(simpleType) || PhpLanguageFeature.SCALAR_TYPE_HINTS.isSupported(element.getProject()) || "array".equalsIgnoreCase(simpleType) || "callable".equalsIgnoreCase(simpleType)) {
-            String typeString = simpleType.endsWith("]") ? "array" : this.getFieldTypeString(element, filterNullCaseInsensitive(element.getType()));
+            String typeString = simpleType.endsWith("]") ? "array" : this.getFieldTypeString(element, filterNullCaseInsensitive(element.getType()), globalType);
             if (!typeString.isEmpty()) {
                 return typeString;
             }
@@ -293,8 +310,9 @@ private String convertTypeToString(@NotNull PhpNamedElement element, Set<String>
         return null;
     }
 
-    private String getFieldTypeString(PhpNamedElement element, @NotNull PhpType type) {
-        return PhpDocUtil.getTypePresentation(this.pluginClass.getProject(), type, PhpCodeInsightUtil.findScopeForUseOperator(element));
+    private String getFieldTypeString(PhpNamedElement element, @NotNull PhpType type, Boolean globalType) {
+        PhpPsiElement scope = (globalType) ? PhpCodeInsightUtil.findScopeForUseOperator(element) : null;
+        return PhpDocUtil.getTypePresentation(this.pluginClass.getProject(), type, scope);
     }
 
     private static PhpType filterNullCaseInsensitive(PhpType filedType) {