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

Debugger: do not compute classnames for inline functions during stepping

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2016-01-28 09:35:58 +03:00
parent e69b115d9a
commit 54fa9eff61
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
+1 -1
View File
@@ -56,7 +56,7 @@ class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
if (sourcePosition == null) return false if (sourcePosition == null) return false
val classNames = positionManager.classNamesForPosition(sourcePosition).map { it.replace('/', '.') } val classNames = positionManager.classNamesForPosition(sourcePosition, false).map { it.replace('/', '.') }
classNames.forEach { className -> classNames.forEach { className ->
val settings = DebuggerSettings.getInstance() val settings = DebuggerSettings.getInstance()
idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
+19 -12
View File
@@ -71,7 +71,6 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
import org.jetbrains.kotlin.resolve.inline.InlineUtil import org.jetbrains.kotlin.resolve.inline.InlineUtil
import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName
import org.jetbrains.kotlin.resolve.source.getPsi import org.jetbrains.kotlin.resolve.source.getPsi
import org.jetbrains.kotlin.utils.addToStdlib.check
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import org.jetbrains.kotlin.utils.toReadOnlyList import org.jetbrains.kotlin.utils.toReadOnlyList
import java.util.* import java.util.*
@@ -260,7 +259,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
private fun classNamesForPositionAndInlinedOnes(sourcePosition: SourcePosition): List<String> { private fun classNamesForPositionAndInlinedOnes(sourcePosition: SourcePosition): List<String> {
val result = hashSetOf<String>() val result = hashSetOf<String>()
val names = classNamesForPosition(sourcePosition) val names = classNamesForPosition(sourcePosition, true)
result.addAll(names) result.addAll(names)
val lambdas = findLambdas(sourcePosition) val lambdas = findLambdas(sourcePosition)
@@ -281,12 +280,12 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
} }
} }
fun classNamesForPosition(sourcePosition: SourcePosition): Collection<String> { fun classNamesForPosition(sourcePosition: SourcePosition, withInlines: Boolean): Collection<String> {
val psiElement = runReadAction { sourcePosition.elementAt } ?: return emptyList() val psiElement = runReadAction { sourcePosition.elementAt } ?: return emptyList()
return classNamesForPosition(psiElement) return classNamesForPosition(psiElement, withInlines)
} }
private fun classNamesForPosition(element: PsiElement): Collection<String> { private fun classNamesForPosition(element: PsiElement, withInlines: Boolean): Collection<String> {
return runReadAction { return runReadAction {
if (DumbService.getInstance(element.project).isDumb) { if (DumbService.getInstance(element.project).isDumb) {
emptySet() emptySet()
@@ -295,7 +294,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
val file = element.containingFile as KtFile val file = element.containingFile as KtFile
val isInLibrary = LibraryUtil.findLibraryEntry(file.virtualFile, file.project) != null val isInLibrary = LibraryUtil.findLibraryEntry(file.virtualFile, file.project) != null
val typeMapper = if (!isInLibrary) prepareTypeMapper(file) else createTypeMapperForLibraryFile(element, file) val typeMapper = if (!isInLibrary) prepareTypeMapper(file) else createTypeMapperForLibraryFile(element, file)
getInternalClassNameForElement(element, typeMapper, file, isInLibrary) getInternalClassNameForElement(element, typeMapper, file, isInLibrary, withInlines)
} }
} }
} }
@@ -357,7 +356,13 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
myTypeMappers.put(key, value) myTypeMappers.put(key, value)
} }
private fun getInternalClassNameForElement(notPositionedElement: PsiElement?, typeMapper: JetTypeMapper, file: KtFile, isInLibrary: Boolean): Collection<String> { private fun getInternalClassNameForElement(
notPositionedElement: PsiElement?,
typeMapper: JetTypeMapper,
file: KtFile,
isInLibrary: Boolean,
withInlines: Boolean = true
): Collection<String> {
val element = getElementToCalculateClassName(notPositionedElement) val element = getElementToCalculateClassName(notPositionedElement)
when (element) { when (element) {
@@ -365,7 +370,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
is KtFunction -> { is KtFunction -> {
val descriptor = InlineUtil.getInlineArgumentDescriptor(element, typeMapper.bindingContext) val descriptor = InlineUtil.getInlineArgumentDescriptor(element, typeMapper.bindingContext)
if (descriptor != null) { if (descriptor != null) {
val classNamesForParent = getInternalClassNameForElement(element.parent, typeMapper, file, isInLibrary) val classNamesForParent = getInternalClassNameForElement(element.parent, typeMapper, file, isInLibrary, withInlines)
if (descriptor.isCrossinline) { if (descriptor.isCrossinline) {
return findCrossInlineArguments(element, descriptor, typeMapper.bindingContext) + classNamesForParent return findCrossInlineArguments(element, descriptor, typeMapper.bindingContext) + classNamesForParent
} }
@@ -388,9 +393,9 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
val parent = getElementToCalculateClassName(element.parent) val parent = getElementToCalculateClassName(element.parent)
// Class-object initializer // Class-object initializer
if (parent is KtObjectDeclaration && parent.isCompanion()) { if (parent is KtObjectDeclaration && parent.isCompanion()) {
return getInternalClassNameForElement(parent.parent, typeMapper, file, isInLibrary) return getInternalClassNameForElement(parent.parent, typeMapper, file, isInLibrary, withInlines)
} }
return getInternalClassNameForElement(element.parent, typeMapper, file, isInLibrary) return getInternalClassNameForElement(element.parent, typeMapper, file, isInLibrary, withInlines)
} }
element is KtProperty && (!element.isTopLevel || !isInLibrary) -> { element is KtProperty && (!element.isTopLevel || !isInLibrary) -> {
if (isInPropertyAccessor(notPositionedElement)) { if (isInPropertyAccessor(notPositionedElement)) {
@@ -402,7 +407,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
val descriptor = typeMapper.bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element) val descriptor = typeMapper.bindingContext.get(BindingContext.DECLARATION_TO_DESCRIPTOR, element)
if (descriptor !is PropertyDescriptor) { if (descriptor !is PropertyDescriptor) {
return getInternalClassNameForElement(element.parent, typeMapper, file, isInLibrary) return getInternalClassNameForElement(element.parent, typeMapper, file, isInLibrary, withInlines)
} }
return getJvmInternalNameForPropertyOwner(typeMapper, descriptor).toSet() return getJvmInternalNameForPropertyOwner(typeMapper, descriptor).toSet()
@@ -420,6 +425,8 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
NoResolveFileClassesProvider.getFileClassInternalName(file) NoResolveFileClassesProvider.getFileClassInternalName(file)
} }
if (!withInlines) return parentInternalName.toSet()
val inlinedCalls = findInlinedCalls(element, typeMapper.bindingContext) val inlinedCalls = findInlinedCalls(element, typeMapper.bindingContext)
return inlinedCalls + parentInternalName.toSet() return inlinedCalls + parentInternalName.toSet()
} }
@@ -490,7 +497,7 @@ class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiReq
val usage = it.element val usage = it.element
if (usage is KtElement) { if (usage is KtElement) {
//TODO recursive search //TODO recursive search
val names = classNamesForPosition(usage) val names = classNamesForPosition(usage, false)
result.addAll(names) result.addAll(names)
} }
} }