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

webpack config support: also recognize variables called webPack and think that an object literal in initializer (even in constructs like merge(inherited, {})) is config

Browse Source
This commit is contained in:
irengrig
2017-02-21 09:59:56 +01:00
parent 259b3dc5b5
commit 01ce3c3c79
2 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectAnnotator.java
+29 -26
View File
@@ -254,38 +254,41 @@ class JsonBySchemaObjectAnnotator implements Annotator {
validatedProperties.add(property.getName());
}
final List<String> required = schema.getRequired();
if (required != null) {
for (String req : required) {
if (!set.contains(req)) {
error("Missing required property '" + req +"'", value.getDelegate());
if (object.shouldCheckIntegralRequirements()) {
final List<String> required = schema.getRequired();
if (required != null) {
for (String req : required) {
if (!set.contains(req)) {
error("Missing required property '" + req + "'", value.getDelegate());
}
}
}
}
if (schema.getMinProperties() != null && propertyList.size() < schema.getMinProperties()) {
error("Number of properties is less than " + schema.getMinProperties(), value.getDelegate());
}
if (schema.getMaxProperties() != null && propertyList.size() > schema.getMaxProperties()) {
error("Number of properties is greater than " + schema.getMaxProperties(), value.getDelegate());
}
final Map<String, List<String>> dependencies = schema.getPropertyDependencies();
if (dependencies != null) {
for (Map.Entry<String, List<String>> entry : dependencies.entrySet()) {
if (set.contains(entry.getKey())) {
final List<String> list = entry.getValue();
for (String s : list) {
if (!set.contains(s)) {
error("Dependency is violated: '" + s + "' must be specified, since '" + entry.getKey() + "' is specified", value.getDelegate());
if (schema.getMinProperties() != null && propertyList.size() < schema.getMinProperties()) {
error("Number of properties is less than " + schema.getMinProperties(), value.getDelegate());
}
if (schema.getMaxProperties() != null && propertyList.size() > schema.getMaxProperties()) {
error("Number of properties is greater than " + schema.getMaxProperties(), value.getDelegate());
}
final Map<String, List<String>> dependencies = schema.getPropertyDependencies();
if (dependencies != null) {
for (Map.Entry<String, List<String>> entry : dependencies.entrySet()) {
if (set.contains(entry.getKey())) {
final List<String> list = entry.getValue();
for (String s : list) {
if (!set.contains(s)) {
error("Dependency is violated: '" + s + "' must be specified, since '" + entry.getKey() + "' is specified",
value.getDelegate());
}
}
}
}
}
}
final Map<String, JsonSchemaObject> schemaDependencies = schema.getSchemaDependencies();
if (schemaDependencies != null) {
for (Map.Entry<String, JsonSchemaObject> entry : schemaDependencies.entrySet()) {
if (set.contains(entry.getKey())) {
checkByScheme(value, entry.getValue(), new HashSet<>());
final Map<String, JsonSchemaObject> schemaDependencies = schema.getSchemaDependencies();
if (schemaDependencies != null) {
for (Map.Entry<String, JsonSchemaObject> entry : schemaDependencies.entrySet()) {
if (set.contains(entry.getKey())) {
checkByScheme(value, entry.getValue(), new HashSet<>());
}
}
}
}
json/src/com/jetbrains/jsonSchema/impl/JsonValueAdapter.java
+2
View File
@@ -34,4 +34,6 @@ public interface JsonValueAdapter {
@Nullable JsonObjectValueAdapter getAsObject();
@Nullable JsonArrayValueAdapter getAsArray();
default boolean shouldCheckIntegralRequirements() {return true;}
}