From 6cee310c5479beb634d8169d8b98d8f161bf1446 Mon Sep 17 00:00:00 2001 From: Alexander Podkhalyuzin Date: Fri, 7 Sep 2018 16:08:21 +0300 Subject: [PATCH] Fixed 181 branch --- .../inspections/QuickFixFactoryCompatibility.kt | 14 ++++++++++++++ .../QuickFixFactoryCompatibility.kt.181 | 14 ++++++++++++++ .../idea/inspections/UnusedSymbolInspection.kt | 5 ++--- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt create mode 100644 idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt.181 diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt new file mode 100644 index 00000000000..40c4a4b3c6f --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.inspections + +import com.intellij.codeInsight.intention.IntentionAction +import com.intellij.codeInsight.intention.QuickFixFactory +import com.intellij.openapi.project.Project + +fun createAddToDependencyInjectionAnnotationsFix(project: Project, fqName: String): IntentionAction { + return QuickFixFactory.getInstance().createAddToDependencyInjectionAnnotationsFix(project, fqName) +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt.181 b/idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt.181 new file mode 100644 index 00000000000..6bdccec7687 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/QuickFixFactoryCompatibility.kt.181 @@ -0,0 +1,14 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.inspections + +import com.intellij.codeInsight.intention.IntentionAction +import com.intellij.codeInsight.intention.QuickFixFactory +import com.intellij.openapi.project.Project + +fun createAddToDependencyInjectionAnnotationsFix(project: Project, fqName: String): IntentionAction { + return QuickFixFactory.getInstance().createAddToDependencyInjectionAnnotationsFix(project, fqName, "declarations") +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index bd4944b05a9..9778385c8a4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -10,7 +10,6 @@ import com.intellij.codeInsight.FileModificationService import com.intellij.codeInsight.daemon.QuickFixBundle import com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil -import com.intellij.codeInsight.intention.QuickFixFactory import com.intellij.codeInspection.* import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection import com.intellij.codeInspection.ex.EntryPointsManager @@ -386,8 +385,8 @@ class UnusedSymbolInspection : AbstractKotlinInspection() { ) continue - val intentionAction = - QuickFixFactory.getInstance().createAddToDependencyInjectionAnnotationsFix(declaration.project, fqName) + val intentionAction = createAddToDependencyInjectionAnnotationsFix(declaration.project, fqName) + list.add(IntentionWrapper(intentionAction, declaration.containingFile)) }