From 7477f72acc3fcb626803c16aeeb75ceedaf3471a Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 4 Jan 2020 14:53:31 +0000 Subject: [PATCH] Update IDEA's code style to match ktlint --- .editorconfig | 3 +++ .idea/codeStyles/Project.xml | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/.editorconfig b/.editorconfig index 2e04c11efc..74a473cd2a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,9 @@ indent_style = tab [*.kt] indent_style = space indent_size = 4 +# see https://github.com/pinterest/ktlint/issues/527 +# noinspection EditorConfigKeyCorrectness +disabled_rules = import-ordering [*.xml] indent_style = space diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index aa60d1c615..1da64b5364 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -37,6 +37,11 @@