MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[grazie] IJPL-218322 Cache results of JsonSchemaSpellcheckerClient

Browse Source 
Merge-request: IJ-MR-182341
Merged-by: Ilia Permiashkin <ilia.permiashkin@jetbrains.com>

GitOrigin-RevId: 57b69cac473645ff0b26e1d52037f78d42a25e75
This commit is contained in:
Ilia Permiashkin
2025-11-13 15:42:47 +00:00
committed by intellij-monorepo-bot
parent 3d5419ec40
commit 9a2a18ed3e
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/backend/src/com/intellij/json/JsonSchemaSpellcheckerClient.java
+25 -15
View File
@@ -8,6 +8,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.ObjectUtils;
import com.intellij.util.ThreeState;
@@ -29,35 +30,44 @@ public abstract class JsonSchemaSpellcheckerClient {
protected abstract @Nullable String getValue();
public boolean matchesNameFromSchema() {
final VirtualFile file = PsiUtilCore.getVirtualFile(getElement());
if (file == null) return false;
PsiElement element = getElement();
return CachedValuesManager.getProjectPsiDependentCache(element, this::matchesNameFromSchema);
}
Project project = getElement().getProject();
final JsonSchemaService service = JsonSchemaService.Impl.get(project);
if (!service.isApplicableToFile(file)) return false;
final JsonSchemaObject rootSchema = service.getSchemaObject(getElement().getContainingFile());
if (rootSchema == null) return false;
if (isXIntellijInjection(service, rootSchema)) return true;
private boolean matchesNameFromSchema(PsiElement element) {
VirtualFile file = PsiUtilCore.getVirtualFile(element);
if (file == null) return false;
String value = getValue();
if (StringUtil.isEmpty(value)) return false;
JsonLikePsiWalker walker = JsonLikePsiWalker.getWalker(getElement(), rootSchema);
Project project = element.getProject();
JsonSchemaService service = JsonSchemaService.Impl.get(project);
if (!service.isApplicableToFile(file)) return false;
JsonSchemaObject rootSchema = service.getSchemaObject(element.getContainingFile());
if (rootSchema == null) return false;
if (isXIntellijInjection(service, rootSchema)) return true;
JsonLikePsiWalker walker = JsonLikePsiWalker.getWalker(element, rootSchema);
if (walker == null) return false;
final PsiElement checkable = walker.findElementToCheck(getElement());
PsiElement checkable = walker.findElementToCheck(element);
if (checkable == null) return false;
final ThreeState isName = walker.isName(checkable);
final JsonPointerPosition position = walker.findPosition(checkable, isName == ThreeState.NO);
ThreeState isName = walker.isName(checkable);
JsonPointerPosition position = walker.findPosition(checkable, isName == ThreeState.NO);
if (position == null || position.isEmpty() && isName == ThreeState.NO) return false;
final Collection<JsonSchemaObject> schemas = new JsonSchemaResolver(project, rootSchema, position, walker.createValueAdapter(checkable)).resolve();
Collection<JsonSchemaObject> schemas =
new JsonSchemaResolver(project, rootSchema, position, walker.createValueAdapter(checkable)).resolve();
if (schemas.isEmpty()) return false;
return schemas.stream().anyMatch(s -> {
return ContainerUtil.exists(schemas, s -> {
if (s.getPropertyByName(value) != null || s.getMatchingPatternPropertySchema(value) != null) {
return true;
}
return ContainerUtil.notNullize(s.getEnum()).stream().anyMatch(e -> e instanceof String && StringUtil.unquoteString((String)e).equals(value));
return ContainerUtil.exists(
ContainerUtil.notNullize(s.getEnum()),
e -> e instanceof String && StringUtil.unquoteString((String)e).equals(value)
);
});
}
plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/inspection/grammar/GrazieInspection.kt
+1 -1
View File
@@ -135,7 +135,7 @@ class GrazieInspection : LocalInspectionTool(), DumbAware {
val contents = findAllTextContents(file.viewProvider, TextContent.TextDomain.ALL)
logger<GrazieInspection>().debug("Evaluating text length of: ${TextContentRelatedData(file, contents)}")
val length = contents.asSequence().filter { it.domain in checkedDomains }.sumOf { it.length }
CachedValueProvider.Result.create(length > MAX_TEXT_LENGTH_IN_FILE, service<GrazieConfig>())
CachedValueProvider.Result.create(length > MAX_TEXT_LENGTH_IN_FILE, service<GrazieConfig>(), file)
}
}