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

IDEA-CR-17497

Browse Source
This commit is contained in:
Dennis Ushakov
2017-01-19 16:23:13 +03:00
parent a28d278a54
commit d82365bf06
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/intellij/json/liveTemplates/JsonContextType.java
+2 -4
View File
@@ -37,11 +37,9 @@ public class JsonContextType extends FileTypeBasedContextType {
@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));
}
}
json/tests/test/com/intellij/json/JsonLiveTemplateTest.java
+4
View File
@@ -63,6 +63,10 @@ public class JsonLiveTemplateTest extends JsonTestCase {
assertFalse(isApplicableContextUnderCaret("{fo<caret>o: \"bar\"}"));
}
public void testNotExpandableInsidePropertyKeyWithWhitespace() {
assertFalse(isApplicableContextUnderCaret("{fo<caret>o : \"bar\"}"));
}
public void testExpandableAtTopLevel() {
assertTrue(isApplicableContextUnderCaret("fo<caret>o"));
}