From 41685f0ba3d426d143cb3f8a272fba5684a8174d Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 3 Oct 2014 13:07:50 +0400
Subject: [PATCH] Fixing declaration ranges in decompiled code - comment "/*
 compiled code */" now is inside property

---
 .../decompiler/textBuilder/DecompiledTextFactory.kt    |  2 +-
 .../decompiled/ClassWithAbstractAndOpenMembers.kt      |  8 ++++----
 .../navigation/decompiled/ClassWithConstructor.kt      |  2 +-
 .../testData/decompiler/navigation/decompiled/Color.kt |  2 +-
 .../navigation/decompiled/LibrariesPackage.kt          | 10 +++++-----
 .../decompiler/navigation/decompiled/NamedObject.kt    |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
index 886be1bab10..b1a42516b20 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt
@@ -115,12 +115,12 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
             if ((descriptor as MemberDescriptor).getModality() != Modality.ABSTRACT) {
                 if (descriptor is FunctionDescriptor) {
                     builder.append(" { ").append(DECOMPILED_COMMENT).append(" }")
-                    endOffset = builder.length()
                 }
                 else {
                     // descriptor instanceof PropertyDescriptor
                     builder.append(" ").append(DECOMPILED_COMMENT)
                 }
+                endOffset = builder.length()
             }
         }
         else
diff --git a/idea/testData/decompiler/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt b/idea/testData/decompiler/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt
index 551b9f49545..11afd259aed 100644
--- a/idea/testData/decompiler/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt
+++ b/idea/testData/decompiler/navigation/decompiled/ClassWithAbstractAndOpenMembers.kt
@@ -8,13 +8,13 @@ package testData.libraries
 
     [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]
 
diff --git a/idea/testData/decompiler/navigation/decompiled/ClassWithConstructor.kt b/idea/testData/decompiler/navigation/decompiled/ClassWithConstructor.kt
index 8e9ee3dca76..957aefa70f6 100644
--- a/idea/testData/decompiler/navigation/decompiled/ClassWithConstructor.kt
+++ b/idea/testData/decompiler/navigation/decompiled/ClassWithConstructor.kt
@@ -4,5 +4,5 @@
 package testData.libraries
 
 [[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 */]
 }]]
diff --git a/idea/testData/decompiler/navigation/decompiled/Color.kt b/idea/testData/decompiler/navigation/decompiled/Color.kt
index 245f35edbb2..889b86eb96b 100644
--- a/idea/testData/decompiler/navigation/decompiled/Color.kt
+++ b/idea/testData/decompiler/navigation/decompiled/Color.kt
@@ -4,7 +4,7 @@
 package testData.libraries
 
 [[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]]
 
diff --git a/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt b/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt
index a7c2fca1596..d6063aec757 100644
--- a/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt
+++ b/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt
@@ -3,15 +3,15 @@
 
 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 */ }]
 
diff --git a/idea/testData/decompiler/navigation/decompiled/NamedObject.kt b/idea/testData/decompiler/navigation/decompiled/NamedObject.kt
index d48cb59c650..9113220742a 100644
--- a/idea/testData/decompiler/navigation/decompiled/NamedObject.kt
+++ b/idea/testData/decompiler/navigation/decompiled/NamedObject.kt
@@ -4,5 +4,5 @@
 package testData.libraries
 
 [[public object NamedObject {
-    [public final val objectMember: kotlin.Int] /* compiled code */
+    [public final val objectMember: kotlin.Int /* compiled code */]
 }]]
\ No newline at end of file