From c1b52fb77789a1e79e1298bdb0740af21269c222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=87=E7=A8=8B?= <1498425439@qq.com> Date: Tue, 23 Jan 2024 07:54:00 +0800 Subject: [PATCH] refactor(JavaLangDoc): delete simple method --- .../plugin/show/java/JavaLangDoc.java | 2 +- .../linwancen/plugin/show/java/JavaTree.java | 3 ++- .../show/java/doc/OwnerToPsiDocUtils.java | 18 +----------------- .../plugin/show/java/doc/ParamDoc.java | 2 +- .../show/java/doc/PsiMethodToPsiDoc.java | 6 +++--- .../show/java/line/OwnerToPsiDocSkip.java | 6 +++--- 6 files changed, 11 insertions(+), 26 deletions(-) diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/JavaLangDoc.java b/src/main/idea/io/github/linwancen/plugin/show/java/JavaLangDoc.java index 21c2b84..260ea1d 100644 --- a/src/main/idea/io/github/linwancen/plugin/show/java/JavaLangDoc.java +++ b/src/main/idea/io/github/linwancen/plugin/show/java/JavaLangDoc.java @@ -51,7 +51,7 @@ public class JavaLangDoc extends BaseTagLangDoc { return null; } // must supper - @Nullable PsiDocComment psiDocComment = OwnerToPsiDocUtils.supperMethodDoc(psiMethod); + @Nullable PsiDocComment psiDocComment = PsiMethodToPsiDoc.supperMethodDoc(psiMethod); return docElementToStr(info, psiDocComment); } if (info.appSettings.fromNew) { diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/JavaTree.java b/src/main/idea/io/github/linwancen/plugin/show/java/JavaTree.java index 4a8d830..1c7d246 100644 --- a/src/main/idea/io/github/linwancen/plugin/show/java/JavaTree.java +++ b/src/main/idea/io/github/linwancen/plugin/show/java/JavaTree.java @@ -81,7 +81,8 @@ public class JavaTree { @Nullable static PsiDocComment dirDoc(@NotNull PsiDirectory child) { while (true) { - @Nullable PsiDocComment docComment = OwnerToPsiDocUtils.dirDoc(child); + @Nullable PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage(child); + @Nullable PsiDocComment docComment = OwnerToPsiDocUtils.packageDoc(psiPackage); if (docComment != null) { return docComment; } diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/doc/OwnerToPsiDocUtils.java b/src/main/idea/io/github/linwancen/plugin/show/java/doc/OwnerToPsiDocUtils.java index 618f422..3bfa6f0 100644 --- a/src/main/idea/io/github/linwancen/plugin/show/java/doc/OwnerToPsiDocUtils.java +++ b/src/main/idea/io/github/linwancen/plugin/show/java/doc/OwnerToPsiDocUtils.java @@ -14,7 +14,7 @@ public class OwnerToPsiDocUtils { private OwnerToPsiDocUtils() {} @Nullable - public static PsiDocComment srcOrByteCodeDoc(@NotNull PsiDocCommentOwner psiDocCommentOwner) { + private static PsiDocComment srcOrByteCodeDoc(@NotNull PsiDocCommentOwner psiDocCommentOwner) { PsiElement navElement; try { navElement = psiDocCommentOwner.getNavigationElement(); @@ -31,16 +31,6 @@ public class OwnerToPsiDocUtils { } } - @Nullable - public static PsiDocComment methodDoc(@NotNull PsiMethod psiMethod) { - return PsiMethodToPsiDoc.methodSupperNewPropDoc(psiMethod); - } - - @Nullable - public static PsiDocComment supperMethodDoc(@NotNull PsiMethod psiMethod) { - return PsiMethodToPsiDoc.supperMethodDoc(psiMethod); - } - @Nullable public static PsiDocComment packageDoc(@Nullable PsiPackage psiPackage) { if (psiPackage == null) { @@ -91,10 +81,4 @@ public class OwnerToPsiDocUtils { PsiClass psiClass = classes[0]; return srcOrByteCodeDoc(psiClass); } - - @Nullable - public static PsiDocComment dirDoc(@NotNull PsiDirectory psiDirectory) { - @Nullable PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage(psiDirectory); - return packageDoc(psiPackage); - } } diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/doc/ParamDoc.java b/src/main/idea/io/github/linwancen/plugin/show/java/doc/ParamDoc.java index a2904ca..c202140 100644 --- a/src/main/idea/io/github/linwancen/plugin/show/java/doc/ParamDoc.java +++ b/src/main/idea/io/github/linwancen/plugin/show/java/doc/ParamDoc.java @@ -17,7 +17,7 @@ public class ParamDoc { if (method == null) { return null; } - @Nullable PsiDocComment psiDocComment = OwnerToPsiDocUtils.methodDoc(method); + @Nullable PsiDocComment psiDocComment = PsiMethodToPsiDoc.methodSupperNewPropDoc(method); if (psiDocComment == null) { return null; } diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiMethodToPsiDoc.java b/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiMethodToPsiDoc.java index f5507ae..46dea02 100644 --- a/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiMethodToPsiDoc.java +++ b/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiMethodToPsiDoc.java @@ -13,7 +13,7 @@ public class PsiMethodToPsiDoc { private PsiMethodToPsiDoc() {} @Nullable - static PsiDocComment methodSupperNewPropDoc(@NotNull PsiMethod psiMethod) { + public static PsiDocComment methodSupperNewPropDoc(@NotNull PsiMethod psiMethod) { @Nullable PsiDocComment docComment = psiMethod.getDocComment(); if (docComment != null) { return docComment; @@ -41,7 +41,7 @@ public class PsiMethodToPsiDoc { } @Nullable - static PsiDocComment supperMethodDoc(@NotNull PsiMethod psiMethod) { + public static PsiDocComment supperMethodDoc(@NotNull PsiMethod psiMethod) { @NotNull PsiMethod[] superMethods; try { superMethods = psiMethod.findSuperMethods(); @@ -59,7 +59,7 @@ public class PsiMethodToPsiDoc { if (navElement instanceof PsiMethod) { superMethod = (PsiMethod) navElement; } - @Nullable PsiDocComment superDoc = OwnerToPsiDocUtils.methodSupperNewPropDoc(superMethod); + @Nullable PsiDocComment superDoc = PsiMethodToPsiDoc.methodSupperNewPropDoc(superMethod); if (superDoc != null) { return superDoc; } diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java b/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java index be85115..608f4c0 100644 --- a/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java +++ b/src/main/idea/io/github/linwancen/plugin/show/java/line/OwnerToPsiDocSkip.java @@ -4,7 +4,7 @@ import com.intellij.psi.PsiDocCommentOwner; import com.intellij.psi.PsiMethod; import com.intellij.psi.javadoc.PsiDocComment; import io.github.linwancen.plugin.show.bean.SettingsInfo; -import io.github.linwancen.plugin.show.java.doc.OwnerToPsiDocUtils; +import io.github.linwancen.plugin.show.java.doc.PsiMethodToPsiDoc; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -25,8 +25,8 @@ public class OwnerToPsiDocSkip { return null; } @Nullable PsiDocComment docComment = docOwner instanceof PsiMethod - ? OwnerToPsiDocUtils.methodDoc(((PsiMethod) docOwner)) - : OwnerToPsiDocUtils.srcOrByteCodeDoc(docOwner); + ? PsiMethodToPsiDoc.methodSupperNewPropDoc(((PsiMethod) docOwner)) + : docOwner.getDocComment(); return SkipUtils.skipDoc(info, docComment); } }