From 305c360c0e22ce2abda5095ddb2c0805c1ce1104 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 24 Aug 2016 15:18:09 +0200
Subject: [PATCH] eslint, provide short descriptions for properties; fix so
 that description is correctly combined if $ref is also used

---
 json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java
index b81b55b26fbb..3958ea1ab31b 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaObject.java
@@ -1,5 +1,7 @@
 package com.jetbrains.jsonSchema.impl;
 
+import com.intellij.openapi.util.text.StringUtil;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -118,6 +120,9 @@ public class JsonSchemaObject {
     myProperties.putAll(other.myProperties);
     myDefinitions = copyMap(myDefinitions, other.myDefinitions);
     myPatternProperties = copyMap(myPatternProperties, other.myPatternProperties);
+    if (!StringUtil.isEmptyOrSpaces(other.myDescription)) {
+      myDescription = other.myDescription;
+    }
 
     if (other.myType != null) myType = other.myType;
     if (other.myDefault != null) myDefault = other.myDefault;