From 56e6062bb9b46eb3a06b8d8b08c102275c4f4bcf Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 27 Mar 2018 16:53:20 +0300
Subject: [PATCH] Make DeprecatedCallableAddReplaceWithInspection applicability
 based

Removes intention version of the same thing
Includes some optimization of 'Deprecated' annotation detection

GitOrigin-RevId: bf003b3f7685ee6520be6adce3713fc9278a1b63
---
 .../after.kt.template                         |   4 -
 .../before.kt.template                        |   4 -
 .../description.html                          |   5 -
 plugins/kotlin/idea/src/META-INF/plugin.xml   |   7 +-
 ...ecatedCallableAddReplaceWithInspection.kt} |  87 +++++-----
 .../codeInsight/InspectionTestGenerated.java  |  12 +-
 .../LocalInspectionTestGenerated.java         | 153 ++++++++++++++++++
 .../intentions/IntentionTestGenerated.java    | 153 ------------------
 .../.inspection                               |   1 +
 .../AlreadyWithReplaceWith.kt                 |   2 +-
 .../CommentInBody.kt                          |   0
 .../CommentInBody.kt.after                    |   0
 .../DeclarationInside.kt                      |   2 +-
 .../DeprecationLevelHidden.kt                 |   2 +-
 .../ExceptionInPropertyDestructuringEntry.kt  |   2 +-
 .../ExpressionBody.kt                         |   0
 .../ExpressionBody.kt.after                   |   0
 .../deprecatedCallableAddReplaceWith/If.kt    |   0
 .../If.kt.after                               |   0
 .../Imports.1.kt                              |   0
 .../Imports.1.kt.after                        |   0
 .../Imports.kt                                |   0
 .../Imports.kt.after                          |   0
 .../NoCompanionObjectImport.1.kt              |   0
 .../NoCompanionObjectImport.1.kt.after        |   0
 .../NoCompanionObjectImport.kt                |   0
 .../NoCompanionObjectImport.kt.after          |   0
 .../NoDefaultImport.kt                        |   0
 .../NoDefaultImport.kt.after                  |   0
 .../NoReturn.kt                               |   2 +-
 .../NotAvailableOnDocComment.kt               |   2 +-
 .../PrivateSymbolUsed.kt                      |   2 +-
 .../QualifiedCall.kt                          |   0
 .../QualifiedCall.kt.after                    |   0
 .../Return.kt                                 |   0
 .../Return.kt.after                           |   0
 .../ReturnInside.kt                           |   2 +-
 .../Simple.kt                                 |   0
 .../Simple.kt.after                           |   0
 .../StringLiteral.kt                          |   0
 .../StringLiteral.kt.after                    |   0
 .../StringTemplate.kt                         |   0
 .../StringTemplate.kt.after                   |   0
 .../TwoStatements.kt                          |   2 +-
 .../ValProperty.kt                            |   0
 .../ValProperty.kt.after                      |   0
 .../ValPropertyWithReturn.kt                  |   0
 .../ValPropertyWithReturn.kt.after            |   0
 .../destructuringWithLambdaInScript.kts       |   2 +-
 .../inspectionData/expected.xml               |  56 +++----
 .../inspectionData/inspections.test           |   1 +
 .../justLambdaInScript.kts                    |   2 +-
 .../.intention                                |   1 -
 .../inspectionData/inspections.test           |   1 -
 54 files changed, 245 insertions(+), 262 deletions(-)
 delete mode 100644 plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/after.kt.template
 delete mode 100644 plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/before.kt.template
 delete mode 100644 plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/description.html
 rename plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/{intentions/DeprecatedCallableAddReplaceWithIntention.kt => inspections/DeprecatedCallableAddReplaceWithInspection.kt} (75%)
 create mode 100644 plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/.inspection
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt (77%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/CommentInBody.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/CommentInBody.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/DeclarationInside.kt (81%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt (85%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt (75%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ExpressionBody.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ExpressionBody.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/If.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/If.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Imports.1.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Imports.1.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Imports.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Imports.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NoDefaultImport.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NoDefaultImport.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NoReturn.kt (87%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt (79%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt (83%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/QualifiedCall.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/QualifiedCall.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Return.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Return.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ReturnInside.kt (77%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Simple.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/Simple.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/StringLiteral.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/StringLiteral.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/StringTemplate.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/StringTemplate.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/TwoStatements.kt (74%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ValProperty.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ValProperty.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt.after (100%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts (83%)
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/inspectionData/expected.xml (60%)
 create mode 100644 plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/inspections.test
 rename plugins/kotlin/idea/tests/testData/{intentions => inspectionsLocal}/deprecatedCallableAddReplaceWith/justLambdaInScript.kts (81%)
 delete mode 100644 plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/.intention
 delete mode 100644 plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test

diff --git a/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/after.kt.template b/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/after.kt.template
deleted file mode 100644
index a8701323b86f..000000000000
--- a/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/after.kt.template
+++ /dev/null
@@ -1,4 +0,0 @@
-@deprecated("Use newFun instead", <spot>ReplaceWith("newFun(null)")</spot>)
-fun oldFun(): Int {
-    return newFun(null)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/before.kt.template b/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/before.kt.template
deleted file mode 100644
index d59280139863..000000000000
--- a/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/before.kt.template
+++ /dev/null
@@ -1,4 +0,0 @@
-@deprecated("Use newFun instead")
-fun oldFun(): Int {
-    return newFun(null)
-}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/description.html b/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/description.html
deleted file mode 100644
index 19846598e5da..000000000000
--- a/plugins/kotlin/idea/resources/intentionDescriptions/DeprecatedCallableAddReplaceWithIntention/description.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-This intention adds a <b>kotlin.ReplaceWith</b> argument to a <b>kotlin.deprecated</b> annotation on a function or a property based on its body.
-</body>
-</html>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/src/META-INF/plugin.xml b/plugins/kotlin/idea/src/META-INF/plugin.xml
index 2e7d50bef07f..7ec629bff6a6 100644
--- a/plugins/kotlin/idea/src/META-INF/plugin.xml
+++ b/plugins/kotlin/idea/src/META-INF/plugin.xml
@@ -1203,11 +1203,6 @@
       <category>Kotlin</category>
     </intentionAction>
 
-    <intentionAction>
-      <className>org.jetbrains.kotlin.idea.intentions.DeprecatedCallableAddReplaceWithIntention</className>
-      <category>Kotlin</category>
-    </intentionAction>
-
     <intentionAction>
       <className>org.jetbrains.kotlin.idea.intentions.AddNameToArgumentIntention</className>
       <category>Kotlin</category>
@@ -1605,7 +1600,7 @@
                      language="kotlin"
     />
 
-    <localInspection implementationClass="org.jetbrains.kotlin.idea.intentions.DeprecatedCallableAddReplaceWithInspection"
+    <localInspection implementationClass="org.jetbrains.kotlin.idea.inspections.DeprecatedCallableAddReplaceWithInspection"
                      displayName="@Deprecated annotation without 'replaceWith' argument"
                      groupPath="Kotlin"
                      groupName="Other problems"
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt
similarity index 75%
rename from plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt
rename to plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt
index e3e0af0dc158..92b05ede6e4b 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedCallableAddReplaceWithInspection.kt
@@ -1,23 +1,13 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.intentions
+package org.jetbrains.kotlin.idea.inspections
 
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.util.TextRange
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
 import com.intellij.psi.codeStyle.CodeStyleManager
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility
@@ -31,9 +21,9 @@ import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.idea.core.moveCaret
 import org.jetbrains.kotlin.idea.core.unblockDocument
 import org.jetbrains.kotlin.idea.imports.importableFqName
-import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
 import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorUtils
@@ -45,30 +35,35 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.typeUtil.isUnit
 import java.util.*
 
-class DeprecatedCallableAddReplaceWithInspection : IntentionBasedInspection<KtCallableDeclaration>(DeprecatedCallableAddReplaceWithIntention::class)
-
-class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<KtCallableDeclaration>(
-        KtCallableDeclaration::class.java, "Add 'replaceWith' argument to specify replacement pattern", "Add 'replaceWith' argument to 'Deprecated' annotation"
+class DeprecatedCallableAddReplaceWithInspection : AbstractApplicabilityBasedInspection<KtCallableDeclaration>(
+    KtCallableDeclaration::class.java
 ) {
+    override fun inspectionText(element: KtCallableDeclaration) =
+        "@Deprecated annotation without 'replaceWith' argument"
+
+    override fun inspectionTarget(element: KtCallableDeclaration): KtAnnotationEntry =
+        element.annotationEntries.first { it.shortName == DEPRECATED_NAME }
+
+    override val defaultFixText =
+        "Add 'replaceWith' argument to specify replacement pattern"
+
     private class ReplaceWith(val expression: String, vararg val imports: String)
 
-    override fun applicabilityRange(element: KtCallableDeclaration): TextRange? {
-        val annotationEntry = element.deprecatedAnnotationWithNoReplaceWith() ?: return null
-        if (element.suggestReplaceWith() == null) return null
-        return annotationEntry.textRange
+    override fun isApplicable(element: KtCallableDeclaration): Boolean {
+        element.deprecatedAnnotationWithNoReplaceWith() ?: return false
+        return element.suggestReplaceWith() != null
     }
 
-    override fun applyTo(element: KtCallableDeclaration, editor: Editor?) {
-        val replaceWith = element.suggestReplaceWith()!!
+    override fun applyTo(element: PsiElement, project: Project, editor: Editor?) {
+        val declaration = element.getParentOfType<KtCallableDeclaration>(strict = true) ?: return
+        val replaceWith = declaration.suggestReplaceWith()!!
 
         assert('\n' !in replaceWith.expression && '\r' !in replaceWith.expression) { "Formatted expression text should not contain \\n or \\r" }
 
-        val annotationEntry = element.deprecatedAnnotationWithNoReplaceWith()!!
-        val psiFactory = KtPsiFactory(element)
+        val annotationEntry = declaration.deprecatedAnnotationWithNoReplaceWith()!!
+        val psiFactory = KtPsiFactory(declaration)
 
-        var escapedText = replaceWith.expression
-                .replace("\\", "\\\\")
-                .replace("\"", "\\\"")
+        var escapedText = replaceWith.expression.replace("\\", "\\\\").replace("\"", "\\\"")
 
         // escape '$' if it's followed by a letter or '{'
         if (escapedText.contains('$')) {
@@ -108,15 +103,12 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<Kt
     }
 
     private fun KtCallableDeclaration.deprecatedAnnotationWithNoReplaceWith(): KtAnnotationEntry? {
-        val bindingContext = this.analyze()
-//        val deprecatedConstructor = KotlinBuiltIns.getInstance().getDeprecatedAnnotation().getUnsubstitutedPrimaryConstructor()
         for (entry in annotationEntries) {
-            entry.analyze()
+            if (entry.shortName != DEPRECATED_NAME) continue
+            val bindingContext = entry.analyze()
             val resolvedCall = entry.calleeExpression.getResolvedCall(bindingContext) ?: continue
             if (!resolvedCall.isReallySuccess()) continue
-//            if (resolvedCall.getResultingDescriptor() != deprecatedConstructor) continue
 
-            //TODO
             val descriptor = resolvedCall.resultingDescriptor.containingDeclaration
             val descriptorFqName = DescriptorUtils.getFqName(descriptor).toSafe()
             if (descriptorFqName != KotlinBuiltIns.FQ_NAMES.deprecated) continue
@@ -125,7 +117,7 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<Kt
             val replaceWithArguments = args["replaceWith"] /*TODO: kotlin.deprecated::replaceWith.name*/
             val level = args["level"]
 
-            if (replaceWithArguments?.arguments?.isNotEmpty() ?: false) return null
+            if (replaceWithArguments?.arguments?.isNotEmpty() == true) return null
 
             if (level != null && level.arguments.isNotEmpty()) {
                 val levelDescriptor = level.arguments[0].getArgumentExpression().getResolvedCall(bindingContext)?.candidateDescriptor
@@ -150,7 +142,7 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<Kt
         } ?: return null
 
         var isGood = true
-        replacementExpression.accept(object: KtVisitorVoid(){
+        replacementExpression.accept(object : KtVisitorVoid() {
             override fun visitReturnExpression(expression: KtReturnExpression) {
                 isGood = false
             }
@@ -185,13 +177,17 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<Kt
         val text = replacementExpression.text
         var expression = try {
             KtPsiFactory(this).createExpression(text.replace('\n', ' '))
-        }
-        catch(e: Throwable) { // does not parse in one line
+        } catch (e: Throwable) { // does not parse in one line
             return null
         }
         expression = CodeStyleManager.getInstance(project).reformat(expression, true) as KtExpression
 
-        return ReplaceWith(expression.text, *extractImports(replacementExpression).toTypedArray())
+        return ReplaceWith(
+            expression.text,
+            *extractImports(
+                replacementExpression
+            ).toTypedArray()
+        )
     }
 
     private fun KtDeclarationWithBody.replacementExpressionFromBody(): KtExpression? {
@@ -212,7 +208,7 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<Kt
         val importHelper = ImportInsertHelper.getInstance(expression.project)
 
         val result = ArrayList<String>()
-        expression.accept(object : KtVisitorVoid(){
+        expression.accept(object : KtVisitorVoid() {
             override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) {
                 val bindingContext = expression.analyze()
                 val target = bindingContext[BindingContext.SHORT_REFERENCE_TO_COMPANION_OBJECT, expression]
@@ -221,7 +217,8 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<Kt
                 if (target.isExtension || expression.getReceiverExpression() == null) {
                     val fqName = target.importableFqName ?: return
                     if (!importHelper.isImportedWithDefault(ImportPath(fqName, false), file)
-                        && (target.containingDeclaration as? PackageFragmentDescriptor)?.fqName != currentPackageFqName) {
+                        && (target.containingDeclaration as? PackageFragmentDescriptor)?.fqName != currentPackageFqName
+                    ) {
                         result.add(fqName.asString())
                     }
                 }
@@ -233,4 +230,8 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<Kt
         })
         return result
     }
+
+    companion object {
+        val DEPRECATED_NAME = KotlinBuiltIns.FQ_NAMES.deprecated.shortName()
+    }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java
index 0695aba4fbed..a4d4ae43a501 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/codeInsight/InspectionTestGenerated.java
@@ -39,12 +39,6 @@ public class InspectionTestGenerated extends AbstractInspectionTest {
             doTest(fileName);
         }
 
-        @TestMetadata("deprecatedCallableAddReplaceWith/inspectionData/inspections.test")
-        public void testDeprecatedCallableAddReplaceWith_inspectionData_Inspections_test() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test");
-            doTest(fileName);
-        }
-
         @TestMetadata("destructuringInLambda/inspectionData/inspections.test")
         public void testDestructuringInLambda_inspectionData_Inspections_test() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/destructuringInLambda/inspectionData/inspections.test");
@@ -507,6 +501,12 @@ public class InspectionTestGenerated extends AbstractInspectionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("deprecatedCallableAddReplaceWith/inspectionData/inspections.test")
+        public void testDeprecatedCallableAddReplaceWith_inspectionData_Inspections_test() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/inspections.test");
+            doTest(fileName);
+        }
+
         @TestMetadata("simplifyNegatedBinaryExpression/inspectionData/inspections.test")
         public void testSimplifyNegatedBinaryExpression_inspectionData_Inspections_test() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/simplifyNegatedBinaryExpression/inspectionData/inspections.test");
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
index 6ca16ffac156..656465d667a3 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/LocalInspectionTestGenerated.java
@@ -1261,6 +1261,159 @@ public class LocalInspectionTestGenerated extends AbstractLocalInspectionTest {
         }
     }
 
+    @TestMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith")
+    @TestDataPath("$PROJECT_ROOT")
+    @RunWith(JUnit3RunnerWithInners.class)
+    public static class DeprecatedCallableAddReplaceWith extends AbstractLocalInspectionTest {
+        public void testAllFilesPresentInDeprecatedCallableAddReplaceWith() throws Exception {
+            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
+        }
+
+        @TestMetadata("AlreadyWithReplaceWith.kt")
+        public void testAlreadyWithReplaceWith() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("CommentInBody.kt")
+        public void testCommentInBody() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/CommentInBody.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("DeclarationInside.kt")
+        public void testDeclarationInside() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeclarationInside.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("DeprecationLevelHidden.kt")
+        public void testDeprecationLevelHidden() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("destructuringWithLambdaInScript.kts")
+        public void testDestructuringWithLambdaInScript() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ExceptionInPropertyDestructuringEntry.kt")
+        public void testExceptionInPropertyDestructuringEntry() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ExpressionBody.kt")
+        public void testExpressionBody() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExpressionBody.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("If.kt")
+        public void testIf() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/If.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("Imports.kt")
+        public void testImports() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("justLambdaInScript.kts")
+        public void testJustLambdaInScript() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/justLambdaInScript.kts");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoCompanionObjectImport.kt")
+        public void testNoCompanionObjectImport() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoDefaultImport.kt")
+        public void testNoDefaultImport() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoDefaultImport.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NoReturn.kt")
+        public void testNoReturn() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoReturn.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("NotAvailableOnDocComment.kt")
+        public void testNotAvailableOnDocComment() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("PrivateSymbolUsed.kt")
+        public void testPrivateSymbolUsed() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("QualifiedCall.kt")
+        public void testQualifiedCall() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/QualifiedCall.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("Return.kt")
+        public void testReturn() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Return.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ReturnInside.kt")
+        public void testReturnInside() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ReturnInside.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("Simple.kt")
+        public void testSimple() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Simple.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("StringLiteral.kt")
+        public void testStringLiteral() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringLiteral.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("StringTemplate.kt")
+        public void testStringTemplate() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringTemplate.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("TwoStatements.kt")
+        public void testTwoStatements() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/TwoStatements.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ValProperty.kt")
+        public void testValProperty() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValProperty.kt");
+            doTest(fileName);
+        }
+
+        @TestMetadata("ValPropertyWithReturn.kt")
+        public void testValPropertyWithReturn() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt");
+            doTest(fileName);
+        }
+    }
+
     @TestMetadata("idea/testData/inspectionsLocal/doubleNegation")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index b4af64e06313..1b520e60aab6 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -8383,159 +8383,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
         }
     }
 
-    @TestMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith")
-    @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class DeprecatedCallableAddReplaceWith extends AbstractIntentionTest {
-        public void testAllFilesPresentInDeprecatedCallableAddReplaceWith() throws Exception {
-            KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/deprecatedCallableAddReplaceWith"), Pattern.compile("^([\\w\\-_]+)\\.(kt|kts)$"), TargetBackend.ANY, true);
-        }
-
-        @TestMetadata("AlreadyWithReplaceWith.kt")
-        public void testAlreadyWithReplaceWith() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("CommentInBody.kt")
-        public void testCommentInBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/CommentInBody.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("DeclarationInside.kt")
-        public void testDeclarationInside() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/DeclarationInside.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("DeprecationLevelHidden.kt")
-        public void testDeprecationLevelHidden() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("destructuringWithLambdaInScript.kts")
-        public void testDestructuringWithLambdaInScript() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts");
-            doTest(fileName);
-        }
-
-        @TestMetadata("ExceptionInPropertyDestructuringEntry.kt")
-        public void testExceptionInPropertyDestructuringEntry() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("ExpressionBody.kt")
-        public void testExpressionBody() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ExpressionBody.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("If.kt")
-        public void testIf() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/If.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("Imports.kt")
-        public void testImports() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Imports.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("justLambdaInScript.kts")
-        public void testJustLambdaInScript() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/justLambdaInScript.kts");
-            doTest(fileName);
-        }
-
-        @TestMetadata("NoCompanionObjectImport.kt")
-        public void testNoCompanionObjectImport() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("NoDefaultImport.kt")
-        public void testNoDefaultImport() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoDefaultImport.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("NoReturn.kt")
-        public void testNoReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NoReturn.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("NotAvailableOnDocComment.kt")
-        public void testNotAvailableOnDocComment() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("PrivateSymbolUsed.kt")
-        public void testPrivateSymbolUsed() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("QualifiedCall.kt")
-        public void testQualifiedCall() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/QualifiedCall.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("Return.kt")
-        public void testReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Return.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("ReturnInside.kt")
-        public void testReturnInside() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ReturnInside.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("Simple.kt")
-        public void testSimple() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/Simple.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("StringLiteral.kt")
-        public void testStringLiteral() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/StringLiteral.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("StringTemplate.kt")
-        public void testStringTemplate() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/StringTemplate.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("TwoStatements.kt")
-        public void testTwoStatements() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/TwoStatements.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("ValProperty.kt")
-        public void testValProperty() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ValProperty.kt");
-            doTest(fileName);
-        }
-
-        @TestMetadata("ValPropertyWithReturn.kt")
-        public void testValPropertyWithReturn() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt");
-            doTest(fileName);
-        }
-    }
-
     @TestMetadata("idea/testData/intentions/destructuringInLambda")
     @TestDataPath("$PROJECT_ROOT")
     @RunWith(JUnit3RunnerWithInners.class)
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/.inspection b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/.inspection
new file mode 100644
index 000000000000..2783134d7a34
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/.inspection
@@ -0,0 +1 @@
+org.jetbrains.kotlin.idea.inspections.DeprecatedCallableAddReplaceWithInspection
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt
similarity index 77%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt
index 41a8908342e9..bed4ac3e6fac 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/AlreadyWithReplaceWith.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 <caret>@Deprecated("", ReplaceWith("bar()"))
 fun foo() {
     bar()
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/CommentInBody.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/CommentInBody.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/CommentInBody.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/CommentInBody.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/CommentInBody.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/CommentInBody.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/CommentInBody.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/CommentInBody.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/DeclarationInside.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeclarationInside.kt
similarity index 81%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/DeclarationInside.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeclarationInside.kt
index df53bc2b9eac..a118fdc00515 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/DeclarationInside.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeclarationInside.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 <caret>@Deprecated("")
 fun foo(p: Int) {
     if (p > 0) {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt
similarity index 85%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt
index dbaf1d2c5072..c193953a351c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/DeprecationLevelHidden.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 
 <caret>@Deprecated("Use the other version", level=DeprecationLevel.HIDDEN)
 fun foo(a: Int) { foo(a) }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt
similarity index 75%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt
index 89f42034045f..bd789055cf7c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExceptionInPropertyDestructuringEntry.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 
 // See KT-7929, EA-76715
 class C {
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ExpressionBody.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExpressionBody.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ExpressionBody.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExpressionBody.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ExpressionBody.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExpressionBody.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ExpressionBody.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ExpressionBody.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/If.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/If.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/If.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/If.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/If.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/If.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/If.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/If.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.1.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.1.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.1.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.1.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.1.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.1.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.1.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.1.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Imports.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Imports.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.1.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoCompanionObjectImport.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoDefaultImport.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoDefaultImport.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoDefaultImport.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoDefaultImport.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoDefaultImport.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoDefaultImport.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoDefaultImport.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoDefaultImport.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoReturn.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoReturn.kt
similarity index 87%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoReturn.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoReturn.kt
index 9ffb554fbb5e..91ef95f90ffa 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NoReturn.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NoReturn.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 // ERROR: A 'return' expression required in a function with a block body ('{...}')
 
 <caret>@Deprecated("")
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt
similarity index 79%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt
index cd2d4ce45b20..e1351aadb954 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/NotAvailableOnDocComment.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 /**
  * <caret>This is a doc-comment
  */
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt
similarity index 83%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt
index 1e6fa3972731..cb050aa3ce0d 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/PrivateSymbolUsed.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 class C {
     private val v = 1
 
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/QualifiedCall.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/QualifiedCall.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/QualifiedCall.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/QualifiedCall.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/QualifiedCall.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/QualifiedCall.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/QualifiedCall.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/QualifiedCall.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Return.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Return.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Return.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Return.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Return.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Return.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Return.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Return.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ReturnInside.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ReturnInside.kt
similarity index 77%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ReturnInside.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ReturnInside.kt
index d3db91d9aa84..dd11abdd05b3 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ReturnInside.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ReturnInside.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 <caret>@Deprecated("")
 fun foo() {
     bar() ?: return
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Simple.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Simple.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Simple.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Simple.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Simple.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Simple.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/Simple.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/Simple.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringLiteral.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringLiteral.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringLiteral.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringLiteral.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringLiteral.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringLiteral.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringLiteral.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringLiteral.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringTemplate.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringTemplate.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringTemplate.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringTemplate.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringTemplate.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringTemplate.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/StringTemplate.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/StringTemplate.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/TwoStatements.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/TwoStatements.kt
similarity index 74%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/TwoStatements.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/TwoStatements.kt
index f70d9e0bb36c..aabe63e1a23c 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/TwoStatements.kt
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/TwoStatements.kt
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 <caret>@Deprecated("")
 fun foo() {
     bar()
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValProperty.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValProperty.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValProperty.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValProperty.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValProperty.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValProperty.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValProperty.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValProperty.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt.after
similarity index 100%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt.after
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt.after
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts
similarity index 83%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts
index b8e6fa2899d1..5ad8c13c6bbd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/destructuringWithLambdaInScript.kts
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 // WITH_RUNTIME
 // SKIP_ERRORS_BEFORE
 // SKIP_ERRORS_AFTER
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/expected.xml b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/expected.xml
similarity index 60%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/expected.xml
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/expected.xml
index 23de8979c51c..caa8b824b00f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/expected.xml
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/expected.xml
@@ -4,8 +4,8 @@
         <line>2</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="ValPropertyWithReturn.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
 
@@ -14,8 +14,8 @@
         <line>2</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="ValProperty.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -23,8 +23,8 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="StringTemplate.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -32,8 +32,8 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="StringLiteral.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -41,8 +41,8 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="Simple.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -50,8 +50,8 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="Return.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -59,8 +59,8 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="QualifiedCall.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -68,8 +68,8 @@
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="NotAvailableOnDocComment.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -77,8 +77,8 @@
         <line>2</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="NoDefaultImport.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -86,8 +86,8 @@
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="NoCompanionObjectImport.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -95,8 +95,8 @@
         <line>5</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="Imports.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -104,8 +104,8 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="If.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -113,8 +113,8 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="ExpressionBody.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 
     <problem>
@@ -122,7 +122,7 @@
         <line>1</line>
         <module>light_idea_test_case</module>
         <entry_point TYPE="file" FQNAME="CommentInBody.kt" />
-        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Add 'replaceWith' argument to 'deprecated' annotation</problem_class>
-        <description>Add 'replaceWith' argument to specify replacement pattern</description>
+        <problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">@Deprecated annotation without 'replaceWith' argument</problem_class>
+        <description>@Deprecated annotation without 'replaceWith' argument</description>
     </problem>
 </problems>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/inspections.test b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/inspections.test
new file mode 100644
index 000000000000..6fcdada27cfa
--- /dev/null
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/inspectionData/inspections.test
@@ -0,0 +1 @@
+// INSPECTION_CLASS: org.jetbrains.kotlin.idea.inspections.DeprecatedCallableAddReplaceWithInspection
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/justLambdaInScript.kts b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/justLambdaInScript.kts
similarity index 81%
rename from plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/justLambdaInScript.kts
rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/justLambdaInScript.kts
index c7e81fed9294..77f0cea166df 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/justLambdaInScript.kts
+++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/deprecatedCallableAddReplaceWith/justLambdaInScript.kts
@@ -1,4 +1,4 @@
-// IS_APPLICABLE: false
+// PROBLEM: none
 // WITH_RUNTIME
 // SKIP_ERRORS_BEFORE
 // SKIP_ERRORS_AFTER
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/.intention b/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/.intention
deleted file mode 100644
index d665c029dd4c..000000000000
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/.intention
+++ /dev/null
@@ -1 +0,0 @@
-org.jetbrains.kotlin.idea.intentions.DeprecatedCallableAddReplaceWithIntention
diff --git a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test b/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test
deleted file mode 100644
index 3a8ac1e6cc56..000000000000
--- a/plugins/kotlin/idea/tests/testData/intentions/deprecatedCallableAddReplaceWith/inspectionData/inspections.test
+++ /dev/null
@@ -1 +0,0 @@
-// INSPECTION_CLASS: org.jetbrains.kotlin.idea.intentions.DeprecatedCallableAddReplaceWithInspection