From e06514c945c47298789d5513fce66151b5140ef4 Mon Sep 17 00:00:00 2001 From: Toshiaki Kameyama Date: Mon, 18 Mar 2019 06:20:23 +0300 Subject: [PATCH] Smart completing anonymous object: follow code style settings (KT-29572) #KT-29572 Fixed --- .../kotlin/idea/completion/smart/TypeInstantiationItems.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index 19854b2a8bd..7ba072bd1e4 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt @@ -40,6 +40,7 @@ import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper import org.jetbrains.kotlin.idea.core.Tail import org.jetbrains.kotlin.idea.core.multipleFuzzyTypes import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler +import org.jetbrains.kotlin.idea.formatter.ktCodeStyleSettings import org.jetbrains.kotlin.idea.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.util.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation @@ -191,7 +192,10 @@ class TypeInstantiationItems( insertHandler = InsertHandler { context, _ -> val startOffset = context.startOffset - val text1 = "object : $typeText" + val settings = ktCodeStyleSettings(context.project)?.custom + val spaceBefore = if (settings?.SPACE_BEFORE_EXTEND_COLON == true) " " else "" + val spaceAfter = if (settings?.SPACE_AFTER_EXTEND_COLON == true) " " else "" + val text1 = "object$spaceBefore:$spaceAfter$typeText" val text2 = "$constructorParenthesis {}" val text = if (allTypeArgsKnown) text1 + IdeDescriptorRenderers.SOURCE_CODE.renderTypeArguments(typeArgsToUse) + text2