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

A bit more clear code

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-12-05 07:28:37 +03:00
parent 191d3e2766
commit ca2b1efac9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+4 -3
View File
@@ -191,9 +191,10 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK or DescriptorKindFilter.PACKAGES_MASK DescriptorKindFilter.NON_SINGLETON_CLASSIFIERS_MASK or DescriptorKindFilter.PACKAGES_MASK
else else
DescriptorKindFilter.ALL_KINDS_MASK DescriptorKindFilter.ALL_KINDS_MASK
val kindFilter = DescriptorKindFilter(kindMask)
if (completeReference) { if (completeReference) {
addReferenceVariants(DescriptorKindFilter(kindMask)) addReferenceVariants(kindFilter, shouldCastToRuntimeType = false)
if (onlyTypes) { if (onlyTypes) {
collector.addDescriptorElements(listOf(KotlinBuiltIns.getInstance().getUnit()), false) collector.addDescriptorElements(listOf(KotlinBuiltIns.getInstance().getUnit()), false)
@@ -213,7 +214,7 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
if (completeReference && position.getContainingFile() is JetCodeFragment) { if (completeReference && position.getContainingFile() is JetCodeFragment) {
flushToResultSet() flushToResultSet()
addReferenceVariants(DescriptorKindFilter(kindMask), true) addReferenceVariants(kindFilter, shouldCastToRuntimeType = true)
} }
} }
@@ -249,7 +250,7 @@ class BasicCompletionSession(configuration: CompletionSessionConfiguration,
return false return false
} }
private fun addReferenceVariants(kindFilter: DescriptorKindFilter, shouldCastToRuntimeType: Boolean = false) { private fun addReferenceVariants(kindFilter: DescriptorKindFilter, shouldCastToRuntimeType: Boolean) {
collector.addDescriptorElements( collector.addDescriptorElements(
getReferenceVariants(kindFilter, shouldCastToRuntimeType), getReferenceVariants(kindFilter, shouldCastToRuntimeType),
suppressAutoInsertion = false, suppressAutoInsertion = false,