From 7acb06052b2e379a8de5d51e5fcd545392da6997 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Tue, 29 Jan 2019 12:18:46 +0300 Subject: [PATCH] Use actual types (integer, boolean) when exporting code style settings to Json --- .../testData/codeStyle/jsonExport.j2ee.json | 382 +++++++++--------- .../testData/codeStyle/jsonExport.json | 382 +++++++++--------- .../codeStyle/JavaCodeStyleSettingsTest.java | 3 +- .../codeStyle/properties/BooleanAccessor.java | 16 +- .../properties/BraceStyleAccessor.java | 2 +- .../properties/EnumPropertyAccessor.java | 2 +- ...essor.java => ExternalStringAccessor.java} | 4 +- .../properties/ForceBracesAccessor.java | 2 +- .../codeStyle/properties/IntegerAccessor.java | 17 +- .../properties/PropertyAccessorFactory.java | 8 +- .../codeStyle/properties/StringAccessor.java | 2 +- .../properties/WrapOnTypingAccessor.java | 22 +- .../properties/WrappingAccessor.java | 2 +- .../json/CodeStyleSchemeJsonExporter.java | 6 + .../testData/codeStyle/json/exportToJson.json | 44 +- ...ntellijConfigOptionDescriptorProvider.java | 2 +- 16 files changed, 466 insertions(+), 430 deletions(-) rename platform/lang-api/src/com/intellij/application/options/codeStyle/properties/{ScalarPropertyAccessor.java => ExternalStringAccessor.java} (84%) diff --git a/java/java-tests/testData/codeStyle/jsonExport.j2ee.json b/java/java-tests/testData/codeStyle/jsonExport.j2ee.json index a2e8af09c35e..130f410ccfc1 100644 --- a/java/java-tests/testData/codeStyle/jsonExport.j2ee.json +++ b/java/java-tests/testData/codeStyle/jsonExport.j2ee.json @@ -5,82 +5,82 @@ { "language": "java", "options": { - "align_consecutive_assignments": "false", - "align_consecutive_variable_declarations": "false", - "align_group_field_declarations": "false", - "align_multiline_annotation_parameters": "false", - "align_multiline_array_initializer_expression": "false", - "align_multiline_assignment": "false", - "align_multiline_binary_operation": "false", - "align_multiline_chained_methods": "false", - "align_multiline_extends_list": "false", - "align_multiline_for": "true", - "align_multiline_method_brackets": "false", - "align_multiline_parameters": "true", - "align_multiline_parameters_in_calls": "false", - "align_multiline_parenthesized_expression": "false", - "align_multiline_resources": "true", - "align_multiline_ternary_operation": "false", - "align_multiline_throws_list": "false", - "align_subsequent_simple_methods": "false", - "align_throws_keyword": "false", + "align_consecutive_assignments": false, + "align_consecutive_variable_declarations": false, + "align_group_field_declarations": false, + "align_multiline_annotation_parameters": false, + "align_multiline_array_initializer_expression": false, + "align_multiline_assignment": false, + "align_multiline_binary_operation": false, + "align_multiline_chained_methods": false, + "align_multiline_extends_list": false, + "align_multiline_for": true, + "align_multiline_method_brackets": false, + "align_multiline_parameters": true, + "align_multiline_parameters_in_calls": false, + "align_multiline_parenthesized_expression": false, + "align_multiline_resources": true, + "align_multiline_ternary_operation": false, + "align_multiline_throws_list": false, + "align_subsequent_simple_methods": false, + "align_throws_keyword": false, "annotation_parameter_wrap": "off", - "array_initializer_new_line_after_left_brace": "false", - "array_initializer_right_brace_on_new_line": "false", + "array_initializer_new_line_after_left_brace": false, + "array_initializer_right_brace_on_new_line": false, "array_initializer_wrap": "off", - "assert_statement_colon_on_next_line": "false", + "assert_statement_colon_on_next_line": false, "assert_statement_wrap": "off", "assignment_wrap": "off", - "binary_operation_sign_on_next_line": "false", + "binary_operation_sign_on_next_line": false, "binary_operation_wrap": "off", - "blank_lines_after_anonymous_class_header": "0", - "blank_lines_after_class_header": "0", - "blank_lines_after_imports": "1", - "blank_lines_after_package": "1", - "blank_lines_around_class": "1", - "blank_lines_around_field": "0", - "blank_lines_around_field_in_interface": "0", - "blank_lines_around_initializer": "1", - "blank_lines_around_method": "1", - "blank_lines_around_method_in_interface": "1", - "blank_lines_before_class_end": "0", - "blank_lines_before_imports": "1", - "blank_lines_before_method_body": "0", - "blank_lines_before_package": "0", - "block_comment_at_first_column": "true", + "blank_lines_after_anonymous_class_header": 0, + "blank_lines_after_class_header": 0, + "blank_lines_after_imports": 1, + "blank_lines_after_package": 1, + "blank_lines_around_class": 1, + "blank_lines_around_field": 0, + "blank_lines_around_field_in_interface": 0, + "blank_lines_around_initializer": 1, + "blank_lines_around_method": 1, + "blank_lines_around_method_in_interface": 1, + "blank_lines_before_class_end": 0, + "blank_lines_before_imports": 1, + "blank_lines_before_method_body": 0, + "blank_lines_before_package": 0, + "block_comment_at_first_column": true, "brace_style": "end_of_line", - "call_parameters_new_line_after_left_paren": "false", - "call_parameters_right_paren_on_new_line": "false", + "call_parameters_new_line_after_left_paren": false, + "call_parameters_right_paren_on_new_line": false, "call_parameters_wrap": "on_every_item", - "case_statement_on_new_line": "true", - "catch_on_new_line": "false", + "case_statement_on_new_line": true, + "catch_on_new_line": false, "class_annotation_wrap": "split_into_lines", "class_brace_style": "end_of_line", - "class_count_to_use_import_on_demand": "5", - "class_names_in_javadoc": "1", - "continuation_indent_size": "8", - "do_not_indent_top_level_class_members": "false", - "do_not_wrap_after_single_annotation": "false", + "class_count_to_use_import_on_demand": 5, + "class_names_in_javadoc": 1, + "continuation_indent_size": 8, + "do_not_indent_top_level_class_members": false, + "do_not_wrap_after_single_annotation": false, "do_while_brace_force": "never", - "doc_add_blank_line_after_description": "true", - "doc_add_blank_line_after_param_comments": "false", - "doc_add_blank_line_after_return": "false", - "doc_add_p_tag_on_empty_lines": "true", - "doc_align_exception_comments": "true", - "doc_align_param_comments": "true", - "doc_do_not_wrap_if_one_line": "false", - "doc_enable_formatting": "true", - "doc_enable_leading_asterisks": "true", - "doc_indent_on_continuation": "false", - "doc_keep_empty_lines": "true", - "doc_keep_empty_parameter_tag": "true", - "doc_keep_empty_return_tag": "true", - "doc_keep_empty_throws_tag": "true", - "doc_keep_invalid_tags": "true", - "doc_param_description_on_new_line": "false", - "doc_preserve_line_breaks": "false", - "doc_use_throws_not_exception_tag": "true", - "else_on_new_line": "false", + "doc_add_blank_line_after_description": true, + "doc_add_blank_line_after_param_comments": false, + "doc_add_blank_line_after_return": false, + "doc_add_p_tag_on_empty_lines": true, + "doc_align_exception_comments": true, + "doc_align_param_comments": true, + "doc_do_not_wrap_if_one_line": false, + "doc_enable_formatting": true, + "doc_enable_leading_asterisks": true, + "doc_indent_on_continuation": false, + "doc_keep_empty_lines": true, + "doc_keep_empty_parameter_tag": true, + "doc_keep_empty_return_tag": true, + "doc_keep_empty_throws_tag": true, + "doc_keep_invalid_tags": true, + "doc_param_description_on_new_line": false, + "doc_preserve_line_breaks": false, + "doc_use_throws_not_exception_tag": true, + "else_on_new_line": false, "entity_dd_suffix": "EJB", "entity_eb_suffix": "Bean", "entity_hi_suffix": "Home", @@ -94,13 +94,13 @@ "extends_list_wrap": "off", "field_annotation_wrap": "split_into_lines", "field_name_prefix": "m_", - "finally_on_new_line": "false", + "finally_on_new_line": false, "for_brace_force": "never", - "for_statement_new_line_after_left_paren": "false", - "for_statement_right_paren_on_new_line": "false", + "for_statement_new_line_after_left_paren": false, + "for_statement_right_paren_on_new_line": false, "for_statement_wrap": "off", - "generate_final_locals": "false", - "generate_final_parameters": "false", + "generate_final_locals": false, + "generate_final_parameters": false, "if_brace_force": "never", "imports_layout": [ "*", @@ -110,53 +110,53 @@ "blank_line", "static *" ], - "indent_case_from_switch": "true", - "indent_size": "4", + "indent_case_from_switch": true, + "indent_size": 4, "indent_style": "space", - "insert_inner_class_imports": "false", - "insert_override_annotation": "true", - "keep_blank_lines_before_right_brace": "2", - "keep_blank_lines_between_package_declaration_and_header": "2", - "keep_blank_lines_in_code": "2", - "keep_blank_lines_in_declarations": "2", - "keep_control_statement_in_one_line": "true", - "keep_first_column_comment": "true", - "keep_indents_on_empty_lines": "false", - "keep_line_breaks": "true", - "keep_multiple_expressions_in_one_line": "false", - "keep_simple_blocks_in_one_line": "false", - "keep_simple_classes_in_one_line": "false", - "keep_simple_lambdas_in_one_line": "false", - "keep_simple_methods_in_one_line": "false", + "insert_inner_class_imports": false, + "insert_override_annotation": true, + "keep_blank_lines_before_right_brace": 2, + "keep_blank_lines_between_package_declaration_and_header": 2, + "keep_blank_lines_in_code": 2, + "keep_blank_lines_in_declarations": 2, + "keep_control_statement_in_one_line": true, + "keep_first_column_comment": true, + "keep_indents_on_empty_lines": false, + "keep_line_breaks": true, + "keep_multiple_expressions_in_one_line": false, + "keep_simple_blocks_in_one_line": false, + "keep_simple_classes_in_one_line": false, + "keep_simple_lambdas_in_one_line": false, + "keep_simple_methods_in_one_line": false, "lambda_brace_style": "end_of_line", - "layout_static_imports_separately": "true", - "line_comment_add_space": "false", - "line_comment_at_first_column": "true", + "layout_static_imports_separately": true, + "line_comment_add_space": false, + "line_comment_at_first_column": true, "message_dd_suffix": "EJB", "message_eb_suffix": "Bean", "method_annotation_wrap": "split_into_lines", "method_brace_style": "end_of_line", "method_call_chain_wrap": "off", - "method_parameters_new_line_after_left_paren": "false", - "method_parameters_right_paren_on_new_line": "false", + "method_parameters_new_line_after_left_paren": false, + "method_parameters_right_paren_on_new_line": false, "method_parameters_wrap": "normal", - "modifier_list_wrap": "false", - "names_count_to_use_import_on_demand": "3", + "modifier_list_wrap": false, + "names_count_to_use_import_on_demand": 3, "packages_to_use_import_on_demand": [ "java.awt.*", "javax.swing.*" ], "parameter_annotation_wrap": "off", - "parentheses_expression_new_line_after_left_paren": "false", - "parentheses_expression_right_paren_on_new_line": "false", - "place_assignment_sign_on_next_line": "false", - "prefer_longer_names": "true", - "prefer_parameters_wrap": "false", - "repeat_synchronized": "true", - "replace_instanceof_and_cast": "false", - "replace_null_check": "true", - "resource_list_new_line_after_left_paren": "false", - "resource_list_right_paren_on_new_line": "false", + "parentheses_expression_new_line_after_left_paren": false, + "parentheses_expression_right_paren_on_new_line": false, + "place_assignment_sign_on_next_line": false, + "prefer_longer_names": true, + "prefer_parameters_wrap": false, + "repeat_synchronized": true, + "replace_instanceof_and_cast": false, + "replace_null_check": true, + "resource_list_new_line_after_left_paren": false, + "resource_list_right_paren_on_new_line": false, "resource_list_wrap": "off", "session_dd_suffix": "EJB", "session_eb_suffix": "Bean", @@ -165,101 +165,101 @@ "session_lhi_suffix": "Home", "session_li_prefix": "Local", "session_si_suffix": "Service", - "smart_tabs": "false", - "space_after_closing_angle_bracket_in_type_argument": "false", - "space_after_colon": "true", - "space_after_comma": "true", - "space_after_comma_in_type_arguments": "true", - "space_after_for_semicolon": "true", - "space_after_quest": "true", - "space_after_type_cast": "true", - "space_before_annotation_array_initializer_left_brace": "false", - "space_before_anotation_parameter_list": "false", - "space_before_array_initializer_left_brace": "false", - "space_before_catch_keyword": "true", - "space_before_catch_left_brace": "true", - "space_before_catch_parentheses": "true", - "space_before_class_left_brace": "true", - "space_before_colon": "true", - "space_before_colon_in_foreach": "true", - "space_before_comma": "false", - "space_before_do_left_brace": "true", - "space_before_else_keyword": "true", - "space_before_else_left_brace": "true", - "space_before_finally_keyword": "true", - "space_before_finally_left_brace": "true", - "space_before_for_left_brace": "true", - "space_before_for_parentheses": "true", - "space_before_for_semicolon": "false", - "space_before_if_left_brace": "true", - "space_before_if_parentheses": "true", - "space_before_method_call_parentheses": "false", - "space_before_method_left_brace": "true", - "space_before_method_parentheses": "false", - "space_before_opening_angle_bracket_in_type_parameter": "false", - "space_before_quest": "true", - "space_before_switch_left_brace": "true", - "space_before_switch_parentheses": "true", - "space_before_synchronized_left_brace": "true", - "space_before_synchronized_parentheses": "true", - "space_before_try_left_brace": "true", - "space_before_try_parentheses": "true", - "space_before_type_parameter_list": "false", - "space_before_while_keyword": "true", - "space_before_while_left_brace": "true", - "space_before_while_parentheses": "true", - "space_inside_one_line_enum_braces": "false", - "spaces_around_additive_operators": "true", - "spaces_around_assignment_operators": "true", - "spaces_around_bitwise_operators": "true", - "spaces_around_equality_operators": "true", - "spaces_around_lambda_arrow": "true", - "spaces_around_logical_operators": "true", - "spaces_around_method_ref_dbl_colon": "false", - "spaces_around_multiplicative_operators": "true", - "spaces_around_relational_operators": "true", - "spaces_around_shift_operators": "true", - "spaces_around_type_bounds_in_type_parameters": "true", - "spaces_around_unary_operator": "false", - "spaces_within_angle_brackets": "false", - "spaces_within_annotation_parentheses": "false", - "spaces_within_array_initializer_braces": "false", - "spaces_within_braces": "false", - "spaces_within_brackets": "false", - "spaces_within_cast_parentheses": "false", - "spaces_within_catch_parentheses": "false", - "spaces_within_empty_array_initializer_braces": "false", - "spaces_within_empty_method_call_parentheses": "false", - "spaces_within_empty_method_parentheses": "false", - "spaces_within_for_parentheses": "false", - "spaces_within_if_parentheses": "false", - "spaces_within_method_call_parentheses": "false", - "spaces_within_method_parentheses": "false", - "spaces_within_parentheses": "false", - "spaces_within_switch_parentheses": "false", - "spaces_within_synchronized_parentheses": "false", - "spaces_within_try_parentheses": "false", - "spaces_within_while_parentheses": "false", - "special_else_if_treatment": "true", + "smart_tabs": false, + "space_after_closing_angle_bracket_in_type_argument": false, + "space_after_colon": true, + "space_after_comma": true, + "space_after_comma_in_type_arguments": true, + "space_after_for_semicolon": true, + "space_after_quest": true, + "space_after_type_cast": true, + "space_before_annotation_array_initializer_left_brace": false, + "space_before_anotation_parameter_list": false, + "space_before_array_initializer_left_brace": false, + "space_before_catch_keyword": true, + "space_before_catch_left_brace": true, + "space_before_catch_parentheses": true, + "space_before_class_left_brace": true, + "space_before_colon": true, + "space_before_colon_in_foreach": true, + "space_before_comma": false, + "space_before_do_left_brace": true, + "space_before_else_keyword": true, + "space_before_else_left_brace": true, + "space_before_finally_keyword": true, + "space_before_finally_left_brace": true, + "space_before_for_left_brace": true, + "space_before_for_parentheses": true, + "space_before_for_semicolon": false, + "space_before_if_left_brace": true, + "space_before_if_parentheses": true, + "space_before_method_call_parentheses": false, + "space_before_method_left_brace": true, + "space_before_method_parentheses": false, + "space_before_opening_angle_bracket_in_type_parameter": false, + "space_before_quest": true, + "space_before_switch_left_brace": true, + "space_before_switch_parentheses": true, + "space_before_synchronized_left_brace": true, + "space_before_synchronized_parentheses": true, + "space_before_try_left_brace": true, + "space_before_try_parentheses": true, + "space_before_type_parameter_list": false, + "space_before_while_keyword": true, + "space_before_while_left_brace": true, + "space_before_while_parentheses": true, + "space_inside_one_line_enum_braces": false, + "spaces_around_additive_operators": true, + "spaces_around_assignment_operators": true, + "spaces_around_bitwise_operators": true, + "spaces_around_equality_operators": true, + "spaces_around_lambda_arrow": true, + "spaces_around_logical_operators": true, + "spaces_around_method_ref_dbl_colon": false, + "spaces_around_multiplicative_operators": true, + "spaces_around_relational_operators": true, + "spaces_around_shift_operators": true, + "spaces_around_type_bounds_in_type_parameters": true, + "spaces_around_unary_operator": false, + "spaces_within_angle_brackets": false, + "spaces_within_annotation_parentheses": false, + "spaces_within_array_initializer_braces": false, + "spaces_within_braces": false, + "spaces_within_brackets": false, + "spaces_within_cast_parentheses": false, + "spaces_within_catch_parentheses": false, + "spaces_within_empty_array_initializer_braces": false, + "spaces_within_empty_method_call_parentheses": false, + "spaces_within_empty_method_parentheses": false, + "spaces_within_for_parentheses": false, + "spaces_within_if_parentheses": false, + "spaces_within_method_call_parentheses": false, + "spaces_within_method_parentheses": false, + "spaces_within_parentheses": false, + "spaces_within_switch_parentheses": false, + "spaces_within_synchronized_parentheses": false, + "spaces_within_try_parentheses": false, + "spaces_within_while_parentheses": false, + "special_else_if_treatment": true, "static_field_name_suffix": "_s", "subclass_name_suffix": "Impl", - "tab_width": "4", - "ternary_operation_signs_on_next_line": "false", + "tab_width": 4, + "ternary_operation_signs_on_next_line": false, "ternary_operation_wrap": "off", "test_name_suffix": "Test", "throws_keyword_wrap": "off", "throws_list_wrap": "off", - "use_external_annotations": "false", - "use_fq_class_names": "false", - "use_single_class_imports": "true", + "use_external_annotations": false, + "use_fq_class_names": false, + "use_single_class_imports": true, "variable_annotation_wrap": "off", "visibility": "public", "while_brace_force": "never", - "while_on_new_line": "false", - "wrap_comments": "false", - "wrap_first_method_in_call_chain": "false", - "wrap_long_lines": "false", - "wrap_on_typing": "true" + "while_on_new_line": false, + "wrap_comments": false, + "wrap_first_method_in_call_chain": false, + "wrap_long_lines": false, + "wrap_on_typing": true } } ] diff --git a/java/java-tests/testData/codeStyle/jsonExport.json b/java/java-tests/testData/codeStyle/jsonExport.json index f18f34adfe12..893de59fcdd5 100644 --- a/java/java-tests/testData/codeStyle/jsonExport.json +++ b/java/java-tests/testData/codeStyle/jsonExport.json @@ -5,94 +5,94 @@ { "language": "java", "options": { - "align_consecutive_assignments": "false", - "align_consecutive_variable_declarations": "false", - "align_group_field_declarations": "false", - "align_multiline_annotation_parameters": "false", - "align_multiline_array_initializer_expression": "false", - "align_multiline_assignment": "false", - "align_multiline_binary_operation": "false", - "align_multiline_chained_methods": "false", - "align_multiline_extends_list": "false", - "align_multiline_for": "true", - "align_multiline_method_brackets": "false", - "align_multiline_parameters": "true", - "align_multiline_parameters_in_calls": "false", - "align_multiline_parenthesized_expression": "false", - "align_multiline_resources": "true", - "align_multiline_ternary_operation": "false", - "align_multiline_throws_list": "false", - "align_subsequent_simple_methods": "false", - "align_throws_keyword": "false", + "align_consecutive_assignments": false, + "align_consecutive_variable_declarations": false, + "align_group_field_declarations": false, + "align_multiline_annotation_parameters": false, + "align_multiline_array_initializer_expression": false, + "align_multiline_assignment": false, + "align_multiline_binary_operation": false, + "align_multiline_chained_methods": false, + "align_multiline_extends_list": false, + "align_multiline_for": true, + "align_multiline_method_brackets": false, + "align_multiline_parameters": true, + "align_multiline_parameters_in_calls": false, + "align_multiline_parenthesized_expression": false, + "align_multiline_resources": true, + "align_multiline_ternary_operation": false, + "align_multiline_throws_list": false, + "align_subsequent_simple_methods": false, + "align_throws_keyword": false, "annotation_parameter_wrap": "off", - "array_initializer_new_line_after_left_brace": "false", - "array_initializer_right_brace_on_new_line": "false", + "array_initializer_new_line_after_left_brace": false, + "array_initializer_right_brace_on_new_line": false, "array_initializer_wrap": "off", - "assert_statement_colon_on_next_line": "false", + "assert_statement_colon_on_next_line": false, "assert_statement_wrap": "off", "assignment_wrap": "off", - "binary_operation_sign_on_next_line": "false", + "binary_operation_sign_on_next_line": false, "binary_operation_wrap": "off", - "blank_lines_after_anonymous_class_header": "0", - "blank_lines_after_class_header": "0", - "blank_lines_after_imports": "1", - "blank_lines_after_package": "1", - "blank_lines_around_class": "1", - "blank_lines_around_field": "0", - "blank_lines_around_field_in_interface": "0", - "blank_lines_around_initializer": "1", - "blank_lines_around_method": "1", - "blank_lines_around_method_in_interface": "1", - "blank_lines_before_class_end": "0", - "blank_lines_before_imports": "1", - "blank_lines_before_method_body": "0", - "blank_lines_before_package": "0", - "block_comment_at_first_column": "true", + "blank_lines_after_anonymous_class_header": 0, + "blank_lines_after_class_header": 0, + "blank_lines_after_imports": 1, + "blank_lines_after_package": 1, + "blank_lines_around_class": 1, + "blank_lines_around_field": 0, + "blank_lines_around_field_in_interface": 0, + "blank_lines_around_initializer": 1, + "blank_lines_around_method": 1, + "blank_lines_around_method_in_interface": 1, + "blank_lines_before_class_end": 0, + "blank_lines_before_imports": 1, + "blank_lines_before_method_body": 0, + "blank_lines_before_package": 0, + "block_comment_at_first_column": true, "brace_style": "end_of_line", - "call_parameters_new_line_after_left_paren": "false", - "call_parameters_right_paren_on_new_line": "false", + "call_parameters_new_line_after_left_paren": false, + "call_parameters_right_paren_on_new_line": false, "call_parameters_wrap": "on_every_item", - "case_statement_on_new_line": "true", - "catch_on_new_line": "false", + "case_statement_on_new_line": true, + "catch_on_new_line": false, "class_annotation_wrap": "split_into_lines", "class_brace_style": "end_of_line", - "class_count_to_use_import_on_demand": "5", - "class_names_in_javadoc": "1", - "continuation_indent_size": "8", - "do_not_indent_top_level_class_members": "false", - "do_not_wrap_after_single_annotation": "false", + "class_count_to_use_import_on_demand": 5, + "class_names_in_javadoc": 1, + "continuation_indent_size": 8, + "do_not_indent_top_level_class_members": false, + "do_not_wrap_after_single_annotation": false, "do_while_brace_force": "never", - "doc_add_blank_line_after_description": "true", - "doc_add_blank_line_after_param_comments": "false", - "doc_add_blank_line_after_return": "false", - "doc_add_p_tag_on_empty_lines": "true", - "doc_align_exception_comments": "true", - "doc_align_param_comments": "true", - "doc_do_not_wrap_if_one_line": "false", - "doc_enable_formatting": "true", - "doc_enable_leading_asterisks": "true", - "doc_indent_on_continuation": "false", - "doc_keep_empty_lines": "true", - "doc_keep_empty_parameter_tag": "true", - "doc_keep_empty_return_tag": "true", - "doc_keep_empty_throws_tag": "true", - "doc_keep_invalid_tags": "true", - "doc_param_description_on_new_line": "false", - "doc_preserve_line_breaks": "false", - "doc_use_throws_not_exception_tag": "true", - "else_on_new_line": "false", + "doc_add_blank_line_after_description": true, + "doc_add_blank_line_after_param_comments": false, + "doc_add_blank_line_after_return": false, + "doc_add_p_tag_on_empty_lines": true, + "doc_align_exception_comments": true, + "doc_align_param_comments": true, + "doc_do_not_wrap_if_one_line": false, + "doc_enable_formatting": true, + "doc_enable_leading_asterisks": true, + "doc_indent_on_continuation": false, + "doc_keep_empty_lines": true, + "doc_keep_empty_parameter_tag": true, + "doc_keep_empty_return_tag": true, + "doc_keep_empty_throws_tag": true, + "doc_keep_invalid_tags": true, + "doc_param_description_on_new_line": false, + "doc_preserve_line_breaks": false, + "doc_use_throws_not_exception_tag": true, + "else_on_new_line": false, "enum_constants_wrap": "off", "extends_keyword_wrap": "off", "extends_list_wrap": "off", "field_annotation_wrap": "split_into_lines", "field_name_prefix": "m_", - "finally_on_new_line": "false", + "finally_on_new_line": false, "for_brace_force": "never", - "for_statement_new_line_after_left_paren": "false", - "for_statement_right_paren_on_new_line": "false", + "for_statement_new_line_after_left_paren": false, + "for_statement_right_paren_on_new_line": false, "for_statement_wrap": "off", - "generate_final_locals": "false", - "generate_final_parameters": "false", + "generate_final_locals": false, + "generate_final_parameters": false, "if_brace_force": "never", "imports_layout": [ "*", @@ -102,147 +102,147 @@ "blank_line", "static *" ], - "indent_case_from_switch": "true", - "indent_size": "4", + "indent_case_from_switch": true, + "indent_size": 4, "indent_style": "space", - "insert_inner_class_imports": "false", - "insert_override_annotation": "true", - "keep_blank_lines_before_right_brace": "2", - "keep_blank_lines_between_package_declaration_and_header": "2", - "keep_blank_lines_in_code": "2", - "keep_blank_lines_in_declarations": "2", - "keep_control_statement_in_one_line": "true", - "keep_first_column_comment": "true", - "keep_indents_on_empty_lines": "false", - "keep_line_breaks": "true", - "keep_multiple_expressions_in_one_line": "false", - "keep_simple_blocks_in_one_line": "false", - "keep_simple_classes_in_one_line": "false", - "keep_simple_lambdas_in_one_line": "false", - "keep_simple_methods_in_one_line": "false", + "insert_inner_class_imports": false, + "insert_override_annotation": true, + "keep_blank_lines_before_right_brace": 2, + "keep_blank_lines_between_package_declaration_and_header": 2, + "keep_blank_lines_in_code": 2, + "keep_blank_lines_in_declarations": 2, + "keep_control_statement_in_one_line": true, + "keep_first_column_comment": true, + "keep_indents_on_empty_lines": false, + "keep_line_breaks": true, + "keep_multiple_expressions_in_one_line": false, + "keep_simple_blocks_in_one_line": false, + "keep_simple_classes_in_one_line": false, + "keep_simple_lambdas_in_one_line": false, + "keep_simple_methods_in_one_line": false, "lambda_brace_style": "end_of_line", - "layout_static_imports_separately": "true", - "line_comment_add_space": "false", - "line_comment_at_first_column": "true", + "layout_static_imports_separately": true, + "line_comment_add_space": false, + "line_comment_at_first_column": true, "method_annotation_wrap": "split_into_lines", "method_brace_style": "end_of_line", "method_call_chain_wrap": "off", - "method_parameters_new_line_after_left_paren": "false", - "method_parameters_right_paren_on_new_line": "false", + "method_parameters_new_line_after_left_paren": false, + "method_parameters_right_paren_on_new_line": false, "method_parameters_wrap": "normal", - "modifier_list_wrap": "false", - "names_count_to_use_import_on_demand": "3", + "modifier_list_wrap": false, + "names_count_to_use_import_on_demand": 3, "packages_to_use_import_on_demand": [ "java.awt.*", "javax.swing.*" ], "parameter_annotation_wrap": "off", - "parentheses_expression_new_line_after_left_paren": "false", - "parentheses_expression_right_paren_on_new_line": "false", - "place_assignment_sign_on_next_line": "false", - "prefer_longer_names": "true", - "prefer_parameters_wrap": "false", - "repeat_synchronized": "true", - "replace_instanceof_and_cast": "false", - "replace_null_check": "true", - "resource_list_new_line_after_left_paren": "false", - "resource_list_right_paren_on_new_line": "false", + "parentheses_expression_new_line_after_left_paren": false, + "parentheses_expression_right_paren_on_new_line": false, + "place_assignment_sign_on_next_line": false, + "prefer_longer_names": true, + "prefer_parameters_wrap": false, + "repeat_synchronized": true, + "replace_instanceof_and_cast": false, + "replace_null_check": true, + "resource_list_new_line_after_left_paren": false, + "resource_list_right_paren_on_new_line": false, "resource_list_wrap": "off", - "smart_tabs": "false", - "space_after_closing_angle_bracket_in_type_argument": "false", - "space_after_colon": "true", - "space_after_comma": "true", - "space_after_comma_in_type_arguments": "true", - "space_after_for_semicolon": "true", - "space_after_quest": "true", - "space_after_type_cast": "true", - "space_before_annotation_array_initializer_left_brace": "false", - "space_before_anotation_parameter_list": "false", - "space_before_array_initializer_left_brace": "false", - "space_before_catch_keyword": "true", - "space_before_catch_left_brace": "true", - "space_before_catch_parentheses": "true", - "space_before_class_left_brace": "true", - "space_before_colon": "true", - "space_before_colon_in_foreach": "true", - "space_before_comma": "false", - "space_before_do_left_brace": "true", - "space_before_else_keyword": "true", - "space_before_else_left_brace": "true", - "space_before_finally_keyword": "true", - "space_before_finally_left_brace": "true", - "space_before_for_left_brace": "true", - "space_before_for_parentheses": "true", - "space_before_for_semicolon": "false", - "space_before_if_left_brace": "true", - "space_before_if_parentheses": "true", - "space_before_method_call_parentheses": "false", - "space_before_method_left_brace": "true", - "space_before_method_parentheses": "false", - "space_before_opening_angle_bracket_in_type_parameter": "false", - "space_before_quest": "true", - "space_before_switch_left_brace": "true", - "space_before_switch_parentheses": "true", - "space_before_synchronized_left_brace": "true", - "space_before_synchronized_parentheses": "true", - "space_before_try_left_brace": "true", - "space_before_try_parentheses": "true", - "space_before_type_parameter_list": "false", - "space_before_while_keyword": "true", - "space_before_while_left_brace": "true", - "space_before_while_parentheses": "true", - "space_inside_one_line_enum_braces": "false", - "spaces_around_additive_operators": "true", - "spaces_around_assignment_operators": "true", - "spaces_around_bitwise_operators": "true", - "spaces_around_equality_operators": "true", - "spaces_around_lambda_arrow": "true", - "spaces_around_logical_operators": "true", - "spaces_around_method_ref_dbl_colon": "false", - "spaces_around_multiplicative_operators": "true", - "spaces_around_relational_operators": "true", - "spaces_around_shift_operators": "true", - "spaces_around_type_bounds_in_type_parameters": "true", - "spaces_around_unary_operator": "false", - "spaces_within_angle_brackets": "false", - "spaces_within_annotation_parentheses": "false", - "spaces_within_array_initializer_braces": "false", - "spaces_within_braces": "false", - "spaces_within_brackets": "false", - "spaces_within_cast_parentheses": "false", - "spaces_within_catch_parentheses": "false", - "spaces_within_empty_array_initializer_braces": "false", - "spaces_within_empty_method_call_parentheses": "false", - "spaces_within_empty_method_parentheses": "false", - "spaces_within_for_parentheses": "false", - "spaces_within_if_parentheses": "false", - "spaces_within_method_call_parentheses": "false", - "spaces_within_method_parentheses": "false", - "spaces_within_parentheses": "false", - "spaces_within_switch_parentheses": "false", - "spaces_within_synchronized_parentheses": "false", - "spaces_within_try_parentheses": "false", - "spaces_within_while_parentheses": "false", - "special_else_if_treatment": "true", + "smart_tabs": false, + "space_after_closing_angle_bracket_in_type_argument": false, + "space_after_colon": true, + "space_after_comma": true, + "space_after_comma_in_type_arguments": true, + "space_after_for_semicolon": true, + "space_after_quest": true, + "space_after_type_cast": true, + "space_before_annotation_array_initializer_left_brace": false, + "space_before_anotation_parameter_list": false, + "space_before_array_initializer_left_brace": false, + "space_before_catch_keyword": true, + "space_before_catch_left_brace": true, + "space_before_catch_parentheses": true, + "space_before_class_left_brace": true, + "space_before_colon": true, + "space_before_colon_in_foreach": true, + "space_before_comma": false, + "space_before_do_left_brace": true, + "space_before_else_keyword": true, + "space_before_else_left_brace": true, + "space_before_finally_keyword": true, + "space_before_finally_left_brace": true, + "space_before_for_left_brace": true, + "space_before_for_parentheses": true, + "space_before_for_semicolon": false, + "space_before_if_left_brace": true, + "space_before_if_parentheses": true, + "space_before_method_call_parentheses": false, + "space_before_method_left_brace": true, + "space_before_method_parentheses": false, + "space_before_opening_angle_bracket_in_type_parameter": false, + "space_before_quest": true, + "space_before_switch_left_brace": true, + "space_before_switch_parentheses": true, + "space_before_synchronized_left_brace": true, + "space_before_synchronized_parentheses": true, + "space_before_try_left_brace": true, + "space_before_try_parentheses": true, + "space_before_type_parameter_list": false, + "space_before_while_keyword": true, + "space_before_while_left_brace": true, + "space_before_while_parentheses": true, + "space_inside_one_line_enum_braces": false, + "spaces_around_additive_operators": true, + "spaces_around_assignment_operators": true, + "spaces_around_bitwise_operators": true, + "spaces_around_equality_operators": true, + "spaces_around_lambda_arrow": true, + "spaces_around_logical_operators": true, + "spaces_around_method_ref_dbl_colon": false, + "spaces_around_multiplicative_operators": true, + "spaces_around_relational_operators": true, + "spaces_around_shift_operators": true, + "spaces_around_type_bounds_in_type_parameters": true, + "spaces_around_unary_operator": false, + "spaces_within_angle_brackets": false, + "spaces_within_annotation_parentheses": false, + "spaces_within_array_initializer_braces": false, + "spaces_within_braces": false, + "spaces_within_brackets": false, + "spaces_within_cast_parentheses": false, + "spaces_within_catch_parentheses": false, + "spaces_within_empty_array_initializer_braces": false, + "spaces_within_empty_method_call_parentheses": false, + "spaces_within_empty_method_parentheses": false, + "spaces_within_for_parentheses": false, + "spaces_within_if_parentheses": false, + "spaces_within_method_call_parentheses": false, + "spaces_within_method_parentheses": false, + "spaces_within_parentheses": false, + "spaces_within_switch_parentheses": false, + "spaces_within_synchronized_parentheses": false, + "spaces_within_try_parentheses": false, + "spaces_within_while_parentheses": false, + "special_else_if_treatment": true, "static_field_name_suffix": "_s", "subclass_name_suffix": "Impl", - "tab_width": "4", - "ternary_operation_signs_on_next_line": "false", + "tab_width": 4, + "ternary_operation_signs_on_next_line": false, "ternary_operation_wrap": "off", "test_name_suffix": "Test", "throws_keyword_wrap": "off", "throws_list_wrap": "off", - "use_external_annotations": "false", - "use_fq_class_names": "false", - "use_single_class_imports": "true", + "use_external_annotations": false, + "use_fq_class_names": false, + "use_single_class_imports": true, "variable_annotation_wrap": "off", "visibility": "public", "while_brace_force": "never", - "while_on_new_line": "false", - "wrap_comments": "false", - "wrap_first_method_in_call_chain": "false", - "wrap_long_lines": "false", - "wrap_on_typing": "true" + "while_on_new_line": false, + "wrap_comments": false, + "wrap_first_method_in_call_chain": false, + "wrap_long_lines": false, + "wrap_on_typing": true } } ] diff --git a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java index f036b93f1040..88a4ed3b27fd 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/codeStyle/JavaCodeStyleSettingsTest.java @@ -133,8 +133,7 @@ public class JavaCodeStyleSettingsTest extends CodeStyleTestCase { private static void setSimple(@NotNull AbstractCodeStylePropertyMapper mapper, @NotNull String name, @NotNull String value) { CodeStylePropertyAccessor accessor = mapper.getAccessor(name); assertNotNull(name + " not found", accessor); - //noinspection unchecked - accessor.set(value); + accessor.setFromString(value); } private static void setList(@NotNull AbstractCodeStylePropertyMapper mapper, @NotNull String name, @NotNull List value) { diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BooleanAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BooleanAccessor.java index b962012d4330..dc8355565a6d 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BooleanAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BooleanAccessor.java @@ -8,7 +8,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; -public class BooleanAccessor extends ScalarPropertyAccessor implements CodeStyleChoiceList { +public class BooleanAccessor extends CodeStylePropertyAccessor implements CodeStyleChoiceList { private final static List BOOLEAN_VALS = Arrays.asList("false", "true"); @@ -18,14 +18,20 @@ public class BooleanAccessor extends ScalarPropertyAccessor implements @Nullable @Override - protected Boolean fromExternal(@NotNull String extVal) { - return extVal.equalsIgnoreCase("true"); + protected Boolean parseString(@NotNull String string) { + return "true".equalsIgnoreCase(string); + } + + @Nullable + @Override + protected Boolean fromExternal(@NotNull Boolean extVal) { + return extVal; } @NotNull @Override - protected String toExternal(@NotNull Boolean value) { - return value.toString(); + protected Boolean toExternal(@NotNull Boolean value) { + return value; } @NotNull diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BraceStyleAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BraceStyleAccessor.java index 057b558ce635..3b18683b7712 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BraceStyleAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/BraceStyleAccessor.java @@ -10,7 +10,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; -class BraceStyleAccessor extends ScalarPropertyAccessor implements CodeStyleChoiceList { +class BraceStyleAccessor extends ExternalStringAccessor implements CodeStyleChoiceList { private final static BidirectionalMap BRACE_STYLE_MAP = new BidirectionalMap<>(); public static final String VALUE_END_OF_LINE = "end_of_line"; diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/EnumPropertyAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/EnumPropertyAccessor.java index 4c2a7662ed88..4d2b482ad4ed 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/EnumPropertyAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/EnumPropertyAccessor.java @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -public class EnumPropertyAccessor extends ScalarPropertyAccessor implements CodeStyleChoiceList{ +public class EnumPropertyAccessor extends ExternalStringAccessor implements CodeStyleChoiceList{ private final Class myEnumClass; private final BidirectionalMap myEnumMap = new BidirectionalMap<>(); diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ScalarPropertyAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ExternalStringAccessor.java similarity index 84% rename from platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ScalarPropertyAccessor.java rename to platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ExternalStringAccessor.java index 99849d74e7c9..8dc8c0975c3a 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ScalarPropertyAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ExternalStringAccessor.java @@ -6,9 +6,9 @@ import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -public abstract class ScalarPropertyAccessor extends CodeStylePropertyAccessor { +public abstract class ExternalStringAccessor extends CodeStylePropertyAccessor { - public ScalarPropertyAccessor(@NotNull Object object, @NotNull Field field) { + public ExternalStringAccessor(@NotNull Object object, @NotNull Field field) { super(object, field); } diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ForceBracesAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ForceBracesAccessor.java index 5860eedb2f1b..73c07c7e4e24 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ForceBracesAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/ForceBracesAccessor.java @@ -10,7 +10,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; -class ForceBracesAccessor extends ScalarPropertyAccessor implements CodeStyleChoiceList { +class ForceBracesAccessor extends ExternalStringAccessor implements CodeStyleChoiceList { private final static BidirectionalMap FORCE_BRACES_MAP = new BidirectionalMap<>(); diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/IntegerAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/IntegerAccessor.java index c178c63984fe..e7175a64be29 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/IntegerAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/IntegerAccessor.java @@ -2,28 +2,35 @@ package com.intellij.application.options.codeStyle.properties; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -public class IntegerAccessor extends ScalarPropertyAccessor { +public class IntegerAccessor extends CodeStylePropertyAccessor { IntegerAccessor(@NotNull Object object, @NotNull Field field) { super(object, field); } + @Nullable @Override - protected Integer fromExternal(@NotNull String str) { + protected Integer parseString(@NotNull String string) { try { - return Integer.parseInt(str); + return Integer.parseInt(string); } catch (NumberFormatException nfe) { return null; } } + @Override + protected Integer fromExternal(@NotNull Integer i) { + return i; + } + @NotNull @Override - protected String toExternal(@NotNull Integer value) { - return value.toString(); + protected Integer toExternal(@NotNull Integer value) { + return value; } @Override diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/PropertyAccessorFactory.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/PropertyAccessorFactory.java index 53db9f877194..38d9b6cc8df5 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/PropertyAccessorFactory.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/PropertyAccessorFactory.java @@ -95,12 +95,18 @@ class PropertyAccessorFactory { myField.getAnnotation(Deprecated.class) == null; } - private static class TabCharPropertyAccessor extends BooleanAccessor { + private static class TabCharPropertyAccessor extends CodeStylePropertyAccessor { TabCharPropertyAccessor(@NotNull Object object, @NotNull Field field) { super(object, field); } + @Nullable + @Override + protected String parseString(@NotNull String string) { + return string; + } + @Nullable @Override protected Boolean fromExternal(@NotNull String str) { diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/StringAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/StringAccessor.java index 7b6baa98d9a8..e7050d2ad3d8 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/StringAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/StringAccessor.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -class StringAccessor extends ScalarPropertyAccessor { +class StringAccessor extends ExternalStringAccessor { StringAccessor(@NotNull Object object, @NotNull Field field) { super(object, field); diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrapOnTypingAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrapOnTypingAccessor.java index ad325b119689..3cd598409321 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrapOnTypingAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrapOnTypingAccessor.java @@ -3,24 +3,36 @@ package com.intellij.application.options.codeStyle.properties; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.lang.reflect.Field; -public class WrapOnTypingAccessor extends IntegerAccessor { +public class WrapOnTypingAccessor extends CodeStylePropertyAccessor { WrapOnTypingAccessor(@NotNull Object object, @NotNull Field field) { super(object, field); } + @Nullable + @Override + protected Boolean parseString(@NotNull String string) { + return "true".equalsIgnoreCase(string); + } + @NotNull @Override - protected String toExternal(@NotNull Integer value) { - return value == CommonCodeStyleSettings.WrapOnTyping.WRAP.intValue ? "true" : "false"; + protected Boolean toExternal(@NotNull Integer value) { + return value == CommonCodeStyleSettings.WrapOnTyping.WRAP.intValue; } @Override - protected Integer fromExternal(@NotNull String str) { - return "true".equalsIgnoreCase(str) ? + protected Integer fromExternal(@NotNull Boolean extValue) { + return extValue ? CommonCodeStyleSettings.WrapOnTyping.WRAP.intValue : CommonCodeStyleSettings.WrapOnTyping.NO_WRAP.intValue; } + + @Override + protected boolean isEmpty(@NotNull Integer value) { + return value < 0; + } } diff --git a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrappingAccessor.java b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrappingAccessor.java index 94bb32f68759..c17f1d906bad 100644 --- a/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrappingAccessor.java +++ b/platform/lang-api/src/com/intellij/application/options/codeStyle/properties/WrappingAccessor.java @@ -10,7 +10,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; -class WrappingAccessor extends ScalarPropertyAccessor implements CodeStyleChoiceList { +class WrappingAccessor extends ExternalStringAccessor implements CodeStyleChoiceList { private final static BidirectionalMap WRAPPING_MAP = new BidirectionalMap<>(); public static final String VALUE_OFF = "off"; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/json/CodeStyleSchemeJsonExporter.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/json/CodeStyleSchemeJsonExporter.java index e9421adce696..f5942857d02d 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/json/CodeStyleSchemeJsonExporter.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/json/CodeStyleSchemeJsonExporter.java @@ -39,6 +39,12 @@ public class CodeStyleSchemeJsonExporter extends SchemeExporter if (externalized instanceof String) { o.addProperty(name, (String)externalized); } + else if (externalized instanceof Integer) { + o.addProperty(name, (Integer)externalized); + } + else if (externalized instanceof Boolean) { + o.addProperty(name, (Boolean)externalized); + } else if (externalized != null && accessor instanceof ValueListPropertyAccessor){ @SuppressWarnings("unchecked") List listValues = (List)externalized; final JsonArray array = new JsonArray(); diff --git a/platform/platform-tests/testData/codeStyle/json/exportToJson.json b/platform/platform-tests/testData/codeStyle/json/exportToJson.json index 9f911c68148b..8bdec47e0972 100644 --- a/platform/platform-tests/testData/codeStyle/json/exportToJson.json +++ b/platform/platform-tests/testData/codeStyle/json/exportToJson.json @@ -7,10 +7,10 @@ "options": { "formatter_off_tag": "@formatter:off", "formatter_on_tag": "@formatter:on", - "formatter_tags_accept_regexp": "false", - "formatter_tags_enabled": "false", - "max_line_length": "120", - "wrap_on_typing": "false" + "formatter_tags_accept_regexp": false, + "formatter_tags_enabled": false, + "max_line_length": 120, + "wrap_on_typing": false } }, { @@ -25,12 +25,12 @@ "h2", "h3" ], - "align_attributes": "true", - "align_text": "false", + "align_attributes": true, + "align_text": false, "attribute_wrap": "normal", - "block_comment_at_first_column": "true", - "continuation_indent_size": "8", - "do_not_align_children_of_min_lines": "0", + "block_comment_at_first_column": true, + "continuation_indent_size": 8, + "do_not_align_children_of_min_lines": 0, "do_not_break_if_inline_tags": [ "title", "h1", @@ -48,8 +48,8 @@ "tbody", "tfoot" ], - "enforce_quotes": "false", - "indent_size": "4", + "enforce_quotes": false, + "indent_size": 4, "indent_style": "space", "inline_tags": [ "a", @@ -85,28 +85,28 @@ "u", "var" ], - "keep_blank_lines": "2", - "keep_indents_on_empty_lines": "false", - "keep_line_breaks": "true", - "keep_line_breaks_in_text": "true", - "keep_whitespaces": "false", + "keep_blank_lines": 2, + "keep_indents_on_empty_lines": false, + "keep_line_breaks": true, + "keep_line_breaks_in_text": true, + "keep_whitespaces": false, "keep_whitespaces_inside": [ "span", "pre", "textarea" ], - "line_comment_at_first_column": "true", + "line_comment_at_first_column": true, "new_line_after_last_attribute": "never", "new_line_before_first_attribute": "never", "quote_style": "double", "remove_new_line_before_tags": [ "br" ], - "smart_tabs": "false", - "space_after_tag_name": "false", - "space_around_equality_in_attribute": "false", - "space_inside_empty_tag": "false", - "tab_width": "4", + "smart_tabs": false, + "space_after_tag_name": false, + "space_around_equality_in_attribute": false, + "space_inside_empty_tag": false, + "tab_width": 4, "text_wrap": "normal" } } diff --git a/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java b/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java index ec5aa77166cf..775f796e3f5e 100644 --- a/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java +++ b/plugins/editorconfig/src/org/editorconfig/configmanagement/extended/IntellijConfigOptionDescriptorProvider.java @@ -69,7 +69,7 @@ public class IntellijConfigOptionDescriptorProvider implements EditorConfigOptio else if (accessor instanceof ValueListPropertyAccessor) { return new EditorConfigListDescriptor(0, true, Collections.singletonList(new EditorConfigStringDescriptor(null, null)), null, null); } - else if (accessor instanceof ScalarPropertyAccessor) { + else if (accessor instanceof ExternalStringAccessor) { return new EditorConfigStringDescriptor(null, null); } return null;