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

json schema, we need read action around psi access

Browse Source
This commit is contained in:
irengrig
2017-01-16 17:18:12 +01:00
parent 2fab2220ca
commit 2f2d3db039
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
+17 -14
View File
@@ -16,6 +16,7 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.VfsUtil;
@@ -157,20 +158,22 @@ public class JsonSchemaServiceImpl implements JsonSchemaServiceEx {
private JsonSchemaObject readObject(@NotNull JsonSchemaFileProvider provider) {
final VirtualFile file = provider.getSchemaFile();
if (file == null) return null;
try {
final JsonSchemaReader reader = JsonSchemaReader.create(myProject, file);
if (reader == null) return null;
final JsonSchemaObject schemaObject = reader.read();
if (schemaObject.getId() != null) myDefinitions.register(file, schemaObject.getId());
return schemaObject;
}
catch (ProcessCanceledException e) {
//ignored
}
catch (Exception e) {
logException(provider, e);
}
return null;
return ApplicationManager.getApplication().runReadAction((Computable<JsonSchemaObject>)() -> {
try {
final JsonSchemaReader reader = JsonSchemaReader.create(myProject, file);
if (reader == null) return null;
final JsonSchemaObject schemaObject = reader.read();
if (schemaObject.getId() != null) myDefinitions.register(file, schemaObject.getId());
return schemaObject;
}
catch (ProcessCanceledException e) {
//ignored
}
catch (Exception e) {
logException(provider, e);
}
return null;
});
}
private static void logException(@NotNull JsonSchemaFileProvider provider, Exception e) {