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-20366 JSON Schema should not validate itself

Browse Source
This commit is contained in:
Anton Lobov
2018-05-22 10:42:52 +02:00
parent 64b3359b64
commit f77adeb1d6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/UserDefinedJsonSchemaConfiguration.java
+3 -1
View File
@@ -29,6 +29,7 @@ import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.xmlb.annotations.Tag;
import com.intellij.util.xmlb.annotations.Transient;
import com.jetbrains.jsonSchema.ide.JsonSchemaService;
import com.jetbrains.jsonSchema.impl.JsonSchemaObject;
import com.jetbrains.jsonSchema.impl.JsonSchemaVersion;
import org.jetbrains.annotations.NotNull;
@@ -148,7 +149,8 @@ public class UserDefinedJsonSchemaConfiguration {
else if (patternText.directory) {
result.add((project, vfile) -> {
final VirtualFile relativeFile = getRelativeFile(project, patternText);
return relativeFile != null && VfsUtilCore.isAncestor(relativeFile, vfile, true);
return relativeFile != null && VfsUtilCore.isAncestor(relativeFile, vfile, true)
&& !JsonSchemaService.Impl.get(project).isSchemaFile(vfile);
});
}
else {