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

Completion for codeFragments: do not show java getters/setters at first completion

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2015-10-07 13:25:15 +03:00
parent 9d7585207c
commit 6fc8a16dd5
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
+7 -2
View File
@@ -263,8 +263,13 @@ abstract class CompletionSession(protected val configuration: CompletionSessionC
} }
protected fun getRuntimeReceiverTypeReferenceVariants(): Collection<DeclarationDescriptor> { protected fun getRuntimeReceiverTypeReferenceVariants(): Collection<DeclarationDescriptor> {
val restrictedKindFilter = descriptorKindFilter!!.restrictedToKinds(DescriptorKindFilter.FUNCTIONS_MASK or DescriptorKindFilter.VARIABLES_MASK) // optimization val descriptors = referenceVariantsHelper.getReferenceVariants(
val descriptors = referenceVariantsHelper.getReferenceVariants(nameExpression!!, restrictedKindFilter, descriptorNameFilter, useRuntimeReceiverType = true) nameExpression!!,
descriptorKindFilter!!,
descriptorNameFilter,
useRuntimeReceiverType = true,
filterOutJavaGettersAndSetters = configuration.filterOutJavaGettersAndSetters
).excludeNonInitializedVariable(nameExpression)
return descriptors.filter { descriptor -> return descriptors.filter { descriptor ->
referenceVariants.none { compareDescriptors(project, it, descriptor) } referenceVariants.none { compareDescriptors(project, it, descriptor) }
} }
idea/idea-completion/testData/basic/codeFragments/noDuplicatesForSyntheticProperties.kt
Vendored
+1 -1
View File
@@ -7,7 +7,7 @@ fun main(args: Array<String>) {
class MyFile: File("") class MyFile: File("")
// EXIST: absoluteFile, getAbsoluteFile // EXIST: absoluteFile
// NOTHING_ELSE // NOTHING_ELSE
// RUNTIME_TYPE: MyFile // RUNTIME_TYPE: MyFile