Browse Source

flattened packages

and renamed package names
pull/1768/head
thelumiereguy 3 years ago
parent
commit
b79e2707e7
  1. 10
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveComposableIntention.kt
  2. 10
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/RemoveParentComposableIntention.kt
  3. 16
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/WrapWithComposableIntentionGroup.kt
  4. 4
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ChildComposableFinder.kt
  5. 2
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinder.kt
  6. 4
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composableFinder/ComposableFunctionFinderImpl.kt
  7. 2
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElement.kt
  8. 4
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isIntentionAvailable/IsIntentionAvailable.kt
  9. 2
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/isPsiElementComposable/IsPsiElementComposable.kt
  10. 10
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/BaseWrapWithComposableAction.kt
  11. 2
      idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrapActions/WrapWithActions.kt
  12. 6
      idea-plugin/src/main/resources/META-INF/plugin.xml
  13. 2
      idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/getRootPsiElement/GetRootPsiElementTest.kt

10
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_composable/RemoveComposableIntention.kt → 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.LowPriorityAction
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction 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.openapi.util.Iconable
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.compose.desktop.ide.preview.PreviewIcons import org.jetbrains.compose.desktop.ide.preview.PreviewIcons
import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinder import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinder
import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinderImpl import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinderImpl
import org.jetbrains.compose.intentions.utils.get_root_psi_element.GetRootPsiElement import org.jetbrains.compose.intentions.utils.getRootPsiElement.GetRootPsiElement
import org.jetbrains.compose.intentions.utils.is_intention_available.IsIntentionAvailable import org.jetbrains.compose.intentions.utils.isIntentionAvailable.IsIntentionAvailable
import javax.swing.Icon import javax.swing.Icon
class RemoveComposableIntention : class RemoveComposableIntention :

10
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/remove_parent_composable/RemoveParentComposableIntention.kt → 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.PriorityAction
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction 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.openapi.util.Iconable
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import org.jetbrains.compose.desktop.ide.preview.PreviewIcons import org.jetbrains.compose.desktop.ide.preview.PreviewIcons
import org.jetbrains.compose.intentions.utils.composable_finder.ChildComposableFinder import org.jetbrains.compose.intentions.utils.composableFinder.ChildComposableFinder
import org.jetbrains.compose.intentions.utils.composable_finder.ComposableFunctionFinder import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinder
import org.jetbrains.compose.intentions.utils.get_root_psi_element.GetRootPsiElement import org.jetbrains.compose.intentions.utils.getRootPsiElement.GetRootPsiElement
import org.jetbrains.compose.intentions.utils.is_intention_available.IsIntentionAvailable import org.jetbrains.compose.intentions.utils.isIntentionAvailable.IsIntentionAvailable
import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtCallExpression
import javax.swing.Icon import javax.swing.Icon

16
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/WrapWithComposableIntentionGroup.kt → 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.codeInsight.intention.impl.IntentionActionGroup
import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.Editor
@ -10,13 +10,13 @@ import com.intellij.openapi.util.Iconable
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
import com.intellij.ui.popup.list.ListPopupImpl import com.intellij.ui.popup.list.ListPopupImpl
import org.jetbrains.compose.desktop.ide.preview.PreviewIcons 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.wrapActions.BaseWrapWithComposableAction
import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithBoxIntention import org.jetbrains.compose.intentions.wrapActions.WrapWithBoxIntention
import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithCardIntention import org.jetbrains.compose.intentions.wrapActions.WrapWithCardIntention
import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithColumnIntention import org.jetbrains.compose.intentions.wrapActions.WrapWithColumnIntention
import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithLzyColumnIntention import org.jetbrains.compose.intentions.wrapActions.WrapWithLzyColumnIntention
import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithLzyRowIntention import org.jetbrains.compose.intentions.wrapActions.WrapWithLzyRowIntention
import org.jetbrains.compose.intentions.wrap_with_composable.wrap_with_actions.WrapWithRowIntention import org.jetbrains.compose.intentions.wrapActions.WrapWithRowIntention
import javax.swing.Icon import javax.swing.Icon
class WrapWithComposableIntentionGroup : class WrapWithComposableIntentionGroup :

4
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ChildComposableFinder.kt → 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 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.KtCallExpression
import org.jetbrains.kotlin.psi.KtLambdaArgument import org.jetbrains.kotlin.psi.KtLambdaArgument
import org.jetbrains.kotlin.psi.psiUtil.getChildOfType import org.jetbrains.kotlin.psi.psiUtil.getChildOfType

2
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinder.kt → 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 import com.intellij.psi.PsiElement

4
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/composable_finder/ComposableFunctionFinderImpl.kt → 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 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.KtCallExpression
import org.jetbrains.kotlin.psi.KtNameReferenceExpression import org.jetbrains.kotlin.psi.KtNameReferenceExpression
import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.psi.KtProperty

2
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElement.kt → 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 com.intellij.psi.PsiElement
import org.jetbrains.kotlin.psi.KtCallExpression import org.jetbrains.kotlin.psi.KtCallExpression

4
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_intention_available/IsIntentionAvailable.kt → 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 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 import org.jetbrains.kotlin.idea.KotlinLanguage
interface IsIntentionAvailable { interface IsIntentionAvailable {

2
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/utils/is_psi_element_composable/IsPsiElementComposable.kt → 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.compose.desktop.ide.preview.isComposableFunction
import org.jetbrains.kotlin.nj2k.postProcessing.resolve import org.jetbrains.kotlin.nj2k.postProcessing.resolve

10
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/BaseWrapWithComposableAction.kt → 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.HighPriorityAction
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction 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.editor.Editor
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElement 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.compose.intentions.utils.composable_finder.ComposableFunctionFinderImpl import org.jetbrains.compose.intentions.utils.composableFinder.ComposableFunctionFinderImpl
import org.jetbrains.compose.intentions.utils.get_root_psi_element.GetRootPsiElement import org.jetbrains.compose.intentions.utils.getRootPsiElement.GetRootPsiElement
import org.jetbrains.compose.intentions.utils.is_intention_available.IsIntentionAvailable import org.jetbrains.compose.intentions.utils.isIntentionAvailable.IsIntentionAvailable
abstract class BaseWrapWithComposableAction : abstract class BaseWrapWithComposableAction :
PsiElementBaseIntentionAction(), PsiElementBaseIntentionAction(),

2
idea-plugin/src/main/kotlin/org/jetbrains/compose/intentions/wrap_with_composable/wrap_with_actions/WrapWithActions.kt → 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.TemplateImpl
import com.intellij.codeInsight.template.impl.TemplateSettings import com.intellij.codeInsight.template.impl.TemplateSettings

6
idea-plugin/src/main/resources/META-INF/plugin.xml

@ -56,19 +56,19 @@
<defaultLiveTemplates file="templates/ComposeMultiplatformTemplates.xml"/> <defaultLiveTemplates file="templates/ComposeMultiplatformTemplates.xml"/>
<intentionAction id="wrap_group" order="first"> <intentionAction id="wrap_group" order="first">
<className>org.jetbrains.compose.intentions.wrap_with_composable.WrapWithComposableIntentionGroup <className>org.jetbrains.compose.intentions.WrapWithComposableIntentionGroup
</className> </className>
<category>Composable intentions</category> <category>Composable intentions</category>
</intentionAction> </intentionAction>
<intentionAction id="remove_composable" order="last"> <intentionAction id="remove_composable" order="last">
<className>org.jetbrains.compose.intentions.remove_composable.RemoveComposableIntention <className>org.jetbrains.compose.intentions.RemoveComposableIntention
</className> </className>
<category>Composable intentions</category> <category>Composable intentions</category>
</intentionAction> </intentionAction>
<intentionAction id="remove_parent_composable" order="last"> <intentionAction id="remove_parent_composable" order="last">
<className>org.jetbrains.compose.intentions.remove_parent_composable.RemoveParentComposableIntention <className>org.jetbrains.compose.intentions.RemoveParentComposableIntention
</className> </className>
<category>Composable intentions</category> <category>Composable intentions</category>
</intentionAction> </intentionAction>

2
idea-plugin/src/test/kotlin/org/jetbrains/compose/intentions/utils/get_root_psi_element/GetRootPsiElementTest.kt → 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 com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase
import junit.framework.TestCase import junit.framework.TestCase
Loading…
Cancel
Save