From 879abdafc2ff017cdf741a5d0bb837759d42e4dd Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 29 May 2019 14:01:07 +0300 Subject: [PATCH] Preserve comments in shorten references processor for qualified expressions --- .../org/jetbrains/kotlin/idea/core/ShortenReferences.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt index d330098d6f4..9f8fb08ad5b 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt @@ -17,10 +17,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.allowResolveInWriteAction import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport import org.jetbrains.kotlin.idea.imports.getImportableTargets -import org.jetbrains.kotlin.idea.util.ImportDescriptorResult -import org.jetbrains.kotlin.idea.util.ImportInsertHelper -import org.jetbrains.kotlin.idea.util.ShadowedDeclarationsFilter -import org.jetbrains.kotlin.idea.util.getResolutionScope +import org.jetbrains.kotlin.idea.util.* import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer @@ -618,7 +615,9 @@ class ShortenReferences(val options: (KtElement) -> Options = { Options.DEFAULT override fun shortenElement(element: KtDotQualifiedExpression, options: Options): KtElement { val parens = element.parent as? KtParenthesizedExpression val requiredParens = parens != null && !KtPsiUtil.areParenthesesUseless(parens) + val commentSaver = CommentSaver(element) val shortenedElement = element.replace(element.selectorExpression!!) as KtElement + commentSaver.restore(shortenedElement) val newParent = shortenedElement.parent if (requiredParens) return newParent.replaced(shortenedElement) if (options.dropBracesInStringTemplates && newParent is KtBlockStringTemplateEntry && newParent.canDropBraces()) {