Skip to content

Commit b5d3e81

Browse files
vRallevvRallev
authored
Merge pull request square#84 from square/ralf/track-ktlint
Track KtLint's code styles.
2 parents 8e7e630 + fbaf43b commit b5d3e81

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

‎configs/codestyles/Square.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,16 @@
294294
</indentOptions>
295295
</codeStyleSettings>
296296
<codeStyleSettings language="kotlin">
297+
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
298+
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
299+
<option name="LINE_COMMENT_ADD_SPACE" value="true" />
297300
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
298301
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
299-
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
302+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
300303
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
301304
<option name="CALL_PARAMETERS_WRAP" value="1" />
305+
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
306+
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
302307
<option name="METHOD_PARAMETERS_WRAP" value="5" />
303308
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
304309
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
@@ -311,7 +316,7 @@
311316
<option name="ALLOW_TRAILING_COMMA" value="true" />
312317
<indentOptions>
313318
<option name="INDENT_SIZE" value="2" />
314-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
319+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
315320
<option name="TAB_SIZE" value="2" />
316321
</indentOptions>
317322
</codeStyleSettings>

‎configs/codestyles/SquareAndroid.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,12 @@
238238
</indentOptions>
239239
</codeStyleSettings>
240240
<codeStyleSettings language="kotlin">
241+
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
242+
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
243+
<option name="LINE_COMMENT_ADD_SPACE" value="true" />
241244
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
242245
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
243-
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
246+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
244247
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
245248
<option name="CALL_PARAMETERS_WRAP" value="1" />
246249
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
@@ -257,7 +260,7 @@
257260
<option name="ALLOW_TRAILING_COMMA" value="true" />
258261
<indentOptions>
259262
<option name="INDENT_SIZE" value="2" />
260-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
263+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
261264
<option name="TAB_SIZE" value="2" />
262265
</indentOptions>
263266
</codeStyleSettings>

0 commit comments

Comments
 (0)