build

Author: rli

plugins/toolkit/jetbrains-core/build.gradle.kts

@@ -34,6 +34,8 @@ intellijToolkit {
 dependencies {
     intellijPlatform {
         localPlugin(project(":plugin-core"))
+        bundledModule("intellij.platform.vcs.dvcs.impl")
+        bundledModule("intellij.libraries.microba")
     }
 }
 

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

@@ -3,54 +3,74 @@
 
 package software.aws.toolkits.jetbrains.services.lambda.python
 
+import com.intellij.ide.util.projectWizard.WizardContext
+import com.intellij.ide.wizard.NewProjectWizardStep
+import com.intellij.openapi.observable.properties.PropertyGraph
 import com.intellij.openapi.projectRoots.Sdk
-import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.openapi.ui.ValidationInfo
-import com.intellij.ui.DocumentAdapter
+import com.intellij.openapi.util.UserDataHolder
+import com.intellij.ui.dsl.builder.panel
 import com.jetbrains.python.configuration.PyConfigurableInterpreterList
-import com.jetbrains.python.newProject.steps.PyAddExistingSdkPanel
-import com.jetbrains.python.newProject.steps.PyAddNewEnvironmentPanel
+import com.jetbrains.python.newProject.NewPythonProjectStep
 import com.jetbrains.python.sdk.PreferredSdkComparator
-import com.jetbrains.python.sdk.PySdkSettings
 import com.jetbrains.python.sdk.PythonSdkType
 import com.jetbrains.python.sdk.PythonSdkUtil
-import com.jetbrains.python.sdk.add.PyAddSdkGroupPanel
 import software.aws.toolkits.jetbrains.services.lambda.wizard.SdkSelector
 import javax.swing.JComponent
 import javax.swing.JLabel
-import javax.swing.event.DocumentEvent
 
 class PyCharmSdkSelectionPanel(private val projectLocation: TextFieldWithBrowseButton?) : SdkSelector {
-    private val sdkPanel by lazy {
-        sdkPanel()
-    }
+//    private val sdkPanel by lazy {
+//        sdkPanel()
+//    }
 
-    override fun sdkSelectionPanel(): JComponent = sdkPanel
 
-    override fun sdkSelectionLabel(): JLabel? = null
+    private val sdkStep by lazy {
+        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")
 
-    private fun sdkPanel(): PyAddSdkGroupPanel {
-        // Based on PyCharm's ProjectSpecificSettingsStep
-        val existingSdks = getValidPythonSdks()
-        val newProjectLocation = getProjectLocation()
-        val newEnvironmentPanel = PyAddNewEnvironmentPanel(existingSdks, newProjectLocation, null)
-        val existingSdkPanel = PyAddExistingSdkPanel(null, null, existingSdks, newProjectLocation, existingSdks.firstOrNull())
+        })
+    }
 
-        val defaultPanel = if (PySdkSettings.instance.useNewEnvironmentForNewProject) newEnvironmentPanel else existingSdkPanel
+    private val sdkPanel by lazy {
+        panel {
+            sdkStep.setupUI(this)
+        }
+    }
 
-        val interpreterPanel = createPythonSdkPanel(listOf(newEnvironmentPanel, existingSdkPanel), defaultPanel)
+    override fun sdkSelectionPanel(): JComponent = sdkPanel
 
-        projectLocation?.textField?.document?.addDocumentListener(
-            object : DocumentAdapter() {
-                override fun textChanged(e: DocumentEvent) {
-                    interpreterPanel.newProjectPath = getProjectLocation()
-                }
-            }
-        )
+    override fun sdkSelectionLabel(): JLabel? = null
 
-        return interpreterPanel
-    }
+//    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()
 
@@ -61,11 +81,7 @@ class PyCharmSdkSelectionPanel(private val projectLocation: TextFieldWithBrowseB
         .toList()
 
     override fun getSdk(): Sdk? {
-        val sdk = sdkPanel.getOrCreateSdk() ?: return null
-        if (sdkPanel.selectedPanel is PyAddNewEnvironmentPanel) {
-            SdkConfigurationUtil.addSdk(sdk)
-        }
-        return sdk
+        return sdkStep.pythonSdk
     }
 
     override fun validateSelection(): ValidationInfo? = sdkPanel.validateAll().firstOrNull()

plugins/toolkit/jetbrains-rider/.gitignore

@@ -1,5 +1,6 @@
 /NuGet.Config
 /testData/NuGet.Config
+ReSharper.AWS.sln.DotSettings.user
 
 # Generated files
 *Generated.kt

plugins/toolkit/jetbrains-rider/build.gradle.kts

@@ -52,6 +52,8 @@ dependencies {
     intellijPlatform {
         localPlugin(project(":plugin-core"))
         testFramework(TestFrameworkType.Bundled)
+
+        bundledModule("intellij.rider")
     }
 
     implementation(project(":plugin-toolkit:jetbrains-core"))