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

fix tests sorry

Browse Source 
(part of json schema based completion: complete array and object literals - WEB-20119)
This commit is contained in:
Irina.Chernushina
2018-03-29 15:59:58 +02:00
parent 5f46dd7513
commit 9cf3510e79
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/jetbrains/jsonSchema/impl/JsonSchemaCompletionContributor.java
+5 -1
View File
@@ -238,7 +238,7 @@ public class JsonSchemaCompletionContributor extends CompletionContributor {
builder = builder.withTypeText(StringUtil.removeHtmlTags(typeText), true);
}
if (variants.size() <= 1) {
if (hasSameType(variants)) {
final JsonSchemaType type = jsonSchemaObject.getType();
final List<Object> values = jsonSchemaObject.getEnum();
if (type != null || !ContainerUtil.isEmpty(values) || jsonSchemaObject.getDefault() != null) {
@@ -251,6 +251,10 @@ public class JsonSchemaCompletionContributor extends CompletionContributor {
myVariants.add(builder);
}
private static boolean hasSameType(@NotNull Collection<JsonSchemaObject> variants) {
return variants.stream().map(JsonSchemaObject::getType).filter(Objects::nonNull).distinct().count() <= 1;
}
private static InsertHandler<LookupElement> createArrayOrObjectLiteralInsertHandler() {
return new InsertHandler<LookupElement>() {
@Override