Skip to content

Commit 2d0de43

Browse files
authored
Merge pull request square#54 from square/jwilson.0224.track_misk_code_style
Track the Kotlin code styles we've adopted in Misk
2 parents 1f95c4a + d4e8e18 commit 2d0de43

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

‎configs/codestyles/Square.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
</option>
7777
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
7878
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
79+
<option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
7980
</JetCodeStyleSettings>
8081
<SqlCodeStyleSettings>
8182
<option name="ALIGN_AS_IN_SELECT_STATEMENT" value="false" />
@@ -298,13 +299,11 @@
298299
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
299300
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
300301
<option name="CALL_PARAMETERS_WRAP" value="1" />
301-
<option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
302-
<option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
303-
<option name="METHOD_PARAMETERS_WRAP" value="2" />
302+
<option name="METHOD_PARAMETERS_WRAP" value="5" />
304303
<option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
305304
<option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
306305
<option name="EXTENDS_LIST_WRAP" value="5" />
307-
<option name="METHOD_CALL_CHAIN_WRAP" value="2" />
306+
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
308307
<option name="ASSIGNMENT_WRAP" value="1" />
309308
<option name="METHOD_ANNOTATION_WRAP" value="1" />
310309
<option name="FIELD_ANNOTATION_WRAP" value="1" />

0 commit comments

Comments
 (0)