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

simplify json caches on file

Browse Source
This commit is contained in:
peter
2019-01-08 10:39:36 +01:00
parent 9322d23a42
commit f1e0c24824
2 changed files with 13 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/CachedValueProviderOnPsiFile.java
-41
View File
@@ -1,41 +0,0 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.jetbrains.jsonSchema.impl;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.util.Key;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.CachedValue;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.util.Function;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class CachedValueProviderOnPsiFile<T> implements CachedValueProvider<T> {
private final PsiFile myPsiFile;
public CachedValueProviderOnPsiFile(@NotNull PsiFile psiFile) {
myPsiFile = psiFile;
}
@Nullable
@Override
public Result<T> compute() {
return CachedValueProvider.Result.create(evaluate(myPsiFile), myPsiFile);
}
@Nullable
public abstract T evaluate(@NotNull PsiFile psiFile);
@Nullable
public static <T> T getOrCompute(@NotNull PsiFile psiFile, @NotNull Function<? super PsiFile, ? extends T> eval, @NotNull Key<CachedValue<T>> key) {
final CachedValueProvider<T> provider = new CachedValueProviderOnPsiFile<T>(psiFile) {
@Override
@Nullable
public T evaluate(@NotNull PsiFile psiFile) {
return eval.fun(psiFile);
}
};
return ReadAction.compute(() -> CachedValuesManager.getCachedValue(psiFile, key, provider));
}
}
json/src/com/jetbrains/jsonSchema/impl/JsonCachedValues.java
+13 -5
View File
@@ -12,6 +12,8 @@ import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.psi.SyntaxTraverser;
import com.intellij.psi.util.CachedValue;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.util.AstLoadingFilter;
import com.intellij.util.Function;
import com.intellij.util.ObjectUtils;
@@ -58,8 +60,7 @@ public class JsonCachedValues {
}
PsiFile psiFile = resolveFile(file, project);
return !(psiFile instanceof JsonFile) ? null : CachedValueProviderOnPsiFile
.getOrCompute(psiFile, JsonCachedValues::fetchSchemaUrl, SCHEMA_URL_KEY);
return !(psiFile instanceof JsonFile) ? null : getOrCompute(psiFile, JsonCachedValues::fetchSchemaUrl, SCHEMA_URL_KEY);
}
private static PsiFile resolveFile(@NotNull VirtualFile file,
@@ -98,18 +99,18 @@ public class JsonCachedValues {
@NotNull Key<CachedValue<T>> cacheKey) {
final PsiFile psiFile = resolveFile(schemaFile, project);
if (!(psiFile instanceof JsonFile)) return null;
return CachedValueProviderOnPsiFile.getOrCompute(psiFile, eval, cacheKey);
return getOrCompute(psiFile, eval, cacheKey);
}
static final String ID_PATHS_CACHE_KEY = "JsonSchemaIdToPointerCache";
private static final Key<CachedValue<Map<String, String>>> SCHEMA_ID_PATHS_CACHE_KEY = Key.create(ID_PATHS_CACHE_KEY);
public static Collection<String> getAllIdsInFile(PsiFile psiFile) {
final Map<String, String> map = CachedValueProviderOnPsiFile.getOrCompute(psiFile, JsonCachedValues::computeIdsMap, SCHEMA_ID_PATHS_CACHE_KEY);
Map<String, String> map = getOrCompute(psiFile, JsonCachedValues::computeIdsMap, SCHEMA_ID_PATHS_CACHE_KEY);
return map == null ? ContainerUtil.emptyList() : map.keySet();
}
@Nullable
public static String resolveId(PsiFile psiFile, String id) {
final Map<String, String> map = CachedValueProviderOnPsiFile.getOrCompute(psiFile, JsonCachedValues::computeIdsMap, SCHEMA_ID_PATHS_CACHE_KEY);
Map<String, String> map = getOrCompute(psiFile, JsonCachedValues::computeIdsMap, SCHEMA_ID_PATHS_CACHE_KEY);
return map == null ? null : map.get(id);
}
@@ -199,4 +200,11 @@ public class JsonCachedValues {
return ContainerUtil.emptyList();
}
@Nullable
private static <T> T getOrCompute(@NotNull PsiFile psiFile,
@NotNull Function<? super PsiFile, ? extends T> eval,
@NotNull Key<CachedValue<T>> key) {
return CachedValuesManager.getCachedValue(psiFile, key, () -> CachedValueProvider.Result.create(eval.fun(psiFile), psiFile));
}
}