From 0b64f028b62f967c05b50a32d459346e4589a8ae Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 17:05:06 +0300 Subject: [PATCH] Rename jet -> kotlin in idea: quickfixes org.jetbrains.jet.plugin.quickfix -> org.jetbrains.kotlin.idea.quickfix --- .../kotlin/generators/tests/GenerateTests.kt | 4 +-- .../plugin/codeInsight/ShortenReferences.kt | 2 +- .../jet/plugin/highlighter/JetPsiChecker.kt | 8 +---- .../KotlinSuppressableWarningProblemGroup.kt | 4 +-- .../idea}/quickfix/ImportInsertHelper.java | 6 ++-- .../quickfix/JetIntentionActionsFactory.kt | 4 +-- .../quickfix/KotlinSuppressIntentionAction.kt | 4 +-- .../idea}/quickfix/QuickFixes.java | 4 +-- .../idea}/quickfix/generateUtil.kt | 4 +-- idea/src/META-INF/plugin.xml | 6 ++-- .../jet/plugin/PluginStartupComponent.java | 2 +- .../plugin/actions/JetAddImportAction.java | 2 +- .../KotlinCopyPasteReferenceProcessor.kt | 2 +- .../OverrideImplementMethodsHandler.java | 2 +- .../plugin/completion/CompletionSorting.kt | 4 +-- .../completion/NamedParametersCompletion.kt | 2 +- .../handlers/KotlinCallableInsertHandler.kt | 2 +- .../plugin/imports/KotlinImportOptimizer.kt | 2 +- .../quickfix/DelegatingIntentionAction.kt | 5 --- .../changeSignature/JetChangeSignature.kt | 2 +- .../jet/plugin/refactoring/move/moveUtils.kt | 2 +- .../idea}/quickfix/AddFunctionBodyFix.java | 4 +-- .../quickfix/AddFunctionParametersFix.java | 4 +-- .../quickfix/AddFunctionToSupertypeFix.java | 4 +-- .../idea}/quickfix/AddModifierFix.java | 4 +-- .../idea}/quickfix/AddNameToArgumentFix.java | 4 +-- .../AddOpenModifierToClassDeclarationFix.java | 4 +-- ...ddOverrideToEqualsHashCodeToStringFix.java | 4 +-- .../AddSemicolonAfterFunctionCallFix.java | 4 +-- .../idea}/quickfix/AddStarProjectionsFix.java | 4 +-- .../idea}/quickfix/AddWhenElseBranchFix.java | 4 +-- .../idea}/quickfix/AutoImportFix.kt | 4 +-- .../idea}/quickfix/CastExpressionFix.java | 4 +-- .../idea}/quickfix/ChangeAccessorTypeFix.java | 4 +-- .../ChangeFunctionLiteralReturnTypeFix.java | 4 +-- .../ChangeFunctionLiteralSignatureFix.java | 4 +-- .../quickfix/ChangeFunctionReturnTypeFix.java | 4 +-- .../quickfix/ChangeFunctionSignatureFix.java | 4 +-- .../ChangeMemberFunctionSignatureFix.java | 4 +-- .../quickfix/ChangeParameterTypeFix.java | 4 +-- .../quickfix/ChangeToBackingFieldFix.java | 4 +-- .../ChangeToConstructorInvocationFix.java | 4 +-- .../ChangeToFunctionInvocationFix.java | 4 +-- .../quickfix/ChangeToPropertyNameFix.java | 4 +-- .../quickfix/ChangeToStarProjectionFix.java | 4 +-- .../idea}/quickfix/ChangeTypeFix.java | 4 +-- .../quickfix/ChangeVariableMutabilityFix.java | 4 +-- .../idea}/quickfix/ChangeVariableTypeFix.java | 4 +-- .../quickfix/ChangeVisibilityModifierFix.java | 4 +-- .../quickfix/DelegatingIntentionAction.kt | 21 +++++++++++ .../idea}/quickfix/ExclExclCallFix.java | 4 +-- .../quickfix/ImportInsertHelperImpl.java | 12 +++---- .../IncorrectSourceRootNameNotification.java | 4 +-- .../idea}/quickfix/JetHintAction.java | 4 +-- .../idea}/quickfix/JetIntentionAction.java | 4 +-- .../JetSingleIntentionActionFactory.kt | 4 +-- .../MakeClassAnAnnotationClassFix.java | 4 +-- .../quickfix/MakeOverriddenMemberOpenFix.java | 4 +-- .../quickfix/MapPlatformClassToKotlinFix.java | 4 +-- .../idea}/quickfix/MoveWhenElseBranchFix.java | 4 +-- .../QuickFixFactoryForTypeMismatchError.java | 4 +-- .../idea}/quickfix/QuickFixRegistrar.java | 17 +++++---- .../idea}/quickfix/QuickFixUtil.java | 4 +-- .../idea}/quickfix/RemoveFunctionBodyFix.java | 4 +-- .../quickfix/RemoveFunctionParametersFix.java | 4 +-- .../idea}/quickfix/RemoveModifierFix.java | 4 +-- .../idea}/quickfix/RemoveNullableFix.java | 4 +-- .../quickfix/RemovePartsFromPropertyFix.java | 4 +-- .../quickfix/RemovePsiElementSimpleFix.java | 4 +-- .../RemoveRightPartOfBinaryExpressionFix.java | 4 +-- .../idea}/quickfix/RemoveSupertypeFix.java | 4 +-- .../RemoveValVarFromParameterFix.java | 4 +-- ...meParameterToMatchOverriddenMethodFix.java | 4 +-- .../idea}/quickfix/ReplaceCallFix.java | 4 +-- .../idea}/quickfix/ReplaceInfixCallFix.java | 4 +-- ...ReplaceOperationInBinaryExpressionFix.java | 4 +-- .../quickfix/SpecifyTypeExplicitlyFix.java | 4 +-- .../createFromUsage/CreateFromUsageFixBase.kt | 6 ++-- .../callableBuilder/CallableBuilder.kt | 6 ++-- .../callableBuilder/CallableInfo.kt | 20 +++++++++-- .../callableBuilder/templateExpressions.kt | 22 +++++++++--- .../callableBuilder/typeUtils.kt | 18 +++++++++- ...mCallWithConstructorCalleeActionFactory.kt | 24 ++++++++++--- ...teClassFromConstructorCallActionFactory.kt | 24 ++++++++++--- ...assFromReferenceExpressionActionFactory.kt | 27 +++++++++----- ...eateClassFromTypeReferenceActionFactory.kt | 24 ++++++++++--- .../createClass/CreateClassFromUsageFix.kt | 20 +++++------ .../createClass/createClassUtils.kt | 26 +++++++++++--- .../CreateBinaryOperationActionFactory.kt | 22 ++++++++++-- .../CreateCallableFromUsageFix.kt | 22 ++++++++++-- .../CreateComponentFunctionActionFactory.kt | 24 ++++++++++--- ...FunctionOrPropertyFromCallActionFactory.kt | 22 ++++++++++-- .../CreateGetFunctionActionFactory.kt | 24 ++++++++++--- .../CreateHasNextFunctionActionFactory.kt | 24 ++++++++++--- .../CreateInvokeFunctionActionFactory.kt | 24 ++++++++++--- .../CreateIteratorFunctionActionFactory.kt | 24 ++++++++++--- .../CreateNextFunctionActionFactory.kt | 24 ++++++++++--- ...ePropertyDelegateAccessorsActionFactory.kt | 28 +++++++++++---- .../CreateSetFunctionActionFactory.kt | 24 ++++++++++--- .../CreateUnaryOperationActionFactory.kt | 25 +++++++++---- .../CreateLocalVariableActionFactory.kt | 36 +++++++++++++------ .../CreateParameterActionFactory.kt | 28 +++++++++++---- ...teParameterByNamedArgumentActionFactory.kt | 10 +++--- .../CreateParameterFromUsageFix.kt | 6 ++-- .../afterUnqualifiedMapOneArg.kt | 4 +-- .../beforeUnqualifiedMapOneArg.kt | 4 +-- .../javaClass/afterFooOfC2.kt | 4 +-- .../javaClass/afterJavaClassOfCRuntime.kt | 4 +-- .../javaClass/beforeFooOfC2.kt | 4 +-- .../javaClass/beforeJavaClassOfCRuntime.kt | 4 +-- .../when/afterUnqualifiedMapOneArg.kt | 4 +-- .../when/beforeUnqualifiedMapOneArg.kt | 4 +-- .../afterNotAvailableForSynthesized.kt | 4 +-- ...foreAddParameterNotAvailableForBuiltins.kt | 4 +-- ...eforeAddParameterNotAvailableForLibrary.kt | 4 +-- .../beforeNotAvailableForSynthesized.kt | 4 +-- ...eRemoveParameterNotAvailableForBuiltins.kt | 4 +-- .../beforeEnumSupertype.kt | 2 +- .../beforeEnumUpperBound.kt | 2 +- .../beforeFinalLibrarySupertype.kt | 2 +- .../beforeFinalLibraryUpperBound.kt | 2 +- .../FinalJavaSupertype.before.kt | 2 +- .../FinalJavaUpperBound.before.kt | 2 +- .../beforeCannotMakeClassAnnotation.kt | 2 +- .../beforeOverridingFinalJavaMethod.kt | 4 +-- ...idingWritableAndNotWritableFinalMembers.kt | 2 +- ...foreParameterNameChangedAmbiguousRename.kt | 2 +- .../beforeNoOpenSuperFunction.kt | 2 +- ...enPropertyTypeToMatchOverridingProperty.kt | 4 +-- ...ePropertyTypeToMatchOverridenProperties.kt | 4 +-- ...antChangeReturnTypeOfOverriddenFunction.kt | 4 +-- .../beforeSupertypeNotInitialized.kt | 2 +- .../typeMismatch/casts/beforeTypeMismatch4.kt | 4 +-- .../beforeChangeFunctionParameterType5.kt | 4 +-- .../beforeMultiFakeOverride.kt | 4 +-- ...CantEvaluateToExpresionThatTypeMismatch.kt | 4 +-- .../when/beforeTwoElseBranchesInWhen.kt | 4 +-- ...AbstractEditorForEvaluateExpressionTest.kt | 2 +- .../imports/OptimizeImportsOnFlyTest.java | 4 +-- .../JetQuickDocProviderTestGenerated.java | 1 + .../AbstractQuickFixMultiFileTest.java | 4 +-- .../idea}/quickfix/AbstractQuickFixTest.java | 4 +-- .../AddOpenToClassDeclarationTest.java | 4 +-- .../idea}/quickfix/ImportClassHelperTest.java | 8 ++--- .../QuickFixMultiFileTestGenerated.java | 2 +- .../idea}/quickfix/QuickFixTestGenerated.java | 2 +- ...esolveDescriptorRendererTestGenerated.java | 1 + .../PartialBodyResolveTestGenerated.java | 1 + .../ReferenceResolveInJavaTestGenerated.java | 1 + ...eResolveInLibrarySourcesTestGenerated.java | 1 + .../ReferenceResolveWithLibTestGenerated.java | 1 + ...vaWithWrongFileStructureTestGenerated.java | 1 + 152 files changed, 712 insertions(+), 354 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ImportInsertHelper.java (95%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/JetIntentionActionsFactory.kt (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/KotlinSuppressIntentionAction.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/QuickFixes.java (94%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/generateUtil.kt (97%) delete mode 100644 idea/src/org/jetbrains/jet/plugin/quickfix/DelegatingIntentionAction.kt rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddFunctionBodyFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddFunctionParametersFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddFunctionToSupertypeFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddModifierFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddNameToArgumentFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddOpenModifierToClassDeclarationFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddOverrideToEqualsHashCodeToStringFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddSemicolonAfterFunctionCallFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddStarProjectionsFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddWhenElseBranchFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AutoImportFix.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/CastExpressionFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeAccessorTypeFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeFunctionLiteralReturnTypeFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeFunctionLiteralSignatureFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeFunctionReturnTypeFix.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeFunctionSignatureFix.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeMemberFunctionSignatureFix.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeParameterTypeFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeToBackingFieldFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeToConstructorInvocationFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeToFunctionInvocationFix.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeToPropertyNameFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeToStarProjectionFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeTypeFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeVariableMutabilityFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeVariableTypeFix.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ChangeVisibilityModifierFix.java (98%) create mode 100644 idea/src/org/jetbrains/kotlin/idea/quickfix/DelegatingIntentionAction.kt rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ExclExclCallFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ImportInsertHelperImpl.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/IncorrectSourceRootNameNotification.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/JetHintAction.java (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/JetIntentionAction.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/JetSingleIntentionActionFactory.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/MakeClassAnAnnotationClassFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/MakeOverriddenMemberOpenFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/MapPlatformClassToKotlinFix.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/MoveWhenElseBranchFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/QuickFixFactoryForTypeMismatchError.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/QuickFixRegistrar.java (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/QuickFixUtil.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemoveFunctionBodyFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemoveFunctionParametersFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemoveModifierFix.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemoveNullableFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemovePartsFromPropertyFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemovePsiElementSimpleFix.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemoveRightPartOfBinaryExpressionFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemoveSupertypeFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RemoveValVarFromParameterFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/RenameParameterToMatchOverriddenMethodFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ReplaceCallFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ReplaceInfixCallFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ReplaceOperationInBinaryExpressionFix.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/SpecifyTypeExplicitlyFix.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/CreateFromUsageFixBase.kt (84%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/callableBuilder/CallableInfo.kt (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/callableBuilder/templateExpressions.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/callableBuilder/typeUtils.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt (78%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt (79%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt (86%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt (77%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt (85%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createClass/createClassUtils.kt (83%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt (72%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt (82%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt (64%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt (86%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt (53%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt (54%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt (62%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt (69%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt (56%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt (74%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt (73%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt (59%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt (67%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt (83%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt (90%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt (91%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AbstractQuickFixMultiFileTest.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AbstractQuickFixTest.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/AddOpenToClassDeclarationTest.java (95%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/ImportClassHelperTest.java (97%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/QuickFixMultiFileTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/quickfix/QuickFixTestGenerated.java (99%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 2ad12dfe96e..65c4fe001b6 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -42,14 +42,14 @@ import org.jetbrains.kotlin.repl.AbstractReplInterpreterTest import org.jetbrains.kotlin.cfg.AbstractControlFlowTest import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest import org.jetbrains.kotlin.checkers.AbstractJetJsCheckerTest -import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest +import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixTest import org.jetbrains.kotlin.completion.AbstractJSBasicCompletionTest import org.jetbrains.kotlin.completion.AbstractKeywordCompletionTest import org.jetbrains.kotlin.completion.AbstractJvmSmartCompletionTest import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest import org.jetbrains.kotlin.completion.AbstractJvmWithLibBasicCompletionTest import org.jetbrains.jet.plugin.navigation.AbstractGotoSuperTest -import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixMultiFileTest +import org.jetbrains.kotlin.idea.quickfix.AbstractQuickFixMultiFileTest import org.jetbrains.jet.plugin.highlighter.AbstractHighlightingTest import org.jetbrains.jet.plugin.folding.AbstractKotlinFoldingTest import org.jetbrains.jet.plugin.codeInsight.surroundWith.AbstractSurroundWithTest diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index c5c89926f1e..9f8be671f77 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.HashSet; import com.intellij.psi.util.PsiTreeUtil diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt index 2f7230dcda8..48f2619bc52 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt @@ -18,7 +18,6 @@ package org.jetbrains.jet.plugin.highlighter import com.intellij.codeInsight.daemon.impl.HighlightRangeExtension import com.intellij.codeInsight.intention.EmptyIntentionAction -import com.intellij.codeInsight.intention.IntentionAction import com.intellij.codeInspection.ProblemHighlightType import com.intellij.lang.annotation.Annotation import com.intellij.lang.annotation.AnnotationHolder @@ -26,14 +25,11 @@ import com.intellij.lang.annotation.Annotator import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.editor.colors.TextAttributesKey import com.intellij.openapi.progress.ProcessCanceledException -import com.intellij.openapi.util.TextRange import com.intellij.psi.MultiRangeReference import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile -import com.intellij.psi.PsiReference import com.intellij.xml.util.XmlStringUtil import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Severity @@ -46,10 +42,8 @@ import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.jet.plugin.util.ProjectRootsUtil import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode import org.jetbrains.jet.plugin.caches.resolve.* -import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory -import org.jetbrains.jet.plugin.quickfix.QuickFixes +import org.jetbrains.kotlin.idea.quickfix.QuickFixes import kotlin.platform.platformStatic -import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS public open class JetPsiChecker : Annotator, HighlightRangeExtension { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt index b6b91cc152d..b48f7d1af31 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinSuppressableWarningProblemGroup.kt @@ -21,9 +21,9 @@ import com.intellij.psi.PsiElement import com.intellij.codeInspection.SuppressIntentionAction import org.jetbrains.kotlin.diagnostics.Severity import java.util.Collections -import org.jetbrains.jet.plugin.quickfix.KotlinSuppressIntentionAction +import org.jetbrains.kotlin.idea.quickfix.KotlinSuppressIntentionAction import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.plugin.quickfix.AnnotationHostKind +import org.jetbrains.kotlin.idea.quickfix.AnnotationHostKind import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelper.java similarity index 95% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelper.java index f7d2839bf58..848b5af004c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.components.ServiceManager; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetImportDirective; import org.jetbrains.kotlin.resolve.ImportPath; -import org.jetbrains.kotlin.name.FqName; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionActionsFactory.kt similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionActionsFactory.kt index 04236f4b8a4..dfe5c6f2e10 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/JetIntentionActionsFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionActionsFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix +package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.diagnostics.Diagnostic diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt index 39090fd454c..d77da14425c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix +package org.jetbrains.kotlin.idea.quickfix import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.java similarity index 94% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.java index d163ef23fc8..7b582615a44 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/QuickFixes.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/generateUtil.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/generateUtil.kt index df74d476213..3ee7a7f0dca 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/generateUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/generateUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix +package org.jetbrains.kotlin.idea.quickfix import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 4dfd0499dc0..67a987b9698 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -145,8 +145,8 @@ - + @@ -426,7 +426,7 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java b/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java index d05665d586e..7208326f9ba 100644 --- a/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java +++ b/idea/src/org/jetbrains/jet/plugin/PluginStartupComponent.java @@ -20,7 +20,7 @@ import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.components.ApplicationComponent; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.debugger.filter.FilterPackage; -import org.jetbrains.jet.plugin.quickfix.QuickFixRegistrar; +import org.jetbrains.kotlin.idea.quickfix.QuickFixRegistrar; import org.jetbrains.kotlin.utils.PathUtil; public class PluginStartupComponent implements ApplicationComponent { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java index 8b7a0d60a1b..1c53d184f09 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java @@ -32,8 +32,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 76a9360a48e..414f89ef6e6 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.codeInsight.editorActions.ReferenceTransferableData import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import org.jetbrains.kotlin.name.FqName import com.intellij.openapi.project.Project import com.intellij.openapi.util.Ref diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 6c3bb8d5591..f4e97e8c7cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -32,9 +32,9 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.plugin.quickfix.QuickfixPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.idea.quickfix.QuickfixPackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt index 49574f3a60e..55a7dbc2959 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt @@ -24,8 +24,6 @@ import com.intellij.codeInsight.lookup.LookupElementWeigher import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.WeighingContext import org.jetbrains.jet.plugin.completion.* -import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor -import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -39,7 +37,7 @@ import com.intellij.psi.PsiClass import java.util.HashSet import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt index 2521cf1cec8..f6dc8564230 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.kotlin.descriptors.FunctionDescriptor import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.plugin.JetIcons -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.completion.InsertionContext diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt index 0035a8857dd..a67e05f05e3 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt @@ -29,7 +29,7 @@ import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.resolve.DescriptorUtils -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import com.intellij.openapi.editor.Document import org.jetbrains.kotlin.types.JetType import com.intellij.openapi.util.TextRange diff --git a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt index c810344dd26..9e1e225221d 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.name.* import org.jetbrains.jet.plugin.references.JetReference import java.util.HashSet import java.util.ArrayList -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class KotlinImportOptimizer() : ImportOptimizer { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/DelegatingIntentionAction.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/DelegatingIntentionAction.kt deleted file mode 100644 index bb8a00a5993..00000000000 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/DelegatingIntentionAction.kt +++ /dev/null @@ -1,5 +0,0 @@ -package org.jetbrains.jet.plugin.quickfix - -import com.intellij.codeInsight.intention.IntentionAction - -public open class DelegatingIntentionAction(val delegate: IntentionAction): IntentionAction by delegate diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt index 6d6a4e4a94a..ae2c4d88631 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt @@ -31,7 +31,7 @@ import java.util.* import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.* import org.jetbrains.annotations.TestOnly import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import com.intellij.CommonBundle import com.intellij.refactoring.RefactoringBundle import org.jetbrains.kotlin.resolve.OverrideResolver diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt index ccfd2614ea6..dee1283ea18 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetImportDirective import java.util.ArrayList import com.intellij.refactoring.util.NonCodeUsageInfo -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java index 2c4d6f6ea5d..913e7c1465c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionBodyFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java index 674a3a722e9..6789bc07537 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java index e941535dbc4..f5218b3af8d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.google.common.collect.Lists; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.java index 7a7a88c3243..7861a7d726c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddModifierFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java index fbdbd6e5314..6bfec927256 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.google.common.collect.Lists; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java index 12bbbee9e55..0677d59c19d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOpenModifierToClassDeclarationFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java index fc4ab030618..7b0453af7ad 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddOverrideToEqualsHashCodeToStringFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddSemicolonAfterFunctionCallFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddSemicolonAfterFunctionCallFix.java index 030fc725785..7c38cacfeb3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddSemicolonAfterFunctionCallFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddSemicolonAfterFunctionCallFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java index 8ac8a3af899..b91fff879ee 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java index 4d160ece4d1..3e4f581f33c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddWhenElseBranchFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.CodeInsightUtilBase; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt index 607a5de3ef0..57bc566f89c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix +package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.daemon.impl.ShowAutoImportPass import com.intellij.codeInsight.hint.HintManager diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java index f20f31f7aa9..a3d2215859b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java index 556c47559f9..bcc722f0a0c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java index 6c2085fd8fb..6a2015a8221 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java index ed8cb3028b4..de88c1458c1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java index f7a5f04223b..e7c089b2701 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java index a0c6f5185c0..cb3a4df36c6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionSignatureFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java index 3c6743d94e5..a35c4443354 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.google.common.base.Function; import com.google.common.collect.Collections2; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java index 1b8012acf8b..3dee4cb14c1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToBackingFieldFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToBackingFieldFix.java index 43f33571452..955b71dd085 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToBackingFieldFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToBackingFieldFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToConstructorInvocationFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToConstructorInvocationFix.java index 8a59df6ec5b..ea1b6e45108 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToConstructorInvocationFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java index 0a3caf01d63..da716f74a00 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToFunctionInvocationFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToPropertyNameFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToPropertyNameFix.java index db678029c1b..c5378dccb9c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToPropertyNameFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToPropertyNameFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java index 029d051f7a8..07ceb8ee5fd 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java index e55973681f3..9eef9d90003 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.java index b1257ce3985..f4ffb73f84d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java index fa37a806716..4781b626739 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.diagnostic.Logger; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java index fe5a952c3fc..79c0b6a1daa 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/DelegatingIntentionAction.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/DelegatingIntentionAction.kt new file mode 100644 index 00000000000..ccfe4377892 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/DelegatingIntentionAction.kt @@ -0,0 +1,21 @@ +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix + +import com.intellij.codeInsight.intention.IntentionAction + +public open class DelegatingIntentionAction(val delegate: IntentionAction): IntentionAction by delegate diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFix.java index d06cae266b7..43d6411b1ec 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.java index 53fe6da13b4..80b907e0516 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ImportInsertHelperImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.actions.OptimizeImportsProcessor; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.plugin.project.ProjectStructureUtil; +import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.NamePackage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.NamePackage; -import org.jetbrains.jet.plugin.project.ProjectStructureUtil; -import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/IncorrectSourceRootNameNotification.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/IncorrectSourceRootNameNotification.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/IncorrectSourceRootNameNotification.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/IncorrectSourceRootNameNotification.java index de1d286bcba..b5e6cc5d089 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/IncorrectSourceRootNameNotification.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/IncorrectSourceRootNameNotification.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.ide.actions.OpenFileAction; import com.intellij.openapi.application.ApplicationManager; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JetHintAction.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetHintAction.java similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/quickfix/JetHintAction.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/JetHintAction.java index 5d36e5e326d..73531f755b8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JetHintAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetHintAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInspection.HintAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionAction.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionAction.java index 2cdce1fe87e..244987948b5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetSingleIntentionActionFactory.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/JetSingleIntentionActionFactory.kt index a8042f09464..0325e7a668d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/JetSingleIntentionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/JetSingleIntentionActionFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix +package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.diagnostics.Diagnostic diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java index 415bad17ac0..8614ba05384 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeClassAnAnnotationClassFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.java index 0894d1e081f..95a54d6b480 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.google.common.collect.Sets; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java index aa471e3f697..8ad0b60b894 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.template.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java index 362cd35701c..a3dab2aec79 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MoveWhenElseBranchFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.CodeInsightUtilBase; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java index b46042ab71f..c3c68fc7758 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.diagnostic.Logger; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java index b220510ef1f..9d68ada8d13 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixRegistrar.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,13 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; -import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler; -import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.*; -import org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction.*; -import org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable.*; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromCallWithConstructorCalleeActionFactory; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromConstructorCallActionFactory; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromReferenceExpressionActionFactory; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromTypeReferenceActionFactory; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction.*; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateLocalVariableActionFactory; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateParameterActionFactory; +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable.CreateParameterByNamedArgumentActionFactory; +import org.jetbrains.kotlin.psi.JetClass; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixUtil.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixUtil.java index 6b1623f21ba..8cffd698dab 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.google.common.collect.Sets; import com.intellij.extapi.psi.ASTDelegatePsiElement; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java index 74efac5ac6e..ac71efd647f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionBodyFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.extapi.psi.ASTDelegatePsiElement; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java index 6fcbd5698f5..3acba389ea4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.java index d44859bd1a2..6008320b3e2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.extapi.psi.ASTDelegatePsiElement; import com.intellij.lang.ASTNode; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java index ea435b089f0..4312bfd3de0 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveNullableFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java index 9d55544a04b..559b6a9b668 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java index 80a3a28a5fc..e24c9e613d0 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePsiElementSimpleFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java index 0ac907b8eac..c84b2ded856 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveRightPartOfBinaryExpressionFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java index 268c87663c5..12bbde92011 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveSupertypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.lang.ASTNode; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java index 3a37ee9b187..e9740e78586 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveValVarFromParameterFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.lang.ASTNode; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java index 89867fc08d2..5e4cfeb2f55 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.java index 9ecff80c4b2..038a4c95f4f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceCallFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.java index 58b5dcd9438..5c87f787939 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceInfixCallFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java index 6beb88642fd..35741e6dade 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ReplaceOperationInBinaryExpressionFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java rename to idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.java index 915fe99f644..2a1b374348c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt similarity index 84% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt index 17408c887d8..feed0c8f9b6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/CreateFromUsageFixBase.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix.createFromUsage +package org.jetbrains.kotlin.idea.quickfix.createFromUsage import com.intellij.psi.PsiElement import org.jetbrains.kotlin.idea.JetBundle -import org.jetbrains.jet.plugin.quickfix.JetIntentionAction +import org.jetbrains.kotlin.idea.quickfix.JetIntentionAction public abstract class CreateFromUsageFixBase(element: PsiElement) : JetIntentionAction(element) { override fun getFamilyName(): String = JetBundle.message("create.from.usage.family") diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 6f9228c1378..176261087f3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder import com.intellij.codeInsight.navigation.NavigationUtil import com.intellij.codeInsight.template.* @@ -62,7 +62,7 @@ import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl import java.util.LinkedHashMap import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers -import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.ClassKind import org.jetbrains.kotlin.idea.util.isAny import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.jetbrains.kotlin.psi.psiUtil.siblings diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt index e0f178ee881..7e86d6bf8a1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt @@ -1,4 +1,20 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder import java.util.Collections import org.jetbrains.kotlin.psi.JetExpression @@ -14,7 +30,7 @@ import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetTypeReference -import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.ClassInfo import org.jetbrains.kotlin.idea.util.makeNotNullable /** diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt index 5d828140b29..36750efd0fc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/templateExpressions.kt @@ -1,4 +1,20 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder import com.intellij.codeInsight.template.Expression import com.intellij.codeInsight.template.ExpressionContext @@ -14,15 +30,11 @@ import org.jetbrains.kotlin.psi.JetParameter import java.util.HashSet import org.jetbrains.jet.plugin.refactoring.CollectingValidator import com.intellij.codeInsight.lookup.LookupElementBuilder -import org.jetbrains.kotlin.types.JetType -import org.jetbrains.kotlin.psi.JetCallableDeclaration import java.util.Collections import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.psi.JetClass -import org.jetbrains.kotlin.psi.JetParameterList import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt index f0a9dc51aa4..276f80dc747 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -1,4 +1,20 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt similarity index 78% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt index af7ac68ca11..25e2ece0433 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt @@ -1,13 +1,29 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ParameterInfo +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetAnnotationEntry import org.jetbrains.kotlin.psi.JetUserType diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt similarity index 79% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt index dcbedba4846..6f5cf63eb7d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt @@ -1,4 +1,20 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction @@ -8,11 +24,11 @@ import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getCall -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ParameterInfo +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetAnnotationEntry diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt similarity index 86% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt index 2fba1c6287a..4dd0d444922 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt @@ -1,4 +1,20 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction @@ -7,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetTypeReference import java.util.Collections -import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory +import org.jetbrains.kotlin.idea.quickfix.JetIntentionActionsFactory import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS @@ -18,16 +34,11 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.psi.JetReferenceExpression import java.util.Arrays import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.psiUtil.isDotReceiver -import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix -import org.jetbrains.kotlin.descriptors.PackageViewDescriptor -import org.jetbrains.kotlin.name.FqName -import java.util.ArrayList -import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList public object CreateClassFromReferenceExpressionActionFactory : JetIntentionActionsFactory() { override fun doCreateActions(diagnostic: Diagnostic): List { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt similarity index 77% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt index 5d1a28dbf38..fbb592b7e96 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt @@ -1,14 +1,30 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetIntentionActionsFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass + +import org.jetbrains.kotlin.idea.quickfix.JetIntentionActionsFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import java.util.Collections import org.jetbrains.kotlin.psi.JetUserType import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt similarity index 85% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt index ff14a876dc7..17d8aba0dde 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass -import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.idea.JetBundle import com.intellij.openapi.project.Project @@ -26,16 +26,16 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiDirectory import org.jetbrains.kotlin.idea.JetFileType import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ConstructorInfo -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallableBuilderConfiguration +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ParameterInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ConstructorInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.CallableBuilderConfiguration import java.util.Collections -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.createBuilder +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.createBuilder import com.intellij.openapi.command.CommandProcessor -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallablePlacement +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.CallablePlacement import org.jetbrains.jet.plugin.refactoring.getOrCreateKotlinFile -import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.ClassKind.* import com.intellij.psi.PsiPackage import com.intellij.openapi.module.ModuleUtilCore import com.intellij.ide.util.DirectoryChooserUtil diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt similarity index 83% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt index eeb33cf528c..1a9bc024817 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt @@ -1,4 +1,20 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -8,24 +24,24 @@ import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import com.intellij.psi.JavaPsiFacade import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.scopes.receivers.Qualifier -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.noSubstitutions +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.noSubstitutions import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix -import org.jetbrains.jet.plugin.quickfix.DelegatingIntentionAction +import org.jetbrains.kotlin.idea.quickfix.DelegatingIntentionAction import org.jetbrains.kotlin.idea.JetBundle import com.intellij.psi.PsiPackage import org.jetbrains.jet.plugin.refactoring.canRefactor diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt similarity index 72% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt index fa183899208..bea267cea8f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt @@ -1,6 +1,22 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetBinaryExpression @@ -10,7 +26,7 @@ import org.jetbrains.kotlin.types.Variance import java.util.Collections import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* public object CreateBinaryOperationActionFactory: JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt similarity index 82% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt index d785c9e7cdf..0206f94c7f7 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt @@ -1,6 +1,22 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.idea.JetBundle @@ -10,7 +26,7 @@ import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.plugin.refactoring.chooseContainerElementIfNecessary import org.jetbrains.kotlin.psi.JetClassBody -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import java.util.HashSet diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt similarity index 64% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt index efb0200203d..cf46a8fbe2c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt @@ -1,15 +1,31 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.resolve.dataClassUtils.* import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* object CreateComponentFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt similarity index 86% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt index caec0fe4585..53dc916df24 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt @@ -1,6 +1,22 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetCallExpression @@ -12,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.scopes.receivers.Qualifier -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt similarity index 53% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt index 869821c12a3..70d86c04fcd 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt @@ -1,12 +1,28 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* import java.util.Collections object CreateGetFunctionActionFactory : JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt similarity index 54% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt index d7521ce4792..4d64badaf1d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt @@ -1,15 +1,31 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* object CreateHasNextFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt similarity index 62% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt index c59fbaf6275..81b3413c90b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt @@ -1,15 +1,29 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* import java.util.Collections object CreateInvokeFunctionActionFactory : JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt similarity index 69% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt index 7377d74fdc6..62ecf07fbb5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt @@ -1,10 +1,26 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.types.Variance @@ -13,7 +29,7 @@ import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.kotlin.types.TypeProjectionImpl import java.util.Collections import org.jetbrains.kotlin.types.JetTypeImpl -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* object CreateIteratorFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt similarity index 56% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt index 90b5b947249..381e38cb9a6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt @@ -1,15 +1,31 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* object CreateNextFunctionActionFactory : JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt similarity index 74% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt index a99d835a6d0..058f90b4b42 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt @@ -1,19 +1,35 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.FunctionInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.ParameterInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.FunctionInfo import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallableInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.CallableInfo import com.intellij.util.SmartList import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt similarity index 73% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt index dd2f4ef5dc4..22e450062f1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt @@ -1,15 +1,31 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.types.Variance import java.util.ArrayList import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* import java.util.Collections import org.jetbrains.kotlin.psi.JetOperationExpression import org.jetbrains.kotlin.psi.JetUnaryExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt similarity index 59% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt index eed7c84b8c5..69075e27c0a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt @@ -1,16 +1,29 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createFunction + +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken -import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.types.Variance -import java.util.Collections import org.jetbrains.kotlin.psi.JetUnaryExpression -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* public object CreateUnaryOperationActionFactory: JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt similarity index 67% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt index a139dcb3c08..1564bf62951 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt @@ -1,22 +1,38 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable +/* + * 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. + */ -import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable + +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.kotlin.idea.JetBundle import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.kotlin.psi.JetBlockExpression -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallableBuilderConfiguration -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.createBuilder -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallablePlacement +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.CallableBuilderConfiguration +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.createBuilder +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.CallablePlacement import com.intellij.openapi.command.CommandProcessor import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.JetElement @@ -24,9 +40,9 @@ import org.jetbrains.jet.plugin.intentions.ConvertToBlockBodyAction import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.plugin.refactoring.getExtractionContainers import org.jetbrains.kotlin.psi.JetClassBody -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.PropertyInfo +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.PropertyInfo import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList object CreateLocalVariableActionFactory: JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt similarity index 83% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt index 0a1457fb76f..8f78185dff4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt @@ -1,14 +1,30 @@ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable +/* + * 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. + */ + +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.kotlin.psi.JetClass -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -20,7 +36,7 @@ import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.psiUtil.parents -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getTypeParameters +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getTypeParameters import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes import java.util.LinkedHashSet import org.jetbrains.kotlin.types.JetType @@ -31,7 +47,7 @@ import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt similarity index 90% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt index 58ada6503dd..c01200d5edc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable -import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory +import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult -import org.jetbrains.jet.plugin.quickfix.QuickFixUtil -import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes +import org.jetbrains.kotlin.idea.quickfix.QuickFixUtil +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo import org.jetbrains.kotlin.psi.JetValueArgument diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt rename to idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt index ece0993be9f..c5d1bd9e82a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * 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. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix.createFromUsage.createVariable +package org.jetbrains.kotlin.idea.quickfix.createFromUsage.createVariable import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.quickfix.createFromUsage.CreateFromUsageFixBase +import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.kotlin.idea.JetBundle import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor diff --git a/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt index ef4f69e79a8..48d62b0822f 100644 --- a/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt +++ b/idea/testData/quickfix/addStarProjections/afterUnqualifiedMapOneArg.kt @@ -1,5 +1,5 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" // ERROR: 2 type arguments expected public fun foo(a: Any) { a is Map -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt index 5a16bf5523d..a964e81394a 100644 --- a/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt +++ b/idea/testData/quickfix/addStarProjections/beforeUnqualifiedMapOneArg.kt @@ -1,5 +1,5 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" // ERROR: 2 type arguments expected public fun foo(a: Any) { a is Map -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt index f2d704178b5..ae6baeccdf9 100644 --- a/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt +++ b/idea/testData/quickfix/addStarProjections/javaClass/afterFooOfC2.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" // ERROR: Type argument expected class C2 @@ -6,4 +6,4 @@ fun foo() {} fun test() { foo>() -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt b/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt index 3fde48746a7..ab2c414b9a0 100644 --- a/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt +++ b/idea/testData/quickfix/addStarProjections/javaClass/afterJavaClassOfCRuntime.kt @@ -1,6 +1,6 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" class C fun test() { javaClass> -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt b/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt index f2d704178b5..ae6baeccdf9 100644 --- a/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt +++ b/idea/testData/quickfix/addStarProjections/javaClass/beforeFooOfC2.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" // ERROR: Type argument expected class C2 @@ -6,4 +6,4 @@ fun foo() {} fun test() { foo>() -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt b/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt index 22653272075..1a83bf59deb 100644 --- a/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt +++ b/idea/testData/quickfix/addStarProjections/javaClass/beforeJavaClassOfCRuntime.kt @@ -1,6 +1,6 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" class C fun test() { javaClass>() -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt index a10166fbe8b..70bffa0d704 100644 --- a/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt +++ b/idea/testData/quickfix/addStarProjections/when/afterUnqualifiedMapOneArg.kt @@ -1,8 +1,8 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" // ERROR: 2 type arguments expected public fun foo(a: Any) { when (a) { is Map -> {} else -> {} } -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt b/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt index 4073f595e96..d9a79a3259b 100644 --- a/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt +++ b/idea/testData/quickfix/addStarProjections/when/beforeUnqualifiedMapOneArg.kt @@ -1,8 +1,8 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddStarProjectionsFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddStarProjectionsFix" "false" // ERROR: 2 type arguments expected public fun foo(a: Any) { when (a) { is Map -> {} else -> {} } -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt b/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt index 24098b07b69..0bb6720b756 100644 --- a/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt +++ b/idea/testData/quickfix/changeSignature/afterNotAvailableForSynthesized.kt @@ -1,8 +1,8 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false" //ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data data class Data(val i: Int) {} fun usage(d: Data) { d.component1(2) -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt index 35eb8a98138..c86af94bc09 100644 --- a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt +++ b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForBuiltins.kt @@ -1,6 +1,6 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false" // ERROR: Too many arguments for public open fun equals(other: kotlin.Any?): kotlin.Boolean defined in kotlin.Any fun f(d: Any) { d.equals("a", "b") -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt index 36f062be3f8..923b47d9e29 100644 --- a/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt +++ b/idea/testData/quickfix/changeSignature/beforeAddParameterNotAvailableForLibrary.kt @@ -1,6 +1,6 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false" // ERROR: Too many arguments for public open fun equals(other: kotlin.Any!): kotlin.Boolean defined in java.lang.Object fun f(d: java.lang.Object) { d.equals("a", "b") -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt b/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt index e5b52e8d91e..4957f8da81b 100644 --- a/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt +++ b/idea/testData/quickfix/changeSignature/beforeNotAvailableForSynthesized.kt @@ -1,8 +1,8 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddFunctionParametersFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddFunctionParametersFix" "false" //ERROR: Too many arguments for internal final fun component1(): kotlin.Int defined in Data data class Data(val i: Int) {} fun usage(d: Data) { d.component1(2) -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt b/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt index 5eabb8d602a..e485fa63687 100644 --- a/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt +++ b/idea/testData/quickfix/changeSignature/beforeRemoveParameterNotAvailableForBuiltins.kt @@ -1,6 +1,6 @@ -// "class org.jetbrains.jet.plugin.quickfix.RemoveFunctionParametersFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.RemoveFunctionParametersFix" "false" // ERROR: No value passed for parameter other fun f(d: Boolean) { d.or() -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt index 924dafb7c6e..eda74fa9d2a 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumSupertype.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false" // ERROR: This type is final, so it cannot be inherited from // ERROR: Cannot access '': it is 'private' in 'E' enum class E {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt index da8b3c3aa4b..bba4e2ef3dc 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeEnumUpperBound.kt @@ -1,3 +1,3 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false" enum class E {} class A> {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt index 0b4558432e4..5b294760e60 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibrarySupertype.kt @@ -1,3 +1,3 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false" // ERROR: This type is final, so it cannot be inherited from class A : String() {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt index 0fc5ccf0845..2acea138dc6 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/beforeFinalLibraryUpperBound.kt @@ -1,2 +1,2 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false" class A> {} diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt index 59c8773159e..2893104ad36 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaSupertype.before.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false" // ERROR: This type is final, so it cannot be inherited from import testPackage.* diff --git a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt index 7dd0b282d83..0b7f0f28b1a 100644 --- a/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt +++ b/idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/FinalJavaUpperBound.before.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.AddOpenModifierToClassDeclarationFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.AddOpenModifierToClassDeclarationFix" "false" import testPackage.* class foo() {} diff --git a/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt b/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt index 4f85ff25d9f..24ba73d5229 100644 --- a/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt +++ b/idea/testData/quickfix/modifiers/beforeCannotMakeClassAnnotation.kt @@ -1,3 +1,3 @@ -// "class org.jetbrains.jet.plugin.quickfix.MakeClassAnAnnotationClassFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.MakeClassAnAnnotationClassFix" "false" // ERROR: 'String' is not an annotation class [String] class foo {} diff --git a/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt b/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt index 107cd921238..92b2811134d 100644 --- a/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt +++ b/idea/testData/quickfix/override/beforeOverridingFinalJavaMethod.kt @@ -1,5 +1,5 @@ -// "class org.jetbrains.jet.plugin.quickfix.MakeOverriddenMemberOpenFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix" "false" // ERROR: 'notify' in 'Object' is final and cannot be overridden class A : Object() { override fun notify() {} -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt b/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt index 12e0988aa09..71015dc2319 100644 --- a/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt +++ b/idea/testData/quickfix/override/beforeOverridingWritableAndNotWritableFinalMembers.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.MakeOverriddenMemberOpenFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.MakeOverriddenMemberOpenFix" "false" // ERROR: This type is final, so it cannot be inherited from // ERROR: Cannot access '': it is 'private' in 'E' // ERROR: 'ordinal' in 'E' is final and cannot be overridden diff --git a/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt b/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt index abb1a5e4a93..d6a132640fe 100644 --- a/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt +++ b/idea/testData/quickfix/override/beforeParameterNameChangedAmbiguousRename.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.RenameParameterToMatchOverriddenMethodFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.RenameParameterToMatchOverriddenMethodFix" "false" abstract class A { abstract fun foo(arg : Int) : Int; diff --git a/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt b/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt index 7e714e9480a..287d36a5020 100644 --- a/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt +++ b/idea/testData/quickfix/override/nothingToOverride/beforeNoOpenSuperFunction.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeMemberFunctionSignatureFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeMemberFunctionSignatureFix" "false" // ERROR: 'f' overrides nothing open class A { open fun foo() {} diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt index 55340b9b3c4..0f2ddea678b 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeOverriddenPropertyTypeToMatchOverridingProperty.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix" "false" // ERROR: Var-property type is 'kotlin.String', which is not a type of overridden
internal abstract var x: kotlin.Int defined in A trait A { var x: Int @@ -10,4 +10,4 @@ trait B { trait C : A, B { override var x: String -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt index 32537ee0873..2cffc07e9db 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangePropertyTypeToMatchOverridenProperties.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeVariableTypeFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeVariableTypeFix" "false" // ERROR: Var-property type is 'kotlin.Int', which is not a type of overridden
internal abstract var x: kotlin.String defined in A trait A { var x: String @@ -10,4 +10,4 @@ trait B { trait C : A, B { override var x: Int -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt index 3dafbd4f04f..46142460927 100644 --- a/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt +++ b/idea/testData/quickfix/override/typeMismatchOnOverride/beforeCantChangeReturnTypeOfOverriddenFunction.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeFunctionReturnTypeFix" "false" // ERROR: Return type is 'kotlin.Long', which is not a subtype of overridden
internal abstract fun foo(): kotlin.Int defined in A trait A { fun foo(): Int @@ -10,4 +10,4 @@ trait B { trait C : A, B { override fun foo(): Long -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt b/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt index eb257bc33b0..8ec0c332702 100644 --- a/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt +++ b/idea/testData/quickfix/supertypeInitialization/beforeSupertypeNotInitialized.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeToConstructorInvocationFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeToConstructorInvocationFix" "false" // ERROR: This type has a constructor, and thus must be initialized here open class A(x : Int) {} class B : A {} diff --git a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt b/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt index 2eabcef3e98..1e1da653a89 100644 --- a/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt +++ b/idea/testData/quickfix/typeMismatch/casts/beforeTypeMismatch4.kt @@ -1,8 +1,8 @@ -// "class org.jetbrains.jet.plugin.quickfix.CastExpressionFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.CastExpressionFix" "false" // ERROR: Type mismatch.
Required:B
Found:A
open class A class B : A() fun foo(a: A): B { return a: A -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt index 970b2d06fda..e2144fe8564 100644 --- a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt +++ b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeChangeFunctionParameterType5.kt @@ -1,5 +1,5 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeParameterTypeFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeParameterTypeFix" "false" // ERROR: Type mismatch.
Required:kotlin.Int
Found:kotlin.String
fun foo(y: Int = 0, z: (Int) -> String = {""}) { foo("": Int) -} \ No newline at end of file +} diff --git a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt index 9d033b6e447..2766953deff 100644 --- a/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt +++ b/idea/testData/quickfix/typeMismatch/parameterTypeMismatch/beforeMultiFakeOverride.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeParameterTypeFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeParameterTypeFix" "false" // ERROR: Type mismatch.
Required:kotlin.Int
Found:kotlin.String
trait A { fun f(i: Int): Boolean @@ -10,4 +10,4 @@ open class AA { class AAA: AA(), A -val c = AAA().f("") \ No newline at end of file +val c = AAA().f("") diff --git a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt index 78ab14f6f0c..c6ed8007279 100644 --- a/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt +++ b/idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression/beforeReturnedExpresionCantEvaluateToExpresionThatTypeMismatch.kt @@ -1,3 +1,3 @@ -// "class org.jetbrains.jet.plugin.quickfix.ChangeFunctionReturnTypeFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.ChangeFunctionReturnTypeFix" "false" // ERROR: Type mismatch.
Required:kotlin.Int
Found:kotlin.String
-fun foo(): Int = if (true) "": Int else 4 \ No newline at end of file +fun foo(): Int = if (true) "": Int else 4 diff --git a/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt b/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt index 7e977b64c6a..30447110c8a 100644 --- a/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt +++ b/idea/testData/quickfix/when/beforeTwoElseBranchesInWhen.kt @@ -1,4 +1,4 @@ -// "class org.jetbrains.jet.plugin.quickfix.MoveWhenElseBranchFix" "false" +// "class org.jetbrains.kotlin.idea.quickfix.MoveWhenElseBranchFix" "false" // ERROR: 'else' entry must be the last one in a when-expression // ERROR: 'else' entry must be the last one in a when-expression // WARNING: Unreachable code @@ -13,4 +13,4 @@ fun foo() { else -> { /* second else branch */ } 3 -> { /* some other code */ } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index c9d6b215565..dee54d403ac 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement import com.intellij.openapi.util.io.FileUtil import java.io.File import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.name.FqName diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java index 355f603bf02..24a8f8e104b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java @@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.imports; import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.idea.quickfix.ImportInsertHelper; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; +import org.jetbrains.kotlin.psi.JetFile; public class OptimizeImportsOnFlyTest extends LightDaemonAnalyzerTestCase { diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java index 2d956d4fe1c..2f23a34f51f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.editor.quickDoc; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java rename to idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index 7f99d361658..fb3ba2e1cd6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java rename to idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java index 844b9b1b7ca..a3270d75705 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.daemon.impl.HighlightInfo; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java similarity index 95% rename from idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java rename to idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java index 67499ebd868..8fe96ff2d66 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AddOpenToClassDeclarationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDocumentManager; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java rename to idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java index f2ca402dc5e..df2191cd627 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/ImportClassHelperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * 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. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetFile; import java.io.IOException; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java index 7da56dc926b..b5eac979353 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 1f1f4d6d13d..ec87dab8b44 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.quickfix; +package org.jetbrains.kotlin.idea.quickfix; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java index b1c1ff0226f..4834e2cfa68 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java index 068d81d8479..af602cfdb22 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java index 429f9147852..e413a5b67a7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java index ddd991db521..88cc804b280 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java index 9a9093192ef..7c6cc6ffcd2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java index 75070a498a9..4cb470ce986 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata;