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

EA-215308: Fix unsafe check casts in template entry handling

Browse Source
This commit is contained in:
Yan Zhulanow
2019-11-13 20:59:23 +09:00
parent 3534d4af36
commit 2983c87212
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt
+15 -13
View File
@@ -243,20 +243,22 @@ class KotlinCompletionContributor : CompletionContributor() {
val toFromOriginalFileMapper = ToFromOriginalFileMapper.create(parameters) val toFromOriginalFileMapper = ToFromOriginalFileMapper.create(parameters)
if (position.node.elementType == KtTokens.LONG_TEMPLATE_ENTRY_START) { if (position.node.elementType == KtTokens.LONG_TEMPLATE_ENTRY_START) {
val expression = (position.parent as KtBlockStringTemplateEntry).expression val expression = (position.parent as? KtBlockStringTemplateEntry)?.expression
if (expression is KtDotQualifiedExpression) { if (expression is KtDotQualifiedExpression) {
val correctedPosition = (expression.selectorExpression as KtNameReferenceExpression).firstChild val correctedPosition = (expression.selectorExpression as? KtNameReferenceExpression)?.firstChild
// Workaround for KT-16848 if (correctedPosition != null) {
// ex: // Workaround for KT-16848
// expression: some.IntellijIdeaRulezzz // ex:
// correctedOffset: ^ // expression: some.IntellijIdeaRulezzz
// expression: some.funcIntellijIdeaRulezzz // correctedOffset: ^
// correctedOffset ^ // expression: some.funcIntellijIdeaRulezzz
val correctedOffset = correctedPosition.endOffset - CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED.length // correctedOffset ^
val correctedParameters = parameters.withPosition(correctedPosition, correctedOffset) val correctedOffset = correctedPosition.endOffset - CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED.length
doComplete(correctedParameters, toFromOriginalFileMapper, result, val correctedParameters = parameters.withPosition(correctedPosition, correctedOffset)
lookupElementPostProcessor = { wrapLookupElementForStringTemplateAfterDotCompletion(it) }) doComplete(correctedParameters, toFromOriginalFileMapper, result,
return lookupElementPostProcessor = { wrapLookupElementForStringTemplateAfterDotCompletion(it) })
return
}
} }
} }