From fba31fab7f58786dd9d60fc023bd6da4fe43fa0f Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Sat, 4 Mar 2017 13:28:10 +0100
Subject: [PATCH] WEB-25724 Missing completion for current property in
 package.json

---
 .../impl/JsonBySchemaObjectCompletionContributor.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java b/json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java
index 5165afb73cf8..eace684d7c39 100644
--- a/json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java
+++ b/json/src/com/jetbrains/jsonSchema/impl/JsonBySchemaObjectCompletionContributor.java
@@ -116,11 +116,12 @@ class JsonBySchemaObjectCompletionContributor extends CompletionContributor {
             final boolean hasValue = myWalker.isPropertyWithValue(myPosition.getParent().getParent());
 
             final Collection<String> properties = myWalker.getPropertyNamesOfParentObject(myOriginalPosition);
+            final JsonPropertyAdapter adapter = myWalker.getParentPropertyAdapter(myOriginalPosition);
 
             JsonSchemaPropertyProcessor.process(new JsonSchemaPropertyProcessor.PropertyProcessor() {
               @Override
               public boolean process(String name, JsonSchemaObject schema) {
-                if (properties.contains(name)) {
+                if (properties.contains(name) && (adapter == null || !name.equals(adapter.getName()))) {
                   return true;
                 }