Merge pull request #6 from jakepurple13/please_let_this_fix_that_crash

Please let this fix that crash
jakepurple13 · May 4, 2023 · 6992e02 · 6992e02
2 parents b0a4a93 + 85651bf
commit 6992e02
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 101 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.programmersbox"
-version = "1.0.15"
+version = "1.0.16"
 
 repositories {
     mavenCentral()
@@ -35,6 +35,11 @@ intellij {
 
 dependencies {
     implementation(compose.desktop.currentOs)
+    implementation(compose.desktop.linux_x64)
+    implementation(compose.desktop.linux_arm64)
+    implementation(compose.desktop.macos_arm64)
+    implementation(compose.desktop.macos_x64)
+    implementation(compose.desktop.windows_x64)
     implementation(compose.desktop.common)
     implementation(compose.materialIconsExtended)
     val ktorVersion = "2.2.2"

diff --git a/src/main/kotlin/com/programmersbox/fullmultiplatformcompose/BuilderWizardBuilder.kt b/src/main/kotlin/com/programmersbox/fullmultiplatformcompose/BuilderWizardBuilder.kt
@@ -18,7 +18,6 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.codeStyle.CodeStyleManager
 import com.intellij.psi.impl.file.PsiDirectoryFactory
 import com.intellij.ui.components.Link
-import com.programmersbox.fullmultiplatformcompose.configurations.BuilderConfigurationFactory
 import com.programmersbox.fullmultiplatformcompose.generators.CommonGenerator
 import com.programmersbox.fullmultiplatformcompose.steps.PlatformOptionsStep
 import com.programmersbox.fullmultiplatformcompose.utils.NetworkVersions
@@ -71,10 +70,10 @@ class BuilderWizardBuilder : ModuleBuilder() {
 
                 formatCode(modifiableRootModel.project, root)
 
-                BuilderConfigurationFactory.createConfigurations(
+                /*BuilderConfigurationFactory.createConfigurations(
                     modifiableRootModel.project,
                     params
-                )
+                )*/
             }
         }
     }

diff --git a/...com/programmersbox/fullmultiplatformcompose/configurations/BuilderConfigurationFactory.kt b/...com/programmersbox/fullmultiplatformcompose/configurations/BuilderConfigurationFactory.kt
@@ -1,9 +1,8 @@
 package com.programmersbox.fullmultiplatformcompose.configurations
+/*
 
 import com.android.tools.idea.run.AndroidRunConfiguration
 import com.android.tools.idea.run.AndroidRunConfigurationType
-import com.intellij.execution.impl.RunManagerImpl
-import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl
 import com.intellij.openapi.project.Project
 import com.programmersbox.fullmultiplatformcompose.BuilderParams
 
@@ -21,7 +20,8 @@ object BuilderConfigurationFactory {
 
         android?.let(runInstance::addConfiguration)
 
-        /*val desktop = if (params.hasDesktop) {
+        */
+/*val desktop = if (params.hasDesktop) {
             println("Creating Desktop")
             RunnerAndConfigurationSettingsImpl(
                 runInstance,
@@ -56,7 +56,8 @@ object BuilderConfigurationFactory {
             )
         } else null
 
-        desktop?.let(runInstance::addConfiguration)*/
+        desktop?.let(runInstance::addConfiguration)*//*
+
 
         val web = if (params.hasWeb) {
             println("Creating Web")
@@ -77,4 +78,4 @@ object BuilderConfigurationFactory {
         runInstance.setOrder({ one, two -> one.name.compareTo(two.name) })
         runInstance.requestSort()
     }
-}
+}*/
diff --git a/...kotlin/com/programmersbox/fullmultiplatformcompose/configurations/DesktopConfiguration.kt b/...kotlin/com/programmersbox/fullmultiplatformcompose/configurations/DesktopConfiguration.kt
@@ -1,11 +1,7 @@
 package com.programmersbox.fullmultiplatformcompose.configurations
 
 import com.intellij.execution.Executor
-import com.intellij.execution.actions.ConfigurationContext
-import com.intellij.execution.actions.LazyRunConfigurationProducer
 import com.intellij.execution.configurations.*
-import com.intellij.execution.impl.RunManagerImpl
-import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.icons.AllIcons
 import com.intellij.openapi.components.BaseState
@@ -14,10 +10,6 @@ import com.intellij.openapi.options.SettingsEditor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.LabeledComponent
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
-import com.intellij.openapi.util.Ref
-import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.idea.run.KotlinRunConfiguration
-import org.jetbrains.kotlin.idea.run.KotlinRunConfigurationType
 import javax.swing.Icon
 import javax.swing.JComponent
 import javax.swing.JPanel
@@ -121,48 +113,3 @@ class DesktopRunConfigurationType : ConfigurationType {
         const val ID = "DesktopRunConfiguration"
     }
 }
-
-class DesktopConfigSetup : LazyRunConfigurationProducer<KotlinRunConfiguration>() {
-
-    override fun getConfigurationFactory(): ConfigurationFactory {
-        return DesktopConfigurationFactory(KotlinRunConfigurationType())
-    }
-
-    override fun setupConfigurationFromContext(
-        configuration: KotlinRunConfiguration,
-        context: ConfigurationContext,
-        sourceElement: Ref<PsiElement>
-    ): Boolean {
-        val location = context.location ?: return false
-        val module = location.module ?: return false
-        context.runManager.addConfiguration(
-            RunnerAndConfigurationSettingsImpl(
-                RunManagerImpl(context.project),
-                KotlinRunConfiguration(
-                    "Desktop",
-                    JavaRunConfigurationModule(context.project, true),
-                    KotlinRunConfigurationType.instance
-                ).apply {
-                    runClass = "MainKt"
-                    setModule(module)
-                    setGeneratedName()
-                }
-            )
-        )
-        return true
-    }
-
-    override fun isConfigurationFromContext(
-        configuration: KotlinRunConfiguration,
-        context: ConfigurationContext
-    ): Boolean {
-        return true
-        /*val entryPointContainer =
-            context.location?.psiElement?.let { EntryPointContainerFinder.find(it) } ?: return false
-        val startClassFQName = KotlinRunConfigurationProducer.getStartClassFqName(entryPointContainer) ?: return false
-
-        return configuration.runClass == startClassFQName &&
-            context.module?.asJvmModule() == configuration.configurationModule?.module*/
-    }
-
-}
diff --git a/...main/kotlin/com/programmersbox/fullmultiplatformcompose/configurations/JsConfiguration.kt b/...main/kotlin/com/programmersbox/fullmultiplatformcompose/configurations/JsConfiguration.kt
@@ -2,11 +2,7 @@ package com.programmersbox.fullmultiplatformcompose.configurations
 
 import com.intellij.execution.ExecutionException
 import com.intellij.execution.Executor
-import com.intellij.execution.actions.ConfigurationContext
-import com.intellij.execution.actions.LazyRunConfigurationProducer
 import com.intellij.execution.configurations.*
-import com.intellij.execution.impl.RunManagerImpl
-import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl
 import com.intellij.execution.process.ProcessHandler
 import com.intellij.execution.process.ProcessHandlerFactory
 import com.intellij.execution.process.ProcessTerminatedListener
@@ -18,8 +14,6 @@ import com.intellij.openapi.options.SettingsEditor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.LabeledComponent
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
-import com.intellij.openapi.util.Ref
-import com.intellij.psi.PsiElement
 import org.jetbrains.plugins.gradle.service.execution.GradleExternalTaskConfigurationType
 import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration
 import javax.swing.Icon
@@ -148,32 +142,4 @@ class JsRunConfigurationType : ConfigurationType {
     companion object {
         const val ID = "JsRunConfiguration"
     }
-}
-
-class JsConfigSetup : LazyRunConfigurationProducer<JsBuilderRunConfiguration>() {
-
-    override fun getConfigurationFactory(): ConfigurationFactory {
-        return JsConfigurationFactory(JsRunConfigurationType())
-    }
-
-    override fun setupConfigurationFromContext(
-        configuration: JsBuilderRunConfiguration,
-        context: ConfigurationContext,
-        sourceElement: Ref<PsiElement>
-    ): Boolean {
-        context.runManager.addConfiguration(
-            RunnerAndConfigurationSettingsImpl(
-                RunManagerImpl(context.project),
-                JsBuilderConfigurationFactory().createTemplateConfiguration(context.project)
-            )
-        )
-        return configuration.project.projectFile?.children?.any { it.name == "jsApp" } ?: false
-    }
-
-    override fun isConfigurationFromContext(
-        configuration: JsBuilderRunConfiguration,
-        context: ConfigurationContext
-    ): Boolean {
-        return configuration.project.projectFile?.children?.any { it.name == "jsApp" } ?: false
-    }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -44,10 +44,5 @@
         <moduleBuilder
                 builderClass="com.programmersbox.fullmultiplatformcompose.BuilderWizardBuilder"
                 order="last"/>
-
-        <!--<runConfigurationProducer
-                implementation="com.programmersbox.fullmultiplatformcompose.configurations.JsConfigSetup"/>
-        <runConfigurationProducer
-                implementation="com.programmersbox.fullmultiplatformcompose.configurations.DesktopConfigSetup"/>-->
     </extensions>
 </idea-plugin>