From 15dd2d1f232260c0f5cf2aba1bea498ade8e6259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=97=E4=B8=87=E7=A8=8B?= <1498425439@qq.com> Date: Fri, 9 Dec 2022 23:01:59 +0800 Subject: [PATCH] skip Annotation only line end comment fixed #18 --- .../github/linwancen/plugin/show/java/line/SkipUtils.java | 3 ++- .../io/github/linwancen/plugin/show/demo/java/Ref.java | 2 ++ .../github/linwancen/plugin/show/demo/java/obj/Anno.java | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Anno.java diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java b/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java index 00e016c..6b260a9 100644 --- a/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java +++ b/src/main/idea/io/github/linwancen/plugin/show/java/line/SkipUtils.java @@ -27,7 +27,8 @@ class SkipUtils { private static String psiName(@NotNull T settingsInfo, @Nullable PsiElement psiElement) { if (psiElement instanceof PsiClass) { @NotNull PsiClass psiClass = (PsiClass) psiElement; - if (settingsInfo.appSettings.skipAnnotation && psiClass.isAnnotationType()) { + if (settingsInfo.funcEnum == FuncEnum.LINE + && settingsInfo.appSettings.skipAnnotation && psiClass.isAnnotationType()) { return null; } return psiClass.getQualifiedName(); diff --git a/src/test/java/io/github/linwancen/plugin/show/demo/java/Ref.java b/src/test/java/io/github/linwancen/plugin/show/demo/java/Ref.java index 8f120c3..fe5f34b 100644 --- a/src/test/java/io/github/linwancen/plugin/show/demo/java/Ref.java +++ b/src/test/java/io/github/linwancen/plugin/show/demo/java/Ref.java @@ -1,9 +1,11 @@ package io.github.linwancen.plugin.show.demo.java; +import io.github.linwancen.plugin.show.demo.java.obj.Anno; import io.github.linwancen.plugin.show.demo.java.obj.Child; import io.github.linwancen.plugin.show.demo.java.obj.Face; import io.github.linwancen.plugin.show.demo.java.obj.Parent; +@Anno public class Ref implements Face { public static void method() { Parent noneNewMethod = new Call(); diff --git a/src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Anno.java b/src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Anno.java new file mode 100644 index 0000000..71e91b1 --- /dev/null +++ b/src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Anno.java @@ -0,0 +1,7 @@ +package io.github.linwancen.plugin.show.demo.java.obj; + +/** + * MyAnno + */ +public @interface Anno { +}