Evaluate: Enable 'foo_field' convention only for Jvm/Common code

This commit is contained in:
Yan Zhulanow
2018-11-26 19:13:12 +09:00
parent 8334769eb0
commit dc34f11f50
@@ -5,11 +5,13 @@
package org.jetbrains.kotlin.idea.debugger.evaluate
import org.jetbrains.kotlin.analyzer.common.CommonPlatform
import org.jetbrains.kotlin.codegen.state.GenerationState
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl
import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl
import org.jetbrains.kotlin.idea.project.platform
import org.jetbrains.kotlin.incremental.KotlinLookupLocation
import org.jetbrains.kotlin.incremental.components.LookupLocation
import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl
@@ -23,7 +25,9 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.codeFragmentUtil.suppressDiagnosticsInDebugMode
import org.jetbrains.kotlin.resolve.DescriptorFactory
import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
import org.jetbrains.kotlin.resolve.scopes.SyntheticScope
import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered
@@ -60,6 +64,12 @@ private class DebuggerFieldSyntheticScope(val javaSyntheticPropertiesScope: Java
private fun isInEvaluator(location: LookupLocation): Boolean {
val element = (location as? KotlinLookupLocation)?.element ?: return false
val containingFile = element.containingFile?.takeIf { it.isValid } as? KtFile ?: return false
val platform = containingFile.platform
if (platform !is JvmPlatform && platform !is CommonPlatform) {
return false
}
return containingFile.suppressDiagnosticsInDebugMode
}