build

Author: rli

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import software.aws.toolkits.gradle.findFolders
 import software.aws.toolkits.gradle.intellij.IdeVersions
 import software.aws.toolkits.gradle.intellij.toolkitIntelliJ
@@ -95,6 +96,10 @@ dependencies {
 
         bundledPlugins(toolkitIntelliJ.productProfile().map { it.bundledPlugins })
         plugins(toolkitIntelliJ.productProfile().map { it.marketplacePlugins })
+
+        testFramework(TestFrameworkType.Plugin.Java)
+        testFramework(TestFrameworkType.Platform)
+        testFramework(TestFrameworkType.JUnit5)
     }
 }
 

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

@@ -3,7 +3,6 @@
 
 import io.gitlab.arturbosch.detekt.Detekt
 import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
-import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import software.aws.toolkits.gradle.intellij.IdeFlavor
 import software.aws.toolkits.telemetry.generator.gradle.GenerateTelemetry
 
@@ -56,12 +55,6 @@ configurations.testFixturesApi {
 }
 
 dependencies {
-    intellijPlatform {
-        testFramework(TestFrameworkType.Plugin.Java)
-        testFramework(TestFrameworkType.Platform)
-        testFramework(TestFrameworkType.JUnit5)
-    }
-
     compileOnlyApi(project(":plugin-core:core"))
     compileOnlyApi(libs.aws.apacheClient)
     compileOnlyApi(libs.aws.nettyClient)

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

@@ -11,21 +11,17 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.openapi.util.UserDataHolder
 import com.intellij.ui.dsl.builder.panel
-import com.jetbrains.python.configuration.PyConfigurableInterpreterList
 import com.jetbrains.python.newProject.NewPythonProjectStep
-import com.jetbrains.python.sdk.PreferredSdkComparator
-import com.jetbrains.python.sdk.PythonSdkType
-import com.jetbrains.python.sdk.PythonSdkUtil
 import software.aws.toolkits.jetbrains.services.lambda.wizard.SdkSelector
 import javax.swing.JComponent
 import javax.swing.JLabel
 
+@Suppress("UnusedPrivateProperty")
 class PyCharmSdkSelectionPanel(private val projectLocation: TextFieldWithBrowseButton?) : SdkSelector {
 //    private val sdkPanel by lazy {
 //        sdkPanel()
 //    }
 
-
     private val sdkStep by lazy {
         NewPythonProjectStep(object : NewProjectWizardStep {
             override val context: WizardContext
@@ -36,7 +32,6 @@ class PyCharmSdkSelectionPanel(private val projectLocation: TextFieldWithBrowseB
                 get() = TODO("Not yet implemented")
             override val data: UserDataHolder
                 get() = TODO("Not yet implemented")
-
         })
     }
 
@@ -71,18 +66,17 @@ class PyCharmSdkSelectionPanel(private val projectLocation: TextFieldWithBrowseB
 //
 //        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()
 
-    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? {
-        return sdkStep.pythonSdk
-    }
+    override fun getSdk(): Sdk? =
+        sdkStep.pythonSdk
 
     override fun validateSelection(): ValidationInfo? = sdkPanel.validateAll().firstOrNull()
 }