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

allow expanding live templates in unfinished property

Browse Source
This commit is contained in:
Dennis Ushakov
2017-01-18 18:40:28 +03:00
parent 835c860cc0
commit 04b882cbbf
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/intellij/json/liveTemplates/JsonContextType.java
+4 -1
View File
@@ -2,6 +2,7 @@ package com.intellij.json.liveTemplates;
import com.intellij.codeInsight.template.FileTypeBasedContextType;
import com.intellij.json.JsonBundle;
import com.intellij.json.JsonElementTypes;
import com.intellij.json.JsonFileType;
import com.intellij.json.psi.JsonFile;
import com.intellij.json.psi.JsonPsiUtil;
@@ -36,7 +37,9 @@ public class JsonContextType extends FileTypeBasedContextType {
@Override
public boolean accepts(@NotNull PsiElement element,
ProcessingContext context) {
return JsonPsiUtil.isPropertyKey(element);
return JsonPsiUtil.isPropertyKey(element) &&
element.getNextSibling() != null &&
element.getNextSibling().getNode().getElementType() == JsonElementTypes.COLON;
}
})));
return !illegalPattern.accepts(file.findElementAt(offset));
json/tests/test/com/intellij/json/JsonLiveTemplateTest.java
+4
View File
@@ -67,6 +67,10 @@ public class JsonLiveTemplateTest extends JsonTestCase {
assertTrue(isApplicableContextUnderCaret("fo<caret>o"));
}
public void testExpandableInObjectLiteral() {
assertTrue(isApplicableContextUnderCaret("{fo<caret>o}"));
}
public void testCustomTemplateExpansion() {
final String templateContent = "{\n" +
" \"foo\": \"$1$\"\n" +