From a37d7b86cc84e344f326b431d6fc4cd630556af8 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:02:59 +0800
Subject: [PATCH] 2.06  xx-abc.xxx from Abc.java doc

---
 README.md                                       |  2 ++
 build.gradle                                    |  4 +++-
 .../plugin/show/java/JsonJumpJava.java          |  2 +-
 .../plugin/show/java/doc/PsiClassUtils.java     | 17 ++++++++++++++---
 .../plugin/show/java/doc/PsiMethodToPsiDoc.java |  1 +
 .../plugin/show/demo/java/obj/Dict.java         |  7 +++++++
 6 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Dict.java

diff --git a/README.md b/README.md
index 17f1607..9369f33 100644
--- a/README.md
+++ b/README.md
@@ -68,6 +68,7 @@ Show doc comment at the Project view Tree, line End, json etc.
 
 <h2>English Change Notes:</h2>
 <ul>
+<li>2.06  Add project-view-tree xx-abc.xxx from Abc.java doc
 <li>2.05  Add line-end-comment  json doc from xxx.json.tsv
 <li>2.04  Add line-end-comment  json dict doc from (key).tsv
 <li>2.03  Add live-templates    input `doc` `docc` -> /** */
@@ -102,6 +103,7 @@ Show doc comment at the Project view Tree, line End, json etc.
 
 <h2>中文更新说明:</h2>
 <ul>
+<li>2.06  增加 文件树注释  xx-abc.xxx 来自 Abc.java 的文档注释
 <li>2.05  增加 行末注释   json 字段注释从 xxx.json.tsv 读取
 <li>2.04  增加 行末注释   json 字典注释从 键名.tsv 读取
 <li>2.03  增加 活动模板   输入 doc / docc 等生成 /** */
diff --git a/build.gradle b/build.gradle
index 25e2d9e..85c305f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'io.github.linwancen'
-version '2.05.0.' + (new Date().format('yyyy.MM.dd_HH.mm'))
+version '2.06.0.' + (new Date().format('yyyy.MM.dd_HH.mm'))
 
 repositories {
     mavenCentral()
@@ -87,6 +87,7 @@ patchPluginXml {
     changeNotes = """
 <h2>English Change Notes:</h2>
 <ul>
+<li>2.06  Add project-view-tree xx-abc.xxx from Abc.java doc
 <li>2.05  Add line-end-comment  json doc from xxx.json.tsv
 <li>2.04  Add line-end-comment  json dict doc from (key).tsv
 <li>2.03  Add live-templates    input `doc` `docc` -> /** */
@@ -121,6 +122,7 @@ patchPluginXml {
 
 <h2>中文更新说明:</h2>
 <ul>
+<li>2.06  增加 文件树注释  xx-abc.xxx 来自 Abc.java 的文档注释
 <li>2.05  增加 行末注释   json 字段注释从 xxx.json.tsv 读取
 <li>2.04  增加 行末注释   json 字典注释从 键名.tsv 读取
 <li>2.03  增加 活动模板   输入 doc / docc 等生成 /** */
diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/JsonJumpJava.java b/src/main/idea/io/github/linwancen/plugin/show/java/JsonJumpJava.java
index 0913ff5..dab7aff 100644
--- a/src/main/idea/io/github/linwancen/plugin/show/java/JsonJumpJava.java
+++ b/src/main/idea/io/github/linwancen/plugin/show/java/JsonJumpJava.java
@@ -47,7 +47,7 @@ public class JsonJumpJava extends PsiReferenceContributor {
                         for (@NotNull PsiField psiField : psiFields) {
                             list.add(new JsonRef<>(element, psiField, tips));
                         }
-                        return list.toArray(new PsiReference[0]);
+                        return list.toArray(PsiReference.EMPTY_ARRAY);
                     }
                 });
     }
diff --git a/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiClassUtils.java b/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiClassUtils.java
index a4aa8d4..ef39320 100644
--- a/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiClassUtils.java
+++ b/src/main/idea/io/github/linwancen/plugin/show/java/doc/PsiClassUtils.java
@@ -24,16 +24,27 @@ public class PsiClassUtils {
         @NotNull String fileName = virtualFile.getNameWithoutExtension();
         @NotNull Matcher matcher = JSON_PATTERN.matcher(fileName);
         if (!matcher.find()) {
-            return new PsiClass[0];
+            return PsiClass.EMPTY_ARRAY;
         }
         String className = matcher.group();
-        return nameToClass(className, project);
+        @NotNull PsiClass[] psiClasses = nameToClass(className, project);
+        if (psiClasses.length != 0) {
+            return psiClasses;
+        }
+        @NotNull char[] chars = className.toCharArray();
+        if (chars.length < 1 || chars[0] < 97 || 122 < chars[0]) {
+            return PsiClass.EMPTY_ARRAY;
+        }
+        // Upper Case
+        chars[0] -= 32;
+        @NotNull String name = String.valueOf(chars);
+        return nameToClass(name, project);
     }
 
     @NotNull
     public static PsiClass[] nameToClass(@Nullable String className, @NotNull Project project) {
         if (className == null) {
-            return new PsiClass[0];
+            return PsiClass.EMPTY_ARRAY;
         }
         int i = className.indexOf('.');
         return i > 0
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 02ba2fd..e71077e 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
@@ -69,6 +69,7 @@ class PsiMethodToPsiDoc {
             return null;
         }
         @NotNull char[] chars = name.toCharArray();
+        // Lower Case
         chars[0] += 32;
         name = String.valueOf(chars);
         @Nullable PsiField fieldByName = psiClass.findFieldByName(name, false);
diff --git a/src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Dict.java b/src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Dict.java
new file mode 100644
index 0000000..6b99d08
--- /dev/null
+++ b/src/test/java/io/github/linwancen/plugin/show/demo/java/obj/Dict.java
@@ -0,0 +1,7 @@
+package io.github.linwancen.plugin.show.demo.java.obj;
+
+/**
+ * Dict
+ */
+public class Dict {
+}