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

Stepping: do not step into kotlin standard library

Browse Source 
#KT-2076 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-08-27 19:00:48 +04:00
parent 88afc7a949
commit 5c0c22d087
8 changed files with 83 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt
+18 -3
View File
@@ -34,6 +34,8 @@ import com.intellij.debugger.settings.DebuggerSettings
public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestCase() {
private var oldSettings: DebuggerSettings by Delegates.notNull()
private var oldIsFilterForStdlibAlreadyAdded: Boolean by Delegates.notNull()
private var oldDisableKoltinInternalClasses: Boolean by Delegates.notNull()
override fun initApplication() {
super<KotlinDebuggerTestCase>.initApplication()
@@ -67,17 +69,30 @@ public abstract class AbstractKotlinSteppingTest : KotlinDebuggerTestCase() {
}
private fun configureSettings(fileText: String) {
val kotlinSettings = KotlinDebuggerSettings.getInstance()
kotlinSettings.DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED = false
kotlinSettings.DEBUG_DISABLE_KOTLIN_INTERNAL_CLASSES = fileText.getValueForSetting("DISABLE_KOTLIN_INTERNAL_CLASSES", oldDisableKoltinInternalClasses)
val debuggerSettings = DebuggerSettings.getInstance()!!
debuggerSettings.SKIP_CONSTRUCTORS = findStringWithPrefixes(fileText, "// SKIP_CONSTRUCTORS: ")?.toBoolean() ?: oldSettings.SKIP_CONSTRUCTORS
debuggerSettings.SKIP_CLASSLOADERS = findStringWithPrefixes(fileText, "// SKIP_CLASSLOADERS: ")?.toBoolean() ?: oldSettings.SKIP_CLASSLOADERS
debuggerSettings.TRACING_FILTERS_ENABLED = findStringWithPrefixes(fileText, "// TRACING_FILTERS_ENABLED: ")?.toBoolean() ?: oldSettings.TRACING_FILTERS_ENABLED
debuggerSettings.SKIP_CONSTRUCTORS = fileText.getValueForSetting("SKIP_CONSTRUCTORS", oldSettings.SKIP_CONSTRUCTORS)
debuggerSettings.SKIP_CLASSLOADERS = fileText.getValueForSetting("SKIP_CLASSLOADERS", oldSettings.SKIP_CLASSLOADERS)
debuggerSettings.TRACING_FILTERS_ENABLED = fileText.getValueForSetting("TRACING_FILTERS_ENABLED", oldSettings.TRACING_FILTERS_ENABLED)
}
private fun String.getValueForSetting(name: String, defaultValue: Boolean): Boolean {
return findStringWithPrefixes(this, "// $name: ")?.toBoolean() ?: defaultValue
}
private fun saveDefaultSettings() {
oldIsFilterForStdlibAlreadyAdded = KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED
oldDisableKoltinInternalClasses = KotlinDebuggerSettings.getInstance().DEBUG_DISABLE_KOTLIN_INTERNAL_CLASSES
oldSettings = DebuggerSettings.getInstance()!!.clone()
}
private fun restoreDefaultSettings() {
KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED = oldIsFilterForStdlibAlreadyAdded
KotlinDebuggerSettings.getInstance().DEBUG_DISABLE_KOTLIN_INTERNAL_CLASSES = oldDisableKoltinInternalClasses
val debuggerSettings = DebuggerSettings.getInstance()!!
debuggerSettings.SKIP_CONSTRUCTORS = oldSettings.SKIP_CONSTRUCTORS
debuggerSettings.SKIP_CLASSLOADERS = oldSettings.SKIP_CLASSLOADERS
idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java
+5
View File
@@ -206,6 +206,11 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt");
}
@TestMetadata("stdlibStep.kt")
public void testStdlibStep() throws Exception {
doStepIntoTest("idea/testData/debugger/tinyApp/src/filters/stdlibStep.kt");
}
}
public static Test suite() {