From 0dc70e6437998d6d59055839da697062fb4baa2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20V=C3=B6gele?= Date: Tue, 5 Sep 2023 20:44:05 +0200 Subject: [PATCH] Default to the code style "intellij_idea" --- .../core/api/editorconfig/CodeStyleEditorConfigProperty.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ktlint-rule-engine-core/src/main/kotlin/com/pinterest/ktlint/rule/engine/core/api/editorconfig/CodeStyleEditorConfigProperty.kt b/ktlint-rule-engine-core/src/main/kotlin/com/pinterest/ktlint/rule/engine/core/api/editorconfig/CodeStyleEditorConfigProperty.kt index ecdb4f70b6..d0577bae82 100644 --- a/ktlint-rule-engine-core/src/main/kotlin/com/pinterest/ktlint/rule/engine/core/api/editorconfig/CodeStyleEditorConfigProperty.kt +++ b/ktlint-rule-engine-core/src/main/kotlin/com/pinterest/ktlint/rule/engine/core/api/editorconfig/CodeStyleEditorConfigProperty.kt @@ -37,7 +37,7 @@ public enum class CodeStyleValue { public val CODE_STYLE_PROPERTY_TYPE: PropertyType.LowerCasingPropertyType = PropertyType.LowerCasingPropertyType( "ktlint_code_style", - "The code style ('ktlint_official', 'intellij_idea' or 'android_studio') to be applied. By default the 'ktlint_official' code " + + "The code style ('ktlint_official', 'intellij_idea' or 'android_studio') to be applied. By default the 'intellij_idea' code " + "style is used", SafeEnumValueParser(CodeStyleValue::class.java), CodeStyleValue.entries.map { it.name }.toSet(), @@ -46,7 +46,7 @@ public val CODE_STYLE_PROPERTY_TYPE: PropertyType.LowerCasingPropertyType = EditorConfigProperty( type = CODE_STYLE_PROPERTY_TYPE, - defaultValue = CodeStyleValue.ktlint_official, + defaultValue = CodeStyleValue.intellij_idea, androidStudioCodeStyleDefaultValue = CodeStyleValue.android_studio, intellijIdeaCodeStyleDefaultValue = CodeStyleValue.intellij_idea, ktlintOfficialCodeStyleDefaultValue = CodeStyleValue.ktlint_official,