From a2b759ef78e320d5be36e3ed7acc47850c5162f4 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Fri, 24 Jul 2015 21:37:35 +0300 Subject: [PATCH] More proper package name --- .../idea/completion/smart/TypeInstantiationItems.kt | 2 +- .../DescriptorClassMember.kt | 2 +- .../ImplementMethodsHandler.kt | 3 ++- .../OverrideImplementMethodsHandler.kt | 5 +++-- .../OverrideMethodsHandler.kt | 2 +- idea/src/META-INF/plugin.xml | 4 ++-- .../breakpoints/dialog/AddFieldBreakpointDialog.java | 5 +---- .../breakpoints/dialog/fieldBreakpointDialogUtil.kt | 2 +- .../macro/AnonymousTemplateEditingListener.java | 2 +- .../jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt | 2 +- .../idea/codeInsight/AbstractOverrideImplementTest.java | 8 ++++---- .../kotlin/idea/codeInsight/OverrideImplementTest.java | 2 +- 12 files changed, 19 insertions(+), 20 deletions(-) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/{codeInsight => overrideImplement}/DescriptorClassMember.kt (98%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/{codeInsight => overrideImplement}/ImplementMethodsHandler.kt (92%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/{codeInsight => overrideImplement}/OverrideImplementMethodsHandler.kt (98%) rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/{codeInsight => overrideImplement}/OverrideMethodsHandler.kt (98%) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt index 75e42cc01e5..1e971bde3b7 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/TypeInstantiationItems.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.idea.completion.* import org.jetbrains.kotlin.idea.completion.handlers.CaretPosition import org.jetbrains.kotlin.idea.completion.handlers.KotlinFunctionInsertHandler -import org.jetbrains.kotlin.idea.core.codeInsight.ImplementMethodsHandler +import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMethodsHandler import org.jetbrains.kotlin.idea.core.psiClassToDescriptor import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.types.typeUtil.makeNotNullable diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/DescriptorClassMember.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/DescriptorClassMember.kt similarity index 98% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/DescriptorClassMember.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/DescriptorClassMember.kt index f60057f338e..9aa36e5e48f 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/DescriptorClassMember.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/DescriptorClassMember.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.core.codeInsight +package org.jetbrains.kotlin.idea.core.overrideImplement import com.intellij.codeInsight.generation.ClassMemberWithElement import com.intellij.codeInsight.generation.MemberChooserObject diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/ImplementMethodsHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMethodsHandler.kt similarity index 92% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/ImplementMethodsHandler.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMethodsHandler.kt index ab4e02d6190..c432d420160 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/ImplementMethodsHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMethodsHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.core.codeInsight +package org.jetbrains.kotlin.idea.core.overrideImplement import com.intellij.codeInsight.intention.IntentionAction import com.intellij.openapi.editor.Editor @@ -23,6 +23,7 @@ import com.intellij.psi.PsiFile import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.idea.JetBundle +import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMethodsHandler import org.jetbrains.kotlin.resolve.OverrideResolver public class ImplementMethodsHandler : OverrideImplementMethodsHandler(), IntentionAction { diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/OverrideImplementMethodsHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideImplementMethodsHandler.kt similarity index 98% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/OverrideImplementMethodsHandler.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideImplementMethodsHandler.kt index 2ac8ab4c4e7..f4f684d612e 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/OverrideImplementMethodsHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideImplementMethodsHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.core.codeInsight +package org.jetbrains.kotlin.idea.core.overrideImplement import com.intellij.codeInsight.hint.HintManager import com.intellij.ide.util.MemberChooser @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde +import org.jetbrains.kotlin.idea.core.overrideImplement.DescriptorClassMember import org.jetbrains.kotlin.idea.quickfix.moveCaretIntoGeneratedElement import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import org.jetbrains.kotlin.idea.util.ShortenReferences @@ -157,7 +158,7 @@ public abstract class OverrideImplementMethodsHandler : LanguageCodeInsightActio elementsToCompact.add(added as JetElement) } - ShortenReferences.DEFAULT.process(elementsToCompact) + ShortenReferences.Companion.DEFAULT.process(elementsToCompact) if (firstGenerated == null) return@runWriteAction diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/OverrideMethodsHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMethodsHandler.kt similarity index 98% rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/OverrideMethodsHandler.kt rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMethodsHandler.kt index 4d6de32bc38..19c3abeb65e 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/codeInsight/OverrideMethodsHandler.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMethodsHandler.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.core.codeInsight +package org.jetbrains.kotlin.idea.core.overrideImplement import com.google.common.collect.LinkedHashMultimap import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index d8193a52ca6..ffb92cec889 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -439,8 +439,8 @@ - - + + diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java index 3f7afc4912a..f1fc31a46b3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.debugger.breakpoints.dialog; -import com.intellij.codeInsight.generation.PsiFieldMember; import com.intellij.debugger.DebuggerBundle; import com.intellij.ide.util.MemberChooser; import com.intellij.ide.util.TreeClassChooser; @@ -27,10 +26,8 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.DocumentAdapter; -import com.intellij.util.Function; -import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.core.codeInsight.DescriptorClassMember; +import org.jetbrains.kotlin.idea.core.overrideImplement.DescriptorClassMember; import org.jetbrains.kotlin.psi.JetProperty; import javax.swing.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt index d0fa651bd53..13a594d4ed9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt @@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass import org.jetbrains.kotlin.asJava.KotlinLightClass import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor -import org.jetbrains.kotlin.idea.core.codeInsight.DescriptorClassMember +import org.jetbrains.kotlin.idea.core.overrideImplement.DescriptorClassMember import org.jetbrains.kotlin.psi.JetProperty fun PsiClass.collectProperties(): Array { diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.java index 0cb7c0ed012..0aa7a03f9d3 100644 --- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousTemplateEditingListener.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; -import org.jetbrains.kotlin.idea.core.codeInsight.ImplementMethodsHandler; +import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMethodsHandler; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index c23ea011a44..53baa99fdff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.diagnostics.Errors.* -import org.jetbrains.kotlin.idea.core.codeInsight.ImplementMethodsHandler +import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMethodsHandler import org.jetbrains.kotlin.idea.inspections.AddReflectionQuickFix import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createCallable.* import org.jetbrains.kotlin.idea.quickfix.createFromUsage.createClass.CreateClassFromCallWithConstructorCalleeActionFactory diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java index ec31101a155..97fc3a178d3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java @@ -34,10 +34,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; -import org.jetbrains.kotlin.idea.core.codeInsight.DescriptorClassMember; -import org.jetbrains.kotlin.idea.core.codeInsight.ImplementMethodsHandler; -import org.jetbrains.kotlin.idea.core.codeInsight.OverrideImplementMethodsHandler; -import org.jetbrains.kotlin.idea.core.codeInsight.OverrideMethodsHandler; +import org.jetbrains.kotlin.idea.core.overrideImplement.DescriptorClassMember; +import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMethodsHandler; +import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideImplementMethodsHandler; +import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMethodsHandler; import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java index 68cec121fca..475843b2465 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OverrideImplementTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.idea.codeInsight; -import org.jetbrains.kotlin.idea.core.codeInsight.OverrideMethodsHandler; +import org.jetbrains.kotlin.idea.core.overrideImplement.OverrideMethodsHandler; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; public final class OverrideImplementTest extends AbstractOverrideImplementTest {