diff --git a/.editorconfig b/.editorconfig index f3d514f..27f2533 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,7 @@ indent_style = space insert_final_newline = true max_line_length = 120 tab_width = 4 -trim_trailing_whitespace = true +trim_trailing_whitespace = false ij_continuation_indent_size = 8 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on @@ -39,10 +39,6 @@ ij_css_space_before_opening_brace = true ij_css_use_double_quotes = true ij_css_value_alignment = do_not_align -[*.haml] -indent_size = 2 -ij_haml_keep_indents_on_empty_lines = false - [*.less] indent_size = 2 ij_less_align_closing_brace_with_properties = false @@ -232,6 +228,7 @@ ij_typescript_method_parameters_new_line_after_left_paren = false ij_typescript_method_parameters_right_paren_on_new_line = false ij_typescript_method_parameters_wrap = off ij_typescript_object_literal_wrap = on_every_item +ij_typescript_object_types_wrap = on_every_item ij_typescript_parentheses_expression_new_line_after_left_paren = false ij_typescript_parentheses_expression_right_paren_on_new_line = false ij_typescript_place_assignment_sign_on_next_line = false @@ -407,6 +404,7 @@ ij_javascript_method_parameters_new_line_after_left_paren = false ij_javascript_method_parameters_right_paren_on_new_line = false ij_javascript_method_parameters_wrap = off ij_javascript_object_literal_wrap = on_every_item +ij_javascript_object_types_wrap = on_every_item ij_javascript_parentheses_expression_new_line_after_left_paren = false ij_javascript_parentheses_expression_right_paren_on_new_line = false ij_javascript_place_assignment_sign_on_next_line = false @@ -501,11 +499,12 @@ ij_javascript_wrap_comments = false [{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}] ij_continuation_indent_size = 4 ij_php_align_assignments = true -ij_php_align_class_constants = false +ij_php_align_class_constants = true +ij_php_align_enum_cases = true ij_php_align_group_field_declarations = false ij_php_align_inline_comments = true ij_php_align_key_value_pairs = true -ij_php_align_match_arm_bodies = true +ij_php_align_match_arm_bodies = false ij_php_align_multiline_array_initializer_expression = true ij_php_align_multiline_binary_operation = false ij_php_align_multiline_chained_methods = false @@ -517,7 +516,7 @@ ij_php_align_multiline_ternary_operation = false ij_php_align_named_arguments = true ij_php_align_phpdoc_comments = false ij_php_align_phpdoc_param_names = false -ij_php_anonymous_brace_style = next_line +ij_php_anonymous_brace_style = end_of_line ij_php_api_weight = 28 ij_php_array_initializer_new_line_after_left_brace = true ij_php_array_initializer_right_brace_on_new_line = true @@ -533,7 +532,8 @@ ij_php_blank_lines_after_imports = 1 ij_php_blank_lines_after_opening_tag = 1 ij_php_blank_lines_after_package = 1 ij_php_blank_lines_around_class = 1 -ij_php_blank_lines_around_constants = 1 +ij_php_blank_lines_around_constants = 0 +ij_php_blank_lines_around_enum_cases = 0 ij_php_blank_lines_around_field = 1 ij_php_blank_lines_around_method = 1 ij_php_blank_lines_before_class_end = 0 @@ -543,8 +543,8 @@ ij_php_blank_lines_before_package = 1 ij_php_blank_lines_before_return_statement = 1 ij_php_blank_lines_between_imports = 1 ij_php_block_brace_style = end_of_line -ij_php_call_parameters_new_line_after_left_paren = false -ij_php_call_parameters_right_paren_on_new_line = false +ij_php_call_parameters_new_line_after_left_paren = true +ij_php_call_parameters_right_paren_on_new_line = true ij_php_call_parameters_wrap = on_every_item ij_php_catch_on_new_line = true ij_php_category_weight = 28 @@ -552,6 +552,7 @@ ij_php_class_brace_style = next_line ij_php_comma_after_last_argument = false ij_php_comma_after_last_array_element = true ij_php_comma_after_last_closure_use_var = false +ij_php_comma_after_last_match_arm = true ij_php_comma_after_last_parameter = false ij_php_concat_spaces = true ij_php_copyright_weight = 4 @@ -569,7 +570,7 @@ ij_php_for_brace_force = always ij_php_for_statement_new_line_after_left_paren = false ij_php_for_statement_right_paren_on_new_line = false ij_php_for_statement_wrap = normal -ij_php_force_empty_methods_in_one_line = false +ij_php_force_empty_methods_in_one_line = true ij_php_force_short_declaration_array_style = true ij_php_getters_setters_naming_style = camel_case ij_php_getters_setters_order_style = getters_first @@ -588,13 +589,13 @@ ij_php_keep_blank_lines_after_lbrace = 1 ij_php_keep_blank_lines_before_right_brace = 0 ij_php_keep_blank_lines_in_code = 1 ij_php_keep_blank_lines_in_declarations = 0 -ij_php_keep_control_statement_in_one_line = true +ij_php_keep_control_statement_in_one_line = false ij_php_keep_first_column_comment = false ij_php_keep_indents_on_empty_lines = false ij_php_keep_line_breaks = true ij_php_keep_rparen_and_lbrace_on_one_line = true ij_php_keep_simple_classes_in_one_line = true -ij_php_keep_simple_methods_in_one_line = false +ij_php_keep_simple_methods_in_one_line = true ij_php_lambda_brace_style = end_of_line ij_php_license_weight = 5 ij_php_line_comment_add_space = false @@ -622,13 +623,13 @@ ij_php_parentheses_expression_right_paren_on_new_line = false ij_php_phpdoc_blank_line_before_tags = true ij_php_phpdoc_blank_lines_around_parameters = true ij_php_phpdoc_keep_blank_lines = true -ij_php_phpdoc_param_spaces_between_name_and_description = 1 -ij_php_phpdoc_param_spaces_between_tag_and_type = 1 +ij_php_phpdoc_param_spaces_between_name_and_description = 2 +ij_php_phpdoc_param_spaces_between_tag_and_type = 2 ij_php_phpdoc_param_spaces_between_type_and_name = 1 ij_php_phpdoc_use_fqcn = true ij_php_phpdoc_wrap_long_lines = true ij_php_place_assignment_sign_on_next_line = false -ij_php_place_parens_for_constructor = 0 +ij_php_place_parens_for_constructor = 1 ij_php_property_read_weight = 11 ij_php_property_weight = 10 ij_php_property_write_weight = 12 @@ -705,7 +706,7 @@ ij_php_spaces_within_parentheses = false ij_php_spaces_within_short_echo_tags = true ij_php_spaces_within_switch_parentheses = false ij_php_spaces_within_while_parentheses = false -ij_php_special_else_if_treatment = false +ij_php_special_else_if_treatment = true ij_php_subpackage_weight = 28 ij_php_ternary_operation_signs_on_next_line = true ij_php_ternary_operation_wrap = on_every_item @@ -717,12 +718,12 @@ ij_php_upper_case_boolean_const = false ij_php_upper_case_null_const = false ij_php_uses_weight = 28 ij_php_var_weight = 28 -ij_php_variable_naming_style = snake_case +ij_php_variable_naming_style = camel_case ij_php_version_weight = 8 ij_php_while_brace_force = always ij_php_while_on_new_line = true -[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}] +[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,composer.lock,jest.config}] ij_continuation_indent_size = 4 ij_json_array_wrapping = on_every_item ij_json_keep_blank_lines_in_code = 1 @@ -769,11 +770,17 @@ ij_html_space_around_equality_in_attribute = false ij_html_space_inside_empty_tag = true ij_html_text_wrap = off +[{*.http,*.rest}] +indent_size = 0 +ij_continuation_indent_size = 4 +ij_http request_call_parameters_wrap = normal + [{*.markdown,*.md}] ij_markdown_force_one_space_after_blockquote_symbol = true ij_markdown_force_one_space_after_header_symbol = true ij_markdown_force_one_space_after_list_bullet = true ij_markdown_force_one_space_between_words = true +ij_markdown_format_tables = true ij_markdown_insert_quote_arrows_on_wrap = true ij_markdown_keep_indents_on_empty_lines = false ij_markdown_keep_line_breaks_inside_text_blocks = true