From 900f59b6017f492896276064cb9b53df6341815d 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, 6 May 2022 00:15:21 +0800 Subject: [PATCH] =?UTF-8?q?Style=20and=20COBOL=20key=20|=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E5=92=8C=20COBOL=20=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/github/linwancen/plugin/show/Tree.java | 2 +- .../io/github/linwancen/plugin/show/doc/PsiClassUtils.java | 4 +++- .../linwancen/plugin/show/ext/conf/ConfCacheGetUtils.java | 2 +- .../github/linwancen/plugin/show/ext/conf/ConfFactory.java | 5 ++++- .../plugin/show/line/FileViewToPsiDocRightToLeft.java | 4 ++-- .../linwancen/plugin/show/demo/ext/cobol/COBOL.cbl.key.tsv | 1 + .../show/demo/ext/cobol/de%/COBOL-data-type.cbl.key.tsv | 6 +++--- .../plugin/show/demo/ext/cobol/de%/COBOL-data.cbl.key.tsv | 2 +- 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/github/linwancen/plugin/show/Tree.java b/src/main/java/io/github/linwancen/plugin/show/Tree.java index cec46ac..79d9853 100644 --- a/src/main/java/io/github/linwancen/plugin/show/Tree.java +++ b/src/main/java/io/github/linwancen/plugin/show/Tree.java @@ -14,8 +14,8 @@ import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.ui.ColoredTreeCellRenderer; import com.intellij.ui.SimpleTextAttributes; -import io.github.linwancen.plugin.show.doc.PsiDocToStrDoc; import io.github.linwancen.plugin.show.doc.OwnerToPsiDocUtils; +import io.github.linwancen.plugin.show.doc.PsiDocToStrDoc; import io.github.linwancen.plugin.show.ext.TreeExt; import io.github.linwancen.plugin.show.settings.AppSettingsState; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/io/github/linwancen/plugin/show/doc/PsiClassUtils.java b/src/main/java/io/github/linwancen/plugin/show/doc/PsiClassUtils.java index 708eaf7..3f317a3 100644 --- a/src/main/java/io/github/linwancen/plugin/show/doc/PsiClassUtils.java +++ b/src/main/java/io/github/linwancen/plugin/show/doc/PsiClassUtils.java @@ -2,7 +2,9 @@ package io.github.linwancen.plugin.show.doc; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.*; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiField; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiShortNamesCache; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCacheGetUtils.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCacheGetUtils.java index 4ddbba2..3b66277 100644 --- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCacheGetUtils.java +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCacheGetUtils.java @@ -48,7 +48,7 @@ class ConfCacheGetUtils { map.put(levelStr + "\b" + confPath, entry.getValue()); } else if (confName.endsWith((name + confMidExt))) { map.put(levelStr + "\t" + confPath, entry.getValue()); - } else{ + } else { if (ext == null) { ext = ""; } 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 6e544ad..e3cc1e7 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 @@ -10,7 +10,10 @@ import groovy.json.StringEscapeUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; diff --git a/src/main/java/io/github/linwancen/plugin/show/line/FileViewToPsiDocRightToLeft.java b/src/main/java/io/github/linwancen/plugin/show/line/FileViewToPsiDocRightToLeft.java index ff8f483..bc10b2a 100644 --- a/src/main/java/io/github/linwancen/plugin/show/line/FileViewToPsiDocRightToLeft.java +++ b/src/main/java/io/github/linwancen/plugin/show/line/FileViewToPsiDocRightToLeft.java @@ -43,8 +43,8 @@ public class FileViewToPsiDocRightToLeft { } private static PsiDocComment psiDoc(AppSettingsState setting, - PsiElement identifier, PsiElement element, - int startOffset, int endOffset) { + PsiElement identifier, PsiElement element, + int startOffset, int endOffset) { if (identifier != null && !(identifier instanceof PsiIdentifier)) { return null; } diff --git a/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/COBOL.cbl.key.tsv b/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/COBOL.cbl.key.tsv index bf28c9a..7d16e9b 100644 --- a/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/COBOL.cbl.key.tsv +++ b/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/COBOL.cbl.key.tsv @@ -3,6 +3,7 @@ 长的要放在短的前面 ^.{7} +(?<=.{72}).* \. . \, , diff --git a/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data-type.cbl.key.tsv b/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data-type.cbl.key.tsv index 0e1cc6c..df4e8fa 100644 --- a/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data-type.cbl.key.tsv +++ b/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data-type.cbl.key.tsv @@ -1,8 +1,8 @@ COBOL 数据类型【关键字】 - 66 重命名 - 77 不能被细分项 - 88 条件名 +66 重命名 +77 不能被细分项 +88 条件名 9\( ( 数字 A\( ( 字母 diff --git a/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data.cbl.key.tsv b/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data.cbl.key.tsv index dcb8c25..71713d7 100644 --- a/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data.cbl.key.tsv +++ b/src/test/java/io/github/linwancen/plugin/show/demo/ext/cobol/de%/COBOL-data.cbl.key.tsv @@ -1,5 +1,5 @@ COBOL 数据部必要【关键字】 -^.{7} +\d{2} +^.{7} +[0-59]{2} PIC COPY REPLACING \ No newline at end of file