From 6a140fb9ed2e976f7e3c35a9d077fe9079f9acd6 Mon Sep 17 00:00:00 2001 From: Toshiaki Kameyama Date: Tue, 19 Jun 2018 12:02:30 +0900 Subject: [PATCH] "Useless call on collection type" inspection: Apply to 'kotlin.sequences.orEmpty' --- .../collections/UselessCallOnNotNullInspection.kt | 1 + .../collections/uselessCallOnNotNull/Sequence.kt | 5 +++++ .../collections/uselessCallOnNotNull/Sequence.kt.after | 5 +++++ .../idea/inspections/LocalInspectionTestGenerated.java | 5 +++++ 4 files changed, 16 insertions(+) create mode 100644 idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt create mode 100644 idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt.after diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnNotNullInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnNotNullInspection.kt index 170309c03f2..b6de250f95a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnNotNullInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/collections/UselessCallOnNotNullInspection.kt @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.types.TypeUtils class UselessCallOnNotNullInspection : AbstractUselessCallInspection() { override val uselessFqNames = mapOf("kotlin.collections.orEmpty" to deleteConversion, + "kotlin.sequences.orEmpty" to deleteConversion, "kotlin.text.orEmpty" to deleteConversion, "kotlin.text.isNullOrEmpty" to Conversion("isEmpty"), "kotlin.text.isNullOrBlank" to Conversion("isBlank")) diff --git a/idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt b/idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt new file mode 100644 index 00000000000..655f12a83d0 --- /dev/null +++ b/idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt @@ -0,0 +1,5 @@ +// WITH_RUNTIME + +fun test(s: Sequence) { + val foo = s.orEmpty() +} \ No newline at end of file diff --git a/idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt.after b/idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt.after new file mode 100644 index 00000000000..de8846437ef --- /dev/null +++ b/idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt.after @@ -0,0 +1,5 @@ +// WITH_RUNTIME + +fun test(s: Sequence) { + val foo = s +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 24c3d5d183c..144225396f3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -1284,6 +1284,11 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { runTest("idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/SafeCall.kt"); } + @TestMetadata("Sequence.kt") + public void testSequence() throws Exception { + runTest("idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/Sequence.kt"); + } + @TestMetadata("String.kt") public void testString() throws Exception { runTest("idea/testData/inspectionsLocal/collections/uselessCallOnNotNull/String.kt");