MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix JsonEditingTest: don't autoinsert comma if there's no value

Browse Source
This commit is contained in:
Anton Lobov
2018-04-21 10:44:31 +02:00
parent 04d43ad3a7
commit ceb2a546c4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json/src/com/intellij/json/editor/JsonEnterHandler.java
View File

@@ -66,7 +66,7 @@ public class JsonEnterHandler extends EnterHandlerDelegateAdapter {
prevSibling = prevSibling.getPrevSibling(); prevSibling = prevSibling.getPrevSibling();
} }
if (prevSibling instanceof JsonProperty) { if (prevSibling instanceof JsonProperty && ((JsonProperty)prevSibling).getValue() != null) {
int offset = elementType == JsonElementTypes.COMMA ? nextSibling.getTextRange().getEndOffset() : prevSibling.getTextRange().getEndOffset(); int offset = elementType == JsonElementTypes.COMMA ? nextSibling.getTextRange().getEndOffset() : prevSibling.getTextRange().getEndOffset();
if (elementType == JsonElementTypes.R_CURLY) { if (elementType == JsonElementTypes.R_CURLY) {
editor.getDocument().insertString(offset, ","); editor.getDocument().insertString(offset, ",");

2
json/tests/testData/editing/NormalIndentAfterPropertyWithoutComma.after.json
View File

@@ -1,6 +1,6 @@
{ {
"vcs": { "vcs": {
"schema": "schema://foo.bar/path" "schema": "schema://foo.bar/path"
} },
<caret> <caret>
} }