Improved kotlin decompiler range indexes

Fixed #KT-30628
2020-01-22 03:50:05 +03:00
parent cb1c0344b8
commit 48db96b66d
27 changed files with 326 additions and 55 deletions
@@ -0,0 +1,8 @@
+package testData.libraries
+
+class SomeClassWithConstructors(private val arg: String)  {
+    constructor(x: Int) : this("Hello")
+    fun check() {
+        TODO()
+    }
+}
@@ -0,0 +1,6 @@
+package testData.libraries
+
+@JvmOverloads
+fun <T> String.overloadedFun(vararg specs: String, allowExisting: Boolean = false, x: Int, y: Int = 2, z: T): String {
+    TODO()
+}
@@ -0,0 +1,6 @@
+package testData.libraries
+
+@JvmName("renamedFun")
+fun funToRename(x: Int) {
+
+}
@@ -0,0 +1,10 @@
+import testData.libraries.*;
+
+class TestClassAndConstructors {
+    void foo() {
+
+        SomeClassWithConstructors inst = new SomeClassWithConstructors("arg");
+
+        SomeClassWithConstructors inst2 = new SomeClassWithConstructors(2);
+    }
+}
@@ -0,0 +1,5 @@
+Actual data differs from file content: ClassAndConstuctors.source.expected expected:< [SomeClassWithConstructors.class
+public final class <1><2><3><4>SomeClassWithConstructors public constructor(arg: kotlin.String)] {
+> but was:< [classAndConstructors.kt
+class <1><2><3><4>SomeClassWithConstructors(private val arg: String) ] {
+>
@@ -0,0 +1,2 @@
+ SomeClassWithConstructors.class
+public final class <1><2><3><4>SomeClassWithConstructors public constructor(arg: kotlin.String) {
@@ -0,0 +1,11 @@
+import testData.libraries.*;
+
+class TestOverload {
+    void foo() {
+        OverloadedFunKt.overloadedFun("", null, 2, null);
+
+        OverloadedFunKt.overloadedFun("", null, true, 2, null);
+
+        OverloadedFunKt.overloadedFun("", null, true, 2, 3, null);
+    }
+}
@@ -0,0 +1,10 @@
+Actual data differs from file content: OverloadedFun.source.expected expected:<...d from a class file
+[// Implementation of methods is not available
+
+package testData.libraries
+
+@kotlin.jvm.JvmOverloads public fun <T> kotlin.String.<2><4><6>overloadedFun(vararg specs: kotlin.String, allowExisting: kotlin.Boolean /* = compiled code */, x: kotlin.Int, y: kotlin.Int /* = compiled code */, z: T): kotlin.String { /* compiled code */ }]
+> but was:<...d from a class file
+[ overloadedFun.kt
+fun <T> String.<2><4><6>overloadedFun(vararg specs: String, allowExisting: Boolean = false, x: Int, y: Int = 2, z: T): String {]
+>
@@ -0,0 +1,7 @@
+ OverloadedFunKt.class
+<1><3><5>// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+@kotlin.jvm.JvmOverloads public fun <T> kotlin.String.<2><4><6>overloadedFun(vararg specs: kotlin.String, allowExisting: kotlin.Boolean /* = compiled code */, x: kotlin.Int, y: kotlin.Int /* = compiled code */, z: T): kotlin.String { /* compiled code */ }
@@ -0,0 +1,7 @@
+import testData.libraries.*;
+
+class TestRenamedElements {
+    void foo() {
+        RenamedElementsKt.renamedFun(2);
+    }
+}
@@ -0,0 +1,12 @@
+Actual data differs from file content: RenamedElements.source.expected expected:<[RenamedElementsKt.class
+<1>// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+@kotlin.jvm.JvmName public fun <2>funToRename(x: kotlin.Int): kotlin.Unit { /* compiled code */ }]
+> but was:<[ RenamedElementsKt.class
+<1>// IntelliJ API Decompiler stub source generated from a class file
+ renamedElements.kt
+fun <2>funToRename(x: Int) {]
+>
@@ -0,0 +1,7 @@
+RenamedElementsKt.class
+<1>// IntelliJ API Decompiler stub source generated from a class file
+// Implementation of methods is not available
+
+package testData.libraries
+
+@kotlin.jvm.JvmName public fun <2>funToRename(x: kotlin.Int): kotlin.Unit { /* compiled code */ }
@@ -0,0 +1,9 @@
+Actual data differs from file content: LibraryNestedClassSecondaryConstructorUsages.results.txt expected:<...3 class Y(): A.T()
+[[LibraryNestedClassSecondaryConstructorUsages.1.java] New instance creation 14 A.T a = new A.T();
+[LibraryNestedClassSecondaryConstructorUsages.1.java] Unclassified usage 10 super();
+[LibraryNestedClassSecondaryConstructorUsages.1.java] Unclassified usage 6 public J() {
+[library.kt] New instance creation 64 val tt = A.T()
+[library.kt] Supertype 40 class VV(): A.T()
+]> but was:<...3 class Y(): A.T()
+[[library.kt] New instance creation 64 val tt = A.T()
+[library.kt] Supertype 40 class VV(): A.T()]>
@@ -1,6 +1,6 @@
-package usages
+package usages;

-import library.*
+import library.*;

 class J extends A.T {
    public J() {
@@ -1,4 +1,7 @@
 [LibraryNestedClassSecondaryConstructorUsages.0.kt] New instance creation 16 val a: A.T = A.T()
 [LibraryNestedClassSecondaryConstructorUsages.0.kt] Supertype 13 class Y(): A.T()
+[LibraryNestedClassSecondaryConstructorUsages.1.java] New instance creation 14 A.T a = new A.T();
+[LibraryNestedClassSecondaryConstructorUsages.1.java] Unclassified usage 10 super();
+[LibraryNestedClassSecondaryConstructorUsages.1.java] Unclassified usage 6 public J() {
 [library.kt] New instance creation 64 val tt = A.T()
 [library.kt] Supertype 40 class VV(): A.T()
@@ -0,0 +1,6 @@
+Actual data differs from file content: LibrarySecondaryConstructorUsages.results.txt expected:<... 13 class Y(): A()
+[[LibrarySecondaryConstructorUsages.1.java] New instance creation 14 A a = new A();
+[LibrarySecondaryConstructorUsages.1.java] Unclassified usage 10 super();
+[LibrarySecondaryConstructorUsages.1.java] Unclassified usage 6 public J() {
+[]library.kt] New inst...> but was:<... 13 class Y(): A()
+[[]library.kt] New inst...>
@@ -1,6 +1,6 @@
-package usages
+package usages;

-import library.*
+import library.*;

 class J extends A {
    public J() {
@@ -1,4 +1,7 @@
 [LibrarySecondaryConstructorUsages.0.kt] New instance creation 16 val a: A = A()
 [LibrarySecondaryConstructorUsages.0.kt] Supertype 13 class Y(): A()
+[LibrarySecondaryConstructorUsages.1.java] New instance creation 14 A a = new A();
+[LibrarySecondaryConstructorUsages.1.java] Unclassified usage 10 super();
+[LibrarySecondaryConstructorUsages.1.java] Unclassified usage 6 public J() {
 [library.kt] New instance creation 58 val aa = A()
-[library.kt] Supertype 39 class CC(): A() {
+[library.kt] Supertype 39 class CC(): A() {