From eb7cf92fbd2a4661e9f9d61d93857c69dc6a373a Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <Dmitry.Petrov@jetbrains.com>
Date: Tue, 1 Mar 2016 13:53:01 +0300
Subject: [PATCH] Minor. Add a test for KT-10732: no redeclaration for fun <T>
 List<T>?.foo() fun <T> List<T>.foo()

---
 .../diagnostics/testsWithStdLib/resolve/kt10732a.kt         | 5 +++++
 .../diagnostics/testsWithStdLib/resolve/kt10732a.txt        | 4 ++++
 .../kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java | 6 ++++++
 3 files changed, 15 insertions(+)
 create mode 100644 compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.kt
 create mode 100644 compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.txt

diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.kt
new file mode 100644
index 00000000000..51607a90819
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.kt
@@ -0,0 +1,5 @@
+fun <T> List<T>?.foo() {}
+
+// NB Not a redeclaration
+@JvmName("f1")
+fun <T> List<T>.foo() {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.txt b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.txt
new file mode 100644
index 00000000000..adc1a34a6e2
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.txt
@@ -0,0 +1,4 @@
+package
+
+@kotlin.jvm.JvmName(name = "f1") public fun </*0*/ T> kotlin.collections.List<T>.foo(): kotlin.Unit
+public fun </*0*/ T> kotlin.collections.List<T>?.foo(): kotlin.Unit
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
index 77e75d7a791..c824f6e2231 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
@@ -1126,6 +1126,12 @@ public class DiagnosticsTestWithStdLibGenerated extends AbstractDiagnosticsTestW
             doTest(fileName);
         }
 
+        @TestMetadata("kt10732a.kt")
+        public void testKt10732a() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/kt10732a.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("kt4711.kt")
         public void testKt4711() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt");