Merge remote-tracking branch 'origin/master'

gejun123456 · gejun123456 · commit f141f291f66a · 2022-12-01T14:59:45.000+08:00
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllGetterAction.java b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllGetterAction.java
@@ -56,7 +56,7 @@ private static String extractSplitText(PsiMethod method, Document document) {
         }
         String methodStartToLastLineText = document
                 .getText(new TextRange(lastLine, startOffset));
-        String splitText = null;
+        String splitText = "";
         if (isTable) {
             splitText += methodStartToLastLineText + "\t";
         } else {
diff --git a/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllSetterBase.java b/src/main/java/com/bruce/intellijplugin/generatesetter/actions/GenerateAllSetterBase.java
@@ -383,7 +383,7 @@ protected static String extractSplitText(PsiMethod method,
         }
         String methodStartToLastLineText = document
                 .getText(new TextRange(lastLine, startOffset));
-        String splitText = null;
+        String splitText = "";
         if (isTable) {
             splitText += methodStartToLastLineText + "\t";
         } else {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ private static String extractSplitText(PsiMethod method, Document document) {`
`56`	`56`	`}`
`57`	`57`	`String methodStartToLastLineText = document`
`58`	`58`	`.getText(new TextRange(lastLine, startOffset));`
`59`		`- String splitText = null;`
	`59`	`+ String splitText = "";`
`60`	`60`	`if (isTable) {`
`61`	`61`	`splitText += methodStartToLastLineText + "\t";`
`62`	`62`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,7 @@ protected static String extractSplitText(PsiMethod method,`
`383`	`383`	`}`
`384`	`384`	`String methodStartToLastLineText = document`
`385`	`385`	`.getText(new TextRange(lastLine, startOffset));`
`386`		`- String splitText = null;`
	`386`	`+ String splitText = "";`
`387`	`387`	`if (isTable) {`
`388`	`388`	`splitText += methodStartToLastLineText + "\t";`
`389`	`389`	`} else {`