Skip to content

Commit e783e8e

Browse files
Col-ECol-E
committed
Update empty line handling in style configs
1 parent f1a9a03 commit e783e8e

File tree

2 files changed

+26
-16
lines changed

2 files changed

+26
-16
lines changed

‎setup/code-style-eclipsej.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
236236
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
237237
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
238-
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="2"/>
238+
<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
239239
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
240240
<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
241241
<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
@@ -259,7 +259,7 @@
259259
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
260260
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
261261
<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="true"/>
262-
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
262+
<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
263263
<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="true"/>
264264
<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
265265
<setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="true"/>
@@ -273,19 +273,19 @@
273273
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="do not insert"/>
274274
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
275275
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
276-
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
277-
<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
278-
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
279-
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
280-
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
281-
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
282-
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
283-
<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
284-
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
285-
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
286-
<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
287-
<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
288-
<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
276+
<setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_preserve"/>
277+
<setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_preserve"/>
278+
<setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_preserve"/>
279+
<setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_preserve"/>
280+
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_preserve"/>
281+
<setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="true"/>
282+
<setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_preserve"/>
283+
<setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_preserve"/>
284+
<setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_preserve"/>
285+
<setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_preserve"/>
286+
<setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_preserve"/>
287+
<setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_preserve"/>
288+
<setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_preserve"/>
289289
<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
290290
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
291291
<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
@@ -373,7 +373,7 @@
373373
<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
374374
<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
375375
<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
376-
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
376+
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
377377
<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
378378
<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
379379
</profile>

‎setup/code-style-intellij.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,22 @@
1111
<ANNO name="jakarta.annotation.Nullable" />
1212
<ANNO name="javax.annotation.Nonnull" />
1313
<ANNO name="javax.annotation.Nullable" />
14+
<ANNO name="org.jetbrains.annotations.NotNull" />
15+
<ANNO name="org.jetbrains.annotations.Nullable" />
1416
</REPEAT_ANNOTATIONS>
1517
</JavaCodeStyleSettings>
1618
<JetCodeStyleSettings>
1719
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
1820
</JetCodeStyleSettings>
1921
<codeStyleSettings language="JAVA">
22+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
23+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
24+
<option name="KEEP_BLANK_LINES_BETWEEN_PACKAGE_DECLARATION_AND_HEADER" value="1" />
25+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
26+
<option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
27+
<option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
28+
<option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
29+
<option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
2030
<indentOptions>
2131
<option name="USE_TAB_CHARACTER" value="true" />
2232
</indentOptions>

0 commit comments

Comments
 (0)