FIR IDE: choose better name for completion helpers
This commit is contained in:
committed by
TeamCityServer
parent
2e57361457
commit
a1fcc34bbc
+2
-2
@@ -12,7 +12,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder
|
|||||||
import org.jetbrains.kotlin.idea.completion.KotlinFirIconProvider.getIconFor
|
import org.jetbrains.kotlin.idea.completion.KotlinFirIconProvider.getIconFor
|
||||||
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
|
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
|
||||||
import org.jetbrains.kotlin.idea.completion.context.FirTypeConstraintNameInWhereClausePositionContext
|
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.completion.lookups.KotlinLookupObject
|
||||||
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
|
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
|
||||||
import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithTypeParameters
|
import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSymbolWithTypeParameters
|
||||||
@@ -47,7 +47,7 @@ private object TypeParameterInWhenClauseInsertionHandler : InsertHandler<LookupE
|
|||||||
val name = lookupElement.shortName.render()
|
val name = lookupElement.shortName.render()
|
||||||
context.document.replaceString(context.startOffset, context.tailOffset, name)
|
context.document.replaceString(context.startOffset, context.tailOffset, name)
|
||||||
context.commitDocument()
|
context.commitDocument()
|
||||||
context.addSymbolAndInvokeCompletion(symbol = " : ")
|
context.insertSymbolAndInvokeCompletion(symbol = " : ")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.*
|
|||||||
import org.jetbrains.kotlin.lexer.KtTokens
|
import org.jetbrains.kotlin.lexer.KtTokens
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.idea.completion.contributors.helpers.FirClassifierProvider.getAvailableClassifiersCurrentScope
|
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.addTypeArguments
|
||||||
import org.jetbrains.kotlin.idea.completion.contributors.helpers.createStarTypeArgumentsList
|
import org.jetbrains.kotlin.idea.completion.contributors.helpers.createStarTypeArgumentsList
|
||||||
import org.jetbrains.kotlin.idea.completion.lookups.KotlinLookupObject
|
import org.jetbrains.kotlin.idea.completion.lookups.KotlinLookupObject
|
||||||
@@ -252,7 +252,7 @@ private object WhenConditionInsertionHandler : InsertionHandlerBase<WhenConditio
|
|||||||
lookupObject: WhenConditionLookupObject
|
lookupObject: WhenConditionLookupObject
|
||||||
) {
|
) {
|
||||||
if (lookupObject.isSingleCondition && completionChar != ',') {
|
if (lookupObject.isSingleCondition && completionChar != ',') {
|
||||||
addSymbolToCompletion(" -> ")
|
insertSymbol(" -> ")
|
||||||
commitDocument()
|
commitDocument()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ internal object SuperCallInsertionHandler : InsertHandler<LookupElement> {
|
|||||||
val lookupObject = item.`object` as SuperCallLookupObject
|
val lookupObject = item.`object` as SuperCallLookupObject
|
||||||
|
|
||||||
replaceWithClassIdAndShorten(lookupObject, context)
|
replaceWithClassIdAndShorten(lookupObject, context)
|
||||||
context.addSymbolAndInvokeCompletion(symbol = ".")
|
context.insertSymbolAndInvokeCompletion(symbol = ".")
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun replaceWithClassIdAndShorten(
|
private fun replaceWithClassIdAndShorten(
|
||||||
|
|||||||
+6
-6
@@ -11,12 +11,12 @@ import com.intellij.codeInsight.completion.InsertionContext
|
|||||||
import com.intellij.openapi.application.ApplicationManager
|
import com.intellij.openapi.application.ApplicationManager
|
||||||
import com.intellij.psi.PsiDocumentManager
|
import com.intellij.psi.PsiDocumentManager
|
||||||
|
|
||||||
internal fun InsertionContext.addSymbolAndInvokeCompletion(symbol: String) {
|
internal fun InsertionContext.insertSymbolAndInvokeCompletion(symbol: String) {
|
||||||
this.addSymbolToCompletion(symbol)
|
this.insertSymbol(symbol)
|
||||||
invokeCompletion(this)
|
scheduleCompletion(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun invokeCompletion(context: InsertionContext) {
|
private fun scheduleCompletion(context: InsertionContext) {
|
||||||
ApplicationManager.getApplication().invokeLater {
|
ApplicationManager.getApplication().invokeLater {
|
||||||
if (!context.editor.isDisposed) {
|
if (!context.editor.isDisposed) {
|
||||||
CodeCompletionHandlerBase(CompletionType.BASIC, true, false, true)
|
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)
|
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(document)
|
||||||
document.insertString(tailOffset, symbol)
|
document.insertString(tailOffset, symbol)
|
||||||
commitDocument()
|
commitDocument()
|
||||||
@@ -42,7 +42,7 @@ internal fun InsertionContext.addTypeArguments(typeArgumentsCount: Int) {
|
|||||||
}
|
}
|
||||||
else -> {
|
else -> {
|
||||||
commitDocument()
|
commitDocument()
|
||||||
addSymbolToCompletion(createStarTypeArgumentsList(typeArgumentsCount))
|
insertSymbol(createStarTypeArgumentsList(typeArgumentsCount))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+2
-2
@@ -10,7 +10,7 @@ import com.intellij.codeInsight.completion.InsertionContext
|
|||||||
import com.intellij.codeInsight.lookup.LookupElement
|
import com.intellij.codeInsight.lookup.LookupElement
|
||||||
import com.intellij.codeInsight.lookup.LookupElementBuilder
|
import com.intellij.codeInsight.lookup.LookupElementBuilder
|
||||||
import com.intellij.icons.AllIcons
|
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.idea.completion.lookups.KotlinLookupObject
|
||||||
import org.jetbrains.kotlin.miniStdLib.letIf
|
import org.jetbrains.kotlin.miniStdLib.letIf
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
@@ -41,7 +41,7 @@ private object PackagePartInsertionHandler : InsertHandler<LookupElement> {
|
|||||||
val name = lookupElement.shortName.render()
|
val name = lookupElement.shortName.render()
|
||||||
context.document.replaceString(context.startOffset, context.tailOffset, name)
|
context.document.replaceString(context.startOffset, context.tailOffset, name)
|
||||||
context.commitDocument()
|
context.commitDocument()
|
||||||
context.addSymbolAndInvokeCompletion(symbol = ".")
|
context.insertSymbolAndInvokeCompletion(symbol = ".")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user