devttl/show-comment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

effective rel file doc both project global

Browse Source
This commit is contained in:
林万程
2023-12-12 18:40:37 +08:00
parent 7129f0031c
commit 92380697ff
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/github/linwancen/plugin/show/lang/base/DocFilter.java
View File

@@ -55,6 +55,7 @@ public class DocFilter {
public static <T extends SettingsInfo> boolean lineCountOrLenOver(@NotNull T info,
@NotNull StringBuilder sb, int lineCount) {
// can not effective both
if (info.projectSettings.projectFilterEffective) {
return lineCountOrLenOverInfo(info.projectSettings, sb, lineCount);
} else if (info.projectSettings.globalFilterEffective) {
@@ -78,6 +79,7 @@ public class DocFilter {
public static String filterDoc(@NotNull String text,
@NotNull GlobalSettingsState globalSettingsState,
@NotNull ProjectSettingsState projectSettings) {
// not effective both because regexp is slow
// docGetEffect first because default false
if (projectSettings.docGetEffect && projectSettings.projectFilterEffective) {
return filterPattern(text, projectSettings.docGet);

14
src/main/java/io/github/linwancen/plugin/show/tree/RelFileDoc.java
View File

@@ -7,6 +7,7 @@ import io.github.linwancen.plugin.show.bean.SettingsInfo;
import io.github.linwancen.plugin.show.settings.AbstractSettingsState;
import io.github.linwancen.plugin.show.settings.GlobalSettingsState;
import io.github.linwancen.plugin.show.settings.ProjectSettingsState;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -17,12 +18,15 @@ public class RelFileDoc {
@NotNull ProjectSettingsState projectSettings = settingsInfo.projectSettings;
@NotNull GlobalSettingsState globalSettings = settingsInfo.globalSettings;
if (projectSettings.projectFilterEffective) {
return relDoc(node, projectSettings);
} else if (projectSettings.globalFilterEffective) {
return relDoc(node, globalSettings);
} else {
return null;
@Nullable String doc = relDoc(node, projectSettings);
if (StringUtils.isNotBlank(doc)) {
return doc;
}
}
if (projectSettings.globalFilterEffective) {
return relDoc(node, globalSettings);
}
return null;
}
@Nullable