Merge pull request #92 from hza/master

fix for default array value in generate all setters with default value

Author: gejun123456

src/main/java/com/bruce/intellijplugin/generatesetter/Parameters.java

@@ -31,6 +31,10 @@ public class Parameters {
 
     private PsiClass returnType;
 
+    private boolean isArray;
+    
+    private int arrayDimensions;
+
 
     public PsiClass getReturnType() {
         return returnType;
@@ -63,4 +67,20 @@ public List<RealParam> getParams() {
     public void setParams(List<RealParam> params) {
         this.params = params;
     }
+
+    public boolean isArray() {
+        return isArray;
+    }
+
+    public void setIsArray(boolean isArray) {
+        this.isArray = isArray;
+    }
+
+    public void setArrayDimensions(int arrayDimensions) {
+        this.arrayDimensions = arrayDimensions;
+    }
+
+    public int getArrayDimensions() {
+        return arrayDimensions;
+    }
 }

src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllSetterBase.java

@@ -32,6 +32,7 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiDeclarationStatement;
 import com.intellij.psi.PsiDocumentManager;
@@ -74,6 +75,13 @@ public GenerateAllSetterBase(GenerateAllHandler generateAllHandler) {
         this.generateAllHandler = generateAllHandler;
     }
 
+    private static final Set<String> javaSimpleTypes = new HashSet<>(Arrays.asList(
+            "char",
+            "boolean",
+            "byte", "short", "int", "long",
+            "float", "double"
+    ));
+
     private static Map<String, String> typeGeneratedMap = new HashMap<String, String>() {
         {
             put("boolean", "false");
@@ -531,11 +539,20 @@ else if (psiClassOfParameter!=null && psiClassOfParameter.isEnum()) {
                             Arrays.stream(allFields).findFirst().ifPresent(field -> builder.append(psiClassOfParameter.getName()).append(".").append(field.getName()));
                         }
                         else {
-                            builder.append("new "
-                                    + paramInfo.getParams().get(0).getRealName()
-                                    + "()");
+                            String realName = paramInfo.getParams().get(0).getRealName();
+                            builder.append("new " + realName);
+
+                            if (paramInfo.isArray()) {
+                                for (int i = 0; i < paramInfo.getArrayDimensions(); i++) {
+                                    builder.append("[0]");
+                                }
+                            } else {
+                                builder.append("()");
+                            }
+                        }
+                        if (!javaSimpleTypes.contains(realPackage)) {
+                            newImportList.add(realPackage);
                         }
-                        newImportList.add(realPackage);
                     }
                 }
 
@@ -550,15 +567,22 @@ else if (psiClassOfParameter!=null && psiClassOfParameter.isEnum()) {
     private static void appendCollectNotEmpty(StringBuilder builder,
                                               Parameters paramInfo, String defaultImpl,
                                               Set<String> newImportList) {
-        builder.append("new " + defaultImpl + "<");
-        for (int i = 0; i < paramInfo.getParams().size(); i++) {
-            builder.append(paramInfo.getParams().get(i).getRealName());
-            newImportList.add(paramInfo.getParams().get(i).getRealPackage());
-            if (i != paramInfo.getParams().size() - 1) {
-                builder.append(",");
+        builder.append("new ").append(defaultImpl);
+        if (paramInfo.isArray()) {
+            for (int i = 0; i < paramInfo.getArrayDimensions(); i++) {
+                builder.append("[0]");
+            }
+        } else {
+            builder.append("<");
+            for (int i = 0; i < paramInfo.getParams().size(); i++) {
+                builder.append(paramInfo.getParams().get(i).getRealName());
+                newImportList.add(paramInfo.getParams().get(i).getRealPackage());
+                if (i != paramInfo.getParams().size() - 1) {
+                    builder.append(",");
+                }
             }
+            builder.append(">()");
         }
-        builder.append(">()");
     }
 
     private String findNextNotNull(PsiTypeElement psiType, String defaultName) {

src/main/java/com/bruce/intellijplugin/generatesetter/utils/PsiToolUtils.java

@@ -55,6 +55,12 @@ public static boolean checkGuavaExist(Project project, @NotNull PsiElement eleme
     public static Parameters extractParamInfo(PsiType psiType) {
         String typeFullName = psiType.getCanonicalText();
         Parameters info = new Parameters();
+        int arrayDimensions = psiType.getArrayDimensions();
+        if (arrayDimensions > 0) {
+            typeFullName = typeFullName.substring(0, typeFullName.indexOf('['));
+            info.setIsArray(true);
+            info.setArrayDimensions(arrayDimensions);
+        }
         info.setReturnType(PsiTypesUtil.getPsiClass(psiType));
         int u = typeFullName.indexOf("<");
         if (u == -1) {