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

Complete type instantiation items after "by"

Browse Source
This commit is contained in:
Valentin Kipyatkov
2016-03-25 12:57:42 +03:00
parent ba6accd5f9
commit 0edc5c15e2
18 changed files with 153 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+4 -4
View File
@@ -57,9 +57,9 @@ import java.util.*
class BasicCompletionSession(
configuration: CompletionSessionConfiguration,
parameters: CompletionParameters,
private val toFromOriginalFileMapper: ToFromOriginalFileMapper,
toFromOriginalFileMapper: ToFromOriginalFileMapper,
resultSet: CompletionResultSet
) : CompletionSession(configuration, parameters, resultSet) {
) : CompletionSession(configuration, parameters, toFromOriginalFileMapper, resultSet) {
private interface CompletionKind {
val descriptorKindFilter: DescriptorKindFilter?
@@ -197,11 +197,11 @@ class BasicCompletionSession(
// getting root packages from scope is very slow so we do this in alternative way
if (callTypeAndReceiver.receiver == null && callTypeAndReceiver.callType.descriptorKindFilter.kindMask.and(DescriptorKindFilter.PACKAGES_MASK) != 0) {
//TODO: move this code somewhere else?
val packageNames = PackageIndexUtil.getSubPackageFqNames(FqName.ROOT, originalSearchScope, project, prefixMatcher.asNameFilter())
val packageNames = PackageIndexUtil.getSubPackageFqNames(FqName.ROOT, searchScope, project, prefixMatcher.asNameFilter())
.toMutableSet()
if (!ProjectStructureUtil.isJsKotlinModule(parameters.originalFile as KtFile)) {
JavaPsiFacade.getInstance(project).findPackage("")?.getSubPackages(originalSearchScope)?.forEach { psiPackage ->
JavaPsiFacade.getInstance(project).findPackage("")?.getSubPackages(searchScope)?.forEach { psiPackage ->
val name = psiPackage.name
if (Name.isValidIdentifier(name!!)) {
packageNames.add(FqName(name))
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
+7 -9
View File
@@ -22,9 +22,7 @@ import com.intellij.codeInsight.completion.CompletionSorter
import com.intellij.codeInsight.completion.CompletionUtil
import com.intellij.codeInsight.completion.impl.CamelHumpMatcher
import com.intellij.codeInsight.lookup.LookupElement
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.patterns.StandardPatterns
import com.intellij.psi.search.DelegatingGlobalSearchScope
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.idea.caches.resolve.*
@@ -70,6 +68,7 @@ fun CompletionSessionConfiguration(parameters: CompletionParameters) = Completio
abstract class CompletionSession(
protected val configuration: CompletionSessionConfiguration,
protected val parameters: CompletionParameters,
protected val toFromOriginalFileMapper: ToFromOriginalFileMapper,
resultSet: CompletionResultSet
) {
protected val position = parameters.position
@@ -148,16 +147,15 @@ abstract class CompletionSession(
LookupElementsCollector(prefixMatcher, parameters, resultSet, createSorter())
}
protected val originalSearchScope: GlobalSearchScope = getResolveScope(parameters.getOriginalFile() as KtFile)
// we need to exclude the original file from scope because our resolve session is built with this file replaced by synthetic one
protected val searchScope: GlobalSearchScope = object : DelegatingGlobalSearchScope(originalSearchScope) {
override fun contains(file: VirtualFile) = super.contains(file) && file != parameters.originalFile.virtualFile
}
protected val searchScope: GlobalSearchScope = getResolveScope(parameters.originalFile as KtFile)
protected fun indicesHelper(mayIncludeInaccessible: Boolean): KotlinIndicesHelper {
val filter = if (mayIncludeInaccessible) isVisibleFilter else isVisibleFilterCheckAlways
return KotlinIndicesHelper(resolutionFacade, searchScope, filter, filterOutPrivate = !mayIncludeInaccessible)
return KotlinIndicesHelper(resolutionFacade,
searchScope,
filter,
filterOutPrivate = !mayIncludeInaccessible,
declarationTranslator = { toFromOriginalFileMapper.toSyntheticFile(it) })
}
// excludes top-level extensions except for ones declared in the current file - those that are fetched from indices
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KDocCompletionContributor.kt
+7 -4
View File
@@ -59,12 +59,15 @@ class KDocCompletionContributor(): CompletionContributor() {
object KDocNameCompletionProvider: CompletionProvider<CompletionParameters>() {
override fun addCompletions(parameters: CompletionParameters, context: ProcessingContext, result: CompletionResultSet) {
KDocNameCompletionSession(parameters, result).complete()
KDocNameCompletionSession(parameters, ToFromOriginalFileMapper.create(parameters), result).complete()
}
}
class KDocNameCompletionSession(parameters: CompletionParameters,
resultSet: CompletionResultSet): CompletionSession(CompletionSessionConfiguration(parameters), parameters, resultSet) {
class KDocNameCompletionSession(
parameters: CompletionParameters,
toFromOriginalFileMapper: ToFromOriginalFileMapper,
resultSet: CompletionResultSet
): CompletionSession(CompletionSessionConfiguration(parameters), parameters, toFromOriginalFileMapper, resultSet) {
override val descriptorKindFilter: DescriptorKindFilter? get() = null
override val expectedInfos: Collection<ExpectedInfo> get() = emptyList()
@@ -85,7 +88,7 @@ class KDocNameCompletionSession(parameters: CompletionParameters,
val section = position.getContainingSection()
val documentedParameters = section.findTagsByName("param").map { it.getSubjectName() }.toSet()
val descriptors = getParamDescriptors(declarationDescriptor)
.filter { it.getName().asString() !in documentedParameters }
.filter { it.name.asString() !in documentedParameters }
descriptors.forEach {
collector.addElement(basicLookupElementFactory.createLookupElement(it, parametersAndTypeGrayed = true))
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt
+3 -4
View File
@@ -240,11 +240,10 @@ class KotlinCompletionContributor : CompletionContributor() {
private fun performCompletion(parameters: CompletionParameters, result: CompletionResultSet) {
val position = parameters.position
val positionFile = position.containingFile as? KtFile ?: return
val originalFile = parameters.originalFile as KtFile
if (originalFile.doNotComplete ?: false) return
if (position.containingFile !is KtFile) return
if ((parameters.originalFile as KtFile).doNotComplete ?: false) return
val toFromOriginalFileMapper = ToFromOriginalFileMapper(originalFile, positionFile, parameters.offset)
val toFromOriginalFileMapper = ToFromOriginalFileMapper.create(parameters)
if (position.node.elementType == KtTokens.LONG_TEMPLATE_ENTRY_START) {
val expression = (position.parent as KtBlockStringTemplateEntry).expression
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ToFromOriginalFileMapper.kt
+10 -1
View File
@@ -16,16 +16,25 @@
package org.jetbrains.kotlin.idea.completion
import com.intellij.codeInsight.completion.CompletionParameters
import com.intellij.psi.PsiElement
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.psiUtil.startOffset
class ToFromOriginalFileMapper(
class ToFromOriginalFileMapper private constructor(
val originalFile: KtFile,
val syntheticFile: KtFile,
val completionOffset: Int
) {
companion object {
fun create(parameters: CompletionParameters): ToFromOriginalFileMapper {
val originalFile = parameters.originalFile as KtFile
val syntheticFile = parameters.position.containingFile as KtFile
return ToFromOriginalFileMapper(originalFile, syntheticFile, parameters.offset)
}
}
private val syntheticLength: Int
private val originalLength: Int
private val tailLength: Int
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletionSession.kt
+2 -2
View File
@@ -41,7 +41,7 @@ class SmartCompletionSession(
parameters: CompletionParameters,
toFromOriginalFileMapper: ToFromOriginalFileMapper,
resultSet: CompletionResultSet
) : CompletionSession(configuration, parameters, resultSet) {
) : CompletionSession(configuration, parameters, toFromOriginalFileMapper, resultSet) {
override val descriptorKindFilter: DescriptorKindFilter by lazy {
// we do not include SAM-constructors because they are handled separately and adding them requires iterating of java classes
@@ -60,7 +60,7 @@ class SmartCompletionSession(
private val smartCompletion by lazy(LazyThreadSafetyMode.NONE) {
expression?.let {
SmartCompletion(it, resolutionFacade, bindingContext, moduleDescriptor, isVisibleFilter, indicesHelper(false),
prefixMatcher, originalSearchScope, toFromOriginalFileMapper,
prefixMatcher, searchScope, toFromOriginalFileMapper,
callTypeAndReceiver, isJvmModule)
}
}
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt
+9 -3
View File
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.idea.completion.*
import org.jetbrains.kotlin.idea.completion.handlers.KotlinFunctionInsertHandler
import org.jetbrains.kotlin.idea.core.ExpectedInfo
import org.jetbrains.kotlin.idea.core.Tail
import org.jetbrains.kotlin.idea.core.fuzzyType
import org.jetbrains.kotlin.idea.core.multipleFuzzyTypes
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.idea.util.FuzzyType
@@ -52,6 +52,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.descriptorUtil.resolveTopLevelClass
import org.jetbrains.kotlin.types.*
import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.*
class TypeInstantiationItems(
val resolutionFacade: ResolutionFacade,
@@ -67,9 +68,14 @@ class TypeInstantiationItems(
inheritanceSearchers: MutableCollection<InheritanceItemsSearcher>,
expectedInfos: Collection<ExpectedInfo>
) {
val expectedInfosGrouped: Map<FuzzyType?, List<ExpectedInfo>> = expectedInfos.groupBy { it.fuzzyType?.makeNotNullable() }
val expectedInfosGrouped = LinkedHashMap<FuzzyType, MutableList<ExpectedInfo>>()
for (expectedInfo in expectedInfos) {
for (fuzzyType in expectedInfo.multipleFuzzyTypes) {
expectedInfosGrouped.getOrPut(fuzzyType.makeNotNullable()) { ArrayList() }.add(expectedInfo)
}
}
for ((type, infos) in expectedInfosGrouped) {
if (type == null) continue
val tail = mergeTails(infos.map { it.tail })
addTo(items, inheritanceSearchers, type, tail)
}
idea/idea-completion/testData/smart/propertyDelegate/ExtensionSubstitution1.kt
Vendored
+4 -3
View File
@@ -1,15 +1,16 @@
import kotlin.reflect.KProperty
class Property<TOwner, TValue>
class Property<TOwner, TValue>(owner: TOwner, value: TValue)
operator fun <TValue, TOwner> Property<TOwner, TValue>.getValue(thisRef: TOwner, property: KProperty<*>): TValue {
throw Exception()
}
fun<TOwner, TValue> createProperty(): Property<TOwner, TValue> = Property()
fun<TOwner, TValue> createProperty(owner: TOwner, value: TValue): Property<TOwner, TValue> = Property(owner, value)
class C {
val v by create<caret>
val v by <caret>
}
// EXIST: { itemText: "createProperty", typeText: "Property<C, TValue>" }
// EXIST: Property
idea/idea-completion/testData/smart/propertyDelegate/ExtensionSubstitution2.kt
Vendored
+2 -1
View File
@@ -9,7 +9,8 @@ operator fun <TValue, TOwner> Property<TOwner, TValue>.getValue(thisRef: TOwner,
fun<TOwner, TValue> createProperty(): Property<TOwner, TValue> = Property()
class C {
val v: Int by create<caret>
val v: Int by <caret>
}
// EXIST: { itemText: "createProperty", typeText: "Property<C, Int>" }
// EXIST: Property
idea/idea-completion/testData/smart/propertyDelegate/ExtensionSubstitution3.kt
Vendored
+2 -1
View File
@@ -13,7 +13,8 @@ operator fun <TValue3, TOwner3> Property<TOwner3, TValue3>.setValue(thisRef: TOw
fun<TOwner4, TValue4> createProperty(): Property<TOwner4, TValue4> = Property()
class C {
var v by create<caret>
var v by <caret>
}
// EXIST: { itemText: "createProperty", typeText: "Property<C, TValue4>" }
// EXIST: Property
idea/idea-completion/testData/smart/propertyDelegate/ExtensionSubstitution4.kt
Vendored
+2 -1
View File
@@ -13,7 +13,8 @@ operator fun <TValue3, TOwner3> Property<TOwner3, TValue3>.setValue(thisRef: TOw
fun<TOwner4, TValue4> createProperty(): Property<TOwner4, TValue4> = Property()
class C {
var v: Int by create<caret>
var v: Int by <caret>
}
// EXIST: { itemText: "createProperty", typeText: "Property<C, Int>" }
// EXIST: Property
idea/idea-completion/testData/smart/propertyDelegate/ExtensionVal.kt
Vendored
+8 -1
View File
@@ -30,10 +30,17 @@ class C
val C.property by <caret>
// EXIST: lazy
// EXIST: createX1
// ABSENT: createX2
// EXIST: createX3
// EXIST: createY1
// ABSENT: createY2
// EXIST: createY3
/*TODO: add constructors*/
// EXIST: X1
// ABSENT: X2
// EXIST: X3
// EXIST: Y1
// ABSENT: Y2
// EXIST: Y3
idea/idea-completion/testData/smart/propertyDelegate/ExtensionVar.kt
Vendored
+7
View File
@@ -35,8 +35,15 @@ class C
var C.property by <caret>
// ABSENT: lazy
// EXIST: createX1
// ABSENT: createX2
// ABSENT: createX3
// EXIST: createX4
// ABSENT: createX5
// EXIST: X1
// ABSENT: X2
// ABSENT: X3
// EXIST: X4
// ABSENT: X5
idea/idea-completion/testData/smart/propertyDelegate/ValInClass.kt
Vendored
+7 -2
View File
@@ -12,7 +12,7 @@ class X3 {
class Y1
class Y2
class Y3
abstract class Y3
operator fun Y1.getValue(thisRef: C, property: KProperty<*>): String = ""
operator fun Y2.getValue(thisRef: String, property: KProperty<*>): String = ""
@@ -36,4 +36,9 @@ class C {
// EXIST: createY1
// ABSENT: createY2
// EXIST: createY3
/*TODO: add constructors*/
// EXIST: X1
// ABSENT: X2
// EXIST: X3
// EXIST: Y1
// ABSENT: Y2
// ABSENT: Y3
idea/idea-completion/testData/smart/propertyDelegate/VarInClass.kt
Vendored
+14
View File
@@ -24,6 +24,13 @@ class X5 {
operator fun setValue(thisRef: C, property: KProperty<*>, value: String) {}
}
class Y1
class Y2
operator fun Y1.getValue(thisRef: C, property: KProperty<*>): String = ""
operator fun Y1.setValue(thisRef: C, property: KProperty<*>, value: String) {}
operator fun Y2.getValue(thisRef: C, property: KProperty<*>): String = ""
fun createX1() = X1()
fun createX2() = X2()
fun createX3() = X3()
@@ -40,3 +47,10 @@ class C {
// ABSENT: createX3
// EXIST: createX4
// ABSENT: createX5
// EXIST: X1
// ABSENT: X2
// ABSENT: X3
// EXIST: X4
// ABSENT: X5
// EXIST: Y1
// ABSENT: Y2