MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

json: skip IntellijConfigurationJsonSchemaProviderFactory content loading (2)

Browse Source 
GitOrigin-RevId: b03856714265e247974eecce2f4e513ea1af8b2f
This commit is contained in:
anstarovoyt
2019-10-31 18:57:57 +03:00
committed by intellij-monorepo-bot
parent 1ef2e61ec7
commit f8ee2facd3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
json/src/com/jetbrains/jsonSchema/impl/JsonCachedValues.java
View File

@@ -15,6 +15,7 @@ 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.testFramework.LightVirtualFile;
import com.intellij.util.AstLoadingFilter;
import com.intellij.util.Function;
import com.intellij.util.ObjectUtils;
@@ -75,6 +76,9 @@ public class JsonCachedValues {
@Nullable
public static String getSchemaId(@NotNull final VirtualFile schemaFile,
@NotNull final Project project) {
//skip content loading for generated schema files (IntellijConfigurationJsonSchemaProviderFactory)
if (schemaFile instanceof LightVirtualFile) return null;
String value = JsonSchemaFileValuesIndex.getCachedValue(project, schemaFile, ID_CACHE_KEY);
if (value != null && !JsonSchemaFileValuesIndex.NULL.equals(value)) return JsonPointerUtil.normalizeId(value);
String obsoleteValue = JsonSchemaFileValuesIndex.getCachedValue(project, schemaFile, OBSOLETE_ID_CACHE_KEY);

3
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
View File

@@ -53,8 +53,7 @@ public class JsonSchemaServiceImpl implements JsonSchemaService, ModificationTra
@NotNull
@Override
protected Set<String> compute() {
return ContainerUtil
.map2SetNotNull(myState.getFiles(), f -> f instanceof LightVirtualFile ? null : JsonCachedValues.getSchemaId(f, myProject));
return ContainerUtil.map2SetNotNull(myState.getFiles(), f -> JsonCachedValues.getSchemaId(f, myProject));
}
};
myCatalogManager = new JsonSchemaCatalogManager(myProject);