From fe544eaf7107432387f3aea4b569f071b1d07071 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 17:21:53 +0300 Subject: [PATCH] Rename jet -> kotlin in idea: intentions org.jetbrains.jet.plugin.intentions -> org.jetbrains.kotlin.idea.intentions --- .../kotlin/generators/tests/GenerateTests.kt | 4 +- .../inspections/IntentionBasedInspection.kt | 2 +- .../RemoveExplicitTypeArgsInspection.kt | 2 +- .../SimplifyBinaryNegationInspection.kt | 2 +- .../references/JetSimpleNameReference.kt | 2 +- .../jet/plugin/references/referenceUtil.kt | 2 +- .../intentions/JetSelfTargetingIntention.kt | 4 +- .../intentions/OperatorToFunctionIntention.kt | 4 +- .../intentions/RemoveExplicitTypeArguments.kt | 4 +- ...implifyNegatedBinaryExpressionIntention.kt | 4 +- idea/src/META-INF/plugin.xml | 128 +++++++++--------- .../extractFunctionForDebuggerUtil.kt | 2 +- .../inspections/ExplicitGetInspection.kt | 2 +- .../inspections/IfThenToElvisInspection.kt | 2 +- .../IfThenToSafeAccessInspection.kt | 2 +- .../jet/plugin/j2k/J2kPostProcessor.kt | 2 +- .../KotlinInplaceVariableIntroducer.java | 2 +- .../KotlinIntroduceVariableHandler.java | 4 +- .../RenameKotlinImplicitLambdaParameter.kt | 2 +- .../idea}/intentions/AddBracesIntention.kt | 4 +- .../ConvertAssertToIfWithThrowIntention.kt | 4 +- .../ConvertIfWithThrowToAssertIntention.kt | 8 +- .../ConvertNegatedBooleanSequenceIntention.kt | 4 +- ...atedExpressionWithDemorgansLawIntention.kt | 4 +- .../intentions/ConvertToBlockBodyAction.kt | 4 +- .../ConvertToConcatenatedStringIntention.kt | 18 ++- .../ConvertToExpressionBodyAction.kt | 4 +- .../ConvertToForEachFunctionCallIntention.kt | 4 +- .../ConvertToForEachLoopIntention.kt | 4 +- .../ConvertToStringTemplateIntention.kt | 4 +- .../InsertCurlyBracesToTemplateIntention.kt | 4 +- .../intentions/InsertExplicitTypeArguments.kt | 4 +- .../intentions/InvertIfConditionIntention.kt | 4 +- .../intentions/JetTypeLookupExpression.java | 4 +- .../MakeTypeExplicitInLambdaIntention.kt | 4 +- .../MakeTypeImplicitInLambdaIntention.kt | 4 +- .../MoveLambdaInsideParenthesesIntention.kt | 4 +- .../MoveLambdaOutsideParenthesesIntention.kt | 5 +- .../ReconstructTypeInCastOrIsAction.java | 4 +- .../idea}/intentions/RemoveBracesIntention.kt | 4 +- .../RemoveCurlyBracesFromTemplateIntention.kt | 4 +- .../RemoveUnnecessaryParenthesesIntention.kt | 4 +- ...icitFunctionLiteralParamWithItIntention.kt | 4 +- ...thExplicitFunctionLiteralParamIntention.kt | 4 +- ...laceWithDotQualifiedMethodCallIntention.kt | 4 +- .../ReplaceWithInfixFunctionCallIntention.kt | 4 +- .../ReplaceWithOperatorAssignIntention.kt | 4 +- ...placeWithTraditionalAssignmentIntention.kt | 4 +- .../SimplifyBooleanWithConstantsIntention.kt | 4 +- .../SpecifyTypeExplicitlyAction.java | 4 +- .../idea}/intentions/SplitIfIntention.kt | 4 +- .../idea}/intentions/SwapBinaryExpression.kt | 4 +- .../idea}/intentions/Transformer.java | 4 +- .../idea}/intentions/Utils.kt | 4 +- .../AttributeCallReplacementIntention.kt | 6 +- .../ReplaceBinaryInfixIntention.kt | 4 +- .../ReplaceContainsIntention.kt | 4 +- .../ReplaceGetIntention.kt | 7 +- .../ReplaceInvokeIntention.kt | 4 +- .../ReplaceUnaryPrefixIntention.kt | 4 +- .../BranchedFoldingUtils.java | 5 +- .../BranchedUnfoldingUtils.java | 7 +- .../branchedTransformations/FoldableKind.java | 10 +- .../branchedTransformations/IfThenUtils.kt | 4 +- .../UnfoldableKind.java | 6 +- .../branchedTransformationUtils.kt | 4 +- .../intentions/DoubleBangToIfThenIntention.kt | 22 +-- .../EliminateWhenSubjectIntention.kt | 8 +- .../intentions/ElvisToIfThenIntention.kt | 12 +- .../intentions/FlattenWhenIntention.kt | 8 +- .../FoldBranchedExpressionIntention.kt | 10 +- .../intentions/IfThenToDoubleBangIntention.kt | 26 ++-- .../intentions/IfThenToElvisIntention.kt | 24 ++-- .../intentions/IfThenToSafeAccessIntention.kt | 20 +-- .../intentions/IfToWhenIntention.kt | 9 +- .../IntroduceWhenSubjectIntention.kt | 8 +- .../intentions/MergeWhenIntention.kt | 8 +- .../intentions/SafeAccessToIfThenIntention.kt | 14 +- .../UnfoldBranchedExpressionIntention.kt | 8 +- .../intentions/WhenToIfIntention.kt | 9 +- .../ConvertMemberToExtension.java | 4 +- .../declarations/DeclarationUtils.java | 4 +- .../SplitPropertyDeclarationIntention.kt | 6 +- .../quickfix/RemovePartsFromPropertyFix.java | 2 +- .../quickfix/SpecifyTypeExplicitlyFix.java | 4 +- .../CreateLocalVariableActionFactory.kt | 2 +- idea/testData/intentions/addBraces/.intention | 2 +- .../replaceBinaryInfixIntention/.intention | 2 +- .../replaceContainsIntention/.intention | 2 +- .../replaceGetIntention/.intention | 2 +- .../replaceInvokeIntention/.intention | 2 +- .../replaceUnaryPrefixIntention/.intention | 2 +- .../branched/doubleBangToIfThen/.intention | 2 +- .../branched/elvisToIfThen/.intention | 2 +- .../folding/ifToAssignment/.intention | 2 +- .../branched/folding/ifToReturn/.intention | 2 +- .../ifToReturnAsymmetrically/.intention | 2 +- .../folding/whenToAssignment/.intention | 2 +- .../branched/folding/whenToReturn/.intention | 2 +- .../branched/ifThenToDoubleBang/.intention | 2 +- .../branched/ifThenToElvis/.intention | 2 +- .../branched/ifThenToSafeAccess/.intention | 2 +- .../branched/ifWhen/ifToWhen/.intention | 2 +- .../branched/ifWhen/whenToIf/.intention | 2 +- .../branched/safeAccessToIfThen/.intention | 2 +- .../unfolding/assignmentToIf/.intention | 2 +- .../unfolding/assignmentToWhen/.intention | 2 +- .../unfolding/propertyToIf/.intention | 2 +- .../unfolding/propertyToWhen/.intention | 2 +- .../branched/unfolding/returnToIf/.intention | 2 +- .../unfolding/returnToWhen/.intention | 2 +- .../branched/when/eliminateSubject/.intention | 2 +- .../branched/when/flatten/.intention | 2 +- .../branched/when/introduceSubject/.intention | 2 +- .../intentions/branched/when/merge/.intention | 2 +- .../intentions/convertAssertToIf/.intention | 2 +- .../intentions/convertIfToAssert/.intention | 2 +- .../convertNegatedBooleanSequence/.intention | 2 +- .../.intention | 2 +- .../intentions/convertToBlockBody/.intention | 2 +- .../.intention | 2 +- .../convertToExpressionBody/.intention | 2 +- .../convertToForEachFunctionCall/.intention | 2 +- .../convertToForEachLoop/.intention | 2 +- .../.intention | 2 +- .../convertMemberToExtension/.intention | 2 +- .../intentions/declarations/split/.intention | 2 +- .../insertCurlyBracesToTemplate/.intention | 2 +- .../insertExplicitTypeArguments/.intention | 2 +- .../intentions/invertIfCondition/.intention | 2 +- .../makeTypeExplicitInLambda/.intention | 2 +- .../makeTypeImplicitInLambda/.intention | 2 +- .../moveLambdaInsideParentheses/.intention | 2 +- .../moveLambdaOutsideParentheses/.intention | 2 +- .../intentions/operatorToFunction/.intention | 2 +- .../intentions/reconstructedType/.intention | 2 +- .../intentions/removeBraces/.intention | 2 +- .../removeCurlyBracesFromTemplate/.intention | 2 +- .../removeExplicitTypeArguments/.intention | 2 +- .../removeUnnecessaryParentheses/.intention | 2 +- .../.intention | 2 +- .../.intention | 2 +- .../.intention | 2 +- .../replaceWithInfixFunctionCall/.intention | 2 +- .../replaceWithOperatorAssign/.intention | 2 +- .../.intention | 2 +- .../simplifyBooleanWithConstants/.intention | 2 +- .../.intention | 2 +- .../intentions/specifyType/.intention | 2 +- idea/testData/intentions/splitIf/.intention | 2 +- .../swapBinaryExpression/.intention | 2 +- .../intentions/AbstractIntentionTest.java | 4 +- ...buteCallReplacementIntentionTestHelpers.kt | 6 +- .../intentions/IntentionTestException.kt | 6 +- .../intentions/IntentionTestGenerated.java | 2 +- ...leReplaceWithInfixFunctionCallIntention.kt | 6 +- .../declarations/AbstractJoinLinesTest.java | 4 +- .../declarations/JoinLinesTestGenerated.java | 2 +- 158 files changed, 390 insertions(+), 378 deletions(-) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/JetSelfTargetingIntention.kt (96%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/OperatorToFunctionIntention.kt (99%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/RemoveExplicitTypeArguments.kt (98%) rename idea/idea-analysis/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/SimplifyNegatedBinaryExpressionIntention.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/AddBracesIntention.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertAssertToIfWithThrowIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertIfWithThrowToAssertIntention.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertNegatedBooleanSequenceIntention.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertToBlockBodyAction.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertToConcatenatedStringIntention.kt (82%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertToExpressionBodyAction.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertToForEachFunctionCallIntention.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertToForEachLoopIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ConvertToStringTemplateIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/InsertCurlyBracesToTemplateIntention.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/InsertExplicitTypeArguments.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/InvertIfConditionIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/JetTypeLookupExpression.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/MakeTypeExplicitInLambdaIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/MakeTypeImplicitInLambdaIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/MoveLambdaInsideParenthesesIntention.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/MoveLambdaOutsideParenthesesIntention.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ReconstructTypeInCastOrIsAction.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/RemoveBracesIntention.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/RemoveCurlyBracesFromTemplateIntention.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/RemoveUnnecessaryParenthesesIntention.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ReplaceWithInfixFunctionCallIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ReplaceWithOperatorAssignIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/ReplaceWithTraditionalAssignmentIntention.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/SimplifyBooleanWithConstantsIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/SpecifyTypeExplicitlyAction.java (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/SplitIfIntention.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/SwapBinaryExpression.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/Transformer.java (91%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/Utils.kt (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/attributeCallReplacements/ReplaceContainsIntention.kt (95%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/attributeCallReplacements/ReplaceGetIntention.kt (87%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt (92%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt (93%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/BranchedFoldingUtils.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/BranchedUnfoldingUtils.java (96%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/FoldableKind.java (88%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/IfThenUtils.kt (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/UnfoldableKind.java (94%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/branchedTransformationUtils.kt (99%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt (82%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt (79%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt (77%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt (78%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt (85%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt (76%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt (77%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt (82%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/IfToWhenIntention.kt (75%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt (79%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/MergeWhenIntention.kt (78%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt (79%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt (89%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/branchedTransformations/intentions/WhenToIfIntention.kt (76%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/declarations/ConvertMemberToExtension.java (98%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/declarations/DeclarationUtils.java (97%) rename idea/src/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/declarations/SplitPropertyDeclarationIntention.kt (85%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/AbstractIntentionTest.java (98%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/AttributeCallReplacementIntentionTestHelpers.kt (90%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/IntentionTestException.kt (77%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/IntentionTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/TestableReplaceWithInfixFunctionCallIntention.kt (90%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/declarations/AbstractJoinLinesTest.java (93%) rename idea/tests/org/jetbrains/{jet/plugin => kotlin/idea}/intentions/declarations/JoinLinesTestGenerated.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 65c4fe001b6..3dce0f4a5b4 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -53,7 +53,7 @@ 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 -import org.jetbrains.jet.plugin.intentions.AbstractIntentionTest +import org.jetbrains.kotlin.idea.intentions.AbstractIntentionTest import org.jetbrains.jet.plugin.AbstractSmartSelectionTest import org.jetbrains.jet.plugin.hierarchy.AbstractHierarchyTest import org.jetbrains.jet.plugin.codeInsight.moveUpDown.AbstractCodeMoverTest @@ -113,7 +113,7 @@ import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest import org.jetbrains.kotlin.load.java.AbstractJavaTypeSubstitutorTest -import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest +import org.jetbrains.kotlin.idea.intentions.declarations.AbstractJoinLinesTest import org.jetbrains.kotlin.codegen.AbstractScriptCodegenTest import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest import org.jetbrains.kotlin.psi.patternMatching.AbstractJetPsiUnifierTest diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt index 9cd2b1e1941..81ac6cd7592 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/IntentionBasedInspection.kt @@ -25,7 +25,7 @@ import com.intellij.codeInspection.ProblemHighlightType import com.intellij.codeInspection.LocalQuickFix import com.intellij.openapi.project.Project import com.intellij.codeInspection.ProblemDescriptor -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.editor.EditorFactory import com.intellij.openapi.editor.Editor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt index 580ec6b18cf..56bbbee5569 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/RemoveExplicitTypeArgsInspection.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.inspections -import org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments +import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments import org.jetbrains.kotlin.psi.JetTypeArgumentList public class RemoveExplicitTypeArgsInspection : IntentionBasedInspection(RemoveExplicitTypeArguments()) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt index e9bf146784c..4d2a08f8c5b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/inspections/SimplifyBinaryNegationInspection.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.inspections -import org.jetbrains.jet.plugin.intentions.SimplifyNegatedBinaryExpressionIntention +import org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention import org.jetbrains.kotlin.psi.JetPrefixExpression public class SimplifyBinaryNegationInspection : IntentionBasedInspection(SimplifyNegatedBinaryExpressionIntention()) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt index 7096c5f128c..582e985e3cf 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt @@ -30,7 +30,7 @@ import org.jetbrains.jet.plugin.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken -import org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention +import org.jetbrains.kotlin.idea.intentions.OperatorToFunctionIntention import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.name.Name diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt index bdcb40c9f33..fcd4d5bc462 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.kotlin.psi.JetProperty import java.util.HashSet import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention +import org.jetbrains.kotlin.idea.intentions.OperatorToFunctionIntention import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetObjectDeclaration diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt similarity index 96% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt index 6e7da4d25cf..1c655cbe055 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/JetSelfTargetingIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt similarity index 99% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt index 4eee3f91d9c..1b992706b2c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetExpression import com.intellij.openapi.editor.Editor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt similarity index 98% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.kt index 218f38c5a12..df7cb2c4c1e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArguments.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt index 6a578914612..9e7661b366b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/SimplifyNegatedBinaryExpressionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.kotlin.psi.JetExpression diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 67a987b9698..6f634efceb0 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -467,17 +467,17 @@ implementationClass="org.jetbrains.jet.plugin.search.ideaExtensions.JetTargetElementEvaluator" /> - org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction + org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyAction Kotlin - org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction + org.jetbrains.kotlin.idea.intentions.ConvertToExpressionBodyAction Kotlin - org.jetbrains.jet.plugin.intentions.ConvertToBlockBodyAction + org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyAction Kotlin @@ -487,307 +487,307 @@ - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldIfToAssignmentIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToAssignmentIntention Kotlin - org.jetbrains.jet.plugin.intentions.attributeCallReplacements.ReplaceGetIntention + org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.ReplaceGetIntention Kotlin - org.jetbrains.jet.plugin.intentions.attributeCallReplacements.ReplaceContainsIntention + org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.ReplaceContainsIntention Kotlin - org.jetbrains.jet.plugin.intentions.attributeCallReplacements.ReplaceInvokeIntention + org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.ReplaceInvokeIntention Kotlin - org.jetbrains.jet.plugin.intentions.attributeCallReplacements.ReplaceUnaryPrefixIntention + org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.ReplaceUnaryPrefixIntention Kotlin - org.jetbrains.jet.plugin.intentions.attributeCallReplacements.ReplaceBinaryInfixIntention + org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.ReplaceBinaryInfixIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldIfToReturnAsymmetricallyIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToReturnAsymmetricallyIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldIfToReturnIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToReturnIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldWhenToAssignmentIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldWhenToAssignmentIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldWhenToReturnIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldWhenToReturnIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldAssignmentToIfIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldAssignmentToIfIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldPropertyToIfIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldPropertyToIfIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldAssignmentToWhenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldAssignmentToWhenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldPropertyToWhenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldPropertyToWhenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldReturnToIfIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldReturnToIfIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldReturnToWhenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldReturnToWhenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.DoubleBangToIfThenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.DoubleBangToIfThenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToDoubleBangIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToDoubleBangIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.ElvisToIfThenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.ElvisToIfThenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToElvisIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.SafeAccessToIfThenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.SafeAccessToIfThenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfToWhenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfToWhenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.WhenToIfIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.WhenToIfIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FlattenWhenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FlattenWhenIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IntroduceWhenSubjectIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IntroduceWhenSubjectIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.EliminateWhenSubjectIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.EliminateWhenSubjectIntention Kotlin - org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.MergeWhenIntention + org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.MergeWhenIntention Kotlin - org.jetbrains.jet.plugin.intentions.SimplifyNegatedBinaryExpressionIntention + org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention Kotlin - org.jetbrains.jet.plugin.intentions.RemoveUnnecessaryParenthesesIntention + org.jetbrains.kotlin.idea.intentions.RemoveUnnecessaryParenthesesIntention Kotlin - org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments + org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments Kotlin - org.jetbrains.jet.plugin.intentions.RemoveCurlyBracesFromTemplateIntention + org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention Kotlin - org.jetbrains.jet.plugin.intentions.InsertCurlyBracesToTemplateIntention + org.jetbrains.kotlin.idea.intentions.InsertCurlyBracesToTemplateIntention Kotlin - org.jetbrains.jet.plugin.intentions.MoveLambdaInsideParenthesesIntention + org.jetbrains.kotlin.idea.intentions.MoveLambdaInsideParenthesesIntention Kotlin - org.jetbrains.jet.plugin.intentions.InsertExplicitTypeArguments + org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments Kotlin - org.jetbrains.jet.plugin.intentions.MoveLambdaOutsideParenthesesIntention + org.jetbrains.kotlin.idea.intentions.MoveLambdaOutsideParenthesesIntention Kotlin - org.jetbrains.jet.plugin.intentions.declarations.SplitPropertyDeclarationIntention + org.jetbrains.kotlin.idea.intentions.declarations.SplitPropertyDeclarationIntention Kotlin - org.jetbrains.jet.plugin.intentions.declarations.ConvertMemberToExtension + org.jetbrains.kotlin.idea.intentions.declarations.ConvertMemberToExtension Kotlin - org.jetbrains.jet.plugin.intentions.ReconstructTypeInCastOrIsAction + org.jetbrains.kotlin.idea.intentions.ReconstructTypeInCastOrIsAction Kotlin - org.jetbrains.jet.plugin.intentions.ReplaceWithDotQualifiedMethodCallIntention + org.jetbrains.kotlin.idea.intentions.ReplaceWithDotQualifiedMethodCallIntention Kotlin - org.jetbrains.jet.plugin.intentions.ReplaceWithInfixFunctionCallIntention + org.jetbrains.kotlin.idea.intentions.ReplaceWithInfixFunctionCallIntention Kotlin - org.jetbrains.jet.plugin.intentions.ReplaceExplicitFunctionLiteralParamWithItIntention + org.jetbrains.kotlin.idea.intentions.ReplaceExplicitFunctionLiteralParamWithItIntention Kotlin - org.jetbrains.jet.plugin.intentions.ReplaceItWithExplicitFunctionLiteralParamIntention + org.jetbrains.kotlin.idea.intentions.ReplaceItWithExplicitFunctionLiteralParamIntention Kotlin - org.jetbrains.jet.plugin.intentions.RemoveBracesIntention + org.jetbrains.kotlin.idea.intentions.RemoveBracesIntention Kotlin - org.jetbrains.jet.plugin.intentions.AddBracesIntention + org.jetbrains.kotlin.idea.intentions.AddBracesIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertNegatedBooleanSequenceIntention + org.jetbrains.kotlin.idea.intentions.ConvertNegatedBooleanSequenceIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertNegatedExpressionWithDemorgansLawIntention + org.jetbrains.kotlin.idea.intentions.ConvertNegatedExpressionWithDemorgansLawIntention Kotlin - org.jetbrains.jet.plugin.intentions.SimplifyBooleanWithConstantsIntention + org.jetbrains.kotlin.idea.intentions.SimplifyBooleanWithConstantsIntention Kotlin - org.jetbrains.jet.plugin.intentions.SwapBinaryExpression + org.jetbrains.kotlin.idea.intentions.SwapBinaryExpression Kotlin - org.jetbrains.jet.plugin.intentions.SplitIfIntention + org.jetbrains.kotlin.idea.intentions.SplitIfIntention Kotlin - org.jetbrains.jet.plugin.intentions.ReplaceWithOperatorAssignIntention + org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignIntention Kotlin - org.jetbrains.jet.plugin.intentions.ReplaceWithTraditionalAssignmentIntention + org.jetbrains.kotlin.idea.intentions.ReplaceWithTraditionalAssignmentIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertAssertToIfWithThrowIntention + org.jetbrains.kotlin.idea.intentions.ConvertAssertToIfWithThrowIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertIfWithThrowToAssertIntention + org.jetbrains.kotlin.idea.intentions.ConvertIfWithThrowToAssertIntention Kotlin - org.jetbrains.jet.plugin.intentions.MakeTypeExplicitInLambdaIntention + org.jetbrains.kotlin.idea.intentions.MakeTypeExplicitInLambdaIntention Kotlin - org.jetbrains.jet.plugin.intentions.MakeTypeImplicitInLambdaIntention + org.jetbrains.kotlin.idea.intentions.MakeTypeImplicitInLambdaIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertToForEachLoopIntention + org.jetbrains.kotlin.idea.intentions.ConvertToForEachLoopIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertToForEachFunctionCallIntention + org.jetbrains.kotlin.idea.intentions.ConvertToForEachFunctionCallIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertToStringTemplateIntention + org.jetbrains.kotlin.idea.intentions.ConvertToStringTemplateIntention Kotlin - org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention + org.jetbrains.kotlin.idea.intentions.OperatorToFunctionIntention Kotlin - org.jetbrains.jet.plugin.intentions.ConvertToConcatenatedStringIntention + org.jetbrains.kotlin.idea.intentions.ConvertToConcatenatedStringIntention Kotlin diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt index 555397648e8..a08d2f6429f 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -33,7 +33,7 @@ import org.jetbrains.jet.plugin.util.application.runReadAction import com.intellij.psi.PsiManager import com.intellij.psi.impl.PsiModificationTrackerImpl import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.plugin.intentions.InsertExplicitTypeArguments +import org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionGeneratorOptions import org.jetbrains.jet.plugin.refactoring.extractFunction.generateDeclaration import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt b/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt index 1d2102740db..317c44b77ee 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt +++ b/idea/src/org/jetbrains/jet/plugin/inspections/ExplicitGetInspection.kt @@ -17,6 +17,6 @@ package org.jetbrains.jet.plugin.inspections import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.plugin.intentions.attributeCallReplacements.ReplaceGetIntention +import org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.ReplaceGetIntention public class ExplicitGetInspection : IntentionBasedInspection(ReplaceGetIntention()) diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt index 631413b0c8d..6c66ef612e6 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt +++ b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToElvisInspection.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.inspections -import org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToElvisIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention import org.jetbrains.kotlin.psi.JetIfExpression public class IfThenToElvisInspection : IntentionBasedInspection(IfThenToElvisIntention()) diff --git a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt index eab86f15361..eea4539c8cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt +++ b/idea/src/org/jetbrains/jet/plugin/inspections/IfThenToSafeAccessInspection.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.inspections -import org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention import org.jetbrains.kotlin.psi.JetIfExpression public class IfThenToSafeAccessInspection : IntentionBasedInspection(IfThenToSafeAccessIntention()) diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt index c252f1f9237..53a88d03eb7 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.j2k import org.jetbrains.kotlin.j2k.PostProcessor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments +import org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import java.util.ArrayList import com.intellij.psi.PsiElement diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java index 36a7b7df5f5..1e64b339ef0 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java @@ -34,7 +34,7 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil; import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer; import com.intellij.ui.NonFocusableCheckBox; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction; +import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyAction; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetExpression; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index c35ca5bf3bb..8698d6e182d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -37,8 +37,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; -import org.jetbrains.jet.plugin.intentions.ConvertToBlockBodyAction; -import org.jetbrains.jet.plugin.intentions.RemoveCurlyBracesFromTemplateIntention; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; import org.jetbrains.jet.plugin.refactoring.JetNameValidatorImpl; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; @@ -51,6 +49,8 @@ import org.jetbrains.jet.plugin.util.psiModificationUtil.PsiModificationUtilPack import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyAction; +import org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt index c0a21ee524f..0e121b1827c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinImplicitLambdaParameter.kt @@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiFile import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.plugin.intentions.ReplaceItWithExplicitFunctionLiteralParamIntention +import org.jetbrains.kotlin.idea.intentions.ReplaceItWithExplicitFunctionLiteralParamIntention import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.application.ApplicationManager import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.kt index 4c8e9aa65f2..f3f78a33360 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetExpressionImpl import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt index 88dfaf8654b..8ca14169338 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt index 1d161f8553c..c0f9565abca 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetIfExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.extractExpressionIfSingle import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isNullExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedBooleanSequenceIntention.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedBooleanSequenceIntention.kt index 60d9011db89..588a08e4082 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedBooleanSequenceIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedBooleanSequenceIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt index 030ad0b5bac..29e725ed036 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetParenthesizedExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.kt index 9b4e9f1d622..b100e5bb86d 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyAction.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction import com.intellij.openapi.project.Project diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt similarity index 82% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt index 3225743dae8..d8ec0f5359e 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt @@ -1,4 +1,20 @@ -package org.jetbrains.jet.plugin.intentions +/* + * 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.intentions import org.jetbrains.kotlin.psi.JetStringTemplateExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.kt index 2d29f73112a..f6430f399a0 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyAction.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction import com.intellij.openapi.project.Project diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachFunctionCallIntention.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachFunctionCallIntention.kt index cc2da6fc61b..d69125e8e63 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachFunctionCallIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachFunctionCallIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetForExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachLoopIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachLoopIntention.kt index 651ca77ca65..be5c1bef56d 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachLoopIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt index 5ec881ee8eb..a1519840ee2 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InsertCurlyBracesToTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/intentions/InsertCurlyBracesToTemplateIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt index ebaa6b2d16e..1b035ad48d5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/InsertCurlyBracesToTemplateIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetSimpleNameStringTemplateEntry diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.kt index ee2a07477ec..2b0cb94dc47 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArguments.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InvertIfConditionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InvertIfConditionIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/InvertIfConditionIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/InvertIfConditionIntention.kt index a2d0744ba76..c38ee922ccd 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/InvertIfConditionIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InvertIfConditionIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/JetTypeLookupExpression.java b/idea/src/org/jetbrains/kotlin/idea/intentions/JetTypeLookupExpression.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/JetTypeLookupExpression.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/JetTypeLookupExpression.java index 729fea32c88..f678eaa1f7a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/JetTypeLookupExpression.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/JetTypeLookupExpression.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.intentions; +package org.jetbrains.kotlin.idea.intentions; import com.intellij.codeInsight.completion.InsertHandler; import com.intellij.codeInsight.completion.InsertionContext; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.kt index ab7de314e2f..48dc28ebdeb 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeExplicitInLambdaIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeImplicitInLambdaIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeImplicitInLambdaIntention.kt index 8a950cb2797..b92b9da6221 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeImplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MakeTypeImplicitInLambdaIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt index 37f480f59f1..da7999ddf7b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaInsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt index 1788611d3ae..85b4e0fe5a8 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MoveLambdaOutsideParenthesesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetLabeledExpression -import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument import org.jetbrains.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses public class MoveLambdaOutsideParenthesesIntention : JetSelfTargetingIntention( diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.java index bc6e860f293..ac25ddfe959 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsAction.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.intentions; +package org.jetbrains.kotlin.idea.intentions; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; import com.intellij.openapi.editor.Editor; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveBracesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/RemoveBracesIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt index b55a58553dd..0e9fcc1eb52 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveBracesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveCurlyBracesFromTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/intentions/RemoveCurlyBracesFromTemplateIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt index 4ca0a607d03..711c37fcdc1 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveCurlyBracesFromTemplateIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetBlockStringTemplateEntry diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt index 83d8eb0fdb6..5d01a8b4975 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/RemoveUnnecessaryParenthesesIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetParenthesizedExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt index 7aff2419cc9..31078ca314c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt index 6ab863549bd..2b5ff5acff7 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt index 205c2a43929..673ea138143 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithDotQualifiedMethodCallIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithDotQualifiedMethodCallIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetBinaryExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithInfixFunctionCallIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithInfixFunctionCallIntention.kt index 203cf5421d0..23f0dab3976 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithInfixFunctionCallIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetCallExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.kt index 723cbb1e720..3e147bbb1df 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithTraditionalAssignmentIntention.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithTraditionalAssignmentIntention.kt index 82250bc96dd..2ee25f39114 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithTraditionalAssignmentIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithTraditionalAssignmentIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt index d3bb8e2831a..ad1269abfe1 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetBinaryExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java index 20c709818f8..e249ec66034 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.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.intentions; +package org.jetbrains.kotlin.idea.intentions; import com.google.common.collect.Lists; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt index 094391018a5..6a44cd2991b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SplitIfIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.kt index 2ba04d3c0db..06c90b5c4a5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpression.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetBinaryExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java b/idea/src/org/jetbrains/kotlin/idea/intentions/Transformer.java similarity index 91% rename from idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/Transformer.java index 5d10ef16833..992756d2089 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/Transformer.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/Transformer.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.intentions; +package org.jetbrains.kotlin.idea.intentions; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt index 3e67b57796d..03c7e019b3f 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.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.intentions +package org.jetbrains.kotlin.idea.intentions import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.types.JetType diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt index eff41946fb4..423e65bf8fb 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/AttributeCallReplacementIntention.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.attributeCallReplacements +package org.jetbrains.kotlin.idea.intentions.attributeCallReplacements import org.jetbrains.kotlin.psi.JetCallExpression import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.ValueArgument diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt index d67a8755ff5..118070e7aa0 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceBinaryInfixIntention.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.intentions.attributeCallReplacements +package org.jetbrains.kotlin.idea.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceContainsIntention.kt similarity index 95% rename from idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceContainsIntention.kt index b54b1453794..0244b54f14b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceContainsIntention.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.intentions.attributeCallReplacements +package org.jetbrains.kotlin.idea.intentions.attributeCallReplacements import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceGetIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceGetIntention.kt similarity index 87% rename from idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceGetIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceGetIntention.kt index cdec42be078..35f9a477e40 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceGetIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceGetIntention.kt @@ -1,6 +1,7 @@ /* - * Copyright 2014 JetBrains s.r.o. - * * Licensed under the Apache License, Version 2.0 (the "License"); + * 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 * @@ -13,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.attributeCallReplacements +package org.jetbrains.kotlin.idea.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt similarity index 92% rename from idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt index 0857bdfc6b6..a2aa831844b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceInvokeIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceInvokeIntention.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.intentions.attributeCallReplacements +package org.jetbrains.kotlin.idea.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt similarity index 93% rename from idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt index c191d9d0929..298bf6a3fa1 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/attributeCallReplacements/ReplaceUnaryPrefixIntention.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.intentions.attributeCallReplacements +package org.jetbrains.kotlin.idea.intentions.attributeCallReplacements import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.java index 1c7bd676094..f9939ff566a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedFoldingUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedFoldingUtils.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,10 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations; +package org.jetbrains.kotlin.idea.intentions.branchedTransformations; import com.google.common.base.Predicate; -import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedUnfoldingUtils.java similarity index 96% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedUnfoldingUtils.java index 45b241b45bc..82244ddc00a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/BranchedUnfoldingUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/BranchedUnfoldingUtils.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,15 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations; +package org.jetbrains.kotlin.idea.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.intentions.declarations.DeclarationUtils; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.plugin.intentions.declarations.DeclarationUtils; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/FoldableKind.java similarity index 88% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/FoldableKind.java index 06172342c8f..6efa5f6501d 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/FoldableKind.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/FoldableKind.java @@ -1,28 +1,28 @@ /* - * 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 TO 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, - * TOOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * 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.jet.plugin.intentions.branchedTransformations; +package org.jetbrains.kotlin.idea.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.intentions.Transformer; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetIfExpression; import org.jetbrains.kotlin.psi.JetWhenExpression; -import org.jetbrains.jet.plugin.intentions.Transformer; public enum FoldableKind implements Transformer { IF_TO_ASSIGNMENT("fold.if.to.assignment") { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.kt index 8aacaf29f59..494dc2e6f22 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/IfThenUtils.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.intentions.branchedTransformations +package org.jetbrains.kotlin.idea.intentions.branchedTransformations import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetBlockExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/UnfoldableKind.java similarity index 94% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/UnfoldableKind.java index 0fb836dd657..a43858e000c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/UnfoldableKind.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/UnfoldableKind.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations; +package org.jetbrains.kotlin.idea.intentions.branchedTransformations; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.idea.intentions.Transformer; import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetReturnExpression; -import org.jetbrains.jet.plugin.intentions.Transformer; public enum UnfoldableKind implements Transformer { ASSIGNMENT_TO_IF("unfold.assignment.to.if") { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/branchedTransformationUtils.kt similarity index 99% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/branchedTransformationUtils.kt index b6000bdf34f..cb94bc8c2a0 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/branchedTransformationUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/branchedTransformationUtils.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.intentions.branchedTransformations +package org.jetbrains.kotlin.idea.intentions.branchedTransformations import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt similarity index 82% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt index 6f82d9e4730..a46b832c2ab 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.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,30 +14,30 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetPostfixExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable -import org.jetbrains.jet.plugin.intentions.JetTypeLookupExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable +import org.jetbrains.kotlin.idea.intentions.JetTypeLookupExpression import com.intellij.codeInsight.template.TemplateEditingAdapter import com.intellij.codeInsight.template.impl.TemplateManagerImpl import com.intellij.codeInsight.template.Template import org.jetbrains.kotlin.idea.JetBundle -import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition import org.jetbrains.kotlin.psi.JetThrowExpression import com.intellij.codeInsight.template.TemplateBuilderImpl import com.intellij.psi.PsiDocumentManager import org.apache.commons.lang.StringEscapeUtils.escapeJava -import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNullExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.NULL_PTR_EXCEPTION -import org.jetbrains.jet.plugin.intentions.branchedTransformations.KOTLIN_NULL_PTR_EXCEPTION -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStatement +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.NULL_PTR_EXCEPTION +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.KOTLIN_NULL_PTR_EXCEPTION +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStatement public class DoubleBangToIfThenIntention : JetSelfTargetingIntention("double.bang.to.if.then", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt similarity index 79% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt index 4f362afb2ad..53ebdc432de 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.jet.plugin.intentions.branchedTransformations.* +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt similarity index 77% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt index 245c383cc1c..a391b380804 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetPsiUtil -import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable public class ElvisToIfThenIntention : JetSelfTargetingIntention("elvis.to.if.then", javaClass()) { override fun isApplicableTo(element: JetBinaryExpression): Boolean = diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt similarity index 78% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt index 6de328c3460..c21ec6058d5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.jet.plugin.intentions.branchedTransformations.* +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt similarity index 85% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt index 2ebe8787a89..d1527078607 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.jet.plugin.intentions.branchedTransformations.BranchedFoldingUtils -import org.jetbrains.jet.plugin.intentions.branchedTransformations.FoldableKind +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedFoldingUtils +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.FoldableKind import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetIfExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt similarity index 76% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt index ce154c8976e..d52d1cfee83 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.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,26 +14,26 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.intentions.branchedTransformations.evaluatesTo -import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull -import org.jetbrains.jet.plugin.intentions.branchedTransformations.getNonNullExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.replace -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.evaluatesTo +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.comparesNonNullToNull +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.getNonNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.replace +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable import org.jetbrains.kotlin.psi.JetPostfixExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineBaseExpressionIfApplicableWithPrompt -import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.inlineBaseExpressionIfApplicableWithPrompt +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.extractExpressionIfSingle import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.idea.JetBundle -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpressionOrEmptyBlock -import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStatement +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isNullExpressionOrEmptyBlock +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStatement public class IfThenToDoubleBangIntention : JetSelfTargetingIntention("if.then.to.double.bang", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt similarity index 77% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt index ded398c4c04..4d1094650c7 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.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,22 +14,22 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle -import org.jetbrains.jet.plugin.intentions.branchedTransformations.evaluatesTo -import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull -import org.jetbrains.jet.plugin.intentions.branchedTransformations.getNonNullExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNotNullExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.replace -import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineLeftSideIfApplicableWithPrompt -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable -import org.jetbrains.jet.plugin.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.extractExpressionIfSingle +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.evaluatesTo +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.comparesNonNullToNull +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.getNonNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isNotNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.replace +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.inlineLeftSideIfApplicableWithPrompt +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.throwsNullPointerExceptionWithNoArguments import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt similarity index 82% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt index 3df8ba83adf..81a86117931 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.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,23 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle -import org.jetbrains.jet.plugin.intentions.branchedTransformations.comparesNonNullToNull -import org.jetbrains.jet.plugin.intentions.branchedTransformations.getNonNullExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isNullExpressionOrEmptyBlock -import org.jetbrains.jet.plugin.intentions.branchedTransformations.replace +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.extractExpressionIfSingle +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.comparesNonNullToNull +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.getNonNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isNullExpressionOrEmptyBlock +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.replace import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable -import org.jetbrains.jet.plugin.intentions.branchedTransformations.inlineReceiverIfApplicableWithPrompt +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.inlineReceiverIfApplicableWithPrompt public class IfThenToSafeAccessIntention : JetSelfTargetingIntention("if.then.to.safe.access", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt similarity index 75% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt index 72590027832..7920f1184eb 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.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,13 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.kotlin.psi.JetWhenExpression +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.plugin.intentions.branchedTransformations.* +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* public class IfToWhenIntention : JetSelfTargetingIntention("if.to.when", javaClass()) { override fun isApplicableTo(element: JetIfExpression): Boolean = element.canTransformToWhen() diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt similarity index 79% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt index 503ef5330ce..120e9545451 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.jet.plugin.intentions.branchedTransformations.* +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/MergeWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/MergeWhenIntention.kt similarity index 78% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/MergeWhenIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/MergeWhenIntention.kt index c9836c1900d..e689260670a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/MergeWhenIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/MergeWhenIntention.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention -import org.jetbrains.jet.plugin.intentions.branchedTransformations.* +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* import org.jetbrains.kotlin.psi.JetWhenExpression import com.intellij.openapi.editor.Editor diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt similarity index 79% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt index 5fbf2dc7cf2..d96190e1c51 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.convertToIfNotNullExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.introduceValueForCondition +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition import org.jetbrains.kotlin.psi.JetDotQualifiedExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStableVariable -import org.jetbrains.jet.plugin.intentions.branchedTransformations.isStatement +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStatement public class SafeAccessToIfThenIntention : JetSelfTargetingIntention("safe.access.to.if.then", javaClass()) { override fun isApplicableTo(element: JetSafeQualifiedExpression): Boolean = true diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt similarity index 89% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt index bafb71cebbc..f5c992b3826 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.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.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.plugin.intentions.branchedTransformations.* -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetBinaryExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt similarity index 76% rename from idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt index d171e954180..96156c5c8b9 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.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,13 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions +package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention import org.jetbrains.kotlin.psi.JetWhenExpression -import org.jetbrains.kotlin.psi.JetIfExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.plugin.intentions.branchedTransformations.* +import org.jetbrains.kotlin.idea.intentions.branchedTransformations.* public class WhenToIfIntention : JetSelfTargetingIntention("when.to.if", javaClass()) { override fun isApplicableTo(element: JetWhenExpression): Boolean = element.canTransformToIf() diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.java similarity index 98% rename from idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.java index 64b23b6a74b..c781084b6e9 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtension.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.intentions.declarations; +package org.jetbrains.kotlin.idea.intentions.declarations; import com.intellij.codeInsight.CodeInsightUtilCore; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java similarity index 97% rename from idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java rename to idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.java index dc1d5d90dac..ef3c6956940 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/DeclarationUtils.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.intentions.declarations; +package org.jetbrains.kotlin.idea.intentions.declarations; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.kt similarity index 85% rename from idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.kt rename to idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.kt index 8e0b1a2b268..2516cec302b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.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.intentions.declarations +package org.jetbrains.kotlin.idea.intentions.declarations import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetProperty -import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention +import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention public class SplitPropertyDeclarationIntention : JetSelfTargetingIntention("split.property.declaration", javaClass()) { override fun isApplicableTo(element: JetProperty): Boolean = DeclarationUtils.checkSplitProperty(element) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java index 559b6a9b668..2050542bf7c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java @@ -23,9 +23,9 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; +import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyAction; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.java index 2a1b374348c..830d443c71f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SpecifyTypeExplicitlyFix.java @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.types.JetType; -import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.addTypeAnnotation; -import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.getTypeForDeclaration; +import static org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyAction.addTypeAnnotation; +import static org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyAction.getTypeForDeclaration; @SuppressWarnings("IntentionDescriptionNotFoundInspection") public class SpecifyTypeExplicitlyFix extends PsiElementBaseIntentionAction { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt index 1564bf62951..409de91d2ec 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.Callab import com.intellij.openapi.command.CommandProcessor import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.intentions.ConvertToBlockBodyAction +import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyAction import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.plugin.refactoring.getExtractionContainers import org.jetbrains.kotlin.psi.JetClassBody diff --git a/idea/testData/intentions/addBraces/.intention b/idea/testData/intentions/addBraces/.intention index f2f1329ee93..4fa1a9e579c 100644 --- a/idea/testData/intentions/addBraces/.intention +++ b/idea/testData/intentions/addBraces/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.AddBracesIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.AddBracesIntention diff --git a/idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/.intention b/idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/.intention index c187f500697..39eaf87b972 100644 --- a/idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/.intention +++ b/idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.TestableReplaceBinaryInfixIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.TestableReplaceBinaryInfixIntention diff --git a/idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/.intention b/idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/.intention index dba96b9ee6c..623313ace82 100644 --- a/idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/.intention +++ b/idea/testData/intentions/attributeCallReplacements/replaceContainsIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.TestableReplaceContainsIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.TestableReplaceContainsIntention diff --git a/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/.intention b/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/.intention index 1cdb22c6264..1ddcfc1d8e6 100644 --- a/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/.intention +++ b/idea/testData/intentions/attributeCallReplacements/replaceGetIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.TestableReplaceGetIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.TestableReplaceGetIntention diff --git a/idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/.intention b/idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/.intention index e772926f66d..35c627f86e1 100644 --- a/idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/.intention +++ b/idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.TestableReplaceInvokeIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.TestableReplaceInvokeIntention diff --git a/idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/.intention b/idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/.intention index ec20e7c5330..624b88be701 100644 --- a/idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/.intention +++ b/idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.TestableReplaceUnaryPrefixIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.TestableReplaceUnaryPrefixIntention diff --git a/idea/testData/intentions/branched/doubleBangToIfThen/.intention b/idea/testData/intentions/branched/doubleBangToIfThen/.intention index 78086e82ede..f46baa81c33 100644 --- a/idea/testData/intentions/branched/doubleBangToIfThen/.intention +++ b/idea/testData/intentions/branched/doubleBangToIfThen/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.DoubleBangToIfThenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.DoubleBangToIfThenIntention diff --git a/idea/testData/intentions/branched/elvisToIfThen/.intention b/idea/testData/intentions/branched/elvisToIfThen/.intention index cbfb4eea8fe..44411b48e79 100644 --- a/idea/testData/intentions/branched/elvisToIfThen/.intention +++ b/idea/testData/intentions/branched/elvisToIfThen/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.ElvisToIfThenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.ElvisToIfThenIntention diff --git a/idea/testData/intentions/branched/folding/ifToAssignment/.intention b/idea/testData/intentions/branched/folding/ifToAssignment/.intention index e645192a549..cbc2161d549 100644 --- a/idea/testData/intentions/branched/folding/ifToAssignment/.intention +++ b/idea/testData/intentions/branched/folding/ifToAssignment/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldIfToAssignmentIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToAssignmentIntention diff --git a/idea/testData/intentions/branched/folding/ifToReturn/.intention b/idea/testData/intentions/branched/folding/ifToReturn/.intention index 1e17480ad01..94d4de3927f 100644 --- a/idea/testData/intentions/branched/folding/ifToReturn/.intention +++ b/idea/testData/intentions/branched/folding/ifToReturn/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldIfToReturnIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToReturnIntention diff --git a/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/.intention b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/.intention index 9155c954aa2..341cd51a7b5 100644 --- a/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/.intention +++ b/idea/testData/intentions/branched/folding/ifToReturnAsymmetrically/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldIfToReturnAsymmetricallyIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldIfToReturnAsymmetricallyIntention diff --git a/idea/testData/intentions/branched/folding/whenToAssignment/.intention b/idea/testData/intentions/branched/folding/whenToAssignment/.intention index 6167bb53372..c06272191d9 100644 --- a/idea/testData/intentions/branched/folding/whenToAssignment/.intention +++ b/idea/testData/intentions/branched/folding/whenToAssignment/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldWhenToAssignmentIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldWhenToAssignmentIntention diff --git a/idea/testData/intentions/branched/folding/whenToReturn/.intention b/idea/testData/intentions/branched/folding/whenToReturn/.intention index 4f7eb22092b..81d77bdef49 100644 --- a/idea/testData/intentions/branched/folding/whenToReturn/.intention +++ b/idea/testData/intentions/branched/folding/whenToReturn/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FoldWhenToReturnIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FoldWhenToReturnIntention diff --git a/idea/testData/intentions/branched/ifThenToDoubleBang/.intention b/idea/testData/intentions/branched/ifThenToDoubleBang/.intention index 8b8739474e3..d9b1de34dcb 100644 --- a/idea/testData/intentions/branched/ifThenToDoubleBang/.intention +++ b/idea/testData/intentions/branched/ifThenToDoubleBang/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToDoubleBangIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToDoubleBangIntention diff --git a/idea/testData/intentions/branched/ifThenToElvis/.intention b/idea/testData/intentions/branched/ifThenToElvis/.intention index 57eab5b4c17..835cc19e7a9 100644 --- a/idea/testData/intentions/branched/ifThenToElvis/.intention +++ b/idea/testData/intentions/branched/ifThenToElvis/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToElvisIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToElvisIntention diff --git a/idea/testData/intentions/branched/ifThenToSafeAccess/.intention b/idea/testData/intentions/branched/ifThenToSafeAccess/.intention index d8a8925188a..06e588f6449 100644 --- a/idea/testData/intentions/branched/ifThenToSafeAccess/.intention +++ b/idea/testData/intentions/branched/ifThenToSafeAccess/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfThenToSafeAccessIntention diff --git a/idea/testData/intentions/branched/ifWhen/ifToWhen/.intention b/idea/testData/intentions/branched/ifWhen/ifToWhen/.intention index 5d8f2edf1fc..3e1e9d7a0f1 100644 --- a/idea/testData/intentions/branched/ifWhen/ifToWhen/.intention +++ b/idea/testData/intentions/branched/ifWhen/ifToWhen/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IfToWhenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IfToWhenIntention diff --git a/idea/testData/intentions/branched/ifWhen/whenToIf/.intention b/idea/testData/intentions/branched/ifWhen/whenToIf/.intention index 5493d73b460..9a0e7076237 100644 --- a/idea/testData/intentions/branched/ifWhen/whenToIf/.intention +++ b/idea/testData/intentions/branched/ifWhen/whenToIf/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.WhenToIfIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.WhenToIfIntention diff --git a/idea/testData/intentions/branched/safeAccessToIfThen/.intention b/idea/testData/intentions/branched/safeAccessToIfThen/.intention index 6ddec789854..f69d9a02224 100644 --- a/idea/testData/intentions/branched/safeAccessToIfThen/.intention +++ b/idea/testData/intentions/branched/safeAccessToIfThen/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.SafeAccessToIfThenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.SafeAccessToIfThenIntention diff --git a/idea/testData/intentions/branched/unfolding/assignmentToIf/.intention b/idea/testData/intentions/branched/unfolding/assignmentToIf/.intention index e4153abfdf3..4b30f5f1f35 100644 --- a/idea/testData/intentions/branched/unfolding/assignmentToIf/.intention +++ b/idea/testData/intentions/branched/unfolding/assignmentToIf/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldAssignmentToIfIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldAssignmentToIfIntention diff --git a/idea/testData/intentions/branched/unfolding/assignmentToWhen/.intention b/idea/testData/intentions/branched/unfolding/assignmentToWhen/.intention index b0c8a1def96..ccb2377890b 100644 --- a/idea/testData/intentions/branched/unfolding/assignmentToWhen/.intention +++ b/idea/testData/intentions/branched/unfolding/assignmentToWhen/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldAssignmentToWhenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldAssignmentToWhenIntention diff --git a/idea/testData/intentions/branched/unfolding/propertyToIf/.intention b/idea/testData/intentions/branched/unfolding/propertyToIf/.intention index 8b0fd3bbac9..cd35e98eabb 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToIf/.intention +++ b/idea/testData/intentions/branched/unfolding/propertyToIf/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldPropertyToIfIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldPropertyToIfIntention diff --git a/idea/testData/intentions/branched/unfolding/propertyToWhen/.intention b/idea/testData/intentions/branched/unfolding/propertyToWhen/.intention index b74c82759ba..17bba702132 100644 --- a/idea/testData/intentions/branched/unfolding/propertyToWhen/.intention +++ b/idea/testData/intentions/branched/unfolding/propertyToWhen/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldPropertyToWhenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldPropertyToWhenIntention diff --git a/idea/testData/intentions/branched/unfolding/returnToIf/.intention b/idea/testData/intentions/branched/unfolding/returnToIf/.intention index e19b7b78d88..1e95ecd0ac3 100644 --- a/idea/testData/intentions/branched/unfolding/returnToIf/.intention +++ b/idea/testData/intentions/branched/unfolding/returnToIf/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldReturnToIfIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldReturnToIfIntention diff --git a/idea/testData/intentions/branched/unfolding/returnToWhen/.intention b/idea/testData/intentions/branched/unfolding/returnToWhen/.intention index e9b7c33aa81..5b720db0a16 100644 --- a/idea/testData/intentions/branched/unfolding/returnToWhen/.intention +++ b/idea/testData/intentions/branched/unfolding/returnToWhen/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.UnfoldReturnToWhenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.UnfoldReturnToWhenIntention diff --git a/idea/testData/intentions/branched/when/eliminateSubject/.intention b/idea/testData/intentions/branched/when/eliminateSubject/.intention index 7921603fdbb..c20e9e97970 100644 --- a/idea/testData/intentions/branched/when/eliminateSubject/.intention +++ b/idea/testData/intentions/branched/when/eliminateSubject/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.EliminateWhenSubjectIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.EliminateWhenSubjectIntention diff --git a/idea/testData/intentions/branched/when/flatten/.intention b/idea/testData/intentions/branched/when/flatten/.intention index 8de846a080b..4b64d07a228 100644 --- a/idea/testData/intentions/branched/when/flatten/.intention +++ b/idea/testData/intentions/branched/when/flatten/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.FlattenWhenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.FlattenWhenIntention diff --git a/idea/testData/intentions/branched/when/introduceSubject/.intention b/idea/testData/intentions/branched/when/introduceSubject/.intention index da8bb6a594a..61258d839f3 100644 --- a/idea/testData/intentions/branched/when/introduceSubject/.intention +++ b/idea/testData/intentions/branched/when/introduceSubject/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.IntroduceWhenSubjectIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.IntroduceWhenSubjectIntention diff --git a/idea/testData/intentions/branched/when/merge/.intention b/idea/testData/intentions/branched/when/merge/.intention index efa026133ba..3903f83008b 100644 --- a/idea/testData/intentions/branched/when/merge/.intention +++ b/idea/testData/intentions/branched/when/merge/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.branchedTransformations.intentions.MergeWhenIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions.MergeWhenIntention diff --git a/idea/testData/intentions/convertAssertToIf/.intention b/idea/testData/intentions/convertAssertToIf/.intention index b253d692c2f..06a97bd6791 100644 --- a/idea/testData/intentions/convertAssertToIf/.intention +++ b/idea/testData/intentions/convertAssertToIf/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertAssertToIfWithThrowIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertAssertToIfWithThrowIntention diff --git a/idea/testData/intentions/convertIfToAssert/.intention b/idea/testData/intentions/convertIfToAssert/.intention index 9fe28fdaa90..281d18eb471 100644 --- a/idea/testData/intentions/convertIfToAssert/.intention +++ b/idea/testData/intentions/convertIfToAssert/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertIfWithThrowToAssertIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertIfWithThrowToAssertIntention diff --git a/idea/testData/intentions/convertNegatedBooleanSequence/.intention b/idea/testData/intentions/convertNegatedBooleanSequence/.intention index 98d3c7d831c..0da6d8bfd89 100644 --- a/idea/testData/intentions/convertNegatedBooleanSequence/.intention +++ b/idea/testData/intentions/convertNegatedBooleanSequence/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertNegatedBooleanSequenceIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertNegatedBooleanSequenceIntention diff --git a/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/.intention b/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/.intention index e8c746d94f2..0cc94276ca0 100644 --- a/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/.intention +++ b/idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertNegatedExpressionWithDemorgansLawIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertNegatedExpressionWithDemorgansLawIntention diff --git a/idea/testData/intentions/convertToBlockBody/.intention b/idea/testData/intentions/convertToBlockBody/.intention index 6cb3ad60700..f6aad814c7c 100644 --- a/idea/testData/intentions/convertToBlockBody/.intention +++ b/idea/testData/intentions/convertToBlockBody/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertToBlockBodyAction \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyAction diff --git a/idea/testData/intentions/convertToConcatenatedStringIntention/.intention b/idea/testData/intentions/convertToConcatenatedStringIntention/.intention index 7ce41a964f5..e5d202fb9e1 100644 --- a/idea/testData/intentions/convertToConcatenatedStringIntention/.intention +++ b/idea/testData/intentions/convertToConcatenatedStringIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertToConcatenatedStringIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertToConcatenatedStringIntention diff --git a/idea/testData/intentions/convertToExpressionBody/.intention b/idea/testData/intentions/convertToExpressionBody/.intention index 80a55e5f100..fb1724c8764 100644 --- a/idea/testData/intentions/convertToExpressionBody/.intention +++ b/idea/testData/intentions/convertToExpressionBody/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertToExpressionBodyAction \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertToExpressionBodyAction diff --git a/idea/testData/intentions/convertToForEachFunctionCall/.intention b/idea/testData/intentions/convertToForEachFunctionCall/.intention index cee391af38a..f3d69495292 100644 --- a/idea/testData/intentions/convertToForEachFunctionCall/.intention +++ b/idea/testData/intentions/convertToForEachFunctionCall/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertToForEachFunctionCallIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertToForEachFunctionCallIntention diff --git a/idea/testData/intentions/convertToForEachLoop/.intention b/idea/testData/intentions/convertToForEachLoop/.intention index faaf580c9e4..d50e0b28305 100644 --- a/idea/testData/intentions/convertToForEachLoop/.intention +++ b/idea/testData/intentions/convertToForEachLoop/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertToForEachLoopIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertToForEachLoopIntention diff --git a/idea/testData/intentions/convertToStringTemplateIntention/.intention b/idea/testData/intentions/convertToStringTemplateIntention/.intention index c5f85017e94..bcdcbf03874 100644 --- a/idea/testData/intentions/convertToStringTemplateIntention/.intention +++ b/idea/testData/intentions/convertToStringTemplateIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ConvertToStringTemplateIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ConvertToStringTemplateIntention diff --git a/idea/testData/intentions/declarations/convertMemberToExtension/.intention b/idea/testData/intentions/declarations/convertMemberToExtension/.intention index aebc7d15209..a3fdde771c0 100644 --- a/idea/testData/intentions/declarations/convertMemberToExtension/.intention +++ b/idea/testData/intentions/declarations/convertMemberToExtension/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.declarations.ConvertMemberToExtension \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.declarations.ConvertMemberToExtension diff --git a/idea/testData/intentions/declarations/split/.intention b/idea/testData/intentions/declarations/split/.intention index 6bb369b0a35..3ed8c330321 100644 --- a/idea/testData/intentions/declarations/split/.intention +++ b/idea/testData/intentions/declarations/split/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.declarations.SplitPropertyDeclarationIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.declarations.SplitPropertyDeclarationIntention diff --git a/idea/testData/intentions/insertCurlyBracesToTemplate/.intention b/idea/testData/intentions/insertCurlyBracesToTemplate/.intention index 323106fc920..27a27a2405e 100644 --- a/idea/testData/intentions/insertCurlyBracesToTemplate/.intention +++ b/idea/testData/intentions/insertCurlyBracesToTemplate/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.InsertCurlyBracesToTemplateIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.InsertCurlyBracesToTemplateIntention diff --git a/idea/testData/intentions/insertExplicitTypeArguments/.intention b/idea/testData/intentions/insertExplicitTypeArguments/.intention index b6bacfe5b12..a8098650d35 100644 --- a/idea/testData/intentions/insertExplicitTypeArguments/.intention +++ b/idea/testData/intentions/insertExplicitTypeArguments/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.InsertExplicitTypeArguments \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.InsertExplicitTypeArguments diff --git a/idea/testData/intentions/invertIfCondition/.intention b/idea/testData/intentions/invertIfCondition/.intention index 697b9b32f49..8ab7c4bf0f5 100644 --- a/idea/testData/intentions/invertIfCondition/.intention +++ b/idea/testData/intentions/invertIfCondition/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.InvertIfConditionIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.InvertIfConditionIntention diff --git a/idea/testData/intentions/makeTypeExplicitInLambda/.intention b/idea/testData/intentions/makeTypeExplicitInLambda/.intention index e8035a85ba3..3e4563108a8 100644 --- a/idea/testData/intentions/makeTypeExplicitInLambda/.intention +++ b/idea/testData/intentions/makeTypeExplicitInLambda/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.MakeTypeExplicitInLambdaIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.MakeTypeExplicitInLambdaIntention diff --git a/idea/testData/intentions/makeTypeImplicitInLambda/.intention b/idea/testData/intentions/makeTypeImplicitInLambda/.intention index 65aef85236c..a23c6dc11fd 100644 --- a/idea/testData/intentions/makeTypeImplicitInLambda/.intention +++ b/idea/testData/intentions/makeTypeImplicitInLambda/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.MakeTypeImplicitInLambdaIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.MakeTypeImplicitInLambdaIntention diff --git a/idea/testData/intentions/moveLambdaInsideParentheses/.intention b/idea/testData/intentions/moveLambdaInsideParentheses/.intention index e1430b712f9..d710b66f259 100644 --- a/idea/testData/intentions/moveLambdaInsideParentheses/.intention +++ b/idea/testData/intentions/moveLambdaInsideParentheses/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.MoveLambdaInsideParenthesesIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.MoveLambdaInsideParenthesesIntention diff --git a/idea/testData/intentions/moveLambdaOutsideParentheses/.intention b/idea/testData/intentions/moveLambdaOutsideParentheses/.intention index 18aae3a81b8..06f2dcba347 100644 --- a/idea/testData/intentions/moveLambdaOutsideParentheses/.intention +++ b/idea/testData/intentions/moveLambdaOutsideParentheses/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.MoveLambdaOutsideParenthesesIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.MoveLambdaOutsideParenthesesIntention diff --git a/idea/testData/intentions/operatorToFunction/.intention b/idea/testData/intentions/operatorToFunction/.intention index 1279518796b..9cffc1a6cd9 100644 --- a/idea/testData/intentions/operatorToFunction/.intention +++ b/idea/testData/intentions/operatorToFunction/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.OperatorToFunctionIntention diff --git a/idea/testData/intentions/reconstructedType/.intention b/idea/testData/intentions/reconstructedType/.intention index 58683baeb5d..f086e3e6a59 100644 --- a/idea/testData/intentions/reconstructedType/.intention +++ b/idea/testData/intentions/reconstructedType/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ReconstructTypeInCastOrIsAction \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ReconstructTypeInCastOrIsAction diff --git a/idea/testData/intentions/removeBraces/.intention b/idea/testData/intentions/removeBraces/.intention index 5efaa355404..1c4b42d3304 100644 --- a/idea/testData/intentions/removeBraces/.intention +++ b/idea/testData/intentions/removeBraces/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.RemoveBracesIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.RemoveBracesIntention diff --git a/idea/testData/intentions/removeCurlyBracesFromTemplate/.intention b/idea/testData/intentions/removeCurlyBracesFromTemplate/.intention index 107e3edeba5..5820ee4d359 100644 --- a/idea/testData/intentions/removeCurlyBracesFromTemplate/.intention +++ b/idea/testData/intentions/removeCurlyBracesFromTemplate/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.RemoveCurlyBracesFromTemplateIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention diff --git a/idea/testData/intentions/removeExplicitTypeArguments/.intention b/idea/testData/intentions/removeExplicitTypeArguments/.intention index a48847af45b..66d949609e3 100644 --- a/idea/testData/intentions/removeExplicitTypeArguments/.intention +++ b/idea/testData/intentions/removeExplicitTypeArguments/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.RemoveExplicitTypeArguments diff --git a/idea/testData/intentions/removeUnnecessaryParentheses/.intention b/idea/testData/intentions/removeUnnecessaryParentheses/.intention index 63b52ba1e82..2112f8fefc5 100644 --- a/idea/testData/intentions/removeUnnecessaryParentheses/.intention +++ b/idea/testData/intentions/removeUnnecessaryParentheses/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.RemoveUnnecessaryParenthesesIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.RemoveUnnecessaryParenthesesIntention diff --git a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/.intention b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/.intention index 659ab16942d..7e9ff463c60 100644 --- a/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/.intention +++ b/idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ReplaceExplicitFunctionLiteralParamWithItIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ReplaceExplicitFunctionLiteralParamWithItIntention diff --git a/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/.intention b/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/.intention index 872a1cdbb06..3ab04183613 100644 --- a/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/.intention +++ b/idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ReplaceItWithExplicitFunctionLiteralParamIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ReplaceItWithExplicitFunctionLiteralParamIntention diff --git a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention b/idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention index b5479e69eaf..cca5972c52a 100644 --- a/idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention +++ b/idea/testData/intentions/replaceWithDotQualifiedMethodCall/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ReplaceWithDotQualifiedMethodCallIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ReplaceWithDotQualifiedMethodCallIntention diff --git a/idea/testData/intentions/replaceWithInfixFunctionCall/.intention b/idea/testData/intentions/replaceWithInfixFunctionCall/.intention index 69b20b1d210..781a2f5c83c 100644 --- a/idea/testData/intentions/replaceWithInfixFunctionCall/.intention +++ b/idea/testData/intentions/replaceWithInfixFunctionCall/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.TestableReplaceWithInfixFunctionCallIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.TestableReplaceWithInfixFunctionCallIntention diff --git a/idea/testData/intentions/replaceWithOperatorAssign/.intention b/idea/testData/intentions/replaceWithOperatorAssign/.intention index 11fdcb93572..79d2cd47cdb 100644 --- a/idea/testData/intentions/replaceWithOperatorAssign/.intention +++ b/idea/testData/intentions/replaceWithOperatorAssign/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ReplaceWithOperatorAssignIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ReplaceWithOperatorAssignIntention diff --git a/idea/testData/intentions/replaceWithTraditionalAssignment/.intention b/idea/testData/intentions/replaceWithTraditionalAssignment/.intention index bd4409e2df8..469246b11e4 100644 --- a/idea/testData/intentions/replaceWithTraditionalAssignment/.intention +++ b/idea/testData/intentions/replaceWithTraditionalAssignment/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.ReplaceWithTraditionalAssignmentIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.ReplaceWithTraditionalAssignmentIntention diff --git a/idea/testData/intentions/simplifyBooleanWithConstants/.intention b/idea/testData/intentions/simplifyBooleanWithConstants/.intention index 9430cafd718..2bb0a2d9089 100644 --- a/idea/testData/intentions/simplifyBooleanWithConstants/.intention +++ b/idea/testData/intentions/simplifyBooleanWithConstants/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.SimplifyBooleanWithConstantsIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.SimplifyBooleanWithConstantsIntention diff --git a/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/.intention b/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/.intention index 7a583219a69..89819d4753e 100644 --- a/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/.intention +++ b/idea/testData/intentions/simplifyNegatedBinaryExpressionIntention/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.SimplifyNegatedBinaryExpressionIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.SimplifyNegatedBinaryExpressionIntention diff --git a/idea/testData/intentions/specifyType/.intention b/idea/testData/intentions/specifyType/.intention index a4e94a0e2be..e92c448ef7c 100644 --- a/idea/testData/intentions/specifyType/.intention +++ b/idea/testData/intentions/specifyType/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyAction diff --git a/idea/testData/intentions/splitIf/.intention b/idea/testData/intentions/splitIf/.intention index 47fac2d6c70..6bfb020fdc3 100644 --- a/idea/testData/intentions/splitIf/.intention +++ b/idea/testData/intentions/splitIf/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.SplitIfIntention \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.SplitIfIntention diff --git a/idea/testData/intentions/swapBinaryExpression/.intention b/idea/testData/intentions/swapBinaryExpression/.intention index 452ff1b26f7..1b4eab66a90 100644 --- a/idea/testData/intentions/swapBinaryExpression/.intention +++ b/idea/testData/intentions/swapBinaryExpression/.intention @@ -1 +1 @@ -org.jetbrains.jet.plugin.intentions.SwapBinaryExpression \ No newline at end of file +org.jetbrains.kotlin.idea.intentions.SwapBinaryExpression diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java rename to idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index b36d0a43ece..89c58093966 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.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.intentions; +package org.jetbrains.kotlin.idea.intentions; import com.google.common.collect.Lists; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AttributeCallReplacementIntentionTestHelpers.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/AttributeCallReplacementIntentionTestHelpers.kt similarity index 90% rename from idea/tests/org/jetbrains/jet/plugin/intentions/AttributeCallReplacementIntentionTestHelpers.kt rename to idea/tests/org/jetbrains/kotlin/idea/intentions/AttributeCallReplacementIntentionTestHelpers.kt index 287b6ad20f1..14318f8ed60 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/AttributeCallReplacementIntentionTestHelpers.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AttributeCallReplacementIntentionTestHelpers.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.plugin.intentions.attributeCallReplacements.* +import org.jetbrains.kotlin.idea.intentions.attributeCallReplacements.* trait AttributeCallReplacementIntentionTestMixin : AttributeCallReplacementIntention { protected override fun intentionFailed(editor: Editor, messageId: String, vararg values: Any?) { diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestException.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestException.kt similarity index 77% rename from idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestException.kt rename to idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestException.kt index a9912217f25..7067bc36ce7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestException.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestException.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,6 +14,6 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions; +package org.jetbrains.kotlin.idea.intentions -public class IntentionTestException(message: String): RuntimeException(message) +public class IntentionTestException(message: String) : RuntimeException(message) diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 38b19b63202..15c66da3686 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions; +package org.jetbrains.kotlin.idea.intentions; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/TestableReplaceWithInfixFunctionCallIntention.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/TestableReplaceWithInfixFunctionCallIntention.kt similarity index 90% rename from idea/tests/org/jetbrains/jet/plugin/intentions/TestableReplaceWithInfixFunctionCallIntention.kt rename to idea/tests/org/jetbrains/kotlin/idea/intentions/TestableReplaceWithInfixFunctionCallIntention.kt index f9987e22b61..8cc4c2ac855 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/TestableReplaceWithInfixFunctionCallIntention.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/TestableReplaceWithInfixFunctionCallIntention.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.intentions +package org.jetbrains.kotlin.idea.intentions import com.intellij.openapi.editor.Editor @@ -22,4 +22,4 @@ public class TestableReplaceWithInfixFunctionCallIntention : ReplaceWithInfixFun override fun intentionFailed(editor: Editor, messageID: String) { throw IntentionTestException(messageID) } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/AbstractJoinLinesTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/AbstractJoinLinesTest.java similarity index 93% rename from idea/tests/org/jetbrains/jet/plugin/intentions/declarations/AbstractJoinLinesTest.java rename to idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/AbstractJoinLinesTest.java index cc23148d944..6fc8c6b21aa 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/AbstractJoinLinesTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/AbstractJoinLinesTest.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.intentions.declarations; +package org.jetbrains.kotlin.idea.intentions.declarations; import com.intellij.codeInsight.editorActions.JoinLinesHandler; import com.intellij.openapi.projectRoots.JavaSdk; diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java index ecda816edb6..dbfbb8a43b4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.intentions.declarations; +package org.jetbrains.kotlin.idea.intentions.declarations; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses;