From 8dbe87a91872461a9fb3903b4fba63d647e39a91 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 1 Sep 2015 16:33:17 +0300 Subject: [PATCH] Moved classes --- .../kotlin/idea/inspections/KotlinCleanupInspection.kt | 2 +- .../jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt | 4 +++- .../{ => replaceWith}/DeprecatedSymbolUsageFix.kt | 5 ++++- .../{ => replaceWith}/DeprecatedSymbolUsageFixBase.kt | 5 +++-- .../DeprecatedSymbolUsageInWholeProjectFix.kt | 3 ++- .../{ => replaceWith}/ReplaceWithAnnotationAnalyzer.kt | 2 +- .../quickfix/deprecatedSymbolUsage/callWithError.kt | 2 +- .../classUsages/noAnnotationConstructorUsage.kt | 2 +- .../quickfix/deprecatedSymbolUsage/incorrectArgs.kt | 2 +- .../deprecatedSymbolUsage/incorrectReplacement.kt | 2 +- .../deprecatedSymbolUsage/javaDeprecated.before.Main.kt | 2 +- .../quickfix/deprecatedSymbolUsage/noReplacement.kt | 2 +- .../idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt | 8 ++------ 13 files changed, 22 insertions(+), 19 deletions(-) rename idea/src/org/jetbrains/kotlin/idea/quickfix/{ => replaceWith}/DeprecatedSymbolUsageFix.kt (93%) rename idea/src/org/jetbrains/kotlin/idea/quickfix/{ => replaceWith}/DeprecatedSymbolUsageFixBase.kt (99%) rename idea/src/org/jetbrains/kotlin/idea/quickfix/{ => replaceWith}/DeprecatedSymbolUsageInWholeProjectFix.kt (98%) rename idea/src/org/jetbrains/kotlin/idea/quickfix/{ => replaceWith}/ReplaceWithAnnotationAnalyzer.kt (99%) diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt index b1799d1b526..5938ecde734 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.idea.highlighter.JetPsiChecker import org.jetbrains.kotlin.idea.quickfix.CleanupFix -import org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix +import org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction import org.jetbrains.kotlin.idea.quickfix.ReplaceObsoleteLabelSyntaxFix import org.jetbrains.kotlin.idea.util.ProjectRootsUtil diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 30ddcf9dbc9..df106cceca4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -29,6 +29,8 @@ import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClas import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateLocalVariableActionFactory import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateParameterByNamedArgumentActionFactory import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateParameterByRefActionFactory +import org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix +import org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageInWholeProjectFix import org.jetbrains.kotlin.lexer.JetTokens.* import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm @@ -311,7 +313,7 @@ public class QuickFixRegistrar : QuickFixContributor { ReplaceObsoleteLabelSyntaxFix.createWholeProjectFixFactory()) DEPRECATED_SYMBOL_WITH_MESSAGE.registerFactory(DeprecatedSymbolUsageFix, - DeprecatedSymbolUsageInWholeProjectFix) + DeprecatedSymbolUsageInWholeProjectFix) POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION.registerFactory(ReplaceJavaAnnotationPositionedArgumentsFix) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt similarity index 93% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFix.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt index 45c00d02cef..f68b96f2bab 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.quickfix +package org.jetbrains.kotlin.idea.quickfix.replaceWith import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.codeInsight.intention.IntentionAction @@ -25,6 +25,9 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.idea.core.targetDescriptors +import org.jetbrains.kotlin.idea.quickfix.CleanupFix +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory +import org.jetbrains.kotlin.idea.quickfix.moveCaret import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt index 76ed6480456..0f3591870d8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFixBase.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.quickfix +package org.jetbrains.kotlin.idea.quickfix.replaceWith import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference import org.jetbrains.kotlin.idea.core.* import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArgumentsIntention import org.jetbrains.kotlin.idea.intentions.setType +import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.ImportInsertHelper import org.jetbrains.kotlin.idea.util.ShortenReferences @@ -577,7 +578,7 @@ public abstract class DeprecatedSymbolUsageFixBase( private fun restoreFunctionLiteralArguments(expression: JetExpression) { val callExpressions = ArrayList() - expression.forEachDescendantOfType( fun (expr: JetExpression) { + expression.forEachDescendantOfType(fun (expr: JetExpression) { if (!expr[WAS_FUNCTION_LITERAL_ARGUMENT_KEY]) return assert(expr.unpackFunctionLiteral() != null) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageInWholeProjectFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt similarity index 98% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageInWholeProjectFix.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt index 7e451d219e0..d49286ba32a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageInWholeProjectFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.quickfix +package org.jetbrains.kotlin.idea.quickfix.replaceWith import com.intellij.codeInsight.intention.IntentionAction import com.intellij.openapi.diagnostic.Logger @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.targetDescriptors +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.idea.references.JetSimpleNameReference import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt similarity index 99% rename from idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt index c32a575c2ac..34251c76531 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceWithAnnotationAnalyzer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/ReplaceWithAnnotationAnalyzer.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.quickfix +package org.jetbrains.kotlin.idea.quickfix.replaceWith import com.intellij.openapi.util.Key import org.jetbrains.kotlin.descriptors.* diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt b/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt index 7b2a6b8c13d..fd941f8452f 100644 --- a/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt +++ b/idea/testData/quickfix/deprecatedSymbolUsage/callWithError.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false" // ERROR: Too many arguments for kotlin.deprecated internal fun oldFun(): kotlin.Unit defined in root package @deprecated("", ReplaceWith("newFun()")) diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/noAnnotationConstructorUsage.kt b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/noAnnotationConstructorUsage.kt index f4567c0c6f2..84a95973599 100644 --- a/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/noAnnotationConstructorUsage.kt +++ b/idea/testData/quickfix/deprecatedSymbolUsage/classUsages/noAnnotationConstructorUsage.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false" @deprecated("") class C(p: Int) diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt b/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt index f5fb3e78443..cd7e83dedea 100644 --- a/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt +++ b/idea/testData/quickfix/deprecatedSymbolUsage/incorrectArgs.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false" // ERROR: An integer literal does not conform to the expected type kotlin.String @deprecated("", ReplaceWith("newFun()", imports = 123)) diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/incorrectReplacement.kt b/idea/testData/quickfix/deprecatedSymbolUsage/incorrectReplacement.kt index 324ed70b491..84fde55081d 100644 --- a/idea/testData/quickfix/deprecatedSymbolUsage/incorrectReplacement.kt +++ b/idea/testData/quickfix/deprecatedSymbolUsage/incorrectReplacement.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false" @deprecated("", ReplaceWith("=")) fun oldFun() { diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/javaDeprecated.before.Main.kt b/idea/testData/quickfix/deprecatedSymbolUsage/javaDeprecated.before.Main.kt index 4c5a64968db..f08b1055f14 100644 --- a/idea/testData/quickfix/deprecatedSymbolUsage/javaDeprecated.before.Main.kt +++ b/idea/testData/quickfix/deprecatedSymbolUsage/javaDeprecated.before.Main.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false" fun foo() { val c = JavaClass() diff --git a/idea/testData/quickfix/deprecatedSymbolUsage/noReplacement.kt b/idea/testData/quickfix/deprecatedSymbolUsage/noReplacement.kt index 0124dcf0140..2aef2220558 100644 --- a/idea/testData/quickfix/deprecatedSymbolUsage/noReplacement.kt +++ b/idea/testData/quickfix/deprecatedSymbolUsage/noReplacement.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.kotlin.idea.quickfix.DeprecatedSymbolUsageFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix" "false" @deprecated("") fun oldFun() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt index bc1361e6112..fd0a00d0620 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/DeprecatedSymbolUsageFixSpecialTest.kt @@ -16,14 +16,10 @@ package org.jetbrains.kotlin.idea.quickfix; -import com.intellij.openapi.projectRoots.JavaSdk -import com.intellij.openapi.projectRoots.Sdk -import com.intellij.testFramework.LightPlatformTestCase import com.intellij.testFramework.TestDataPath -import org.apache.commons.lang.SystemUtils -import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil +import org.jetbrains.kotlin.idea.quickfix.replaceWith.DeprecatedSymbolUsageFix +import org.jetbrains.kotlin.idea.quickfix.replaceWith.ReplaceWith import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.idea.util.application.executeWriteCommand import org.jetbrains.kotlin.psi.JetSimpleNameExpression