From b79e2707e74bcd2088272781999498af1c262a14 Mon Sep 17 00:00:00 2001 From: thelumiereguy Date: Fri, 4 Feb 2022 18:50:51 +0530 Subject: [PATCH] flattened packages and renamed package names --- .../RemoveComposableIntention.kt | 10 +++++----- .../RemoveParentComposableIntention.kt | 10 +++++----- .../WrapWithComposableIntentionGroup.kt | 16 ++++++++-------- .../ChildComposableFinder.kt | 4 ++-- .../ComposableFunctionFinder.kt | 2 +- .../ComposableFunctionFinderImpl.kt | 4 ++-- .../GetRootPsiElement.kt | 2 +- .../IsIntentionAvailable.kt | 4 ++-- .../IsPsiElementComposable.kt | 2 +- .../BaseWrapWithComposableAction.kt | 10 +++++----- .../WrapWithActions.kt | 2 +- .../src/main/resources/META-INF/plugin.xml | 6 +++--- .../GetRootPsiElementTest.kt | 2 +- 13 files changed, 37 insertions(+), 37 deletions(-) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/{remove_composable => }/RemoveComposableIntention.kt (74%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/{remove_parent_composable => }/RemoveParentComposableIntention.kt (79%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/{wrap_with_composable => }/WrapWithComposableIntentionGroup.kt (73%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/{composable_finder => composableFinder}/ChildComposableFinder.kt (87%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/{composable_finder => composableFinder}/ComposableFunctionFinder.kt (67%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/{composable_finder => composableFinder}/ComposableFunctionFinderImpl.kt (91%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/{get_root_psi_element => getRootPsiElement}/GetRootPsiElement.kt (96%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/{is_intention_available => isIntentionAvailable}/IsIntentionAvailable.kt (76%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/{is_psi_element_composable => isPsiElementComposable}/IsPsiElementComposable.kt (90%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/{wrap_with_composable/wrap_with_actions => wrapActions}/BaseWrapWithComposableAction.kt (78%) rename idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/{wrap_with_composable/wrap_with_actions => wrapActions}/WrapWithActions.kt (96%) rename idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/{get_root_psi_element => getRootPsiElement}/GetRootPsiElementTest.kt (99%) diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_composable/RemoveComposableIntention.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveComposableIntention.kt similarity index 74% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_composable/RemoveComposableIntention.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveComposableIntention.kt index b6d4741aee..05ae49adcd 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_composable/RemoveComposableIntention.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveComposableIntention.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.remove_composable +package org.jetbrains.compose.intentions import com.intellij.codeInsight.intention.LowPriorityAction import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction @@ -7,10 +7,10 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.Iconable import com.intellij.psi.PsiElement import org.jetbrains.compose.desktop.ide.preview.PreviewIcons -import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinder -import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinderImpl -import org.jetbrains.compose.intentions.utils.get_root_psi_element.GetRootPsiElement -import org.jetbrains.compose.intentions.utils.is_intention_available.IsIntentionAvailable +import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinder +import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinderImpl +import org.jetbrains.compose.intentions.utils.getRootPsiElement.GetRootPsiElement +import org.jetbrains.compose.intentions.utils.isIntentionAvailable.IsIntentionAvailable import javax.swing.Icon class RemoveComposableIntention : diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_parent_composable/RemoveParentComposableIntention.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveParentComposableIntention.kt similarity index 79% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_parent_composable/RemoveParentComposableIntention.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveParentComposableIntention.kt index 298e146986..45ca2e33ae 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_parent_composable/RemoveParentComposableIntention.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveParentComposableIntention.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.remove_parent_composable +package org.jetbrains.compose.intentions import com.intellij.codeInsight.intention.PriorityAction import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction @@ -7,10 +7,10 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.util.Iconable import com.intellij.psi.PsiElement import org.jetbrains.compose.desktop.ide.preview.PreviewIcons -import org.jetbrains.compose.intentions.utils.composable_finder.ChildComposableFinder -import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinder -import org.jetbrains.compose.intentions.utils.get_root_psi_element.GetRootPsiElement -import org.jetbrains.compose.intentions.utils.is_intention_available.IsIntentionAvailable +import org.jetbrains.compose.intentions.utils.composableFinder.ChildComposableFinder +import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinder +import org.jetbrains.compose.intentions.utils.getRootPsiElement.GetRootPsiElement +import org.jetbrains.compose.intentions.utils.isIntentionAvailable.IsIntentionAvailable import org.jetbrains.kotlin.psi.KtCallExpression import javax.swing.Icon diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/WrapWithComposableIntentionGroup.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/WrapWithComposableIntentionGroup.kt similarity index 73% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/WrapWithComposableIntentionGroup.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/WrapWithComposableIntentionGroup.kt index 7629b27e58..7fd1b3bdaf 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/WrapWithComposableIntentionGroup.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/WrapWithComposableIntentionGroup.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.wrap_with_composable +package org.jetbrains.compose.intentions import com.intellij.codeInsight.intention.impl.IntentionActionGroup import com.intellij.openapi.editor.Editor @@ -10,13 +10,13 @@ import com.intellij.openapi.util.Iconable import com.intellij.psi.PsiFile import com.intellij.ui.popup.list.ListPopupImpl import org.jetbrains.compose.desktop.ide.preview.PreviewIcons -import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.BaseWrapWithComposableAction -import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithBoxIntention -import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithCardIntention -import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithColumnIntention -import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithLzyColumnIntention -import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithLzyRowIntention -import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithRowIntention +import org.jetbrains.compose.intentions.wrapActions.BaseWrapWithComposableAction +import org.jetbrains.compose.intentions.wrapActions.WrapWithBoxIntention +import org.jetbrains.compose.intentions.wrapActions.WrapWithCardIntention +import org.jetbrains.compose.intentions.wrapActions.WrapWithColumnIntention +import org.jetbrains.compose.intentions.wrapActions.WrapWithLzyColumnIntention +import org.jetbrains.compose.intentions.wrapActions.WrapWithLzyRowIntention +import org.jetbrains.compose.intentions.wrapActions.WrapWithRowIntention import javax.swing.Icon class WrapWithComposableIntentionGroup : diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ChildComposableFinder.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ChildComposableFinder.kt similarity index 87% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ChildComposableFinder.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ChildComposableFinder.kt index b923bf2c0a..eba5366702 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ChildComposableFinder.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ChildComposableFinder.kt @@ -1,7 +1,7 @@ -package org.jetbrains.compose.intentions.utils.composable_finder +package org.jetbrains.compose.intentions.utils.composableFinder import com.intellij.psi.PsiElement -import org.jetbrains.compose.intentions.utils.is_psi_element_composable.IsPsiElementComposable +import org.jetbrains.compose.intentions.utils.isPsiElementComposable.IsPsiElementComposable import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtLambdaArgument import org.jetbrains.kotlin.psi.psiUtil.getChildOfType diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinder.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinder.kt similarity index 67% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinder.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinder.kt index 5d082a55b4..e56aca5cd7 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinder.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinder.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.utils.composable_finder +package org.jetbrains.compose.intentions.utils.composableFinder import com.intellij.psi.PsiElement diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinderImpl.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinderImpl.kt similarity index 91% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinderImpl.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinderImpl.kt index d03d2fc80f..669b01e03d 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinderImpl.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinderImpl.kt @@ -1,7 +1,7 @@ -package org.jetbrains.compose.intentions.utils.composable_finder +package org.jetbrains.compose.intentions.utils.composableFinder import com.intellij.psi.PsiElement -import org.jetbrains.compose.intentions.utils.is_psi_element_composable.IsPsiElementComposable +import org.jetbrains.compose.intentions.utils.isPsiElementComposable.IsPsiElementComposable import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.psi.KtProperty diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElement.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElement.kt similarity index 96% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElement.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElement.kt index c0adf648f5..d8301ed04b 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElement.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElement.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.utils.get_root_psi_element +package org.jetbrains.compose.intentions.utils.getRootPsiElement import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.KtCallExpression diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_intention_available/IsIntentionAvailable.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isIntentionAvailable/IsIntentionAvailable.kt similarity index 76% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_intention_available/IsIntentionAvailable.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isIntentionAvailable/IsIntentionAvailable.kt index 30d1d8a9b9..44b16d6db0 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_intention_available/IsIntentionAvailable.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isIntentionAvailable/IsIntentionAvailable.kt @@ -1,7 +1,7 @@ -package org.jetbrains.compose.intentions.utils.is_intention_available +package org.jetbrains.compose.intentions.utils.isIntentionAvailable import com.intellij.psi.PsiElement -import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinder +import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinder import org.jetbrains.kotlin.idea.KotlinLanguage interface IsIntentionAvailable { diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_psi_element_composable/IsPsiElementComposable.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isPsiElementComposable/IsPsiElementComposable.kt similarity index 90% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_psi_element_composable/IsPsiElementComposable.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isPsiElementComposable/IsPsiElementComposable.kt index 701be8cde3..c28af0e350 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_psi_element_composable/IsPsiElementComposable.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isPsiElementComposable/IsPsiElementComposable.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.utils.is_psi_element_composable +package org.jetbrains.compose.intentions.utils.isPsiElementComposable import org.jetbrains.compose.desktop.ide.preview.isComposableFunction import org.jetbrains.kotlin.nj2k.postProcessing.resolve diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/BaseWrapWithComposableAction.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/BaseWrapWithComposableAction.kt similarity index 78% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/BaseWrapWithComposableAction.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/BaseWrapWithComposableAction.kt index 4b003af082..649c4fec3c 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/BaseWrapWithComposableAction.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/BaseWrapWithComposableAction.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions +package org.jetbrains.compose.intentions.wrapActions import com.intellij.codeInsight.intention.HighPriorityAction import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction @@ -7,10 +7,10 @@ import com.intellij.codeInsight.template.impl.TemplateImpl import com.intellij.openapi.editor.Editor import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinder -import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinderImpl -import org.jetbrains.compose.intentions.utils.get_root_psi_element.GetRootPsiElement -import org.jetbrains.compose.intentions.utils.is_intention_available.IsIntentionAvailable +import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinder +import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinderImpl +import org.jetbrains.compose.intentions.utils.getRootPsiElement.GetRootPsiElement +import org.jetbrains.compose.intentions.utils.isIntentionAvailable.IsIntentionAvailable abstract class BaseWrapWithComposableAction : PsiElementBaseIntentionAction(), diff --git a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/WrapWithActions.kt b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/WrapWithActions.kt similarity index 96% rename from idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/WrapWithActions.kt rename to idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/WrapWithActions.kt index 2947413848..a338b33cf1 100644 --- a/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/WrapWithActions.kt +++ b/idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/WrapWithActions.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions +package org.jetbrains.compose.intentions.wrapActions import com.intellij.codeInsight.template.impl.TemplateImpl import com.intellij.codeInsight.template.impl.TemplateSettings diff --git a/idea-plugin/src/main/resources/META-INF/plugin.xml b/idea-plugin/src/main/resources/META-INF/plugin.xml index a0cd9aa00b..094a452331 100644 --- a/idea-plugin/src/main/resources/META-INF/plugin.xml +++ b/idea-plugin/src/main/resources/META-INF/plugin.xml @@ -56,19 +56,19 @@ - org.jetbrains.compose.intentions.wrap_with_composable.WrapWithComposableIntentionGroup + org.jetbrains.compose.intentions.WrapWithComposableIntentionGroup Composable intentions - org.jetbrains.compose.intentions.remove_composable.RemoveComposableIntention + org.jetbrains.compose.intentions.RemoveComposableIntention Composable intentions - org.jetbrains.compose.intentions.remove_parent_composable.RemoveParentComposableIntention + org.jetbrains.compose.intentions.RemoveParentComposableIntention Composable intentions diff --git a/idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElementTest.kt b/idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElementTest.kt similarity index 99% rename from idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElementTest.kt rename to idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElementTest.kt index 7bb034109c..b5c11e0e3c 100644 --- a/idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElementTest.kt +++ b/idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElementTest.kt @@ -1,4 +1,4 @@ -package org.jetbrains.compose.intentions.utils.get_root_psi_element +package org.jetbrains.compose.intentions.utils.getRootPsiElement import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase import junit.framework.TestCase