Skip to content

Commit fddb6a3

Browse files
committed
feat: fix Objects.requireNonNull 部分idea sdk 不支持次方法
1 parent 4fe8f64 commit fddb6a3

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55

66
group 'cn.bugstack.idea.plugin'
77

8-
version '2.4.9'
8+
version '2.5.0'
99

1010
apply plugin: 'java'
1111
apply plugin: 'idea'

src/main/java/cn/bugstack/guide/idea/plugin/action/Vo2DtoGenerateAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void actionPerformed(@NotNull AnActionEvent event) {
1818
// 织入代码
1919
generateVo2Dto.doGenerate(event.getProject(), event.getDataContext(), event.getData(LangDataKeys.PSI_FILE));
2020
} catch (Exception e) {
21-
Messages.showErrorDialog(event.getProject(), "请按规:先复制对象后,例如:A a,再光标放到需要织入的对象上,例如:B b!", "错误提示");
21+
Messages.showErrorDialog(event.getProject(), "请按规:先复制对象后,例如:A a,再光标放到需要织入的对象上,例如:B b!联系作者:小傅哥 微信:fustack", "错误提示");
2222
}
2323
}
2424

src/main/java/cn/bugstack/guide/idea/plugin/domain/service/AbstractGenerateVo2Dto.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import cn.bugstack.guide.idea.plugin.infrastructure.DataSetting;
99
import com.intellij.openapi.actionSystem.DataContext;
1010
import com.intellij.openapi.project.Project;
11+
import com.intellij.openapi.ui.Messages;
1112
import com.intellij.psi.*;
1213

1314
import java.util.ArrayList;
@@ -80,7 +81,9 @@ protected MethodVO getMethods(PsiClass psiClass, String regex, String typeStr) {
8081
Pattern p = Pattern.compile("static.*?final|final.*?static");
8182
PsiField[] fields = psiClass.getFields();
8283
for (PsiField psiField : fields) {
83-
String fieldVal = Objects.requireNonNull(psiField.getNameIdentifier().getContext()).getText();
84+
PsiElement context = psiField.getNameIdentifier().getContext();
85+
if (null == context) continue;
86+
String fieldVal = context.getText();
8487
// serialVersionUID 判断
8588
if (fieldVal.contains("serialVersionUID")) {
8689
continue;
@@ -102,6 +105,8 @@ protected MethodVO getMethods(PsiClass psiClass, String regex, String typeStr) {
102105
}
103106
}
104107

108+
Messages.showErrorDialog(""+fieldNameList.size(),"");
109+
105110
return new MethodVO(fieldNameList, methodNameList);
106111
}
107112

src/main/resources/META-INF/plugin.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@
8484
<ul>
8585
<li>lombok builder</li>
8686
</ul>
87+
<h3>V2.5.0</h3>
88+
<ul>
89+
<li>fix Objects.requireNonNull</li>
90+
</ul>
8791
]]>
8892
</change-notes>
8993

0 commit comments

Comments
 (0)