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

Fixing declaration ranges in decompiled code - comment "/* compiled code */" now is inside property

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-10-03 13:07:50 +04:00
parent 9dd4b5598e
commit 41685f0ba3
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
+1 -1
View File
@@ -115,12 +115,12 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
if ((descriptor as MemberDescriptor).getModality() != Modality.ABSTRACT) { if ((descriptor as MemberDescriptor).getModality() != Modality.ABSTRACT) {
if (descriptor is FunctionDescriptor) { if (descriptor is FunctionDescriptor) {
builder.append(" { ").append(DECOMPILED_COMMENT).append(" }") builder.append(" { ").append(DECOMPILED_COMMENT).append(" }")
endOffset = builder.length()
} }
else { else {
// descriptor instanceof PropertyDescriptor // descriptor instanceof PropertyDescriptor
builder.append(" ").append(DECOMPILED_COMMENT) builder.append(" ").append(DECOMPILED_COMMENT)
} }
endOffset = builder.length()
} }
} }
else else
idea/testData/decompiler/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt
+4 -4
View File
@@ -8,13 +8,13 @@ package testData.libraries
[public abstract var abstractVar: kotlin.String] [public abstract var abstractVar: kotlin.String]
[public open val openVal: kotlin.String] /* compiled code */ [public open val openVal: kotlin.String /* compiled code */]
[public open val openValWithGetter: kotlin.String] /* compiled code */ [public open val openValWithGetter: kotlin.String /* compiled code */]
[public open var openVar: kotlin.String] /* compiled code */ [public open var openVar: kotlin.String /* compiled code */]
[public open var openVarWithGetter: kotlin.String] /* compiled code */ [public open var openVarWithGetter: kotlin.String /* compiled code */]
[public abstract fun abstractFun(): kotlin.Unit] [public abstract fun abstractFun(): kotlin.Unit]
idea/testData/decompiler/navigation/decompiled/ClassWithConstructor.kt
+1 -1
View File
@@ -4,5 +4,5 @@
package testData.libraries package testData.libraries
[[public final class ClassWithConstructor(a: kotlin.String, b: kotlin.Any) { [[public final class ClassWithConstructor(a: kotlin.String, b: kotlin.Any) {
[internal final val a: kotlin.String] /* compiled code */ [internal final val a: kotlin.String /* compiled code */]
}]] }]]
idea/testData/decompiler/navigation/decompiled/Color.kt
+1 -1
View File
@@ -4,7 +4,7 @@
package testData.libraries package testData.libraries
[[public final enum class Color(rgb: kotlin.Int) : kotlin.Enum<testData.libraries.Color> { [[public final enum class Color(rgb: kotlin.Int) : kotlin.Enum<testData.libraries.Color> {
[internal final val rgb: kotlin.Int] /* compiled code */ [internal final val rgb: kotlin.Int /* compiled code */]
[[BLUE]] [[BLUE]]
idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt
+5 -5
View File
@@ -3,15 +3,15 @@
package testData.libraries package testData.libraries
[public val globalVal: testData.libraries.Pair<kotlin.Int, kotlin.String>] /* compiled code */ [public val globalVal: testData.libraries.Pair<kotlin.Int, kotlin.String> /* compiled code */]
[public val globalValWithGetter: kotlin.Long] /* compiled code */ [public val globalValWithGetter: kotlin.Long /* compiled code */]
[public val kotlin.Int.exProp: kotlin.Int] /* compiled code */ [public val kotlin.Int.exProp: kotlin.Int /* compiled code */]
[public val kotlin.String.exProp: kotlin.String] /* compiled code */ [public val kotlin.String.exProp: kotlin.String /* compiled code */]
[public val <T> testData.libraries.Pair<T, T>.exProp: kotlin.String] /* compiled code */ [public val <T> testData.libraries.Pair<T, T>.exProp: kotlin.String /* compiled code */]
[public fun <T : kotlin.CharSequence> funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }] [public fun <T : kotlin.CharSequence> funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }]
idea/testData/decompiler/navigation/decompiled/NamedObject.kt
+1 -1
View File
@@ -4,5 +4,5 @@
package testData.libraries package testData.libraries
[[public object NamedObject { [[public object NamedObject {
[public final val objectMember: kotlin.Int] /* compiled code */ [public final val objectMember: kotlin.Int /* compiled code */]
}]] }]]