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

FIR IDE: add ::class/::class.java to callable references completion

Browse Source
This commit is contained in:
Ilya Kirillov
2021-06-09 19:20:05 +02:00
committed by teamcityserver
parent 915c8b7996
commit a5edbd531b
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/KotlinFirCompletionContributor.kt
+2 -1
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.idea.completion.contributors.*
import org.jetbrains.kotlin.idea.completion.contributors.FirAnnotationCompletionContributor
import org.jetbrains.kotlin.idea.completion.contributors.FirCallableCompletionContributor
import org.jetbrains.kotlin.idea.completion.contributors.FirClassifierCompletionContributor
import org.jetbrains.kotlin.idea.completion.contributors.FirKeywordCompletionContributor
import org.jetbrains.kotlin.idea.completion.contributors.complete
import org.jetbrains.kotlin.idea.completion.weighers.Weighers
import org.jetbrains.kotlin.idea.fir.low.level.api.util.originalKtFile
@@ -78,6 +77,7 @@ private object KotlinFirCompletionProvider : CompletionProvider<CompletionParame
positionContext: FirRawPositionCompletionContext,
) {
val keywordContributor = FirKeywordCompletionContributor(basicContext)
val classReferenceContributor = FirClassReferenceCompletionContributor(basicContext)
val callableContributor = FirCallableCompletionContributor(basicContext)
val infixCallableContributor = FirInfixCallableCompletionContributor(basicContext)
val callableReferenceContributor = FirCallableReferenceCompletionContributor(basicContext)
@@ -141,6 +141,7 @@ private object KotlinFirCompletionProvider : CompletionProvider<CompletionParame
}
is FirCallableReferencePositionContext -> {
complete(classReferenceContributor, positionContext)
complete(callableReferenceContributor, positionContext)
complete(classifierReferenceContributor, positionContext)
}
idea/idea-fir/src/org/jetbrains/kotlin/idea/completion/contributors/FirClassReferenceCompletionContributor.kt
+24
View File
@@ -0,0 +1,24 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.completion.contributors
import org.jetbrains.kotlin.idea.completion.context.FirBasicCompletionContext
import org.jetbrains.kotlin.idea.completion.context.FirCallableReferencePositionContext
import org.jetbrains.kotlin.idea.completion.createKeywordElement
import org.jetbrains.kotlin.idea.frontend.api.KtAnalysisSession
import org.jetbrains.kotlin.platform.jvm.isJvm
internal class FirClassReferenceCompletionContributor(
basicContext: FirBasicCompletionContext
) : FirCompletionContributorBase<FirCallableReferencePositionContext>(basicContext) {
override fun KtAnalysisSession.complete(positionContext: FirCallableReferencePositionContext) {
if (positionContext.explicitReceiver == null) return
sink.addElement(createKeywordElement("class"))
if (targetPlatform.isJvm()) {
sink.addElement(createKeywordElement("class", tail = ".java"))
}
}
}