diff --git a/.editorconfig b/.editorconfig index 932e24503..0c9c384c3 100644 --- a/.editorconfig +++ b/.editorconfig @@ -11,40 +11,17 @@ insert_final_newline = false max_line_length = 1000 tab_width = 4 trim_trailing_whitespace = false -ij_continuation_indent_size = 8 +ij_continuation_indent_size = 4 ij_formatter_off_tag = @formatter:off ij_formatter_on_tag = @formatter:on ij_formatter_tags_enabled = true ij_smart_tabs = false -ij_visual_guides = +ij_visual_guides = none ij_wrap_on_typing = false -[*.dcl] -ij_declarative_keep_indents_on_empty_lines = false - -[*.gsh] -ij_glsl_space_after_colon = true -ij_glsl_space_after_comma = true -ij_glsl_space_after_for_semicolon = true -ij_glsl_space_after_quest = true -ij_glsl_space_before_colon = true -ij_glsl_space_before_comma = false -ij_glsl_space_before_for_semicolon = false -ij_glsl_space_before_quest = true -ij_glsl_spaces_around_additive_operators = true -ij_glsl_spaces_around_assignment_operators = true -ij_glsl_spaces_around_bitwise_operators = true -ij_glsl_spaces_around_equality_operators = true -ij_glsl_spaces_around_logical_operators = true -ij_glsl_spaces_around_multiplicative_operators = true -ij_glsl_spaces_around_relational_operators = true -ij_glsl_spaces_around_shift_operators = true -ij_glsl_spaces_within_brackets = false -ij_glsl_spaces_within_parentheses = false - [*.java] indent_style = tab -ij_continuation_indent_size = 4 +ij_smart_tabs = true ij_java_align_consecutive_assignments = false ij_java_align_consecutive_variable_declarations = false ij_java_align_group_field_declarations = false @@ -53,21 +30,21 @@ ij_java_align_multiline_array_initializer_expression = false ij_java_align_multiline_assignment = false ij_java_align_multiline_binary_operation = false ij_java_align_multiline_chained_methods = false -ij_java_align_multiline_deconstruction_list_components = true +ij_java_align_multiline_deconstruction_list_components = false ij_java_align_multiline_extends_list = false -ij_java_align_multiline_for = true +ij_java_align_multiline_for = false ij_java_align_multiline_method_parentheses = false ij_java_align_multiline_parameters = false ij_java_align_multiline_parameters_in_calls = false ij_java_align_multiline_parenthesized_expression = false -ij_java_align_multiline_records = true +ij_java_align_multiline_records = false ij_java_align_multiline_resources = false ij_java_align_multiline_ternary_operation = false ij_java_align_multiline_text_blocks = false ij_java_align_multiline_throws_list = false ij_java_align_subsequent_simple_methods = false ij_java_align_throws_keyword = false -ij_java_align_types_in_multi_catch = true +ij_java_align_types_in_multi_catch = false ij_java_annotation_parameter_wrap = off ij_java_array_initializer_new_line_after_left_brace = false ij_java_array_initializer_right_brace_on_new_line = false @@ -84,17 +61,17 @@ ij_java_blank_lines_after_package = 1 ij_java_blank_lines_around_class = 1 ij_java_blank_lines_around_field = 0 ij_java_blank_lines_around_field_in_interface = 0 -ij_java_blank_lines_around_initializer = 1 -ij_java_blank_lines_around_method = 1 -ij_java_blank_lines_around_method_in_interface = 1 -ij_java_blank_lines_before_class_end = 0 +ij_java_blank_lines_around_initializer = 0 +ij_java_blank_lines_around_method = 0 +ij_java_blank_lines_around_method_in_interface = 0 +ij_java_blank_lines_before_class_end = 1 ij_java_blank_lines_before_imports = 1 ij_java_blank_lines_before_method_body = 0 ij_java_blank_lines_before_package = 1 ij_java_block_brace_style = next_line ij_java_block_comment_add_space = false ij_java_block_comment_at_first_column = true -ij_java_builder_methods = +ij_java_builder_methods = none ij_java_call_parameters_new_line_after_left_paren = false ij_java_call_parameters_right_paren_on_new_line = false ij_java_call_parameters_wrap = normal @@ -109,7 +86,7 @@ ij_java_do_not_indent_top_level_class_members = false ij_java_do_not_wrap_after_single_annotation = false ij_java_do_not_wrap_after_single_annotation_in_parameter = false ij_java_do_while_brace_force = never -ij_java_doc_add_blank_line_after_description = false +ij_java_doc_add_blank_line_after_description = true ij_java_doc_add_blank_line_after_param_comments = false ij_java_doc_add_blank_line_after_return = false ij_java_doc_add_p_tag_on_empty_lines = false @@ -120,29 +97,25 @@ ij_java_doc_enable_formatting = true ij_java_doc_enable_leading_asterisks = true ij_java_doc_indent_on_continuation = false ij_java_doc_keep_empty_lines = true -ij_java_doc_keep_empty_parameter_tag = false +ij_java_doc_keep_empty_parameter_tag = true ij_java_doc_keep_empty_return_tag = false -ij_java_doc_keep_empty_throws_tag = false -ij_java_doc_keep_invalid_tags = false +ij_java_doc_keep_empty_throws_tag = true +ij_java_doc_keep_invalid_tags = true ij_java_doc_param_description_on_new_line = false ij_java_doc_preserve_line_breaks = false ij_java_doc_use_throws_not_exception_tag = true ij_java_else_on_new_line = true ij_java_enum_constants_wrap = off -ij_java_enum_field_annotation_wrap = off ij_java_extends_keyword_wrap = normal ij_java_extends_list_wrap = normal ij_java_field_annotation_wrap = off -ij_java_field_name_prefix = -ij_java_field_name_suffix = ij_java_finally_on_new_line = true -ij_java_for_brace_force = never +ij_java_for_brace_force = always ij_java_for_statement_new_line_after_left_paren = false ij_java_for_statement_right_paren_on_new_line = false ij_java_for_statement_wrap = off ij_java_generate_final_locals = false ij_java_generate_final_parameters = false -ij_java_generate_use_type_annotation_before_type = true ij_java_if_brace_force = never ij_java_imports_layout = *,|,javax.**,java.**,|,$* ij_java_indent_case_from_switch = true @@ -153,13 +126,13 @@ ij_java_keep_blank_lines_between_package_declaration_and_header = 2 ij_java_keep_blank_lines_in_code = 10 ij_java_keep_blank_lines_in_declarations = 10 ij_java_keep_builder_methods_indents = false -ij_java_keep_control_statement_in_one_line = false -ij_java_keep_first_column_comment = false +ij_java_keep_control_statement_in_one_line = true +ij_java_keep_first_column_comment = true ij_java_keep_indents_on_empty_lines = true ij_java_keep_line_breaks = true -ij_java_keep_multiple_expressions_in_one_line = false +ij_java_keep_multiple_expressions_in_one_line = true ij_java_keep_simple_blocks_in_one_line = false -ij_java_keep_simple_classes_in_one_line = false +ij_java_keep_simple_classes_in_one_line = true ij_java_keep_simple_lambdas_in_one_line = true ij_java_keep_simple_methods_in_one_line = true ij_java_label_indent_absolute = false @@ -168,13 +141,11 @@ ij_java_lambda_brace_style = end_of_line ij_java_layout_static_imports_separately = true ij_java_line_comment_add_space = false ij_java_line_comment_add_space_on_reformat = false -ij_java_line_comment_at_first_column = true -ij_java_local_variable_name_prefix = -ij_java_local_variable_name_suffix = +ij_java_line_comment_at_first_column = false ij_java_method_annotation_wrap = off ij_java_method_brace_style = next_line ij_java_method_call_chain_wrap = normal -ij_java_method_parameters_new_line_after_left_paren = false +ij_java_method_parameters_new_line_after_left_paren = true ij_java_method_parameters_right_paren_on_new_line = false ij_java_method_parameters_wrap = normal ij_java_modifier_list_wrap = false @@ -183,22 +154,18 @@ ij_java_names_count_to_use_import_on_demand = 3 ij_java_new_line_after_lparen_in_annotation = false ij_java_new_line_after_lparen_in_deconstruction_pattern = true ij_java_new_line_after_lparen_in_record_header = false -ij_java_new_line_when_body_is_presented = false ij_java_packages_to_use_import_on_demand = java.awt.*,javax.swing.* ij_java_parameter_annotation_wrap = off -ij_java_parameter_name_prefix = -ij_java_parameter_name_suffix = ij_java_parentheses_expression_new_line_after_left_paren = false ij_java_parentheses_expression_right_paren_on_new_line = false ij_java_place_assignment_sign_on_next_line = false ij_java_prefer_longer_names = true ij_java_prefer_parameters_wrap = false ij_java_record_components_wrap = normal -ij_java_repeat_annotations = ij_java_repeat_synchronized = true ij_java_replace_instanceof_and_cast = false -ij_java_replace_null_check = true -ij_java_replace_sum_lambda_with_method_ref = true +ij_java_replace_null_check = false +ij_java_replace_sum_lambda_with_method_ref = false ij_java_resource_list_new_line_after_left_paren = false ij_java_resource_list_right_paren_on_new_line = false ij_java_resource_list_wrap = on_every_item @@ -214,7 +181,7 @@ ij_java_space_after_quest = true ij_java_space_after_type_cast = true ij_java_space_before_annotation_array_initializer_left_brace = false ij_java_space_before_annotation_parameter_list = false -ij_java_space_before_array_initializer_left_brace = true +ij_java_space_before_array_initializer_left_brace = false ij_java_space_before_catch_keyword = true ij_java_space_before_catch_left_brace = true ij_java_space_before_catch_parentheses = true @@ -240,7 +207,7 @@ ij_java_space_before_opening_angle_bracket_in_type_parameter = false ij_java_space_before_quest = true ij_java_space_before_switch_left_brace = true ij_java_space_before_switch_parentheses = true -ij_java_space_before_synchronized_left_brace = true +ij_java_space_before_synchronized_left_brace = false ij_java_space_before_synchronized_parentheses = true ij_java_space_before_try_left_brace = true ij_java_space_before_try_parentheses = true @@ -249,7 +216,7 @@ ij_java_space_before_while_keyword = true ij_java_space_before_while_left_brace = true ij_java_space_before_while_parentheses = true ij_java_space_inside_one_line_enum_braces = false -ij_java_space_within_empty_array_initializer_braces = false +ij_java_space_within_empty_array_initializer_braces = true ij_java_space_within_empty_method_call_parentheses = false ij_java_space_within_empty_method_parentheses = false ij_java_spaces_around_additive_operators = true @@ -265,10 +232,9 @@ ij_java_spaces_around_relational_operators = true ij_java_spaces_around_shift_operators = true ij_java_spaces_around_type_bounds_in_type_parameters = true ij_java_spaces_around_unary_operator = false -ij_java_spaces_inside_block_braces_when_body_is_present = false ij_java_spaces_within_angle_brackets = false ij_java_spaces_within_annotation_parentheses = false -ij_java_spaces_within_array_initializer_braces = true +ij_java_spaces_within_array_initializer_braces = false ij_java_spaces_within_braces = true ij_java_spaces_within_brackets = false ij_java_spaces_within_cast_parentheses = false @@ -285,14 +251,9 @@ ij_java_spaces_within_synchronized_parentheses = false ij_java_spaces_within_try_parentheses = false ij_java_spaces_within_while_parentheses = false ij_java_special_else_if_treatment = true -ij_java_static_field_name_prefix = -ij_java_static_field_name_suffix = -ij_java_subclass_name_prefix = ij_java_subclass_name_suffix = Impl -ij_java_switch_expressions_wrap = normal ij_java_ternary_operation_signs_on_next_line = false ij_java_ternary_operation_wrap = on_every_item -ij_java_test_name_prefix = ij_java_test_name_suffix = Test ij_java_throws_keyword_wrap = normal ij_java_throws_list_wrap = normal @@ -302,12 +263,11 @@ ij_java_use_relative_indents = false ij_java_use_single_class_imports = true ij_java_variable_annotation_wrap = off ij_java_visibility = public -ij_java_while_brace_force = never +ij_java_while_brace_force = always ij_java_while_on_new_line = true ij_java_wrap_comments = false ij_java_wrap_first_method_in_call_chain = false ij_java_wrap_long_lines = false -ij_java_wrap_semicolon_after_call_chain = false [*.nbtt] indent_style = tab @@ -353,9 +313,11 @@ ij_xml_space_after_tag_name = false ij_xml_space_around_equals_in_attribute = false ij_xml_space_inside_empty_tag = false ij_xml_text_wrap = normal +ij_xml_use_custom_settings = false [{*.bash,*.sh,*.zsh}] -indent_style = tab +indent_size = 4 +tab_width = 4 ij_shell_binary_ops_start_line = false ij_shell_keep_column_alignment_padding = false ij_shell_minify_program = false @@ -363,8 +325,25 @@ ij_shell_redirect_followed_by_space = false ij_shell_switch_cases_indented = false ij_shell_use_unix_line_separator = true -[{*.comp,*.frag,*.fsh,*.geom,*.glsl,*.tesc,*.tese,*.vert,*.vsh}] -ij_glsl_keep_indents_on_empty_lines = false +[{*.comp,*.frag,*.fsh,*.geom,*.glsl,*.gsh,*.tesc,*.tese,*.vert,*.vsh}] +ij_glsl_space_after_colon = true +ij_glsl_space_after_comma = true +ij_glsl_space_after_for_semicolon = true +ij_glsl_space_after_quest = true +ij_glsl_space_before_colon = false +ij_glsl_space_before_comma = false +ij_glsl_space_before_for_semicolon = false +ij_glsl_space_before_quest = true +ij_glsl_spaces_around_additive_operators = true +ij_glsl_spaces_around_assignment_operators = true +ij_glsl_spaces_around_bitwise_operators = true +ij_glsl_spaces_around_equality_operators = true +ij_glsl_spaces_around_logical_operators = true +ij_glsl_spaces_around_multiplicative_operators = true +ij_glsl_spaces_around_relational_operators = true +ij_glsl_spaces_around_shift_operators = true +ij_glsl_spaces_within_brackets = false +ij_glsl_spaces_within_parentheses = false [{*.gant,*.groovy,*.gy}] ij_groovy_align_group_field_declarations = false @@ -557,9 +536,8 @@ ij_groovy_while_on_new_line = false ij_groovy_wrap_chain_calls_after_dot = false ij_groovy_wrap_long_lines = false -[{*.har,*.json,*.jsonc,*.png.mcmeta,mcmod.info,pack.mcmeta}] -indent_style = tab -ij_continuation_indent_size = 4 +[{*.har,*.json,*.png.mcmeta,mcmod.info,pack.mcmeta}] +indent_size = 4 ij_json_array_wrapping = split_into_lines ij_json_keep_blank_lines_in_code = 0 ij_json_keep_indents_on_empty_lines = false @@ -604,8 +582,6 @@ ij_html_space_inside_empty_tag = false ij_html_text_wrap = normal [{*.kt,*.kts}] -indent_style = tab -ij_continuation_indent_size = 4 ij_kotlin_align_in_columns_case_branch = false ij_kotlin_align_multiline_binary_operation = false ij_kotlin_align_multiline_extends_list = false @@ -614,34 +590,32 @@ ij_kotlin_align_multiline_parameters = true ij_kotlin_align_multiline_parameters_in_calls = false ij_kotlin_allow_trailing_comma = false ij_kotlin_allow_trailing_comma_on_call_site = false -ij_kotlin_assignment_wrap = normal +ij_kotlin_assignment_wrap = off ij_kotlin_blank_lines_after_class_header = 0 ij_kotlin_blank_lines_around_block_when_branches = 0 ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1 ij_kotlin_block_comment_add_space = false ij_kotlin_block_comment_at_first_column = true -ij_kotlin_call_parameters_new_line_after_left_paren = true -ij_kotlin_call_parameters_right_paren_on_new_line = true -ij_kotlin_call_parameters_wrap = on_every_item +ij_kotlin_call_parameters_new_line_after_left_paren = false +ij_kotlin_call_parameters_right_paren_on_new_line = false +ij_kotlin_call_parameters_wrap = off ij_kotlin_catch_on_new_line = false ij_kotlin_class_annotation_wrap = split_into_lines -ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL -ij_kotlin_continuation_indent_for_chained_calls = false -ij_kotlin_continuation_indent_for_expression_bodies = false -ij_kotlin_continuation_indent_in_argument_lists = false -ij_kotlin_continuation_indent_in_elvis = false -ij_kotlin_continuation_indent_in_if_conditions = false -ij_kotlin_continuation_indent_in_parameter_lists = false -ij_kotlin_continuation_indent_in_supertype_lists = false +ij_kotlin_continuation_indent_for_chained_calls = true +ij_kotlin_continuation_indent_for_expression_bodies = true +ij_kotlin_continuation_indent_in_argument_lists = true +ij_kotlin_continuation_indent_in_elvis = true +ij_kotlin_continuation_indent_in_if_conditions = true +ij_kotlin_continuation_indent_in_parameter_lists = true +ij_kotlin_continuation_indent_in_supertype_lists = true ij_kotlin_else_on_new_line = false ij_kotlin_enum_constants_wrap = off -ij_kotlin_extends_list_wrap = normal +ij_kotlin_extends_list_wrap = off ij_kotlin_field_annotation_wrap = split_into_lines ij_kotlin_finally_on_new_line = false -ij_kotlin_if_rparen_on_new_line = true +ij_kotlin_if_rparen_on_new_line = false ij_kotlin_import_nested_classes = false ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^ -ij_kotlin_indent_before_arrow_on_new_line = true ij_kotlin_insert_whitespaces_in_simple_one_line_method = true ij_kotlin_keep_blank_lines_before_right_brace = 2 ij_kotlin_keep_blank_lines_in_code = 2 @@ -655,10 +629,10 @@ ij_kotlin_line_comment_add_space = false ij_kotlin_line_comment_add_space_on_reformat = false ij_kotlin_line_comment_at_first_column = true ij_kotlin_method_annotation_wrap = split_into_lines -ij_kotlin_method_call_chain_wrap = normal -ij_kotlin_method_parameters_new_line_after_left_paren = true -ij_kotlin_method_parameters_right_paren_on_new_line = true -ij_kotlin_method_parameters_wrap = on_every_item +ij_kotlin_method_call_chain_wrap = off +ij_kotlin_method_parameters_new_line_after_left_paren = false +ij_kotlin_method_parameters_right_paren_on_new_line = false +ij_kotlin_method_parameters_wrap = off ij_kotlin_name_count_to_use_star_import = 5 ij_kotlin_name_count_to_use_star_import_for_members = 3 ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.** @@ -688,7 +662,7 @@ ij_kotlin_spaces_around_when_arrow = true ij_kotlin_variable_annotation_wrap = off ij_kotlin_while_on_new_line = false ij_kotlin_wrap_elvis_expressions = 1 -ij_kotlin_wrap_expression_body_functions = 1 +ij_kotlin_wrap_expression_body_functions = 0 ij_kotlin_wrap_first_method_in_call_chain = false [{*.markdown,*.md}] @@ -713,15 +687,13 @@ ij_markdown_wrap_text_inside_blockquotes = true ij_toml_keep_indents_on_empty_lines = false [{*.yaml,*.yml}] +indent_size = 4 ij_yaml_align_values_properties = do_not_align ij_yaml_autoinsert_sequence_marker = true ij_yaml_block_mapping_on_new_line = false ij_yaml_indent_sequence_value = true ij_yaml_keep_indents_on_empty_lines = false ij_yaml_keep_line_breaks = true -ij_yaml_line_comment_add_space = false -ij_yaml_line_comment_add_space_on_reformat = false -ij_yaml_line_comment_at_first_column = true ij_yaml_sequence_on_new_line = false ij_yaml_space_before_colon = false ij_yaml_spaces_within_braces = true