azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve comments in shorten references processor for qualified expressions

Browse Source
This commit is contained in:
Ilya Kirillov
2019-05-29 14:01:07 +03:00
parent 39dfa631bf
commit 879abdafc2
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/ShortenReferences.kt
+3 -4
View File
@@ -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.caches.resolve.getResolutionFacade
import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport import org.jetbrains.kotlin.idea.imports.canBeReferencedViaImport
import org.jetbrains.kotlin.idea.imports.getImportableTargets import org.jetbrains.kotlin.idea.imports.getImportableTargets
import org.jetbrains.kotlin.idea.util.ImportDescriptorResult import org.jetbrains.kotlin.idea.util.*
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.incremental.components.NoLookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer 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 { override fun shortenElement(element: KtDotQualifiedExpression, options: Options): KtElement {
val parens = element.parent as? KtParenthesizedExpression val parens = element.parent as? KtParenthesizedExpression
val requiredParens = parens != null && !KtPsiUtil.areParenthesesUseless(parens) val requiredParens = parens != null && !KtPsiUtil.areParenthesesUseless(parens)
val commentSaver = CommentSaver(element)
val shortenedElement = element.replace(element.selectorExpression!!) as KtElement val shortenedElement = element.replace(element.selectorExpression!!) as KtElement
commentSaver.restore(shortenedElement)
val newParent = shortenedElement.parent val newParent = shortenedElement.parent
if (requiredParens) return newParent.replaced(shortenedElement) if (requiredParens) return newParent.replaced(shortenedElement)
if (options.dropBracesInStringTemplates && newParent is KtBlockStringTemplateEntry && newParent.canDropBraces()) { if (options.dropBracesInStringTemplates && newParent is KtBlockStringTemplateEntry && newParent.canDropBraces()) {