Skip to content

Commit e478d90

Browse files
authored
Merge pull request square#51 from zach-klippenstein/zachklipp/kotlin-indent-2-spaces
Make the Kotlin indent 2 spaces.
2 parents 5ae72bb + 2a1c355 commit e478d90

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

‎configs/codestyles/Square.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,5 +307,10 @@
307307
<option name="METHOD_ANNOTATION_WRAP" value="1" />
308308
<option name="FIELD_ANNOTATION_WRAP" value="1" />
309309
<option name="ENUM_CONSTANTS_WRAP" value="2" />
310+
<indentOptions>
311+
<option name="INDENT_SIZE" value="2" />
312+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
313+
<option name="TAB_SIZE" value="2" />
314+
</indentOptions>
310315
</codeStyleSettings>
311316
</code_scheme>

‎configs/codestyles/SquareAndroid.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,11 @@
256256
<option name="METHOD_ANNOTATION_WRAP" value="1" />
257257
<option name="FIELD_ANNOTATION_WRAP" value="1" />
258258
<option name="ENUM_CONSTANTS_WRAP" value="2" />
259+
<indentOptions>
260+
<option name="INDENT_SIZE" value="2" />
261+
<option name="CONTINUATION_INDENT_SIZE" value="4" />
262+
<option name="TAB_SIZE" value="2" />
263+
</indentOptions>
259264
</codeStyleSettings>
260265
<codeStyleSettings language="SQL">
261266
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />

0 commit comments

Comments
 (0)