Skip to content

Commit 1b53a8e

Browse files
committed
Track the Android Kotlin style guide.
4-space indents for everyone. https://android.github.io/kotlin-guides/style.html
1 parent 85d8ae4 commit 1b53a8e

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

configs/codestyles/Square.xml

+13-6
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@
7070
<JavaCodeStyleSettings>
7171
<option name="CLASS_NAMES_IN_JAVADOC" value="3" />
7272
</JavaCodeStyleSettings>
73+
<JetCodeStyleSettings>
74+
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
75+
<value />
76+
</option>
77+
</JetCodeStyleSettings>
7378
<SqlCodeStyleSettings>
7479
<option name="ALIGN_AS_IN_SELECT_STATEMENT" value="false" />
7580
<option name="ALIGN_TYPE_IN_CREATE_STATEMENT" value="false" />
@@ -286,10 +291,12 @@
286291
</indentOptions>
287292
</codeStyleSettings>
288293
<codeStyleSettings language="kotlin">
289-
<indentOptions>
290-
<option name="INDENT_SIZE" value="2" />
291-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
292-
<option name="TAB_SIZE" value="2" />
293-
</indentOptions>
294+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
295+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
296+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
297+
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
298+
<option name="CALL_PARAMETERS_WRAP" value="1" />
299+
<option name="METHOD_PARAMETERS_WRAP" value="1" />
300+
<option name="EXTENDS_LIST_WRAP" value="1" />
294301
</codeStyleSettings>
295-
</code_scheme>
302+
</code_scheme>

configs/codestyles/SquareAndroid.xml

+5-6
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,13 @@
227227
</indentOptions>
228228
</codeStyleSettings>
229229
<codeStyleSettings language="kotlin">
230+
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
231+
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
232+
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
230233
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
231234
<option name="CALL_PARAMETERS_WRAP" value="1" />
232235
<option name="METHOD_PARAMETERS_WRAP" value="1" />
233-
<indentOptions>
234-
<option name="INDENT_SIZE" value="2" />
235-
<option name="CONTINUATION_INDENT_SIZE" value="4" />
236-
<option name="TAB_SIZE" value="2" />
237-
</indentOptions>
236+
<option name="EXTENDS_LIST_WRAP" value="1" />
238237
</codeStyleSettings>
239238
<codeStyleSettings language="SQL">
240239
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
@@ -310,7 +309,7 @@
310309
</match>
311310
</rule>
312311
</section>
313-
<section>
312+
<section>
314313
<rule>
315314
<match>
316315
<AND>

0 commit comments

Comments
 (0)