Skip to content

Commit c8e5e9b

Browse files
committed
Update to mc26.1-rc-3
1 parent 5ff4225 commit c8e5e9b

File tree

51 files changed

+494
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+494
-442
lines changed

.editorconfig

Lines changed: 148 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,18 @@ root = true
33

44
[*]
55
charset = utf-8
6-
end_of_line = lf #g-crlf
7-
indent_size = 4 #g-2
6+
#g-crlf
7+
end_of_line = lf
8+
#g-2
9+
indent_size = 4
810
indent_style = space
9-
insert_final_newline = true #g-false
11+
#g-false
12+
insert_final_newline = true
1013
max_line_length = 100
11-
tab_width = 4 #g-2
12-
ij_continuation_indent_size = 8 #g-4
14+
#g-2
15+
tab_width = 4
16+
#g-4
17+
ij_continuation_indent_size = 8
1318
ij_formatter_off_tag = @formatter:off
1419
ij_formatter_on_tag = @formatter:on
1520
ij_formatter_tags_enabled = true
@@ -48,13 +53,19 @@ ij_java_align_subsequent_simple_methods = false
4853
ij_java_align_throws_keyword = false
4954
ij_java_align_types_in_multi_catch = true
5055
ij_java_annotation_new_line_in_record_component = false
51-
ij_java_annotation_parameter_wrap = split_into_lines #g-off
52-
ij_java_array_initializer_new_line_after_left_brace = true #g-false
53-
ij_java_array_initializer_right_brace_on_new_line = true #g-false
54-
ij_java_array_initializer_wrap = on_every_item #g-normal
56+
#g-off
57+
ij_java_annotation_parameter_wrap = split_into_lines
58+
#g-false
59+
ij_java_array_initializer_new_line_after_left_brace = true
60+
#g-false
61+
ij_java_array_initializer_right_brace_on_new_line = true
62+
#g-normal
63+
ij_java_array_initializer_wrap = on_every_item
5564
ij_java_assert_statement_colon_on_next_line = false
56-
ij_java_assert_statement_wrap = normal #g-off
57-
ij_java_assignment_wrap = normal #g-off
65+
#g-off
66+
ij_java_assert_statement_wrap = normal
67+
#g-off
68+
ij_java_assignment_wrap = normal
5869
ij_java_binary_operation_sign_on_next_line = true
5970
ij_java_binary_operation_wrap = normal
6071
ij_java_blank_lines_after_anonymous_class_header = 0
@@ -77,20 +88,25 @@ ij_java_block_brace_style = end_of_line
7788
ij_java_block_comment_add_space = false
7889
ij_java_block_comment_at_first_column = true
7990
ij_java_builder_methods =
80-
ij_java_call_parameters_new_line_after_left_paren = true #g-false
81-
ij_java_call_parameters_right_paren_on_new_line = true #g-false
82-
ij_java_call_parameters_wrap = on_every_item #g-normal
91+
#g-false
92+
ij_java_call_parameters_new_line_after_left_paren = true
93+
#g-false
94+
ij_java_call_parameters_right_paren_on_new_line = true
95+
#g-normal
96+
ij_java_call_parameters_wrap = on_every_item
8397
ij_java_case_statement_on_separate_line = true
8498
ij_java_catch_on_new_line = false
8599
ij_java_class_annotation_wrap = split_into_lines
86100
ij_java_class_brace_style = end_of_line
87-
ij_java_class_count_to_use_import_on_demand = 5 #g-999
101+
#g-999
102+
ij_java_class_count_to_use_import_on_demand = 5
88103
ij_java_class_names_in_javadoc = 1
89104
ij_java_deconstruction_list_wrap = normal
90105
ij_java_do_not_indent_top_level_class_members = false
91106
ij_java_do_not_wrap_after_single_annotation = false
92107
ij_java_do_not_wrap_after_single_annotation_in_parameter = false
93-
ij_java_do_while_brace_force = never #g-always
108+
#g-always
109+
ij_java_do_while_brace_force = never
94110
ij_java_doc_add_blank_line_after_description = true
95111
ij_java_doc_add_blank_line_after_param_comments = false
96112
ij_java_doc_add_blank_line_after_return = false
@@ -110,23 +126,32 @@ ij_java_doc_param_description_on_new_line = false
110126
ij_java_doc_preserve_line_breaks = false
111127
ij_java_doc_use_throws_not_exception_tag = true
112128
ij_java_else_on_new_line = false
113-
ij_java_enum_constants_wrap = split_into_lines #g-off
114-
ij_java_enum_field_annotation_wrap = split_into_lines #g-off
115-
ij_java_extends_keyword_wrap = normal #g-off
129+
#g-off
130+
ij_java_enum_constants_wrap = split_into_lines
131+
#g-off
132+
ij_java_enum_field_annotation_wrap = split_into_lines
133+
#g-off
134+
ij_java_extends_keyword_wrap = normal
116135
ij_java_extends_list_wrap = normal
117136
ij_java_field_annotation_wrap = split_into_lines
118137
ij_java_field_name_prefix =
119138
ij_java_field_name_suffix =
120139
ij_java_finally_on_new_line = false
121-
ij_java_for_brace_force = never #g-always
122-
ij_java_for_statement_new_line_after_left_paren = true #g-false
123-
ij_java_for_statement_right_paren_on_new_line = true #g-false
124-
ij_java_for_statement_wrap = on_every_item #g-normal
140+
#g-always
141+
ij_java_for_brace_force = never
142+
#g-false
143+
ij_java_for_statement_new_line_after_left_paren = true
144+
#g-false
145+
ij_java_for_statement_right_paren_on_new_line = true
146+
#g-normal
147+
ij_java_for_statement_wrap = on_every_item
125148
ij_java_generate_final_locals = false
126149
ij_java_generate_final_parameters = false
127150
ij_java_generate_use_type_annotation_before_type = true
128-
ij_java_if_brace_force = never #g-always
129-
ij_java_imports_layout = *, |, javax.**, java.**, |, $* #g-$*,|,*
151+
#g-always
152+
ij_java_if_brace_force = never
153+
#g-$*,|,*
154+
ij_java_imports_layout = *, |, javax.**, java.**, |, $*
130155
ij_java_indent_case_from_switch = true
131156
ij_java_insert_inner_class_imports = true
132157
ij_java_insert_override_annotation = true
@@ -156,18 +181,26 @@ ij_java_local_variable_name_prefix =
156181
ij_java_local_variable_name_suffix =
157182
ij_java_method_annotation_wrap = split_into_lines
158183
ij_java_method_brace_style = end_of_line
159-
ij_java_method_call_chain_wrap = on_every_item #g-normal
160-
ij_java_method_parameters_new_line_after_left_paren = true #g-false
161-
ij_java_method_parameters_right_paren_on_new_line = true #g-false
162-
ij_java_method_parameters_wrap = on_every_item #g-normal
184+
#g-normal
185+
ij_java_method_call_chain_wrap = on_every_item
186+
#g-false
187+
ij_java_method_parameters_new_line_after_left_paren = true
188+
#g-false
189+
ij_java_method_parameters_right_paren_on_new_line = true
190+
#g-normal
191+
ij_java_method_parameters_wrap = on_every_item
163192
ij_java_modifier_list_wrap = false
164193
ij_java_multi_catch_types_wrap = normal
165-
ij_java_names_count_to_use_import_on_demand = 3 #g-999
166-
ij_java_new_line_after_lparen_in_annotation = true #g-false
194+
#g-999
195+
ij_java_names_count_to_use_import_on_demand = 3
196+
#g-false
197+
ij_java_new_line_after_lparen_in_annotation = true
167198
ij_java_new_line_after_lparen_in_deconstruction_pattern = true
168-
ij_java_new_line_after_lparen_in_record_header = true #g-false
199+
#g-false
200+
ij_java_new_line_after_lparen_in_record_header = true
169201
ij_java_new_line_when_body_is_presented = false
170-
ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.* #g-
202+
#g-
203+
ij_java_packages_to_use_import_on_demand = java.awt.*, javax.swing.*
171204
ij_java_parameter_annotation_wrap = off
172205
ij_java_parameter_name_prefix =
173206
ij_java_parameter_name_suffix =
@@ -177,17 +210,23 @@ ij_java_place_assignment_sign_on_next_line = false
177210
ij_java_prefer_longer_names = true
178211
ij_java_prefer_parameters_wrap = false
179212
ij_java_preserve_module_imports = true
180-
ij_java_record_components_wrap = on_every_item #g-normal
213+
#g-normal
214+
ij_java_record_components_wrap = on_every_item
181215
ij_java_repeat_synchronized = true
182216
ij_java_replace_instanceof_and_cast = false
183217
ij_java_replace_null_check = true
184218
ij_java_replace_sum_lambda_with_method_ref = true
185-
ij_java_resource_list_new_line_after_left_paren = true #g-false
186-
ij_java_resource_list_right_paren_on_new_line = true #g-false
187-
ij_java_resource_list_wrap = on_every_item #g-off
188-
ij_java_rparen_on_new_line_in_annotation = true #g-false
219+
#g-false
220+
ij_java_resource_list_new_line_after_left_paren = true
221+
#g-false
222+
ij_java_resource_list_right_paren_on_new_line = true
223+
#g-off
224+
ij_java_resource_list_wrap = on_every_item
225+
#g-false
226+
ij_java_rparen_on_new_line_in_annotation = true
189227
ij_java_rparen_on_new_line_in_deconstruction_pattern = true
190-
ij_java_rparen_on_new_line_in_record_header = true #g-false
228+
#g-false
229+
ij_java_rparen_on_new_line_in_record_header = true
191230
ij_java_space_after_closing_angle_bracket_in_type_argument = false
192231
ij_java_space_after_colon = true
193232
ij_java_space_after_comma = true
@@ -274,7 +313,8 @@ ij_java_subclass_name_prefix =
274313
ij_java_subclass_name_suffix = Impl
275314
ij_java_switch_expressions_wrap = normal
276315
ij_java_ternary_operation_signs_on_next_line = true
277-
ij_java_ternary_operation_wrap = on_every_item #g-normal
316+
#g-normal
317+
ij_java_ternary_operation_wrap = on_every_item
278318
ij_java_test_name_prefix =
279319
ij_java_test_name_suffix = Test
280320
ij_java_throws_keyword_wrap = normal
@@ -297,7 +337,8 @@ indent_size = 4
297337
indent_style = tab
298338
max_line_length = 150
299339
tab_width = 4
300-
ij_continuation_indent_size = 4 #g-unset
340+
#g-unset
341+
ij_continuation_indent_size = 4
301342
ij_nbtt_keep_indents_on_empty_lines = false
302343
ij_nbtt_space_after_colon = true
303344
ij_nbtt_space_after_comma = true
@@ -308,7 +349,8 @@ ij_nbtt_spaces_within_parentheses = false
308349

309350
[*.properties]
310351
ij_properties_align_group_field_declarations = false
311-
ij_properties_keep_blank_lines = true #g-false
352+
#g-false
353+
ij_properties_keep_blank_lines = true
312354
ij_properties_key_value_delimiter = equals
313355
ij_properties_spaces_around_key_value_delimiter = false
314356

@@ -341,8 +383,10 @@ ij_xml_space_inside_empty_tag = false
341383
ij_xml_text_wrap = normal
342384

343385
[{*.bash,*.sh,*.zsh}]
344-
indent_size = 2 #g-unset
345-
tab_width = 2 #g-unset
386+
#g-unset
387+
indent_size = 2
388+
#g-unset
389+
tab_width = 2
346390
ij_shell_binary_ops_start_line = false
347391
ij_shell_keep_column_alignment_padding = false
348392
ij_shell_minify_program = false
@@ -542,10 +586,13 @@ ij_groovy_wrap_chain_calls_after_dot = false
542586
ij_groovy_wrap_long_lines = false
543587

544588
[{*.har,*.inputactions,*.json,*.jsonc,*.png.mcmeta,mcmod.info,pack.mcmeta}]
545-
indent_size = 2 #g-unset
546-
tab_width = 2 #g-unset
589+
#g-unset
590+
indent_size = 2
591+
#g-unset
592+
tab_width = 2
547593
ij_json_array_wrapping = split_into_lines
548-
ij_json_keep_blank_lines_in_code = 1 #g-0
594+
#g-0
595+
ij_json_keep_blank_lines_in_code = 1
549596
ij_json_keep_indents_on_empty_lines = false
550597
ij_json_keep_line_breaks = true
551598
ij_json_keep_trailing_comma = false
@@ -599,30 +646,43 @@ ij_kotlin_align_multiline_parameters = true
599646
ij_kotlin_align_multiline_parameters_in_calls = false
600647
ij_kotlin_allow_trailing_comma = false
601648
ij_kotlin_allow_trailing_comma_on_call_site = false
602-
ij_kotlin_assignment_wrap = normal #s-off
649+
#s-off
650+
ij_kotlin_assignment_wrap = normal
603651
ij_kotlin_blank_lines_after_class_header = 0
604652
ij_kotlin_blank_lines_around_block_when_branches = 0
605653
ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
606654
ij_kotlin_block_comment_add_space = false
607655
ij_kotlin_block_comment_at_first_column = true
608-
ij_kotlin_call_parameters_new_line_after_left_paren = true #s-false
609-
ij_kotlin_call_parameters_right_paren_on_new_line = true #s-false
610-
ij_kotlin_call_parameters_wrap = on_every_item #s-off
656+
#s-false
657+
ij_kotlin_call_parameters_new_line_after_left_paren = true
658+
#s-false
659+
ij_kotlin_call_parameters_right_paren_on_new_line = true
660+
#s-off
661+
ij_kotlin_call_parameters_wrap = on_every_item
611662
ij_kotlin_catch_on_new_line = false
612663
ij_kotlin_class_annotation_wrap = split_into_lines
613-
ij_kotlin_continuation_indent_for_chained_calls = false #s-true
614-
ij_kotlin_continuation_indent_for_expression_bodies = false #s-true
615-
ij_kotlin_continuation_indent_in_argument_lists = false #s-true
616-
ij_kotlin_continuation_indent_in_elvis = false #s-true
617-
ij_kotlin_continuation_indent_in_if_conditions = false #s-true
618-
ij_kotlin_continuation_indent_in_parameter_lists = false #s-true
619-
ij_kotlin_continuation_indent_in_supertype_lists = false #s-true
664+
#s-true
665+
ij_kotlin_continuation_indent_for_chained_calls = false
666+
#s-true
667+
ij_kotlin_continuation_indent_for_expression_bodies = false
668+
#s-true
669+
ij_kotlin_continuation_indent_in_argument_lists = false
670+
#s-true
671+
ij_kotlin_continuation_indent_in_elvis = false
672+
#s-true
673+
ij_kotlin_continuation_indent_in_if_conditions = false
674+
#s-true
675+
ij_kotlin_continuation_indent_in_parameter_lists = false
676+
#s-true
677+
ij_kotlin_continuation_indent_in_supertype_lists = false
620678
ij_kotlin_else_on_new_line = false
621679
ij_kotlin_enum_constants_wrap = off
622-
ij_kotlin_extends_list_wrap = normal #s-off
680+
#s-off
681+
ij_kotlin_extends_list_wrap = normal
623682
ij_kotlin_field_annotation_wrap = split_into_lines
624683
ij_kotlin_finally_on_new_line = false
625-
ij_kotlin_if_rparen_on_new_line = true #s-false
684+
#s-false
685+
ij_kotlin_if_rparen_on_new_line = true
626686
ij_kotlin_import_nested_classes = false
627687
ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
628688
ij_kotlin_indent_before_arrow_on_new_line = true
@@ -639,10 +699,14 @@ ij_kotlin_line_comment_add_space = false
639699
ij_kotlin_line_comment_add_space_on_reformat = false
640700
ij_kotlin_line_comment_at_first_column = true
641701
ij_kotlin_method_annotation_wrap = split_into_lines
642-
ij_kotlin_method_call_chain_wrap = normal #s-off
643-
ij_kotlin_method_parameters_new_line_after_left_paren = true #s-false
644-
ij_kotlin_method_parameters_right_paren_on_new_line = true #s-false
645-
ij_kotlin_method_parameters_wrap = on_every_item #s-off
702+
#s-off
703+
ij_kotlin_method_call_chain_wrap = normal
704+
#s-false
705+
ij_kotlin_method_parameters_new_line_after_left_paren = true
706+
#s-false
707+
ij_kotlin_method_parameters_right_paren_on_new_line = true
708+
#s-off
709+
ij_kotlin_method_parameters_wrap = on_every_item
646710
ij_kotlin_name_count_to_use_star_import = 5
647711
ij_kotlin_name_count_to_use_star_import_for_members = 3
648712
ij_kotlin_packages_to_use_import_on_demand = java.util.*, kotlinx.android.synthetic.**, io.ktor.**
@@ -673,21 +737,26 @@ ij_kotlin_spaces_around_when_arrow = true
673737
ij_kotlin_variable_annotation_wrap = off
674738
ij_kotlin_while_on_new_line = false
675739
ij_kotlin_wrap_elvis_expressions = 1
676-
ij_kotlin_wrap_expression_body_functions = 1 #s-0
740+
#s-0
741+
ij_kotlin_wrap_expression_body_functions = 1
677742
ij_kotlin_wrap_first_method_in_call_chain = false
678743

679744
[{*.markdown,*.md}]
680-
indent_size = 2 #g-4
681-
tab_width = 2 #g-4
682-
ij_continuation_indent_size = 4 #g-8
745+
#g-4
746+
indent_size = 2
747+
#g-4
748+
tab_width = 2
749+
#g-8
750+
ij_continuation_indent_size = 4
683751
ij_markdown_force_one_space_after_blockquote_symbol = true
684752
ij_markdown_force_one_space_after_header_symbol = true
685753
ij_markdown_force_one_space_after_list_bullet = true
686754
ij_markdown_force_one_space_between_words = true
687755
ij_markdown_format_tables = true
688756
ij_markdown_insert_quote_arrows_on_wrap = true
689757
ij_markdown_keep_indents_on_empty_lines = false
690-
ij_markdown_keep_line_breaks_inside_text_blocks = false #g-true
758+
#g-true
759+
ij_markdown_keep_line_breaks_inside_text_blocks = false
691760
ij_markdown_max_lines_around_block_elements = 1
692761
ij_markdown_max_lines_around_header = 1
693762
ij_markdown_max_lines_between_paragraphs = 1
@@ -704,17 +773,22 @@ ij_continuation_indent_size = 8
704773
ij_toml_keep_indents_on_empty_lines = false
705774

706775
[{*.yaml,*.yml}]
707-
indent_size = 2 #g-unset
708-
tab_width = 2 #g-unset
776+
#g-unset
777+
indent_size = 2
778+
#g-unset
779+
tab_width = 2
709780
ij_yaml_align_values_properties = do_not_align
710781
ij_yaml_autoinsert_sequence_marker = true
711782
ij_yaml_block_mapping_on_new_line = false
712783
ij_yaml_indent_sequence_value = true
713784
ij_yaml_keep_indents_on_empty_lines = false
714785
ij_yaml_keep_line_breaks = true
715-
ij_yaml_line_comment_add_space = true #g-false
716-
ij_yaml_line_comment_add_space_on_reformat = true #g-false
717-
ij_yaml_line_comment_at_first_column = false #g-true
786+
#g-false
787+
ij_yaml_line_comment_add_space = true
788+
#g-false
789+
ij_yaml_line_comment_add_space_on_reformat = true
790+
#g-true
791+
ij_yaml_line_comment_at_first_column = false
718792
ij_yaml_sequence_on_new_line = false
719793
ij_yaml_space_before_colon = false
720794
ij_yaml_spaces_within_braces = true

0 commit comments

Comments
 (0)