From d6eee65d72bd41a76297bad093f19167bb8b1019 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 24 Oct 2016 19:44:56 +0300
Subject: [PATCH] Object literal to lambda: more precise shorten references
 #KT-14289 Fixed

---
 .../idea/intentions/ObjectLiteralToLambdaIntention.kt       | 5 +++--
 .../objectLiteralToLambda/ShortGenericArgument.1.java       | 3 +++
 .../objectLiteralToLambda/ShortGenericArgument.1.java.after | 3 +++
 .../objectLiteralToLambda/ShortGenericArgument.kt           | 5 +++++
 .../objectLiteralToLambda/ShortGenericArgument.kt.after     | 3 +++
 .../kotlin/idea/intentions/IntentionTestGenerated.java      | 6 ++++++
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java
 create mode 100644 idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java.after
 create mode 100644 idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt
 create mode 100644 idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
index b3a9ebaa3a5..bef56f68b14 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
@@ -85,7 +85,7 @@ class ObjectLiteralToLambdaIntention : SelfTargetingRangeIntention<KtObjectLiter
     override fun applyTo(element: KtObjectLiteralExpression, editor: Editor?) {
         val commentSaver = CommentSaver(element)
 
-        val (@Suppress("UNUSED_VARIABLE") baseTypeRef, baseType, singleFunction) = extractData(element)!!
+        val (baseTypeRef, baseType, singleFunction) = extractData(element)!!
 
         val returnSaver = ReturnSaver(singleFunction)
 
@@ -141,7 +141,8 @@ class ObjectLiteralToLambdaIntention : SelfTargetingRangeIntention<KtObjectLiter
             }
         }
         else {
-            ShortenReferences.DEFAULT.process(replaced.getContainingKtFile(), replaced.startOffset, callee.endOffset)
+            val endOffset = (callee.parent as? KtCallExpression)?.typeArgumentList?.endOffset ?: callee.endOffset
+            ShortenReferences.DEFAULT.process(replaced.getContainingKtFile(), replaced.startOffset, endOffset)
         }
     }
 
diff --git a/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java
new file mode 100644
index 00000000000..21e7f72f04e
--- /dev/null
+++ b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java
@@ -0,0 +1,3 @@
+interface User<T> {
+    void call(T arg);
+}
diff --git a/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java.after b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java.after
new file mode 100644
index 00000000000..21e7f72f04e
--- /dev/null
+++ b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.1.java.after
@@ -0,0 +1,3 @@
+interface User<T> {
+    void call(T arg);
+}
diff --git a/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt
new file mode 100644
index 00000000000..cb005289c62
--- /dev/null
+++ b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt
@@ -0,0 +1,5 @@
+fun use() {
+    val myUser = <caret>object : User<String> {
+        override fun call(arg: String) {}
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt.after b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt.after
new file mode 100644
index 00000000000..05379a699a4
--- /dev/null
+++ b/idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt.after
@@ -0,0 +1,3 @@
+fun use() {
+    val myUser = User<String> { }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 464756ae471..651f0c2c82e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -10118,6 +10118,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("ShortGenericArgument.kt")
+        public void testShortGenericArgument() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/ShortGenericArgument.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("Simple.kt")
         public void testSimple() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/Simple.kt");