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

Fixed IDEA-206778 Export codestyle settings to JSON: export fails when non-default values are provided

Browse Source 
Namely "Next line if wrapped"
This commit is contained in:
Rustam Vishnyakov
2019-02-06 21:26:04 +03:00
parent 44f083e88e
commit c40d30a6eb
4 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeStyle/jsonExport.j2ee.json
+1 -1
View File
@@ -133,7 +133,7 @@
"message_dd_suffix": "EJB",
"message_eb_suffix": "Bean",
"method_annotation_wrap": "split_into_lines",
"method_brace_style": "end_of_line",
"method_brace_style": "next_line_if_wrapped",
"method_call_chain_wrap": "off",
"method_parameters_new_line_after_left_paren": false,
"method_parameters_right_paren_on_new_line": false,
java/java-tests/testData/codeStyle/jsonExport.json
+1 -1
View File
@@ -123,7 +123,7 @@
"line_comment_add_space": false,
"line_comment_at_first_column": true,
"method_annotation_wrap": "split_into_lines",
"method_brace_style": "end_of_line",
"method_brace_style": "next_line_if_wrapped",
"method_call_chain_wrap": "off",
"method_parameters_new_line_after_left_paren": false,
"method_parameters_right_paren_on_new_line": false,
java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java
+1
View File
@@ -83,6 +83,7 @@ public class JavaCodeStyleSettingsTest extends CodeStyleTestCase {
commonJavaSettings.METHOD_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_AS_NEEDED;
commonJavaSettings.CALL_PARAMETERS_WRAP = CommonCodeStyleSettings.WRAP_ON_EVERY_ITEM;
commonJavaSettings.WRAP_ON_TYPING = CommonCodeStyleSettings.WrapOnTyping.WRAP.intValue;
commonJavaSettings.METHOD_BRACE_STYLE = CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED;
final JavaCodeStyleSettings javaSettings = settings.getCustomSettings(JavaCodeStyleSettings.class);
javaSettings.FIELD_NAME_PREFIX = "m_";
javaSettings.STATIC_FIELD_NAME_SUFFIX = "_s";
platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BraceStyleAccessor.java
+2
View File
@@ -15,6 +15,7 @@ class BraceStyleAccessor extends ExternalStringAccessor<Integer> implements Code
public static final String VALUE_END_OF_LINE = "end_of_line";
public static final String VALUE_NEXT_LINE = "next_line";
public static final String VALUE_NEXT_LINE_IF_WRAPPED = "next_line_if_wrapped";
public static final String VALUE_WHITESMITHS = "whitesmiths";
public static final String VALUE_GNU = "gnu";
@@ -23,6 +24,7 @@ class BraceStyleAccessor extends ExternalStringAccessor<Integer> implements Code
static {
BRACE_STYLE_MAP.put(CommonCodeStyleSettings.END_OF_LINE, VALUE_END_OF_LINE);
BRACE_STYLE_MAP.put(CommonCodeStyleSettings.NEXT_LINE, VALUE_NEXT_LINE);
BRACE_STYLE_MAP.put(CommonCodeStyleSettings.NEXT_LINE_IF_WRAPPED, VALUE_NEXT_LINE_IF_WRAPPED);
BRACE_STYLE_MAP.put(CommonCodeStyleSettings.NEXT_LINE_SHIFTED, VALUE_WHITESMITHS);
BRACE_STYLE_MAP.put(CommonCodeStyleSettings.NEXT_LINE_SHIFTED2, VALUE_GNU);
}