From ffe41b88a7138a518de4e477737978ff68f0826e Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Wed, 26 Aug 2015 12:27:07 +0300 Subject: [PATCH] Update to 142.4245.2: Debugger tests: changes in testData --- .../idea/debugger/render/DelegatedPropertyFieldDescriptor.kt | 4 ++++ .../debugger/tinyApp/outs/delegatedPropertyInClass.out | 4 ++-- .../tinyApp/outs/delegatedPropertyInClassWoRenderer.out | 2 +- idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt index 3ce3d947600..a9ae36efff7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/render/DelegatedPropertyFieldDescriptor.kt @@ -87,4 +87,8 @@ class DelegatedPropertyFieldDescriptor( return getObject().referenceType().methodsByName(JvmAbi.getterName(fieldName))?.firstOrNull() } + + override fun getDeclaredType(): String? { + return objectRef.type().name() + } } diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out index 5d24ebd9c46..496d08286e5 100644 --- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out +++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClass.out @@ -31,9 +31,9 @@ class MyDelegateThrowsException { local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClass.kt, 5) local = a: delegatedPropertyInClass.A = {delegatedPropertyInClass.A@uniqueID} (sp = delegatedPropertyInClass.kt, 6) field = prop$delegate: delegatedPropertyInClass.MyDelegate = {delegatedPropertyInClass.MyDelegate@uniqueID} (sp = delegatedPropertyInClass.kt, 12) - field = prop: int = 1 (sp = delegatedPropertyInClass.kt, 12) + field = prop: int: delegatedPropertyInClass.A = 1 (sp = delegatedPropertyInClass.kt, 12) field = propEx$delegate: delegatedPropertyInClass.MyDelegateThrowsException = {delegatedPropertyInClass.MyDelegateThrowsException@uniqueID} (sp = delegatedPropertyInClass.kt, 13) - field = propEx: java.lang.IllegalStateException = {java.lang.IllegalStateException@uniqueID}java.lang.IllegalStateException (sp = delegatedPropertyInClass.kt, 13) + field = propEx: java.lang.IllegalStateException: delegatedPropertyInClass.A = {java.lang.IllegalStateException@uniqueID}java.lang.IllegalStateException (sp = delegatedPropertyInClass.kt, 13) field = detailMessage: java.lang.String = null (sp = Throwable.!EXT!) field = cause: java.lang.Throwable = {java.lang.IllegalStateException@uniqueID}java.lang.IllegalStateException (sp = Throwable.!EXT!) field = stackTrace: java.lang.StackTraceElement[] = null (sp = Throwable.!EXT!) diff --git a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out index 6c12e905f8c..4100c6beb93 100644 --- a/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out +++ b/idea/testData/debugger/tinyApp/outs/delegatedPropertyInClassWoRenderer.out @@ -26,7 +26,7 @@ class MyDelegate { static = static = delegatedPropertyInClassWoRenderer.DelegatedPropertyInClassWoRendererPackage$@packagePartHASH local = args: java.lang.String[] = {java.lang.String[0]@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 5) local = a: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.A@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 6) - field = prop: delegatedPropertyInClassWoRenderer.MyDelegate = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 12) + field = prop: delegatedPropertyInClassWoRenderer.MyDelegate: delegatedPropertyInClassWoRenderer.A = {delegatedPropertyInClassWoRenderer.MyDelegate@uniqueID} (sp = delegatedPropertyInClassWoRenderer.kt, 12) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0 diff --git a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out index 4339014abdd..d1e982aab50 100644 --- a/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out +++ b/idea/testData/debugger/tinyApp/outs/evDelegatedProperty.out @@ -25,7 +25,7 @@ fun main(args: Array) { field = prop$delegate: kotlin.properties.ReadWriteProperty = {kotlin.properties.NotNullVar@uniqueID} (sp = evDelegatedProperty.kt, 6) field = value: java.lang.Object = {java.lang.Integer@uniqueID}1 (sp = Delegation.!EXT!) field = value: int = 1 (sp = Integer.!EXT!) - field = prop: int = 1 (sp = evDelegatedProperty.kt, 6) + field = prop: int: evDelegatedProperty.A = 1 (sp = evDelegatedProperty.kt, 6) Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket' Process finished with exit code 0