Merge branch 'master' of https://github.com/gejun123456/intellij-generateAllSetMethod

Author: gejun123456

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

@@ -44,6 +44,8 @@
 public abstract class GenerateAllSetterBase extends PsiElementBaseIntentionAction {
     public static final String IS = "is";
     public static final String GET = "get";
+    private static final String SET_SETTER_PREFIX = "set";
+    private static final String WITH_SETTER_PREFIX = "with";
     private final GenerateAllHandler generateAllHandler;
 
     public GenerateAllSetterBase(GenerateAllHandler generateAllHandler) {
@@ -245,8 +247,14 @@ private String generateStringForParam(String generateName,
         StringBuilder builder = new StringBuilder();
         builder.append(splitText);
         for (PsiMethod method : methodList) {
-            if (method.getName().startsWith("set")) {
-                String fieldToLower = method.getName().substring(3)
+            String setterMethodNamePrefix =
+                    method.getName().startsWith(SET_SETTER_PREFIX)
+                            ? SET_SETTER_PREFIX
+                            : method.getName().startsWith(WITH_SETTER_PREFIX)
+                                    ? WITH_SETTER_PREFIX
+                                    : null;
+            if (setterMethodNamePrefix != null) {
+                String fieldToLower = method.getName().substring(setterMethodNamePrefix.length())
                         .toLowerCase();
                 PsiMethod s = info.getNameToMethodMap().get(fieldToLower);
                 if (s != null) {

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

@@ -40,7 +40,9 @@ public static boolean isNotSystemClass(PsiClass psiClass) {
     }
 
     public static boolean isValidSetMethod(PsiMethod m) {
-        return m.hasModifierProperty("public") && !m.hasModifierProperty("static") && m.getName().startsWith("set");
+        return m.hasModifierProperty("public") &&
+                !m.hasModifierProperty("static") &&
+                (m.getName().startsWith("set") || m.getName().startsWith("with"));
     }
 
     public static boolean isValidGetMethod(PsiMethod m) {