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-36383 follow-up: properly skip foreign values in webpack validation

Browse Source
This commit is contained in:
Anton Lobov
2018-12-20 16:56:47 +01:00
parent 7c3de5ddad
commit fb795da377
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/extension/adapters/JsonValueAdapter.java
+1
View File
@@ -37,4 +37,5 @@ public interface JsonValueAdapter {
@Nullable JsonArrayValueAdapter getAsArray();
default boolean shouldCheckIntegralRequirements() {return true;}
default boolean shouldCheckAsValue() {return true;}
}
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaAnnotatorChecker.java
+6
View File
@@ -488,6 +488,7 @@ class JsonSchemaAnnotatorChecker {
@Nullable JsonValueAdapter adapter,
@NotNull String text,
@NotNull BiFunction<String, String, Boolean> stringEq) {
if (adapter != null && !adapter.shouldCheckAsValue()) return true;
if (object instanceof EnumArrayValueWrapper) {
if (adapter instanceof JsonArrayValueAdapter) {
List<JsonValueAdapter> elements = ((JsonArrayValueAdapter)adapter).getElements();
@@ -673,6 +674,7 @@ class JsonSchemaAnnotatorChecker {
for (Map.Entry<String, Collection<JsonValueAdapter>> entry: valueTexts.entrySet()) {
if (entry.getValue().size() > 1) {
for (JsonValueAdapter item: entry.getValue()) {
if (!item.shouldCheckAsValue()) continue;
error("Item is not unique", item.getDelegate(), JsonErrorPriority.TYPE_MISMATCH);
}
}
@@ -727,6 +729,8 @@ class JsonSchemaAnnotatorChecker {
private void checkString(PsiElement propValue, JsonSchemaObject schema) {
final JsonLikePsiWalker walker = JsonLikePsiWalker.getWalker(propValue, schema);
assert walker != null;
JsonValueAdapter adapter = walker.createValueAdapter(propValue);
if (adapter != null && !adapter.shouldCheckAsValue()) return;
final String value = StringUtil.unquoteString(walker.getNodeTextForValidation(propValue));
if (schema.getMinLength() != null) {
if (value.length() < schema.getMinLength()) {
@@ -760,6 +764,8 @@ class JsonSchemaAnnotatorChecker {
Number value;
final JsonLikePsiWalker walker = JsonLikePsiWalker.getWalker(propValue, schema);
assert walker != null;
JsonValueAdapter adapter = walker.createValueAdapter(propValue);
if (adapter != null && !adapter.shouldCheckAsValue()) return;
String valueText = walker.getNodeTextForValidation(propValue);
if (JsonSchemaType._integer.equals(schemaType)) {
try {