From b756e189624684068192ece53377211cc973f8c4 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 5 Mar 2020 20:41:25 +0900 Subject: [PATCH] Never treat @JsExport-annotated declarations as not-used instead of @JsName --- .../kotlin/idea/inspections/UnusedSymbolInspection.kt | 2 +- .../unusedSymbol/{jsName.kt => jsExport.kt} | 2 +- .../idea/inspections/LocalInspectionTestGenerated.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename idea/testData/inspectionsLocal/unusedSymbol/{jsName.kt => jsExport.kt} (85%) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 0d9a5566b3c..dbbc37e3e8f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -98,7 +98,7 @@ class UnusedSymbolInspection : AbstractKotlinInspection() { private val javaInspection = UnusedDeclarationInspection() - private val KOTLIN_ADDITIONAL_ANNOTATIONS = listOf("kotlin.test.*", "kotlin.js.JsName") + private val KOTLIN_ADDITIONAL_ANNOTATIONS = listOf("kotlin.test.*", "kotlin.js.JsExport") private val KOTLIN_BUILTIN_ENUM_FUNCTIONS = listOf(FqName("kotlin.enumValues"), FqName("kotlin.enumValueOf")) diff --git a/idea/testData/inspectionsLocal/unusedSymbol/jsName.kt b/idea/testData/inspectionsLocal/unusedSymbol/jsExport.kt similarity index 85% rename from idea/testData/inspectionsLocal/unusedSymbol/jsName.kt rename to idea/testData/inspectionsLocal/unusedSymbol/jsExport.kt index 7889c682435..aaab4812232 100644 --- a/idea/testData/inspectionsLocal/unusedSymbol/jsName.kt +++ b/idea/testData/inspectionsLocal/unusedSymbol/jsExport.kt @@ -5,7 +5,7 @@ class Person(val name: String) { println("Hello $name!") } - @JsName("helloWithGreeting") + @JsExport fun hello(greeting: String) { println("$greeting $name!") } diff --git a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java index 2d6fb8660e3..e5b7227234d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java @@ -13531,9 +13531,9 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest { runTest("idea/testData/inspectionsLocal/unusedSymbol/internal.kt"); } - @TestMetadata("jsName.kt") - public void testJsName() throws Exception { - runTest("idea/testData/inspectionsLocal/unusedSymbol/jsName.kt"); + @TestMetadata("jsExport.kt") + public void testJsExport() throws Exception { + runTest("idea/testData/inspectionsLocal/unusedSymbol/jsExport.kt"); } @TestMetadata("propertyOfInlineClassType.kt")