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

FIR IDE: choose better name for completion helpers

Browse Source
This commit is contained in:
Ilya Kirillov
2021-06-02 00:34:28 +02:00
committed by TeamCityServer
parent 2e57361457
commit a1fcc34bbc
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirTypeParameterConstraintNameInWhereClauseCompletionContributor.kt
+2 -2
View File
@@ -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<LookupE
val name = lookupElement.shortName.render()
context.document.replaceString(context.startOffset, context.tailOffset, name)
context.commitDocument()
context.addSymbolAndInvokeCompletion(symbol = " : ")
context.insertSymbolAndInvokeCompletion(symbol = " : ")
}
}
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirWhenWithSubjectConditionContributor.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.*
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.idea.completion.contributors.helpers.FirClassifierProvider.getAvailableClassifiersCurrentScope
import org.jetbrains.kotlin.idea.completion.contributors.helpers.addSymbolToCompletion
import org.jetbrains.kotlin.idea.completion.contributors.helpers.insertSymbol
import org.jetbrains.kotlin.idea.completion.contributors.helpers.addTypeArguments
import org.jetbrains.kotlin.idea.completion.contributors.helpers.createStarTypeArgumentsList
import org.jetbrains.kotlin.idea.completion.lookups.KotlinLookupObject
@@ -252,7 +252,7 @@ private object WhenConditionInsertionHandler : InsertionHandlerBase<WhenConditio
lookupObject: WhenConditionLookupObject
) {
if (lookupObject.isSingleCondition && completionChar != ',') {
addSymbolToCompletion(" -> ")
insertSymbol(" -> ")
commitDocument()
}
}
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/FirSuperEntriesProvider.kt
+1 -1
View File
@@ -34,7 +34,7 @@ internal object SuperCallInsertionHandler : InsertHandler<LookupElement> {
val lookupObject = item.`object` as SuperCallLookupObject
replaceWithClassIdAndShorten(lookupObject, context)
context.addSymbolAndInvokeCompletion(symbol = ".")
context.insertSymbolAndInvokeCompletion(symbol = ".")
}
private fun replaceWithClassIdAndShorten(
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/helpers/completionHelpers.kt
+6 -6
View File
@@ -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))
}
}
}
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/lookups/factories/PackagePartLookupElementFactory.kt
+2 -2
View File
@@ -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<LookupElement> {
val name = lookupElement.shortName.render()
context.document.replaceString(context.startOffset, context.tailOffset, name)
context.commitDocument()
context.addSymbolAndInvokeCompletion(symbol = ".")
context.insertSymbolAndInvokeCompletion(symbol = ".")
}
}