diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirTypeParameterConstraintNameInWhereClauseCompletionContributor.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirTypeParameterConstraintNameInWhereClauseCompletionContributor.kt index 8b09ec3442c..f8d5c6f3587 100644 --- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirTypeParameterConstraintNameInWhereClauseCompletionContributor.kt +++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirTypeParameterConstraintNameInWhereClauseCompletionContributor.kt @@ -12,7 +12,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.kotlin.idea.completion.KotlinFirIconProvider.getIconFor import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext import org.jetbrains.kotlin.idea.completion.context.FirTypeConstraintNameInWhereClausePositionContext -import org.jetbrains.kotlin.idea.completion.contributors.helpers.addSymbolAndInvokeCompletion +import org.jetbrains.kotlin.idea.completion.contributors.helpers.insertSymbolAndInvokeCompletion import org.jetbrains.kotlin.idea.completion.lookups.KotlinLookupObject import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithTypeParameters @@ -47,7 +47,7 @@ private object TypeParameterInWhenClauseInsertionHandler : InsertHandler ") + insertSymbol(" -> ") commitDocument() } } diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/FirSuperEntriesProvider.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/FirSuperEntriesProvider.kt index c81245f5358..9494e6a6d8d 100644 --- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/FirSuperEntriesProvider.kt +++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/FirSuperEntriesProvider.kt @@ -34,7 +34,7 @@ internal object SuperCallInsertionHandler : InsertHandler { val lookupObject = item.`object` as SuperCallLookupObject replaceWithClassIdAndShorten(lookupObject, context) - context.addSymbolAndInvokeCompletion(symbol = ".") + context.insertSymbolAndInvokeCompletion(symbol = ".") } private fun replaceWithClassIdAndShorten( diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/completionHelpers.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/completionHelpers.kt index e3100a49d19..dfa3a9d0326 100644 --- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/completionHelpers.kt +++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/completionHelpers.kt @@ -11,12 +11,12 @@ import com.intellij.codeInsight.completion.InsertionContext import com.intellij.openapi.application.ApplicationManager import com.intellij.psi.PsiDocumentManager -internal fun InsertionContext.addSymbolAndInvokeCompletion(symbol: String) { - this.addSymbolToCompletion(symbol) - invokeCompletion(this) +internal fun InsertionContext.insertSymbolAndInvokeCompletion(symbol: String) { + this.insertSymbol(symbol) + scheduleCompletion(this) } -private fun invokeCompletion(context: InsertionContext) { +private fun scheduleCompletion(context: InsertionContext) { ApplicationManager.getApplication().invokeLater { if (!context.editor.isDisposed) { CodeCompletionHandlerBase(CompletionType.BASIC, true, false, true) @@ -25,7 +25,7 @@ private fun invokeCompletion(context: InsertionContext) { } } -internal fun InsertionContext.addSymbolToCompletion(symbol: String) { +internal fun InsertionContext.insertSymbol(symbol: String) { PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document) document.insertString(tailOffset, symbol) commitDocument() @@ -42,7 +42,7 @@ internal fun InsertionContext.addTypeArguments(typeArgumentsCount: Int) { } else -> { commitDocument() - addSymbolToCompletion(createStarTypeArgumentsList(typeArgumentsCount)) + insertSymbol(createStarTypeArgumentsList(typeArgumentsCount)) } } } \ No newline at end of file diff --git a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/lookups/factories/PackagePartLookupElementFactory.kt b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/lookups/factories/PackagePartLookupElementFactory.kt index bc9ac066f1b..2841e701095 100644 --- a/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/lookups/factories/PackagePartLookupElementFactory.kt +++ b/idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/lookups/factories/PackagePartLookupElementFactory.kt @@ -10,7 +10,7 @@ import com.intellij.codeInsight.completion.InsertionContext import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.icons.AllIcons -import org.jetbrains.kotlin.idea.completion.contributors.helpers.addSymbolAndInvokeCompletion +import org.jetbrains.kotlin.idea.completion.contributors.helpers.insertSymbolAndInvokeCompletion import org.jetbrains.kotlin.idea.completion.lookups.KotlinLookupObject import org.jetbrains.kotlin.miniStdLib.letIf import org.jetbrains.kotlin.name.FqName @@ -41,7 +41,7 @@ private object PackagePartInsertionHandler : InsertHandler { val name = lookupElement.shortName.render() context.document.replaceString(context.startOffset, context.tailOffset, name) context.commitDocument() - context.addSymbolAndInvokeCompletion(symbol = ".") + context.insertSymbolAndInvokeCompletion(symbol = ".") } }