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

Implemented better rendering for parameters with default values in decompiler and descriptor renderer.

Browse Source 
#KT-1582 fixed
This commit is contained in:
Evgeny Gerashchenko
2012-04-08 19:59:53 +04:00
parent 0d84a045ee
commit aec021e668
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/resolve/DescriptorRenderer.java
+5 -1
View File
@@ -79,7 +79,11 @@ public class DescriptorRenderer implements Renderer<DeclarationDescriptor> {
@Override @Override
public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) { public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) {
return super.visitVariableDescriptor(descriptor, builder); super.visitVariableDescriptor(descriptor, builder);
if (descriptor.hasDefaultValue()) {
builder.append(" = ...");
}
return null;
} }
}; };
compiler/testData/renderer/GlobalFunctions.kt
+1 -1
View File
@@ -15,7 +15,7 @@ public fun Int.ext() : Int {}
//internal final fun int() : jet.String defined in <module>.<root>.rendererTest //internal final fun int() : jet.String defined in <module>.<root>.rendererTest
//internal final fun int2(val ints : jet.IntArray) : jet.Int defined in <module>.<root>.rendererTest //internal final fun int2(val ints : jet.IntArray) : jet.Int defined in <module>.<root>.rendererTest
//value-parameter vararg val ints : jet.IntArray defined in <module>.<root>.rendererTest.int2 //value-parameter vararg val ints : jet.IntArray defined in <module>.<root>.rendererTest.int2
//private final fun prv(val a : jet.String, val b : jet.Int) : jet.Int defined in <module>.<root>.rendererTest //private final fun prv(val a : jet.String, val b : jet.Int = ...) : jet.Int defined in <module>.<root>.rendererTest
//value-parameter val a : jet.String defined in <module>.<root>.rendererTest.prv //value-parameter val a : jet.String defined in <module>.<root>.rendererTest.prv
//value-parameter val b : jet.Int defined in <module>.<root>.rendererTest.prv //value-parameter val b : jet.Int defined in <module>.<root>.rendererTest.prv
//public final fun jet.Int.ext() : jet.Int defined in <module>.<root>.rendererTest //public final fun jet.Int.ext() : jet.Int defined in <module>.<root>.rendererTest
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+3 -1
View File
@@ -179,7 +179,9 @@ class DecompiledDataFactory {
private void appendDescriptor(DeclarationDescriptor descriptor, String indent) { private void appendDescriptor(DeclarationDescriptor descriptor, String indent) {
int startOffset = myBuilder.length(); int startOffset = myBuilder.length();
myBuilder.append(DescriptorRenderer.COMPACT.render(descriptor)); String renderedDescriptor = DescriptorRenderer.COMPACT.render(descriptor);
renderedDescriptor = renderedDescriptor.replace("= ...", "= " + DECOMPILED_COMMENT);
myBuilder.append(renderedDescriptor);
int endOffset = myBuilder.length(); int endOffset = myBuilder.length();
if (descriptor instanceof FunctionDescriptor || descriptor instanceof PropertyDescriptor) { if (descriptor instanceof FunctionDescriptor || descriptor instanceof PropertyDescriptor) {
idea/testData/libraries/decompiled/namespace.kt
+1 -1
View File
@@ -17,7 +17,7 @@ package testData.libraries
[public final fun func(val a : jet.Int, val b : jet.Int) : Unit { /* compiled code */ }] [public final fun func(val a : jet.Int, val b : jet.Int) : Unit { /* compiled code */ }]
[public final fun func(val a : jet.Int, val b : jet.String) : Unit { /* compiled code */ }] [public final fun func(val a : jet.Int, val b : jet.String = /* compiled code */) : Unit { /* compiled code */ }]
[public final fun func(val str : jet.String) : Unit { /* compiled code */ }] [public final fun func(val str : jet.String) : Unit { /* compiled code */ }]