MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 06:36:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

optimization: cache inspections with inconsistent shortName <-> EP.shortName to avoid wasting time enumerating all of them on each highlighting restart

Browse Source 
(and move away `new LocalInspectionWrapper()` calls from class initializer to avoid fatal ClassDefNotFoundException when is throws)

GitOrigin-RevId: 7e2117288d8f475e5aae7bac830684c67858d080
This commit is contained in:
Alexey Kudravtsev
2024-09-05 21:04:12 +02:00
committed by intellij-monorepo-bot
parent 130a555cb5
commit aa2d1edc99
3 changed files with 82 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
spellchecker/src/com/intellij/spellchecker/ui/SpellCheckingEditorCustomization.java
View File

@@ -34,36 +34,49 @@ import java.util.function.Function;
* Thread-safe.
*/
public class SpellCheckingEditorCustomization extends SimpleEditorCustomization {
private static final Map<String, LocalInspectionToolWrapper> SPELL_CHECK_TOOLS = new HashMap<>();
private static final boolean READY = init();
private static volatile Map<String, LocalInspectionToolWrapper> SPELL_CHECK_TOOLS;
private static volatile boolean READY;
SpellCheckingEditorCustomization(boolean enabled) {
super(enabled);
}
@SuppressWarnings("unchecked")
private static boolean init() {
// It's assumed that default spell checking inspection settings are just fine for processing all types of data.
// Please perform corresponding settings tuning if that assumption is broken in the future.
Class<LocalInspectionTool>[] inspectionClasses = (Class<LocalInspectionTool>[])new Class<?>[]{SpellCheckingInspection.class};
for (Class<LocalInspectionTool> inspectionClass : inspectionClasses) {
try {
LocalInspectionTool tool = inspectionClass.newInstance();
SPELL_CHECK_TOOLS.put(tool.getShortName(), new LocalInspectionToolWrapper(tool));
}
catch (Throwable e) {
return false;
@NotNull
private static Map<String, LocalInspectionToolWrapper> getSpellCheckTools() {
Map<String, LocalInspectionToolWrapper> tools = SPELL_CHECK_TOOLS;
if (tools == null) {
tools = new HashMap<>();
// It's assumed that default spell checking inspection settings are just fine for processing all types of data.
// Please perform corresponding settings tuning if that assumption is broken in the future.
Class<LocalInspectionTool>[] inspectionClasses = (Class<LocalInspectionTool>[])new Class<?>[]{SpellCheckingInspection.class};
for (Class<LocalInspectionTool> inspectionClass : inspectionClasses) {
try {
LocalInspectionTool tool = inspectionClass.newInstance();
tools.put(tool.getShortName(), new LocalInspectionToolWrapper(tool));
}
catch (Throwable e) {
READY = false;
return Map.of();
}
}
SPELL_CHECK_TOOLS = tools;
READY = true;
}
return true;
return tools;
}
private static boolean isReady() {
if (SPELL_CHECK_TOOLS == null) {
getSpellCheckTools();
}
return READY;
}
@Override
public void customize(@NotNull EditorEx editor) {
boolean apply = isEnabled();
if (!READY) {
if (!isReady()) {
return;
}
@@ -106,8 +119,8 @@ public class SpellCheckingEditorCustomization extends SimpleEditorCustomization
return strategy instanceof MyInspectionProfileStrategy && !((MyInspectionProfileStrategy)strategy).myUseSpellCheck;
}
public static Set<String> getSpellCheckingToolNames() {
return Collections.unmodifiableSet(SPELL_CHECK_TOOLS.keySet());
static Set<String> getSpellCheckingToolNames() {
return Collections.unmodifiableSet(getSpellCheckTools().keySet());
}
private static class MyInspectionProfileStrategy implements Function<InspectionProfile, InspectionProfileWrapper> {
@@ -117,7 +130,7 @@ public class SpellCheckingEditorCustomization extends SimpleEditorCustomization
@Override
public @NotNull InspectionProfileWrapper apply(@NotNull InspectionProfile profile) {
if (!READY) {
if (!isReady()) {
return new InspectionProfileWrapper((InspectionProfileImpl)profile);
}
MyInspectionProfileWrapper wrapper = myWrappers.get(profile);
@@ -141,7 +154,7 @@ public class SpellCheckingEditorCustomization extends SimpleEditorCustomization
@Override
public boolean isToolEnabled(HighlightDisplayKey key, PsiElement element) {
return (key != null && SPELL_CHECK_TOOLS.containsKey(key.getShortName()) ? myUseSpellCheck : super.isToolEnabled(key, element));
return (key != null && getSpellCheckTools().containsKey(key.getShortName()) ? myUseSpellCheck : super.isToolEnabled(key, element));
}
}
}