From bf9dde5c32790d6d19b61de18071540e315d0292 Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 5 Jun 2019 13:07:31 +0700 Subject: [PATCH] Fix assert from createExpression in RemoveRedundantQualifierNameInspection --- .../inspections/RemoveRedundantQualifierNameInspection.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt index cc252a41453..b5634b72514 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/RemoveRedundantQualifierNameInspection.kt @@ -76,7 +76,7 @@ private fun KtDotQualifiedExpression.applicableExpression( ) ) return null val expressionText = originalExpression.text.substring(lastChild.startOffset - originalExpression.startOffset) - val newExpression = KtPsiFactory(originalExpression).createExpression(expressionText) + val newExpression = KtPsiFactory(originalExpression).createExpressionIfPossible(expressionText) ?: return null val newContext = newExpression.analyzeAsReplacement(originalExpression, oldContext) val newDescriptor = newExpression.getQualifiedElementSelector()?.getResolvedCall(newContext)?.resultingDescriptor ?: return null @@ -132,9 +132,9 @@ class RemoveRedundantQualifierNameQuickFix : LocalQuickFix { else -> IntRange.EMPTY } - val substring = file.text.substring(range.start, range.endInclusive) + val substring = file.text.substring(range.first, range.last) Regex.fromLiteral(substring).findAll(file.text, file.importList?.endOffset ?: 0).toList().reversed().forEach { - ShortenReferences.DEFAULT.process(file, it.range.start, it.range.endInclusive + 1) + ShortenReferences.DEFAULT.process(file, it.range.first, it.range.last + 1) } } } \ No newline at end of file