diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCache.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCache.java index 72db54d..e757f61 100644 --- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCache.java +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfCache.java @@ -38,7 +38,7 @@ public class ConfCache { @Nullable public static Pattern pattern(@Nullable Project project, @NotNull Map>> keyMap, @NotNull String path) { - return ConfFactory.buildPattern(project, path, keyMap); + return SpiltKeyWordPatternFactory.from(project, path, keyMap); } @NotNull @@ -70,7 +70,7 @@ public class ConfCache { return ConfCacheGetUtils.filterPath(JSON_CACHE, path); } - static void clearAll() { + public static void clearAll() { EXT_IN_KEY_CACHE.clear(); KEY_CACHE.clear(); DOC_CACHE.clear(); @@ -78,7 +78,7 @@ public class ConfCache { JSON_CACHE.clear(); } - static void remove(@NotNull VirtualFile file, @Nullable String name) { + public static void remove(@NotNull VirtualFile file, @Nullable String name) { if (name != null) { int i = name.lastIndexOf('.'); name = name.substring(0, i); @@ -96,7 +96,7 @@ public class ConfCache { } } - static void copy(@NotNull VirtualFile file, @NotNull VirtualFile newFile) { + public static void copy(@NotNull VirtualFile file, @NotNull VirtualFile newFile) { @NotNull String name = file.getNameWithoutExtension(); if (name.endsWith(KEY_MID_EXT)) { copyCache(file, newFile, KEY_CACHE); @@ -117,7 +117,7 @@ public class ConfCache { } } - static void loadAll(@NotNull Project project) { + public static void loadAll(@NotNull Project project) { DumbService.getInstance(project).smartInvokeLater(() -> { @NotNull Collection files = FilenameIndex.getAllFilesByExt(project, TsvLoader.EXT); @NotNull StringBuilder sb = new StringBuilder(); @@ -135,7 +135,7 @@ public class ConfCache { }); } - static void loadFile(@NotNull VirtualFile file, @Nullable Project project) { + public static void loadFile(@NotNull VirtualFile file, @Nullable Project project) { ApplicationManager.getApplication().invokeLater(() -> { ConfCache.load(file); if (project != null && !project.isDisposed()) { 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/SpiltKeyWordPatternFactory.java similarity index 85% rename from src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFactory.java rename to src/main/java/io/github/linwancen/plugin/show/ext/conf/SpiltKeyWordPatternFactory.java index a88653b..5dfe74a 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/SpiltKeyWordPatternFactory.java @@ -13,16 +13,16 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; -class ConfFactory { - private static final Logger LOG = LoggerFactory.getLogger(ConfFactory.class); +class SpiltKeyWordPatternFactory { + private static final Logger LOG = LoggerFactory.getLogger(SpiltKeyWordPatternFactory.class); private static final Pattern EMPTY_PATTERN = Pattern.compile(""); private static final Map PATTERN_CACHE = new ConcurrentHashMap<>(); - private ConfFactory() {} + private SpiltKeyWordPatternFactory() {} @Nullable - static Pattern buildPattern(@SuppressWarnings("unused") @Nullable Project project, @NotNull String path, - @NotNull Map>> map) { + static Pattern from(@SuppressWarnings("unused") @Nullable Project project, @NotNull String path, + @NotNull Map>> map) { @NotNull Set exclude = new LinkedHashSet<>(); @NotNull StringBuilder sb = new StringBuilder(); for (@NotNull Map> keyMap : map.values()) { diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ReloadExtDocAction.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/action/ReloadExtDocAction.java similarity index 90% rename from src/main/java/io/github/linwancen/plugin/show/ext/conf/ReloadExtDocAction.java rename to src/main/java/io/github/linwancen/plugin/show/ext/conf/action/ReloadExtDocAction.java index 8e22b56..11fae0b 100644 --- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ReloadExtDocAction.java +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/action/ReloadExtDocAction.java @@ -1,8 +1,9 @@ -package io.github.linwancen.plugin.show.ext.conf; +package io.github.linwancen.plugin.show.ext.conf.action; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; +import io.github.linwancen.plugin.show.ext.conf.ConfCache; import io.github.linwancen.plugin.show.settings.ShowBundle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ResetExtDocAction.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/action/ResetExtDocAction.java similarity index 92% rename from src/main/java/io/github/linwancen/plugin/show/ext/conf/ResetExtDocAction.java rename to src/main/java/io/github/linwancen/plugin/show/ext/conf/action/ResetExtDocAction.java index 93e9a2d..aaa6d51 100644 --- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ResetExtDocAction.java +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/action/ResetExtDocAction.java @@ -1,10 +1,11 @@ -package io.github.linwancen.plugin.show.ext.conf; +package io.github.linwancen.plugin.show.ext.conf.action; import com.intellij.ide.projectView.ProjectView; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; +import io.github.linwancen.plugin.show.ext.conf.ConfCache; import io.github.linwancen.plugin.show.settings.ShowBundle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/action/package-info.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/action/package-info.java new file mode 100644 index 0000000..87e2843 --- /dev/null +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/action/package-info.java @@ -0,0 +1,4 @@ +/** + * call ConfCache clear and loadAll + */ +package io.github.linwancen.plugin.show.ext.conf.action; \ No newline at end of file diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileChangeListener.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileChangeListener.java similarity index 90% rename from src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileChangeListener.java rename to src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileChangeListener.java index 966fe06..e15b7ce 100644 --- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileChangeListener.java +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileChangeListener.java @@ -1,9 +1,10 @@ -package io.github.linwancen.plugin.show.ext.conf; +package io.github.linwancen.plugin.show.ext.conf.listener; import com.intellij.openapi.fileEditor.FileEditorManagerEvent; import com.intellij.openapi.fileEditor.FileEditorManagerListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; +import io.github.linwancen.plugin.show.ext.conf.ConfCache; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileInitListener.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileInitListener.java similarity index 84% rename from src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileInitListener.java rename to src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileInitListener.java index 2b820c6..dfd9a16 100644 --- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileInitListener.java +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileInitListener.java @@ -1,7 +1,8 @@ -package io.github.linwancen.plugin.show.ext.conf; +package io.github.linwancen.plugin.show.ext.conf.listener; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManagerListener; +import io.github.linwancen.plugin.show.ext.conf.ConfCache; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileListener.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileListener.java similarity index 93% rename from src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileListener.java rename to src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileListener.java index b0a6b35..08c6e56 100644 --- a/src/main/java/io/github/linwancen/plugin/show/ext/conf/ConfFileListener.java +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/ConfFileListener.java @@ -1,8 +1,10 @@ -package io.github.linwancen.plugin.show.ext.conf; +package io.github.linwancen.plugin.show.ext.conf.listener; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.newvfs.BulkFileListener; import com.intellij.openapi.vfs.newvfs.events.*; +import io.github.linwancen.plugin.show.ext.conf.ConfCache; +import io.github.linwancen.plugin.show.ext.conf.TsvLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; diff --git a/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/package-info.java b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/package-info.java new file mode 100644 index 0000000..87f639d --- /dev/null +++ b/src/main/java/io/github/linwancen/plugin/show/ext/conf/listener/package-info.java @@ -0,0 +1,4 @@ +/** + * call ConfCache.load etc. + */ +package io.github.linwancen.plugin.show.ext.conf.listener; \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 31ed5ea..91cd5bb 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -119,14 +119,14 @@ Show doc comment at the Project view Tree, line End, json, other - - - @@ -156,13 +156,13 @@ Show doc comment at the Project view Tree, line End, json, other