IDEA-CR-17497

JetBrains · Jan 19, 2017 · d82365b · d82365b
1 parent a28d278
commit d82365b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/json/src/com/intellij/json/liveTemplates/JsonContextType.java b/json/src/com/intellij/json/liveTemplates/JsonContextType.java
@@ -37,11 +37,9 @@ public boolean isInContext(@NotNull PsiFile file, int offset) {
                                                                                  @Override
                                                                                  public boolean accepts(@NotNull PsiElement element,
                                                                                                         ProcessingContext context) {
-                                                                                   return JsonPsiUtil.isPropertyKey(element) &&
-                                                                                          element.getNextSibling() != null &&
-                                                                                          element.getNextSibling().getNode().getElementType() == JsonElementTypes.COLON;
+                                                                                   return JsonPsiUtil.isPropertyKey(element);
                                                                                  }
-                                                                               })));
+                                                                               })).beforeLeaf(psiElement(JsonElementTypes.COLON)));
     return !illegalPattern.accepts(file.findElementAt(offset));
   }
 }
diff --git a/json/tests/test/com/intellij/json/JsonLiveTemplateTest.java b/json/tests/test/com/intellij/json/JsonLiveTemplateTest.java
@@ -63,6 +63,10 @@ public void testNotExpandableInsidePropertyKey() {
     assertFalse(isApplicableContextUnderCaret("{fo<caret>o: \"bar\"}"));
   }
 
+  public void testNotExpandableInsidePropertyKeyWithWhitespace() {
+    assertFalse(isApplicableContextUnderCaret("{fo<caret>o : \"bar\"}"));
+  }
+
   public void testExpandableAtTopLevel() {
     assertTrue(isApplicableContextUnderCaret("fo<caret>o"));
   }