Skip to content

Commit 5bd4eb8

Browse files
committed
Keep @Formatter tags
1 parent c55049b commit 5bd4eb8

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

configs/codestyles/Square.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
3333
<option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
3434
<option name="JD_KEEP_EMPTY_RETURN" value="false" />
35+
<option name="FORMATTER_TAGS_ENABLED" value="true" />
3536
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
3637
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
3738
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />

configs/codestyles/SquareAndroid.xml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
3434
<option name="JD_KEEP_EMPTY_RETURN" value="false" />
3535
<option name="JD_PRESERVE_LINE_FEEDS" value="true" />
36+
<option name="FORMATTER_TAGS_ENABLED" value="true" />
3637
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
3738
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
3839
<option name="KEEP_LINE_BREAKS" value="false" />
@@ -256,16 +257,6 @@
256257
<option name="TAB_SIZE" value="2" />
257258
</indentOptions>
258259
</codeStyleSettings>
259-
<codeStyleSettings language="kotlin">
260-
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
261-
<option name="CALL_PARAMETERS_WRAP" value="1" />
262-
<option name="METHOD_PARAMETERS_WRAP" value="1" />
263-
<indentOptions>
264-
<option name="INDENT_SIZE" value="2" />
265-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
266-
<option name="TAB_SIZE" value="2" />
267-
</indentOptions>
268-
</codeStyleSettings>
269260
<codeStyleSettings language="SQL">
270261
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
271262
<option name="PARENT_SETTINGS_INSTALLED" value="true" />
@@ -410,4 +401,14 @@
410401
</rules>
411402
</arrangement>
412403
</codeStyleSettings>
404+
<codeStyleSettings language="kotlin">
405+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
406+
<option name="CALL_PARAMETERS_WRAP" value="1" />
407+
<option name="METHOD_PARAMETERS_WRAP" value="1" />
408+
<indentOptions>
409+
<option name="INDENT_SIZE" value="2" />
410+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
411+
<option name="TAB_SIZE" value="2" />
412+
</indentOptions>
413+
</codeStyleSettings>
413414
</code_scheme>

0 commit comments

Comments
 (0)