json doc support List<> in class and same name | json 注释支持 class 的 List<> 和同名

This commit is contained in:
林万程
2022-03-09 19:33:43 +08:00
parent 1122637819
commit bf1463a3f8
4 changed files with 32 additions and 10 deletions

View File

@@ -43,7 +43,7 @@ public class JsonDocUtils {
for (PsiClass psiClass : psiClasses) {
PsiField psiField = psiClass.findFieldByName(name, true);
if (psiField == null) {
return null;
continue;
}
if (level == 0) {
return DocUtils.srcOrByteCodeDoc(psiField);
@@ -60,6 +60,11 @@ public class JsonDocUtils {
@NotNull
private static String toClassFullName(PsiField psiField) {
// <> only in .java
PsiElement navElement = psiField.getNavigationElement();
if (navElement instanceof PsiField) {
psiField = (PsiField) navElement;
}
PsiTypeElement typeElement = psiField.getTypeElement();
if (typeElement != null) {
PsiJavaCodeReferenceElement code = typeElement.getInnermostComponentReferenceElement();

View File

@@ -14,11 +14,11 @@ public class InDoc {
/** field */
public String field;
/** method() */
/** method1() */
public void method1() {
}
/** method(InDoc) */
/** method2(InDoc) */
public void method2(InDoc inDoc) {
}
}

View File

@@ -0,0 +1,23 @@
package io.github.linwancen.plugin.show.demo.java.obj;
import java.util.Date;
import java.util.List;
/** not doc */
public class Pojo {
private int integer;
private String str;
private Date date;
private boolean bool;
private NestedClass nestedClass;
private NestedClass[] nestedClassArr;
private List<NestedClass> nestedClassList;
public static class NestedClass {
private NestedClass2 nestedClass2;
public static class NestedClass2 {
private String a;
}
}
}

View File

@@ -1,14 +1,8 @@
{
"nestedClassList": [
{
"nestedClass2": {
"a": ""
}
},
"nestedClass":
{
"nestedClass2": {
"a": ""
}
}
]
}