From 72aba2b7583f3ce05c9eca93d85537f89deecc01 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Tue, 2 Dec 2014 14:38:59 +0300
Subject: [PATCH] Change default parameter rendering in decompiled text

So the code does not contain syntax errors
---
 .../decompiler/textBuilder/DecompiledTextFactory.kt      | 9 +++++----
 .../decompiler/decompiledText/TestPackage.expected.kt    | 2 +-
 .../decompiler/decompiledText/TestPackage/TestPackage.kt | 2 +-
 .../decompiler/navigation/decompiled/LibrariesPackage.kt | 2 +-
 4 files changed, 8 insertions(+), 7 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 9e48dbe3238..c59210aedd5 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
@@ -71,7 +71,8 @@ public fun buildDecompiledText(
     }
 }
 
-private val DECOMPILED_COMMENT = "/* compiled code */"
+private val DECOMPILED_CODE_COMMENT = "/* compiled code */"
+private val DECOMPILED_COMMENT_FOR_PARAMETER = "/* = compiled code */"
 private val FLEXIBLE_TYPE_COMMENT = "/* platform type */"
 
 public val descriptorRendererForDecompiler: DescriptorRenderer = DescriptorRendererBuilder()
@@ -118,7 +119,7 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
         val header = if (isEnumEntry(descriptor))
             descriptor.getName().asString()
         else
-            descriptorRendererForDecompiler.render(descriptor).replace("= ...", "= " + DECOMPILED_COMMENT)
+            descriptorRendererForDecompiler.render(descriptor).replace("= ...", DECOMPILED_COMMENT_FOR_PARAMETER)
         builder.append(header)
         var endOffset = builder.length()
 
@@ -132,11 +133,11 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List<Declara
         if (descriptor is FunctionDescriptor || descriptor is PropertyDescriptor) {
             if ((descriptor as MemberDescriptor).getModality() != Modality.ABSTRACT) {
                 if (descriptor is FunctionDescriptor) {
-                    builder.append(" { ").append(DECOMPILED_COMMENT).append(" }")
+                    builder.append(" { ").append(DECOMPILED_CODE_COMMENT).append(" }")
                 }
                 else {
                     // descriptor instanceof PropertyDescriptor
-                    builder.append(" ").append(DECOMPILED_COMMENT)
+                    builder.append(" ").append(DECOMPILED_CODE_COMMENT)
                 }
                 endOffset = builder.length()
             }
diff --git a/idea/testData/decompiler/decompiledText/TestPackage.expected.kt b/idea/testData/decompiler/decompiledText/TestPackage.expected.kt
index 3b804df0791..76add9f5a7a 100644
--- a/idea/testData/decompiler/decompiledText/TestPackage.expected.kt
+++ b/idea/testData/decompiler/decompiledText/TestPackage.expected.kt
@@ -9,5 +9,5 @@ internal val p: kotlin.Int /* compiled code */
 
 internal fun f(): kotlin.Unit { /* compiled code */ }
 
-internal fun kotlin.Int.plus(i: kotlin.Int): kotlin.Int { /* compiled code */ }
+internal fun kotlin.Int.plus(i: kotlin.Int /* = compiled code */): kotlin.Int { /* compiled code */ }
 
diff --git a/idea/testData/decompiler/decompiledText/TestPackage/TestPackage.kt b/idea/testData/decompiler/decompiledText/TestPackage/TestPackage.kt
index 8517a8330c9..c730cdee046 100644
--- a/idea/testData/decompiler/decompiledText/TestPackage/TestPackage.kt
+++ b/idea/testData/decompiler/decompiledText/TestPackage/TestPackage.kt
@@ -4,7 +4,7 @@ fun f() {}
 val p = 3
 private var i = 2
 
-fun Int.plus(i: Int) = this + i
+fun Int.plus(i: Int = 1) = this + i
 
 class ShouldNotBeVisible1
 trait ShouldNotBeVisible2
diff --git a/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt b/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt
index d6063aec757..0ff82c947d7 100644
--- a/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt
+++ b/idea/testData/decompiler/navigation/decompiled/LibrariesPackage.kt
@@ -23,7 +23,7 @@ package testData.libraries
 
 [public fun func(a: kotlin.Int, b: kotlin.Int): kotlin.Unit { /* compiled code */ }]
 
-[public fun func(a: kotlin.Int, b: kotlin.String = /* compiled code */): kotlin.Unit { /* compiled code */ }]
+[public fun func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }]
 
 [public fun func(str: kotlin.String): kotlin.Unit { /* compiled code */ }]