From 8f7047817f13f45ccd19928d133ce419ed13cf97 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 9 Mar 2016 13:41:00 +0300 Subject: [PATCH] Fix debugger testData after improving toString() of lambdas --- idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out | 2 +- idea/testData/debugger/tinyApp/outs/frameClassObject.out | 2 +- idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out | 2 +- idea/testData/debugger/tinyApp/outs/frameInnerLambda.out | 4 ++-- idea/testData/debugger/tinyApp/outs/frameLambda.out | 2 +- idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out | 2 +- idea/testData/debugger/tinyApp/outs/frameObject.out | 2 +- idea/testData/debugger/tinyApp/outs/frameSharedVar.out | 2 +- idea/testData/debugger/tinyApp/outs/frameThis0.out | 2 +- idea/testData/debugger/tinyApp/outs/frameThis0Ext.out | 2 +- idea/testData/debugger/tinyApp/outs/frameThis0This0.out | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out index 066b03c8fb2..f71b6942cda 100644 --- a/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out +++ b/idea/testData/debugger/tinyApp/outs/frameAnonymousObject.out @@ -26,7 +26,7 @@ fun foo(f: () -> Unit) { // PRINT_FRAME frame = invoke():11, FrameAnonymousObjectKt$main$o$1$run$1 {frameAnonymousObject} - this = this = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1$run$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1$run$1@uniqueID}Function0 field = this$0: frameAnonymousObject.FrameAnonymousObjectKt$main$o$1 = {frameAnonymousObject.FrameAnonymousObjectKt$main$o$1@uniqueID} (sp = null) field = obProp: int = 1 (sp = frameAnonymousObject.kt, 6) field = $val1: int = 1 (sp = null) diff --git a/idea/testData/debugger/tinyApp/outs/frameClassObject.out b/idea/testData/debugger/tinyApp/outs/frameClassObject.out index d4b23db8f89..7d6ebde4201 100644 --- a/idea/testData/debugger/tinyApp/outs/frameClassObject.out +++ b/idea/testData/debugger/tinyApp/outs/frameClassObject.out @@ -36,7 +36,7 @@ fun foo(f: () -> Unit) { // EXPRESSION: myFun() // RESULT: 1: I frame = invoke():16, A$test$1 {frameClassObject} - this = this = {frameClassObject.A$test$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameClassObject.A$test$1@uniqueID}Function0 field = arity: int = 0 (sp = Lambda.!EXT!) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out index 08d4ff4e805..035fac79533 100644 --- a/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out +++ b/idea/testData/debugger/tinyApp/outs/frameExtFunExtFun.out @@ -84,7 +84,7 @@ fun lambda(f: () -> Unit) { // EXPRESSION: bMyFun() // RESULT: 1: I frame = invoke():24, Outer$foo$LocalClass$test$1 {frameExtFunExtFun} - this = this = {frameExtFunExtFun.Outer$foo$LocalClass$test$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameExtFunExtFun.Outer$foo$LocalClass$test$1@uniqueID}Function0 field = this$0: frameExtFunExtFun.Outer$foo$LocalClass = {frameExtFunExtFun.Outer$foo$LocalClass@uniqueID} (sp = null) field = lcProp: int = 1 (sp = frameExtFunExtFun.kt, 19) field = this$0: frameExtFunExtFun.Outer = {frameExtFunExtFun.Outer@uniqueID} (sp = null) diff --git a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out index 044bae0d080..71eea332ece 100644 --- a/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out +++ b/idea/testData/debugger/tinyApp/outs/frameInnerLambda.out @@ -33,8 +33,8 @@ fun foo(f: () -> Unit) { // EXPRESSION: val1 + val2 // RESULT: 2: I frame = invoke():9, FrameInnerLambdaKt$main$1$1 {frameInnerLambda} - this = this = {frameInnerLambda.FrameInnerLambdaKt$main$1$1@uniqueID}kotlin.jvm.functions.Function0 - field = this$0: frameInnerLambda.FrameInnerLambdaKt$main$1 = {frameInnerLambda.FrameInnerLambdaKt$main$1@uniqueID}kotlin.jvm.functions.Function0 (sp = null) + this = this = {frameInnerLambda.FrameInnerLambdaKt$main$1$1@uniqueID}Function0 + field = this$0: frameInnerLambda.FrameInnerLambdaKt$main$1 = {frameInnerLambda.FrameInnerLambdaKt$main$1@uniqueID}Function0 (sp = null) field = $val1: int = 1 (sp = null) field = arity: int = 0 (sp = Lambda.!EXT!) field = $val2: int = 1 (sp = null) diff --git a/idea/testData/debugger/tinyApp/outs/frameLambda.out b/idea/testData/debugger/tinyApp/outs/frameLambda.out index e52ac848a54..27c9dccdefe 100644 --- a/idea/testData/debugger/tinyApp/outs/frameLambda.out +++ b/idea/testData/debugger/tinyApp/outs/frameLambda.out @@ -22,7 +22,7 @@ fun foo(f: () -> Unit) { // EXPRESSION: val1 // RESULT: 1: I frame = invoke():7, FrameLambdaKt$main$1 {frameLambda} - this = this = {frameLambda.FrameLambdaKt$main$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameLambda.FrameLambdaKt$main$1@uniqueID}Function0 field = $val1: int = 1 (sp = null) field = arity: int = 0 (sp = Lambda.!EXT!) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out index 789bf2a7ac0..c8b9f5068a3 100644 --- a/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out +++ b/idea/testData/debugger/tinyApp/outs/frameLambdaNotUsed.out @@ -22,7 +22,7 @@ fun foo(f: () -> Unit) { // EXPRESSION: val1 // RESULT: Cannot find local variable: name = val1 frame = invoke():7, FrameLambdaNotUsedKt$main$1 {frameLambdaNotUsed} - this = this = {frameLambdaNotUsed.FrameLambdaNotUsedKt$main$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameLambdaNotUsed.FrameLambdaNotUsedKt$main$1@uniqueID}Function0 field = arity: int = 0 (sp = Lambda.!EXT!) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameObject.out b/idea/testData/debugger/tinyApp/outs/frameObject.out index f76b784a369..91902d6c741 100644 --- a/idea/testData/debugger/tinyApp/outs/frameObject.out +++ b/idea/testData/debugger/tinyApp/outs/frameObject.out @@ -30,7 +30,7 @@ fun foo(f: () -> Unit) { // EXPRESSION: O.obMyFun() // RESULT: 1: I frame = invoke():6, FrameObjectKt$main$1 {frameObject} - this = this = {frameObject.FrameObjectKt$main$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameObject.FrameObjectKt$main$1@uniqueID}Function0 field = arity: int = 0 (sp = Lambda.!EXT!) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' diff --git a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out index f9249ad3ab7..c716aee0dcd 100644 --- a/idea/testData/debugger/tinyApp/outs/frameSharedVar.out +++ b/idea/testData/debugger/tinyApp/outs/frameSharedVar.out @@ -22,7 +22,7 @@ fun foo(f: () -> Unit) { // EXPRESSION: var1 // RESULT: 1: I frame = invoke():7, FrameSharedVarKt$main$1 {frameSharedVar} - this = this = {frameSharedVar.FrameSharedVarKt$main$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameSharedVar.FrameSharedVarKt$main$1@uniqueID}Function0 field = $var1: kotlin.jvm.internal.Ref$IntRef = {kotlin.jvm.internal.Ref$IntRef@uniqueID}1 (sp = null) field = element: int = 1 (sp = Ref.!EXT!) field = arity: int = 0 (sp = Lambda.!EXT!) diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0.out b/idea/testData/debugger/tinyApp/outs/frameThis0.out index 370c7ab5207..64f3d06a95c 100644 --- a/idea/testData/debugger/tinyApp/outs/frameThis0.out +++ b/idea/testData/debugger/tinyApp/outs/frameThis0.out @@ -48,7 +48,7 @@ fun foo(f: () -> Unit) { // EXPRESSION: myFun() // RESULT: 1: I frame = invoke():16, A$test$1 {frameThis0} - this = this = {frameThis0.A$test$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameThis0.A$test$1@uniqueID}Function0 field = this$0: frameThis0.A = {frameThis0.A@uniqueID} (sp = null) field = prop1: int = 1 (sp = frameThis0.kt, 8) field = $val1: int = 1 (sp = null) diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out index 0bfc669ab90..c861ec9978b 100644 --- a/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out +++ b/idea/testData/debugger/tinyApp/outs/frameThis0Ext.out @@ -64,7 +64,7 @@ fun foo(f: () -> Unit) { // EXPRESSION: myFun2() // RESULT: 1: I frame = invoke():15, A$testExt$1 {frameThis0Ext} - this = this = {frameThis0Ext.A$testExt$1@uniqueID}kotlin.jvm.functions.Function0 + this = this = {frameThis0Ext.A$testExt$1@uniqueID}Function0 field = this$0: frameThis0Ext.A = {frameThis0Ext.A@uniqueID} (sp = null) field = prop1: int = 1 (sp = frameThis0Ext.kt, 8) field = receiver$0: frameThis0Ext.AExt = {frameThis0Ext.AExt@uniqueID} (sp = null) diff --git a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out index a6950816cda..5479351993a 100644 --- a/idea/testData/debugger/tinyApp/outs/frameThis0This0.out +++ b/idea/testData/debugger/tinyApp/outs/frameThis0This0.out @@ -50,8 +50,8 @@ fun foo(f: () -> Unit) { // EXPRESSION: myFun() // RESULT: 1: I frame = invoke():17, A$test$1$1 {frameThis0This0} - this = this = {frameThis0This0.A$test$1$1@uniqueID}kotlin.jvm.functions.Function0 - field = this$0: frameThis0This0.A$test$1 = {frameThis0This0.A$test$1@uniqueID}kotlin.jvm.functions.Function0 (sp = null) + this = this = {frameThis0This0.A$test$1$1@uniqueID}Function0 + field = this$0: frameThis0This0.A$test$1 = {frameThis0This0.A$test$1@uniqueID}Function0 (sp = null) field = this$0: frameThis0This0.A = {frameThis0This0.A@uniqueID} (sp = null) field = prop1: int = 1 (sp = frameThis0This0.kt, 8) field = $val1: int = 1 (sp = null)