From a2f55e8b7c0a2eda587590b3e3b417e2768d992b Mon Sep 17 00:00:00 2001
From: Toshiaki Kameyama <kmymtsak@gmail.com>
Date: Tue, 3 Mar 2020 15:51:09 +0900
Subject: [PATCH] Remove redundant calls of the conversion method: report for
 unsigned types

#KT-30263 Fixed
---
 ...undantCallsOfConversionMethodsIntention.kt |  7 ++++++-
 .../uByte.kt                                  |  4 ++++
 .../uByte.kt.after                            |  4 ++++
 .../uInt.kt                                   |  4 ++++
 .../uInt.kt.after                             |  4 ++++
 .../uLong.kt                                  |  4 ++++
 .../uLong.kt.after                            |  4 ++++
 .../uShort.kt                                 |  4 ++++
 .../uShort.kt.after                           |  4 ++++
 .../intentions/IntentionTestGenerated.java    | 20 +++++++++++++++++++
 10 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt.after
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt.after
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt.after
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt
 create mode 100644 idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt.after

diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveRedundantCallsOfConversionMethodsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveRedundantCallsOfConversionMethodsIntention.kt
index c1bf9ba9a64..d554d1cc3ed 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveRedundantCallsOfConversionMethodsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveRedundantCallsOfConversionMethodsIntention.kt
@@ -32,6 +32,7 @@ class RemoveRedundantCallsOfConversionMethodsIntention : SelfTargetingRangeInten
     KotlinBundle.lazyMessage("remove.redundant.calls.of.the.conversion.method")
 ) {
 
+    @ExperimentalUnsignedTypes
     private val targetClassMap: Map<String, String?> by lazy {
         mapOf(
             "toString()" to String::class.qualifiedName,
@@ -41,7 +42,11 @@ class RemoveRedundantCallsOfConversionMethodsIntention : SelfTargetingRangeInten
             "toInt()" to Int::class.qualifiedName,
             "toChar()" to Char::class.qualifiedName,
             "toShort()" to Short::class.qualifiedName,
-            "toByte()" to Byte::class.qualifiedName
+            "toByte()" to Byte::class.qualifiedName,
+            "toULong()" to ULong::class.qualifiedName,
+            "toUInt()" to UInt::class.qualifiedName,
+            "toUShort()" to UShort::class.qualifiedName,
+            "toUByte()" to UByte::class.qualifiedName
         )
     }
 
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt
new file mode 100644
index 00000000000..aaec772b2cd
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UByte) {
+    val foo = i.toUByte()<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt.after b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt.after
new file mode 100644
index 00000000000..d12cfa152c9
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt.after
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UByte) {
+    val foo = i
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt
new file mode 100644
index 00000000000..b060cb27371
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UInt) {
+    val foo = i.toUInt()<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt.after b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt.after
new file mode 100644
index 00000000000..95a9e88cf1e
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt.after
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UInt) {
+    val foo = i
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt
new file mode 100644
index 00000000000..cf5f9de1072
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: ULong) {
+    val foo = i.toULong()<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt.after b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt.after
new file mode 100644
index 00000000000..4b6abb2562c
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt.after
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: ULong) {
+    val foo = i
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt
new file mode 100644
index 00000000000..b7f4603699d
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UShort) {
+    val foo = i.toUShort()<caret>
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt.after b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt.after
new file mode 100644
index 00000000000..4946f4c2970
--- /dev/null
+++ b/idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt.after
@@ -0,0 +1,4 @@
+// WITH_RUNTIME
+fun test(i: UShort) {
+    val foo = i
+}
\ 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 edcb1783860..3ac1bf69b95 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -14209,6 +14209,26 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/removeRedundantCallsOfConversionMethods/toOtherType.kt");
         }
 
+        @TestMetadata("uByte.kt")
+        public void testUByte() throws Exception {
+            runTest("idea/testData/intentions/removeRedundantCallsOfConversionMethods/uByte.kt");
+        }
+
+        @TestMetadata("uInt.kt")
+        public void testUInt() throws Exception {
+            runTest("idea/testData/intentions/removeRedundantCallsOfConversionMethods/uInt.kt");
+        }
+
+        @TestMetadata("uLong.kt")
+        public void testULong() throws Exception {
+            runTest("idea/testData/intentions/removeRedundantCallsOfConversionMethods/uLong.kt");
+        }
+
+        @TestMetadata("uShort.kt")
+        public void testUShort() throws Exception {
+            runTest("idea/testData/intentions/removeRedundantCallsOfConversionMethods/uShort.kt");
+        }
+
         @TestMetadata("variable.kt")
         public void testVariable() throws Exception {
             runTest("idea/testData/intentions/removeRedundantCallsOfConversionMethods/variable.kt");