From c37148a56abaee08fa2ea0aea8485a93e465c524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=87=E7=A8=8B?= <1498425439@qq.com>
Date: Thu, 31 Aug 2023 08:03:37 +0800
Subject: [PATCH] =?UTF-8?q?isEmpty=20|=20=E2=80=9C=E6=89=AB=E9=BB=84?=
=?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
.../idea/io/github/linwancen/plugin/show/java/JavaTree.java | 2 +-
.../linwancen/plugin/show/java/doc/OwnerToPsiDocUtils.java | 2 +-
.../github/linwancen/plugin/show/java/doc/PsiClassUtils.java | 3 +++
.../linwancen/plugin/show/java/doc/PsiMethodToPsiDoc.java | 2 +-
.../java/io/github/linwancen/plugin/show/ext/LineExt.java | 4 ++--
.../io/github/linwancen/plugin/show/ext/conf/ConfFactory.java | 2 +-
.../io/github/linwancen/plugin/show/ext/conf/TsvLoader.java | 4 ++--
.../github/linwancen/plugin/show/lang/base/BaseLangDoc.java | 2 +-
.../linwancen/plugin/show/lang/base/BaseTagLangDoc.java | 4 ++--
.../io/github/linwancen/plugin/show/lang/base/DocFilter.java | 4 ++--
.../io/github/linwancen/plugin/show/lang/base/DocSkip.java | 4 ++--
src/main/resources/META-INF/plugin.xml | 2 +-
13 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/README.md b/README.md
index aad0ecd..604a37d 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Show doc comment at the Project view Tree, line End, json, other
My Project
-- Show doc comment at the Project view Tree, line End, json etc:
+
- Show doc comment at the Project view Tree, line End, json etc.:
Show Comment
- Method call usage graph and maven dependency graph:
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 f426627..93de7f8 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
@@ -29,7 +29,7 @@ public class JavaTree {
if (docComment == null) {
return null;
}
- String s = JavaLangDoc.INSTANCE.docElementToStr(settingsInfo, docComment);
+ @Nullable String s = JavaLangDoc.INSTANCE.docElementToStr(settingsInfo, docComment);
if (s != null && !DocSkip.skipDoc(settingsInfo, s)) {
return s;
}
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 1316ceb..618f422 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
@@ -47,7 +47,7 @@ public class OwnerToPsiDocUtils {
return null;
}
@Nullable String name = psiPackage.getName();
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
return null;
}
@NotNull PsiDirectory[] psiDirectories = psiPackage.getDirectories();
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 086340e..56742bc 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
@@ -27,6 +27,9 @@ public class PsiClassUtils {
return PsiClass.EMPTY_ARRAY;
}
String className = matcher.group();
+ if (className == null) {
+ return PsiClass.EMPTY_ARRAY;
+ }
@NotNull PsiClass[] psiClasses = nameToClass(className, project);
if (psiClasses.length != 0) {
return psiClasses;
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 6cfa31a..8674a71 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
@@ -15,7 +15,7 @@ class PsiMethodToPsiDoc {
@Nullable
static PsiDocComment methodSupperNewPropDoc(@NotNull PsiMethod psiMethod) {
// .class
- PsiElement navElement = null;
+ @Nullable PsiElement navElement;
try {
navElement = psiMethod.getNavigationElement();
} catch (Exception e) {
diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/LineExt.java b/src/main/java/io/github/linwancen/plugin/show/ext/LineExt.java
index 3eff3f2..23923fc 100644
--- a/src/main/java/io/github/linwancen/plugin/show/ext/LineExt.java
+++ b/src/main/java/io/github/linwancen/plugin/show/ext/LineExt.java
@@ -38,7 +38,7 @@ public class LineExt {
return null;
}
@Nullable Pattern pattern = ConfCache.pattern(lineInfo.project, keyMap, path);
- if (pattern == null || pattern.pattern().length() == 0) {
+ if (pattern == null || pattern.pattern().isEmpty()) {
return null;
}
@NotNull Map>> docMap = ConfCache.docMap(path, name, ext);
@@ -100,7 +100,7 @@ public class LineExt {
@NotNull Map>> docMap,
@NotNull Map>> treeMap) {
word = word.trim();
- if (word.length() == 0) {
+ if (word.isEmpty()) {
return false;
}
@Nullable String wordDoc = GetFromDocMap.get(docMap, word);
diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFactory.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFactory.java
index 0f5edb0..a88653b 100644
--- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFactory.java
+++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFactory.java
@@ -31,7 +31,7 @@ class ConfFactory {
String key = list.get(0);
if (key.startsWith("?")) {
exclude.add(key.substring(1));
- } else if (key.length() > 0 && !exclude.contains(key)) {
+ } else if (!key.isEmpty() && !exclude.contains(key)) {
sb.append(key).append("|");
}
}
diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/TsvLoader.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/TsvLoader.java
index cad7ac4..235b0a9 100644
--- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/TsvLoader.java
+++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/TsvLoader.java
@@ -36,13 +36,13 @@ public class TsvLoader {
@NotNull List words = Splitter.on('\t').splitToList(line);
if (!words.isEmpty()) {
String key = words.get(0);
- if (key.length() == 0) {
+ if (key.isEmpty()) {
continue;
}
if (patternKey) {
key = StringEscapeUtils.unescapeJava(key);
String del = DEL_PATTERN.matcher(key).replaceAll("");
- if (del.length() != 0) {
+ if (!del.isEmpty()) {
key = del;
}
}
diff --git a/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseLangDoc.java b/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseLangDoc.java
index eacb871..9bf7d38 100644
--- a/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseLangDoc.java
+++ b/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseLangDoc.java
@@ -177,7 +177,7 @@ public abstract class BaseLangDoc extends EditorLinePainter {
}
@NotNull String cutDoc = DocFilter.cutDoc(s, lineInfo.appSettings, true);
@NotNull String filterDoc = DocFilter.filterDoc(cutDoc, lineInfo.appSettings, lineInfo.projectSettings);
- if (filterDoc.trim().length() == 0) {
+ if (filterDoc.trim().isEmpty()) {
return null;
}
return filterDoc;
diff --git a/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseTagLangDoc.java b/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseTagLangDoc.java
index 83c0198..e8ba132 100644
--- a/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseTagLangDoc.java
+++ b/src/main/java/io/github/linwancen/plugin/show/lang/base/BaseTagLangDoc.java
@@ -31,14 +31,14 @@ public abstract class BaseTagLangDoc extends BaseLangDoc {
for (@NotNull String name : names) {
appendTag(lineInfo, tagStrBuilder, docElement, name);
}
- if (desc.length() > 0) {
+ if (!desc.isEmpty()) {
if (tagStrBuilder.length() > 0) {
tagStrBuilder.insert(0, " @ ");
}
tagStrBuilder.insert(0, desc);
}
@NotNull String text = tagStrBuilder.toString().trim();
- if (text.length() == 0) {
+ if (text.isEmpty()) {
return null;
}
return text;
diff --git a/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java b/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java
index fc23f1f..e93d903 100644
--- a/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java
+++ b/src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java
@@ -42,7 +42,7 @@ public class DocFilter {
}
s = s.trim();
sb.append(s);
- if (s.length() > 0) {
+ if (!s.isEmpty()) {
sb.append(" ");
}
lineCount++;
@@ -93,7 +93,7 @@ public class DocFilter {
*/
public static void addHtml(@NotNull StringBuilder sb, @NotNull String s) {
@NotNull String deleteHtml = html2Text(s);
- if (deleteHtml.length() > 0) {
+ if (!deleteHtml.isEmpty()) {
sb.append(deleteHtml);
}
}
diff --git a/src/main/java/io/github/linwancen/plugin/show/lang/base/DocSkip.java b/src/main/java/io/github/linwancen/plugin/show/lang/base/DocSkip.java
index 345ef60..11fbe97 100644
--- a/src/main/java/io/github/linwancen/plugin/show/lang/base/DocSkip.java
+++ b/src/main/java/io/github/linwancen/plugin/show/lang/base/DocSkip.java
@@ -52,14 +52,14 @@ public class DocSkip {
}
static boolean include(@NotNull String text, @NotNull Pattern include) {
- if (include.pattern().length() == 0) {
+ if (include.pattern().isEmpty()) {
return true;
}
return include.matcher(text).find();
}
static boolean exclude(@NotNull String text, @NotNull Pattern exclude) {
- if (exclude.pattern().length() == 0) {
+ if (exclude.pattern().isEmpty()) {
return false;
}
return exclude.matcher(text).find();
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 8448bfc..1eae409 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -34,7 +34,7 @@ Show doc comment at the Project view Tree, line End, json, other
My Project
-- Show doc comment at the Project view Tree, line End, json etc:
+
- Show doc comment at the Project view Tree, line End, json etc.:
Show Comment
- Method call usage graph and maven dependency graph: