From 8563614b6901154329c7b5316f84e8bdc40ff8d1 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 23 Oct 2019 15:51:02 +0300 Subject: [PATCH] 193: Mute navigation tests in 193 (KT-34542) --- .../kotlin/generators/tests/GenerateTests.kt | 4 ++-- .../generators/tests/GenerateTests.kt.183 | 4 ++-- .../generators/tests/GenerateTests.kt.as34 | 5 +++-- .../generators/tests/GenerateTests.kt.as35 | 5 +++-- .../generators/tests/GenerateTests.kt.as36 | 5 +++-- .../usercode/ClassObject.kt.libsrc.fail.193 | 7 +++++++ .../usercode/ClassObject.kt.libsrcjs.fail.193 | 7 +++++++ .../usercode/Constructor.kt.libsrc.fail.193 | 7 +++++++ .../usercode/Constructor.kt.libsrcjs.fail.193 | 7 +++++++ .../usercode/Enum.kt.libsrc.fail.193 | 13 ++++++++++++ .../usercode/Enum.kt.libsrcjs.fail.193 | 13 ++++++++++++ .../ExtensionFunction.kt.libsrc.fail.193 | 5 +++++ .../ExtensionFunction.kt.libsrcjs.fail.193 | 5 +++++ .../ExtensionProperty.kt.libsrc.fail.193 | 21 +++++++++++++++++++ .../ExtensionProperty.kt.libsrcjs.fail.193 | 21 +++++++++++++++++++ ...lyDeclaredTypeArguments.kt.libsrc.fail.193 | 5 +++++ ...DeclaredTypeArguments.kt.libsrcjs.fail.193 | 5 +++++ ...thInferredTypeArguments.kt.libsrc.fail.193 | 5 +++++ ...InferredTypeArguments.kt.libsrcjs.fail.193 | 5 +++++ .../GlobalFunction.kt.libsrc.fail.193 | 17 +++++++++++++++ .../GlobalFunction.kt.libsrcjs.fail.193 | 17 +++++++++++++++ .../GlobalProperty.kt.libsrc.fail.193 | 9 ++++++++ .../GlobalProperty.kt.libsrcjs.fail.193 | 9 ++++++++ .../usercode/NamedObject.kt.libsrc.fail.193 | 7 +++++++ .../usercode/NamedObject.kt.libsrcjs.fail.193 | 7 +++++++ ...rloadedFunWithTypeParam.kt.libsrc.fail.193 | 10 +++++++++ ...oadedFunWithTypeParam.kt.libsrcjs.fail.193 | 10 +++++++++ .../usercode/Property.kt.libsrc.fail.193 | 20 ++++++++++++++++++ .../usercode/Property.kt.libsrcjs.fail.193 | 20 ++++++++++++++++++ ...eNameInDifferentSources.kt.libsrc.fail.193 | 9 ++++++++ ...ameInDifferentSources.kt.libsrcjs.fail.193 | 9 ++++++++ .../usercode/TypeAlias.kt.libsrc.fail.193 | 5 +++++ .../usercode/TypeAlias.kt.libsrcjs.fail.193 | 5 +++++ .../TypeWithSameShortName.kt.libsrc.fail.193 | 13 ++++++++++++ ...TypeWithSameShortName.kt.libsrcjs.fail.193 | 13 ++++++++++++ .../NavigateToLibrarySourceTestGenerated.java | 2 ++ ...ateToLibrarySourceTestWithJSGenerated.java | 2 ++ 37 files changed, 323 insertions(+), 10 deletions(-) create mode 100644 idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.193 create mode 100644 idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.193 diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 342a97da681..6b0cc52b18f 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -308,11 +308,11 @@ fun main(args: Array) { model("navigation/gotoSymbol", testMethod = "doSymbolTest") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrc"))) { model("decompiler/navigation/usercode") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrcjs"))) { model("decompiler/navigation/usercode", testClassName = "UsercodeWithJSModule") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 index d9f528018f3..4b7481365c8 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183 @@ -318,11 +318,11 @@ fun main(args: Array) { model("navigation/gotoSymbol", testMethod = "doSymbolTest") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrc"))) { model("decompiler/navigation/usercode") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrcjs"))) { model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 index 5e9993dd8db..f1dae257b1c 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34 @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.tests.generator.TestGroup +import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix import org.jetbrains.kotlin.generators.tests.generator.testGroup import org.jetbrains.kotlin.generators.util.KT_OR_KTS import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME @@ -305,11 +306,11 @@ fun main(args: Array) { model("navigation/gotoSymbol", testMethod = "doSymbolTest") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrc"))) { model("decompiler/navigation/usercode") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrcjs"))) { model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 index 5e9993dd8db..f1dae257b1c 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.tests.generator.TestGroup +import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix import org.jetbrains.kotlin.generators.tests.generator.testGroup import org.jetbrains.kotlin.generators.util.KT_OR_KTS import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME @@ -305,11 +306,11 @@ fun main(args: Array) { model("navigation/gotoSymbol", testMethod = "doSymbolTest") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrc"))) { model("decompiler/navigation/usercode") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrcjs"))) { model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule") } diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 index 5e9993dd8db..f1dae257b1c 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 +++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36 @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.findUsages.AbstractKotlinFindUsagesWithLibraryTest import org.jetbrains.kotlin.formatter.AbstractFormatterTest import org.jetbrains.kotlin.formatter.AbstractTypingIndentationTestBase import org.jetbrains.kotlin.generators.tests.generator.TestGroup +import org.jetbrains.kotlin.generators.tests.generator.muteExtraSuffix import org.jetbrains.kotlin.generators.tests.generator.testGroup import org.jetbrains.kotlin.generators.util.KT_OR_KTS import org.jetbrains.kotlin.generators.util.KT_OR_KTS_WITHOUT_DOTS_IN_NAME @@ -305,11 +306,11 @@ fun main(args: Array) { model("navigation/gotoSymbol", testMethod = "doSymbolTest") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrc"))) { model("decompiler/navigation/usercode") } - testClass { + testClass(annotations = listOf(muteExtraSuffix(".libsrcjs"))) { model("decompiler/navigation/usercode", testClassName ="UsercodeWithJSModule") } diff --git a/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.193 new file mode 100644 index 00000000000..c00b05d13eb --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrc.fail.193 @@ -0,0 +1,7 @@ +Actual data differs from file content: ClassObject.source.expected expected:<[main.kt + companion <1>object { + fun <2>foo() {] +> but was:<[ WithInnerAndObject.class + public companion <1>object { + public final fun <2>foo(): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..c00b05d13eb --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/ClassObject.kt.libsrcjs.fail.193 @@ -0,0 +1,7 @@ +Actual data differs from file content: ClassObject.source.expected expected:<[main.kt + companion <1>object { + fun <2>foo() {] +> but was:<[ WithInnerAndObject.class + public companion <1>object { + public final fun <2>foo(): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.193 new file mode 100644 index 00000000000..6f32a1ffb4f --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrc.fail.193 @@ -0,0 +1,7 @@ +Actual data differs from file content: Constructor.source.expected expected:<[main.kt +public class <1><3>ClassWithConstructor<2>(val a: String, b: Any) { + <4>constructor(a: String): this(a, a)] +> but was:<[ ClassWithConstructor.class +public final class <1><3>ClassWithConstructor public <2>constructor(a: kotlin.String, b: kotlin.Any) { + public <4>constructor(a: kotlin.String) { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..6f32a1ffb4f --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/Constructor.kt.libsrcjs.fail.193 @@ -0,0 +1,7 @@ +Actual data differs from file content: Constructor.source.expected expected:<[main.kt +public class <1><3>ClassWithConstructor<2>(val a: String, b: Any) { + <4>constructor(a: String): this(a, a)] +> but was:<[ ClassWithConstructor.class +public final class <1><3>ClassWithConstructor public <2>constructor(a: kotlin.String, b: kotlin.Any) { + public <4>constructor(a: kotlin.String) { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.193 new file mode 100644 index 00000000000..d3028e1d2ef --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrc.fail.193 @@ -0,0 +1,13 @@ +Actual data differs from file content: Enum.source.expected expected:<[main.kt +public enum class <1><2>Color(val <4>rgb : Int) { + <3>RED(0xFF0000),] +> but was:<[ Color.class +public final enum class <1><2>Color private constructor(rgb: kotlin.Int) : kotlin.Enum { + <3>RED, + + GREEN, + + BLUE; + + public final val <4>rgb: kotlin.Int /* compiled code */] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..d3028e1d2ef --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/Enum.kt.libsrcjs.fail.193 @@ -0,0 +1,13 @@ +Actual data differs from file content: Enum.source.expected expected:<[main.kt +public enum class <1><2>Color(val <4>rgb : Int) { + <3>RED(0xFF0000),] +> but was:<[ Color.class +public final enum class <1><2>Color private constructor(rgb: kotlin.Int) : kotlin.Enum { + <3>RED, + + GREEN, + + BLUE; + + public final val <4>rgb: kotlin.Int /* compiled code */] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.193 new file mode 100644 index 00000000000..dadcd744bce --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrc.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: ExtensionFunction.source.expected expected:<[main.kt +public inline fun T.<1>filter(predicate: (T)-> Boolean) : T? = this] +> but was:<[ MainKt.class +public inline fun T.<1>filter(predicate: (T) -> kotlin.Boolean): T? { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..dadcd744bce --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/ExtensionFunction.kt.libsrcjs.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: ExtensionFunction.source.expected expected:<[main.kt +public inline fun T.<1>filter(predicate: (T)-> Boolean) : T? = this] +> but was:<[ MainKt.class +public inline fun T.<1>filter(predicate: (T) -> kotlin.Boolean): T? { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.193 new file mode 100644 index 00000000000..41ddeb1d004 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrc.fail.193 @@ -0,0 +1,21 @@ +Actual data differs from file content: ExtensionProperty.source.expected expected:<[main.kt +public val String.<1>exProp : String +get() { + return this +} + +public val Int.exProp : Int +get() { + return this +} + +public class Pair<2>(val first: A, val second: B) + +public val Pair.<3>exProp : String] +> but was:<[ MainKt.class +public val kotlin.String.<1>exProp: kotlin.String /* compiled code */ + +public val testData.libraries.Pair.<3>exProp: kotlin.String /* compiled code */ + Pair.class +public final class Pair public <2>constructor(first: A, second: B) {] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..41ddeb1d004 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/ExtensionProperty.kt.libsrcjs.fail.193 @@ -0,0 +1,21 @@ +Actual data differs from file content: ExtensionProperty.source.expected expected:<[main.kt +public val String.<1>exProp : String +get() { + return this +} + +public val Int.exProp : Int +get() { + return this +} + +public class Pair<2>(val first: A, val second: B) + +public val Pair.<3>exProp : String] +> but was:<[ MainKt.class +public val kotlin.String.<1>exProp: kotlin.String /* compiled code */ + +public val testData.libraries.Pair.<3>exProp: kotlin.String /* compiled code */ + Pair.class +public final class Pair public <2>constructor(first: A, second: B) {] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.193 new file mode 100644 index 00000000000..48f8590de47 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrc.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: GenericFunctionWithExplicitlyDeclaredTypeArguments.source.expected expected:<[main.kt +public fun <1>genericFunc() : T = throw Exception()] +> but was:<[ MainKt.class +public fun <1>genericFunc(): T { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..48f8590de47 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithExplicitlyDeclaredTypeArguments.kt.libsrcjs.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: GenericFunctionWithExplicitlyDeclaredTypeArguments.source.expected expected:<[main.kt +public fun <1>genericFunc() : T = throw Exception()] +> but was:<[ MainKt.class +public fun <1>genericFunc(): T { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.193 new file mode 100644 index 00000000000..412e436d9b8 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrc.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: GenericFunctionWithInferredTypeArguments.source.expected expected:<[main.kt +public fun <1>genericFunc() : T = throw Exception()] +> but was:<[ MainKt.class +public fun <1>genericFunc(): T { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..412e436d9b8 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GenericFunctionWithInferredTypeArguments.kt.libsrcjs.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: GenericFunctionWithInferredTypeArguments.source.expected expected:<[main.kt +public fun <1>genericFunc() : T = throw Exception()] +> but was:<[ MainKt.class +public fun <1>genericFunc(): T { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.193 new file mode 100644 index 00000000000..88f280577e2 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrc.fail.193 @@ -0,0 +1,17 @@ +Actual data differs from file content: GlobalFunction.source.expected expected:<[main.kt +public fun <1><2>func(a : Int, b : String = "55") { +} + +public fun <3>func(a : Int, b : Int) { +} + +public fun <4>func() {] +> but was:<[ MainKt.class +public fun <4>func(): kotlin.Unit { /* compiled code */ } + +public fun func(cs: kotlin.CharSequence): kotlin.Unit { /* compiled code */ } + +public fun <3>func(a: kotlin.Int, b: kotlin.Int): kotlin.Unit { /* compiled code */ } + +public fun <1><2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..88f280577e2 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GlobalFunction.kt.libsrcjs.fail.193 @@ -0,0 +1,17 @@ +Actual data differs from file content: GlobalFunction.source.expected expected:<[main.kt +public fun <1><2>func(a : Int, b : String = "55") { +} + +public fun <3>func(a : Int, b : Int) { +} + +public fun <4>func() {] +> but was:<[ MainKt.class +public fun <4>func(): kotlin.Unit { /* compiled code */ } + +public fun func(cs: kotlin.CharSequence): kotlin.Unit { /* compiled code */ } + +public fun <3>func(a: kotlin.Int, b: kotlin.Int): kotlin.Unit { /* compiled code */ } + +public fun <1><2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.193 new file mode 100644 index 00000000000..947df1e9ba6 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrc.fail.193 @@ -0,0 +1,9 @@ +Actual data differs from file content: GlobalProperty.source.expected expected:<[main.kt +public val <1>globalVal : Pair = Pair(239, "239") + +public val <2>globalValWithGetter : Long] +> but was:<[ MainKt.class +public val <1>globalVal: testData.libraries.Pair /* compiled code */ + +public val <2>globalValWithGetter: kotlin.Long /* compiled code */] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..947df1e9ba6 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/GlobalProperty.kt.libsrcjs.fail.193 @@ -0,0 +1,9 @@ +Actual data differs from file content: GlobalProperty.source.expected expected:<[main.kt +public val <1>globalVal : Pair = Pair(239, "239") + +public val <2>globalValWithGetter : Long] +> but was:<[ MainKt.class +public val <1>globalVal: testData.libraries.Pair /* compiled code */ + +public val <2>globalValWithGetter: kotlin.Long /* compiled code */] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.193 new file mode 100644 index 00000000000..761e9150245 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrc.fail.193 @@ -0,0 +1,7 @@ +Actual data differs from file content: NamedObject.source.expected expected:<[main.kt +public object <1>NamedObject { + public val <2>objectMember: Int = 1] +> but was:<[ NamedObject.class +public object <1>NamedObject { + public final val <2>objectMember: kotlin.Int /* compiled code */] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..761e9150245 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/NamedObject.kt.libsrcjs.fail.193 @@ -0,0 +1,7 @@ +Actual data differs from file content: NamedObject.source.expected expected:<[main.kt +public object <1>NamedObject { + public val <2>objectMember: Int = 1] +> but was:<[ NamedObject.class +public object <1>NamedObject { + public final val <2>objectMember: kotlin.Int /* compiled code */] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.193 new file mode 100644 index 00000000000..d4a7858288f --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrc.fail.193 @@ -0,0 +1,10 @@ +Actual data differs from file content: OverloadedFunWithTypeParam.source.expected expected:<[main.kt +public fun <2>funWithTypeParam(t: T) { +} + +public fun <1>funWithTypeParam(t: T) {] +> but was:<[ MainKt.class +public fun <2>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ } + +public fun <1>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..d4a7858288f --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/OverloadedFunWithTypeParam.kt.libsrcjs.fail.193 @@ -0,0 +1,10 @@ +Actual data differs from file content: OverloadedFunWithTypeParam.source.expected expected:<[main.kt +public fun <2>funWithTypeParam(t: T) { +} + +public fun <1>funWithTypeParam(t: T) {] +> but was:<[ MainKt.class +public fun <2>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ } + +public fun <1>funWithTypeParam(t: T): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.193 new file mode 100644 index 00000000000..0295f3f9f31 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrc.fail.193 @@ -0,0 +1,20 @@ +Actual data differs from file content: Property.source.expected expected:<[main.kt +public abstract class <1>ClassWithAbstractAndOpenMembers { + public abstract fun abstractFun() + public open fun openFun() { + } + + public abstract val abstractVal : String + public open val openVal : String = "" + public open val openValWithGetter : String + get() { + return "239" + } + + public abstract var <2><3>abstractVar : ]String +> but was:<[ ClassWithAbstractAndOpenMembers.class +public abstract class <1>ClassWithAbstractAndOpenMembers public constructor() { + public abstract val abstractVal: kotlin.String + + public abstract var <2><3>abstractVar: kotlin.]String +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..0295f3f9f31 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/Property.kt.libsrcjs.fail.193 @@ -0,0 +1,20 @@ +Actual data differs from file content: Property.source.expected expected:<[main.kt +public abstract class <1>ClassWithAbstractAndOpenMembers { + public abstract fun abstractFun() + public open fun openFun() { + } + + public abstract val abstractVal : String + public open val openVal : String = "" + public open val openValWithGetter : String + get() { + return "239" + } + + public abstract var <2><3>abstractVar : ]String +> but was:<[ ClassWithAbstractAndOpenMembers.class +public abstract class <1>ClassWithAbstractAndOpenMembers public constructor() { + public abstract val abstractVal: kotlin.String + + public abstract var <2><3>abstractVar: kotlin.]String +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.193 new file mode 100644 index 00000000000..645085c51b4 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrc.fail.193 @@ -0,0 +1,9 @@ +Actual data differs from file content: SameNameInDifferentSources.source.expected expected:<[extra.kt +public fun <1>func(str : kotlin.String) { + main.kt +public fun <2>func(a : Int, b : String = "55") {] +> but was:<[ ExtraKt.class +public fun <1>func(str: kotlin.String): kotlin.Unit { /* compiled code */ } + MainKt.class +public fun <2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..645085c51b4 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/SameNameInDifferentSources.kt.libsrcjs.fail.193 @@ -0,0 +1,9 @@ +Actual data differs from file content: SameNameInDifferentSources.source.expected expected:<[extra.kt +public fun <1>func(str : kotlin.String) { + main.kt +public fun <2>func(a : Int, b : String = "55") {] +> but was:<[ ExtraKt.class +public fun <1>func(str: kotlin.String): kotlin.Unit { /* compiled code */ } + MainKt.class +public fun <2>func(a: kotlin.Int, b: kotlin.String /* = compiled code */): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.193 new file mode 100644 index 00000000000..b6758010f5e --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrc.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: TypeAlias.source.expected expected:< [main.kt +typealias <1><2>SimpleClassAlias = ]SimpleClass +> but was:< [MainKt.class +public typealias <1><2>SimpleClassAlias = testData.libraries.]SimpleClass +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..b6758010f5e --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/TypeAlias.kt.libsrcjs.fail.193 @@ -0,0 +1,5 @@ +Actual data differs from file content: TypeAlias.source.expected expected:< [main.kt +typealias <1><2>SimpleClassAlias = ]SimpleClass +> but was:< [MainKt.class +public typealias <1><2>SimpleClassAlias = testData.libraries.]SimpleClass +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.193 new file mode 100644 index 00000000000..c4e98291ae9 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrc.fail.193 @@ -0,0 +1,13 @@ +Actual data differs from file content: TypeWithSameShortName.source.expected expected:< [extra.kt +public fun <2>processDouble(d: Double) {} + +public fun <1>processDouble(d: kotlin.Double) {} + main.kt +public class <3>Double] +> but was:< [Double.class +public final class Double public <3>constructor() { + ExtraKt.class +public fun <1>processDouble(d: kotlin.Double): kotlin.Unit { /* compiled code */ } + +public fun <2>processDouble(d: testData.libraries.Double): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.193 b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.193 new file mode 100644 index 00000000000..c4e98291ae9 --- /dev/null +++ b/idea/testData/decompiler/navigation/usercode/TypeWithSameShortName.kt.libsrcjs.fail.193 @@ -0,0 +1,13 @@ +Actual data differs from file content: TypeWithSameShortName.source.expected expected:< [extra.kt +public fun <2>processDouble(d: Double) {} + +public fun <1>processDouble(d: kotlin.Double) {} + main.kt +public class <3>Double] +> but was:< [Double.class +public final class Double public <3>constructor() { + ExtraKt.class +public fun <1>processDouble(d: kotlin.Double): kotlin.Unit { /* compiled code */ } + +public fun <2>processDouble(d: testData.libraries.Double): kotlin.Unit { /* compiled code */ }] +> \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java index 0f0c4b13856..60c34f95706 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.MuteExtraSuffix; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -18,6 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/decompiler/navigation/usercode") @TestDataPath("$PROJECT_ROOT") +@MuteExtraSuffix(".libsrc") @RunWith(JUnit3RunnerWithInners.class) public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibrarySourceTest { private void runTest(String testDataFilePath) throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestWithJSGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestWithJSGenerated.java index 03aa4ddc415..e1e345e5ec6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestWithJSGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestWithJSGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.MuteExtraSuffix; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -18,6 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/decompiler/navigation/usercode") @TestDataPath("$PROJECT_ROOT") +@MuteExtraSuffix(".libsrcjs") @RunWith(JUnit3RunnerWithInners.class) public class NavigateToLibrarySourceTestWithJSGenerated extends AbstractNavigateToLibrarySourceTestWithJS { private void runTest(String testDataFilePath) throws Exception {