Skip to content

Commit 6f0a2ba

Browse files
committed
sync(common): 同步 common 模块
1 parent 5e7b1b3 commit 6f0a2ba

5 files changed

Lines changed: 29 additions & 9 deletions

File tree

src/main/java/cn/gudqs7/plugins/common/enums/MoreCommentTagEnum.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ public enum MoreCommentTagEnum {
3535
AMP_RW("Rw"),
3636
AMP_FIELD("AmpField"),
3737
AMP_DATA_SIZE("DataSize"),
38+
AMP_CURRENT_TAG("currentTag"),
39+
AMP_PID("AmpPid"),
3840
AMP_MOCK_VAL("mock-val"),
3941
AMP_MOCK_KEY("mock-key"),
4042
;

src/main/java/cn/gudqs7/plugins/common/pojo/resolver/CommentInfo.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
import org.apache.commons.lang3.StringUtils;
1111
import org.jetbrains.annotations.NotNull;
1212

13-
import java.util.*;
13+
import java.util.ArrayList;
14+
import java.util.HashMap;
15+
import java.util.List;
16+
import java.util.Map;
1417

1518
/**
1619
* 字段注解/注释
@@ -130,8 +133,12 @@ public List<String> getSplitData(String tagKey, String splitRegex) {
130133
List<String> list = otherTagMap.get(tagKey);
131134
if (CollectionUtils.isNotEmpty(list)) {
132135
for (String item : list) {
133-
String[] hiddenInfoArray = item.split(splitRegex);
134-
splitDataArray.addAll(Arrays.asList(hiddenInfoArray));
136+
String[] itemArray = item.split(splitRegex);
137+
for (String item0 : itemArray) {
138+
if (StringUtils.isNotBlank(item0)) {
139+
splitDataArray.add(item0.trim());
140+
}
141+
}
135142
}
136143
}
137144
return splitDataArray;

src/main/java/cn/gudqs7/plugins/common/util/file/FileUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public static void writeStringToFile(String content, File parent, String path) {
3030
return;
3131
}
3232
path = getRightFileName(path);
33-
if (parent == null || !parent.isDirectory()) {
33+
// 若 parent 不存在, 则 parent.isFile() 返回 false, 不影响代码运行 (反之判断是否为目录则有问题)
34+
if (parent == null || parent.isFile()) {
3435
return;
3536
}
3637
try {

src/main/java/cn/gudqs7/plugins/common/util/jetbrain/NotificationUtil.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package cn.gudqs7.plugins.common.util.jetbrain;
22

3+
import cn.gudqs7.plugins.consts.CommonIdConst;
34
import com.intellij.notification.*;
45

56
/**
@@ -10,15 +11,12 @@
1011
*/
1112
public class NotificationUtil {
1213

13-
private static final String NOTIFICATION_TIP_GROUP_ID = "Search Everywhere Api Tip";
14-
private static final String NOTIFICATION_ERROR_GROUP_ID = "Search Everywhere Api Error";
15-
1614
public static void showTips(String content) {
17-
showNotification(NOTIFICATION_TIP_GROUP_ID, content, NotificationType.INFORMATION);
15+
showNotification(CommonIdConst.NOTIFICATION_TIP_GROUP_ID, content, NotificationType.INFORMATION);
1816
}
1917

2018
public static void showError(String content) {
21-
showNotification(NOTIFICATION_ERROR_GROUP_ID, content, NotificationType.ERROR);
19+
showNotification(CommonIdConst.NOTIFICATION_ERROR_GROUP_ID, content, NotificationType.ERROR);
2220
}
2321

2422
private static void showNotification(String groupId, String content, NotificationType notificationType) {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package cn.gudqs7.plugins.consts;
2+
3+
/**
4+
* @author wenquan
5+
* @date 2022/7/4
6+
*/
7+
public class CommonIdConst {
8+
9+
public static final String NOTIFICATION_TIP_GROUP_ID = "Search Everywhere Api Tip";
10+
public static final String NOTIFICATION_ERROR_GROUP_ID = "Search Everywhere Api Error";
11+
12+
}

0 commit comments

Comments
 (0)