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

WEB-20485 JSON Schema: do not try to validate non-JSON files

Browse Source
This commit is contained in:
irengrig
2016-02-25 14:50:07 +01:00
parent c3a34f9372
commit 00cd692ceb
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaServiceImpl.java
+12 -6
View File
@@ -5,12 +5,14 @@ import com.intellij.codeInsight.completion.CompletionContributor;
import com.intellij.codeInsight.completion.CompletionParameters;
import com.intellij.codeInsight.completion.CompletionResultSet;
import com.intellij.idea.RareLogger;
import com.intellij.json.JsonFileType;
import com.intellij.json.JsonLanguage;
import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.Annotator;
import com.intellij.lang.documentation.CompositeDocumentationProvider;
import com.intellij.lang.documentation.DocumentationProvider;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VirtualFile;
@@ -111,12 +113,16 @@ public class JsonSchemaServiceImpl implements JsonSchemaService {
@Nullable
private CodeInsightProviders getWrapper(@Nullable VirtualFile file) {
if (file != null && !JsonFileType.INSTANCE.equals(file.getFileType())) return null;
final List<JsonSchemaObjectCodeInsightWrapper> wrappers = getWrappers(file);
if (wrappers == null || wrappers.isEmpty()) {
return null;
if (file == null) return null;
final FileType type = file.getFileType();
if (type instanceof LanguageFileType && ((LanguageFileType)type).getLanguage().isKindOf(JsonLanguage.INSTANCE)) {
final List<JsonSchemaObjectCodeInsightWrapper> wrappers = getWrappers(file);
if (wrappers == null || wrappers.isEmpty()) {
return null;
}
return (wrappers.size() == 1 ? wrappers.get(0) : new CompositeCodeInsightProviderWithWarning(wrappers));
}
return (wrappers.size() == 1 ? wrappers.get(0) : new CompositeCodeInsightProviderWithWarning(wrappers));
return null;
}
@Nullable