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

WEB-13587 Align compound property values on opening brace/bracket

Browse Source 
Also updated test data with more complete example from user and
changed preview shown in settings so effect was more clear.
This commit is contained in:
Mikhail Golubev
2014-10-22 16:32:45 +04:00
parent b762b79d4b
commit 9ec8fbb7d8
6 changed files with 99 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/intellij/json/formatter/JsonBlock.java
+20 -12
View File
@@ -3,7 +3,6 @@ package com.intellij.json.formatter;
import com.intellij.formatting.*;
import com.intellij.json.JsonElementTypes;
import com.intellij.json.JsonLanguage;
import com.intellij.json.JsonParserDefinition;
import com.intellij.json.psi.JsonArray;
import com.intellij.json.psi.JsonObject;
import com.intellij.json.psi.JsonProperty;
@@ -23,8 +22,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.List;
import static com.intellij.json.JsonParserDefinition.JSON_BRACES;
import static com.intellij.json.JsonParserDefinition.JSON_BRACKETS;
import static com.intellij.json.JsonParserDefinition.*;
import static com.intellij.json.formatter.JsonCodeStyleSettings.PropertyAlignment.ALIGN_ON_COLON;
import static com.intellij.json.formatter.JsonCodeStyleSettings.PropertyAlignment.ALIGN_ON_VALUE;
@@ -115,21 +113,31 @@ public class JsonBlock implements ASTBlock {
Alignment alignment = null;
Wrap wrap = null;
JsonCodeStyleSettings customSettings = getCustomSettings();
if (isContainer() && childNodeType != JsonElementTypes.COMMA && !BRACES.contains(childNodeType)) {
assert myChildWrap != null;
wrap = myChildWrap;
indent = Indent.getNormalIndent();
final JsonCodeStyleSettings customSettings = getCustomSettings();
if (isContainer()) {
if (childNodeType != JsonElementTypes.COMMA && !BRACES.contains(childNodeType)) {
assert myChildWrap != null;
wrap = myChildWrap;
indent = Indent.getNormalIndent();
}
else if (OPEN_BRACES.contains(childNodeType)) {
if (JsonPsiUtil.isPropertyValue(myPsiElement) && customSettings.PROPERTY_ALIGNMENT == ALIGN_ON_VALUE) {
// WEB-13587 Align compound values on opening brace/bracket, not the whole block
assert myParent != null && myParent.myParent != null && myParent.myParent.myPropertyValueAlignment != null;
alignment = myParent.myParent.myPropertyValueAlignment;
}
}
}
// Handle properties alignment
else if (myNode.getElementType() == JsonElementTypes.PROPERTY) {
assert myParent.myNode.getElementType() == JsonElementTypes.OBJECT;
assert myParent.myPropertyValueAlignment != null;
assert myParent != null && myParent.myPropertyValueAlignment != null;
if (childNode.getElementType() == JsonElementTypes.COLON && customSettings.PROPERTY_ALIGNMENT == ALIGN_ON_COLON) {
alignment = myParent.myPropertyValueAlignment;
}
else if (JsonPsiUtil.isPropertyValue(childNode.getPsi()) && customSettings.PROPERTY_ALIGNMENT == ALIGN_ON_VALUE) {
alignment = myParent.myPropertyValueAlignment;
if (!JSON_CONTAINERS.contains(childNodeType)) {
alignment = myParent.myPropertyValueAlignment;
}
}
}
return new JsonBlock(this, childNode, mySettings, alignment, indent, wrap);
@@ -216,7 +224,7 @@ public class JsonBlock implements ASTBlock {
}
private boolean isContainer() {
return JsonParserDefinition.JSON_CONTAINERS.contains(myNode.getElementType());
return JSON_CONTAINERS.contains(myNode.getElementType());
}
private JsonCodeStyleSettings getCustomSettings() {
json/src/com/intellij/json/formatter/JsonCodeStylePanel.java
+11 -9
View File
@@ -23,13 +23,16 @@ import java.awt.event.ItemListener;
* @author Mikhail Golubev
*/
public class JsonCodeStylePanel extends CodeStyleAbstractPanel {
public static final String SAMPLE = "{\n" +
" \"longKeyName\": true,\n" +
" \"short\": false,\n" +
"\n" +
" \"group2-longKeyName\": null,\n" +
" \"group2-short\": 42\n" +
"}";
public static final String ALIGNMENT_SAMPLE = "{\n" +
" \"foo\": {\n" +
" \"bar\": true,\n" +
" \"baz\": false\n" +
" },\n" +
" \"quux\": [\n" +
" 1, 2.0, 3e0, 4.0e0\n" +
" ],\n" +
" \"longPropertyName\": null\n" +
"}";
private JComboBox myPropertiesAlignmentCombo;
private JPanel myPreviewPanel;
@@ -59,7 +62,6 @@ public class JsonCodeStylePanel extends CodeStyleAbstractPanel {
}
}
});
}
@Override
@@ -82,7 +84,7 @@ public class JsonCodeStylePanel extends CodeStyleAbstractPanel {
@Nullable
@Override
protected String getPreviewText() {
return SAMPLE;
return ALIGNMENT_SAMPLE;
}
@Override
json/tests/testData/formatting/AlignPropertiesOnColon.json
+17 -3
View File
@@ -1,5 +1,19 @@
{
"a": 1,
"aaa": 2,
"aaaaa": 3
"require-dev": {
"phpunit/phpunit": "~3.7",
"phpunit/phpunit-selenium": "@stable",
"phpunit/phpunit-story": "@stable",
"phpunit/dbunit": "@stable"
},
"minimum-stability": "dev",
"autoload": {
"psr-4": {
"DreamFactory\\Yii\\": "src/"
}
},
"extra": {
"branch-alias": {
"dev-develop": "1.5.x-dev"
}
}
}
json/tests/testData/formatting/AlignPropertiesOnColon_after.json
+17 -3
View File
@@ -1,5 +1,19 @@
{
"a" : 1,
"aaa" : 2,
"aaaaa": 3
"require-dev" : {
"phpunit/phpunit" : "~3.7",
"phpunit/phpunit-selenium": "@stable",
"phpunit/phpunit-story" : "@stable",
"phpunit/dbunit" : "@stable"
},
"minimum-stability": "dev",
"autoload" : {
"psr-4": {
"DreamFactory\\Yii\\": "src/"
}
},
"extra" : {
"branch-alias": {
"dev-develop": "1.5.x-dev"
}
}
}
json/tests/testData/formatting/AlignPropertiesOnValue.json
+17 -3
View File
@@ -1,5 +1,19 @@
{
"a": 1,
"aaa": 2,
"aaaaa": 3
"require-dev": {
"phpunit/phpunit": "~3.7",
"phpunit/phpunit-selenium": "@stable",
"phpunit/phpunit-story": "@stable",
"phpunit/dbunit": "@stable"
},
"minimum-stability": "dev",
"autoload": {
"psr-4": {
"DreamFactory\\Yii\\": "src/"
}
},
"extra": {
"branch-alias": {
"dev-develop": "1.5.x-dev"
}
}
}
json/tests/testData/formatting/AlignPropertiesOnValue_after.json
+17 -3
View File
@@ -1,5 +1,19 @@
{
"a": 1,
"aaa": 2,
"aaaaa": 3
"require-dev": {
"phpunit/phpunit": "~3.7",
"phpunit/phpunit-selenium": "@stable",
"phpunit/phpunit-story": "@stable",
"phpunit/dbunit": "@stable"
},
"minimum-stability": "dev",
"autoload": {
"psr-4": {
"DreamFactory\\Yii\\": "src/"
}
},
"extra": {
"branch-alias": {
"dev-develop": "1.5.x-dev"
}
}
}