Update IDEA's code style to match ktlint

master
Graham 5 years ago
parent e9a9a8f962
commit 7477f72acc
  1. 3
      .editorconfig
  2. 14
      .idea/codeStyles/Project.xml

@ -10,6 +10,9 @@ indent_style = tab
[*.kt] [*.kt]
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
# see https://github.com/pinterest/ktlint/issues/527
# noinspection EditorConfigKeyCorrectness
disabled_rules = import-ordering
[*.xml] [*.xml]
indent_style = space indent_style = space

@ -37,6 +37,11 @@
<option name="JD_INDENT_ON_CONTINUATION" value="true" /> <option name="JD_INDENT_ON_CONTINUATION" value="true" />
</JavaCodeStyleSettings> </JavaCodeStyleSettings>
<JetCodeStyleSettings> <JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value />
</option>
<option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
<option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings> </JetCodeStyleSettings>
<XML> <XML>
@ -80,6 +85,15 @@
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="kotlin"> <codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" /> <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
<option name="LINE_COMMENT_ADD_SPACE" value="true" />
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings> </codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>
Loading…
Cancel
Save