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

IDEA 142.4859.6: Update dependencies and fix compilation

Browse Source
This commit is contained in:
Alexey Sedunov
2015-09-20 02:05:34 +03:00
committed by Alexey Sedunov
parent 39e0b3ab92
commit a892d3f995
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestBase.kt
+10 -10
View File
@@ -131,17 +131,17 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
debuggerContext = createDebuggerContext(suspendContext) debuggerContext = createDebuggerContext(suspendContext)
} }
protected fun SuspendContextImpl.stepInto(ignoreFilters: Boolean, smartStepFilter: MethodFilter?) { protected fun SuspendContextImpl.doStepInto(ignoreFilters: Boolean, smartStepFilter: MethodFilter?) {
dp.getManagerThread()!!.schedule(dp.createStepIntoCommand(this, ignoreFilters, smartStepFilter)) dp.getManagerThread()!!.schedule(dp.createStepIntoCommand(this, ignoreFilters, smartStepFilter))
} }
protected fun SuspendContextImpl.stepOut() { protected fun SuspendContextImpl.doStepOut() {
val stepOutCommand = runReadAction { KotlinSteppingCommandProvider().getStepOutCommand(this, StepRequest.STEP_LINE) } val stepOutCommand = runReadAction { KotlinSteppingCommandProvider().getStepOutCommand(this, StepRequest.STEP_LINE) }
?: dp.createStepOutCommand(this) ?: dp.createStepOutCommand(this)
dp.getManagerThread()!!.schedule(stepOutCommand) dp.getManagerThread()!!.schedule(stepOutCommand)
} }
protected fun SuspendContextImpl.stepOver() { protected fun SuspendContextImpl.doStepOver() {
val stepOverCommand = runReadAction { KotlinSteppingCommandProvider().getStepOverCommand(this, false, StepRequest.STEP_LINE) } val stepOverCommand = runReadAction { KotlinSteppingCommandProvider().getStepOverCommand(this, false, StepRequest.STEP_LINE) }
?: dp.createStepOverCommand(this, false) ?: dp.createStepOverCommand(this, false)
dp.getManagerThread()!!.schedule(stepOverCommand) dp.getManagerThread()!!.schedule(stepOverCommand)
@@ -164,19 +164,19 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() {
when { when {
line.startsWith("// STEP_INTO: ") -> repeat("// STEP_INTO: ") { stepInto(this) } line.startsWith("// STEP_INTO: ") -> repeat("// STEP_INTO: ") { stepInto(this) }
line.startsWith("// STEP_OUT: ") -> repeat("// STEP_OUT: ") { stepOut() } line.startsWith("// STEP_OUT: ") -> repeat("// STEP_OUT: ") { doStepOut() }
line.startsWith("// STEP_OVER: ") -> repeat("// STEP_OVER: ") { stepOver() } line.startsWith("// STEP_OVER: ") -> repeat("// STEP_OVER: ") { doStepOver() }
line.startsWith("// SMART_STEP_INTO_BY_INDEX: ") -> doOnBreakpoint { smartStepInto(InTextDirectivesUtils.getPrefixedInt(line, "// SMART_STEP_INTO_BY_INDEX: ")!!) } line.startsWith("// SMART_STEP_INTO_BY_INDEX: ") -> doOnBreakpoint { doSmartStepInto(InTextDirectivesUtils.getPrefixedInt(line, "// SMART_STEP_INTO_BY_INDEX: ")!!) }
line.startsWith("// SMART_STEP_INTO: ") -> repeat("// SMART_STEP_INTO: ") { smartStepInto() } line.startsWith("// SMART_STEP_INTO: ") -> repeat("// SMART_STEP_INTO: ") { doSmartStepInto() }
line.startsWith("// RESUME: ") -> repeat("// RESUME: ") { resume(this) } line.startsWith("// RESUME: ") -> repeat("// RESUME: ") { resume(this) }
} }
} }
protected fun SuspendContextImpl.smartStepInto(chooseFromList: Int = 0) { protected fun SuspendContextImpl.doSmartStepInto(chooseFromList: Int = 0) {
this.smartStepInto(chooseFromList, false) this.doSmartStepInto(chooseFromList, false)
} }
private fun SuspendContextImpl.smartStepInto(chooseFromList: Int, ignoreFilters: Boolean) { private fun SuspendContextImpl.doSmartStepInto(chooseFromList: Int, ignoreFilters: Boolean) {
val filters = createSmartStepIntoFilters() val filters = createSmartStepIntoFilters()
if (chooseFromList == 0) { if (chooseFromList == 0) {
filters.forEach { filters.forEach {
update_dependencies.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless"> <project name="Update Dependencies" default="update" xmlns:if="ant:if" xmlns:unless="ant:unless">
<property name="ideaVersion" value="142.4675.3"/> <property name="ideaVersion" value="142.4859.6"/>
<property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS"/> <property name="kotlin.bootstrap.locator" value="buildType:bt345,tag:bootstrap,status:SUCCESS"/>
<property name="kotlin.bootstrap.locator.force" value="false"/> <property name="kotlin.bootstrap.locator.force" value="false"/>