build

Author: rli

plugins/toolkit/intellij-standalone/build.gradle.kts

@@ -22,6 +22,8 @@ dependencies {
     intellijPlatform {
         localPlugin(project(":plugin-core"))
         pluginModule(project(":plugin-toolkit:jetbrains-core"))
+
+        plugin("PythonCore:243.18137.10")
     }
 }
 

plugins/toolkit/jetbrains-core/src-243+/software/aws/toolkits/jetbrains/services/lambda/python/PyCharmSdkSelectionPanel.kt

@@ -4,12 +4,13 @@
 package software.aws.toolkits.jetbrains.services.lambda.python
 
 import com.intellij.ide.util.projectWizard.WizardContext
+import com.intellij.ide.wizard.NewProjectWizardBaseData
 import com.intellij.ide.wizard.NewProjectWizardStep
 import com.intellij.openapi.observable.properties.PropertyGraph
-import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.openapi.ui.ValidationInfo
-import com.intellij.openapi.util.UserDataHolder
+import com.intellij.openapi.util.UserDataHolderBase
 import com.intellij.ui.dsl.builder.panel
 import com.jetbrains.python.newProject.NewPythonProjectStep
 import software.aws.toolkits.jetbrains.services.lambda.wizard.SdkSelector
@@ -18,20 +19,24 @@ import javax.swing.JLabel
 
 @Suppress("UnusedPrivateProperty")
 class PyCharmSdkSelectionPanel(private val projectLocation: TextFieldWithBrowseButton?) : SdkSelector {
-//    private val sdkPanel by lazy {
-//        sdkPanel()
-//    }
-
     private val sdkStep by lazy {
+        val graph = PropertyGraph()
         NewPythonProjectStep(object : NewProjectWizardStep {
-            override val context: WizardContext
-                get() = TODO("Not yet implemented")
-            override val propertyGraph: PropertyGraph
-                get() = TODO("Not yet implemented")
-            override val keywords: NewProjectWizardStep.Keywords
-                get() = TODO("Not yet implemented")
-            override val data: UserDataHolder
-                get() = TODO("Not yet implemented")
+            override val context = WizardContext(null, null)
+            override val propertyGraph: PropertyGraph = graph
+            override val keywords = NewProjectWizardStep.Keywords()
+            override val data = UserDataHolderBase().apply {
+                putUserData(
+                    NewProjectWizardBaseData.KEY,
+                    object : NewProjectWizardBaseData {
+                        override val nameProperty = graph.property("")
+                        override val pathProperty = graph.property(projectLocation?.text?.trim() ?: "")
+
+                        override var name by nameProperty
+                        override var path by pathProperty
+                    }
+                )
+            }
         })
     }
 
@@ -45,38 +50,9 @@ class PyCharmSdkSelectionPanel(private val projectLocation: TextFieldWithBrowseB
 
     override fun sdkSelectionLabel(): JLabel? = null
 
-//    private fun sdkPanel(): PyAddSdkGroupPanel {
-//        // Based on PyCharm's ProjectSpecificSettingsStep
-//        val existingSdks = getValidPythonSdks()
-//        val newProjectLocation = getProjectLocation()
-//        val newEnvironmentPanel = PyAddNewEnvironmentPanel(existingSdks, newProjectLocation, null as String?)
-//        val existingSdkPanel = PyAddExistingSdkPanel(null, null, existingSdks, newProjectLocation, existingSdks.firstOrNull())
-//
-//        val defaultPanel = if (PySdkSettings.instance.useNewEnvironmentForNewProject) newEnvironmentPanel else existingSdkPanel
-//        PyAddSdkGroupPanel()
-//        val interpreterPanel = createPythonSdkPanel(listOf(newEnvironmentPanel, existingSdkPanel), defaultPanel)
-//
-//        projectLocation?.textField?.document?.addDocumentListener(
-//            object : DocumentAdapter() {
-//                override fun textChanged(e: DocumentEvent) {
-//                    interpreterPanel.newProjectPath = getProjectLocation()
-//                }
-//            }
-//        )
-//
-//        return interpreterPanel
-//    }
-//
-//    private fun getProjectLocation(): String? = projectLocation?.text?.trim()
-//
-//    private fun getValidPythonSdks(): List<Sdk> = PyConfigurableInterpreterList.getInstance(null).allPythonSdks
-//        .asSequence()
-//        .filter { it.sdkType is PythonSdkType && !PythonSdkUtil.isInvalid(it) }
-//        .sortedWith(PreferredSdkComparator())
-//        .toList()
-
-    override fun getSdk(): Sdk? =
-        sdkStep.pythonSdk
+    override fun applySdkSettings(model: ModifiableRootModel) {
+        sdkStep.setupProject(model.project)
+    }
 
     override fun validateSelection(): ValidationInfo? = sdkPanel.validateAll().firstOrNull()
 }

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamProjectGenerator.kt

@@ -106,7 +106,11 @@ class SamProjectGeneratorSettingsPeer(val generator: SamProjectGenerator, privat
     /**
      * This hook is used in PyCharm and is called via {@link SamProjectBuilder#modifySettingsStep} for IntelliJ
      */
-    override fun validate(): ValidationInfo? = samInitSelectionPanel.validate()
+    override fun validate(): ValidationInfo? = if (!::samInitSelectionPanel.isInitialized) {
+        null
+    } else {
+        samInitSelectionPanel.validate()
+    }
 
     override fun getSettings(): SamNewProjectSettings = samInitSelectionPanel.getNewProjectSettings()
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SdkSelectionPanel.kt

@@ -6,7 +6,9 @@ package software.aws.toolkits.jetbrains.services.lambda.wizard
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.WriteAction
 import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.projectRoots.ProjectJdkTable
 import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.openapi.roots.ProjectRootManager
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
@@ -29,12 +31,19 @@ interface SdkSelector {
     fun sdkSelectionLabel(): JLabel?
 
     fun applySdkSettings(model: ModifiableRootModel) {
-        val sdk = getSdk() ?: return
+        var sdk = getSdk() ?: return
         val project = model.project
 
         val projectRootManager = ProjectRootManager.getInstance(project)
         WriteAction.runAndWait(
             ThrowableRunnable<Exception> {
+                val existingSdk = ProjectJdkTable.getInstance().findJdk(sdk.name)
+                if (existingSdk != null) {
+                    sdk = existingSdk
+                } else {
+                    SdkConfigurationUtil.addSdk(sdk)
+                }
+
                 if (projectRootManager.projectSdk == null) {
                     projectRootManager.projectSdk = sdk
                 }