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

Do not highlight completion variants from nullable receiver with grey in Evaluate Expression Dialog

Browse Source 
#KT-11578 Fixed
This commit is contained in:
Natalia Ukhorskaya
2016-03-31 12:59:58 +03:00
parent 4d8673d097
commit 8b6a447e68
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicCompletionSession.kt
+1 -1
View File
@@ -247,7 +247,7 @@ class BasicCompletionSession(
completeNonImported(lookupElementFactory) completeNonImported(lookupElementFactory)
flushToResultSet() flushToResultSet()
if (position.containingFile is KtCodeFragment) { if (isDebuggerContext) {
val variantsAndFactory = getRuntimeReceiverTypeReferenceVariants(lookupElementFactory) val variantsAndFactory = getRuntimeReceiverTypeReferenceVariants(lookupElementFactory)
if (variantsAndFactory != null) { if (variantsAndFactory != null) {
val variants = variantsAndFactory.first val variants = variantsAndFactory.first
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionSession.kt
+3 -2
View File
@@ -78,6 +78,7 @@ abstract class CompletionSession(
protected val moduleDescriptor = resolutionFacade.moduleDescriptor protected val moduleDescriptor = resolutionFacade.moduleDescriptor
protected val project = position.project protected val project = position.project
protected val isJvmModule = !ProjectStructureUtil.isJsKotlinModule(parameters.originalFile as KtFile) protected val isJvmModule = !ProjectStructureUtil.isJsKotlinModule(parameters.originalFile as KtFile)
protected val isDebuggerContext = file is KtCodeFragment
protected val nameExpression: KtSimpleNameExpression? protected val nameExpression: KtSimpleNameExpression?
protected val expression: KtExpression? protected val expression: KtExpression?
@@ -191,7 +192,7 @@ abstract class CompletionSession(
if (descriptor is DeclarationDescriptorWithVisibility) { if (descriptor is DeclarationDescriptorWithVisibility) {
val visible = descriptor.isVisible(position, callTypeAndReceiver.receiver as? KtExpression, bindingContext, resolutionFacade) val visible = descriptor.isVisible(position, callTypeAndReceiver.receiver as? KtExpression, bindingContext, resolutionFacade)
if (visible) return true if (visible) return true
return completeNonAccessible && (!descriptor.isFromLibrary() || file is KtCodeFragment) return completeNonAccessible && (!descriptor.isFromLibrary() || isDebuggerContext)
} }
return true return true
@@ -450,7 +451,7 @@ abstract class CompletionSession(
bindingContext, nameExpression, moduleDescriptor, resolutionFacade, bindingContext, nameExpression, moduleDescriptor, resolutionFacade,
predictableSmartCastsOnly = true /* we don't include smart cast receiver types for "unpredictable" receiver value to mark members grayed */) predictableSmartCastsOnly = true /* we don't include smart cast receiver types for "unpredictable" receiver value to mark members grayed */)
if (callTypeAndReceiver is CallTypeAndReceiver.SAFE) { if (callTypeAndReceiver is CallTypeAndReceiver.SAFE || isDebuggerContext) {
receiverTypes = receiverTypes!!.map { it.makeNotNullable() } receiverTypes = receiverTypes!!.map { it.makeNotNullable() }
} }
idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/SmartCompletionSession.kt
+1 -2
View File
@@ -30,7 +30,6 @@ import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver import org.jetbrains.kotlin.idea.util.CallTypeAndReceiver
import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptorKindExclude import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptorKindExclude
import org.jetbrains.kotlin.psi.LambdaArgument import org.jetbrains.kotlin.psi.LambdaArgument
import org.jetbrains.kotlin.psi.KtCodeFragment
import org.jetbrains.kotlin.psi.ValueArgumentName import org.jetbrains.kotlin.psi.ValueArgumentName
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
@@ -140,7 +139,7 @@ class SmartCompletionSession(
} }
} }
if (position.containingFile is KtCodeFragment) { if (isDebuggerContext) {
val variantsAndFactory = getRuntimeReceiverTypeReferenceVariants(lookupElementFactory) val variantsAndFactory = getRuntimeReceiverTypeReferenceVariants(lookupElementFactory)
if (variantsAndFactory != null) { if (variantsAndFactory != null) {
val variants = variantsAndFactory.first val variants = variantsAndFactory.first