build

Author: rli

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/learn/LearnCodeWhispererEditor.kt

@@ -17,7 +17,7 @@ import com.intellij.ui.dsl.builder.BottomGap
 import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.TopGap
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.Gaps
+import com.intellij.ui.dsl.gridLayout.UnscaledGaps
 import icons.AwsIcons
 import software.aws.toolkits.jetbrains.services.codewhisperer.learn.LearnCodeWhispererUIComponents.examplesDescriptionPanel
 import software.aws.toolkits.jetbrains.services.codewhisperer.learn.LearnCodeWhispererUIComponents.tryExamplePanel
@@ -29,7 +29,7 @@ class LearnCodeWhispererEditor(val project: Project, val virtualFile: VirtualFil
     private val contentPanel = panel {
         row {
             panel {
-                customize(Gaps(20, 50, 0, 0))
+                customize(UnscaledGaps(20, 50, 0, 0))
                 row {
                     icon(AwsIcons.Logos.AWS_Q_GRADIENT)
 
@@ -46,7 +46,7 @@ class LearnCodeWhispererEditor(val project: Project, val virtualFile: VirtualFil
         row {
             // Single panel
             panel {
-                customize(Gaps(0, 50, 0, 0))
+                customize(UnscaledGaps(0, 50, 0, 0))
                 align(AlignY.TOP)
 
                 subtitle(message("codewhisperer.learn_page.examples.title")).bottomGap(BottomGap.MEDIUM)

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/PluginVersionChecker.kt

@@ -12,7 +12,6 @@ import com.intellij.notification.SingletonNotificationManager
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ex.ApplicationManagerEx
 import com.intellij.openapi.progress.EmptyProgressIndicator
-import kotlinx.coroutines.CoroutineScope
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
@@ -24,7 +23,7 @@ import software.aws.toolkits.resources.AwsCoreBundle
 import javax.swing.SwingUtilities
 
 class PluginVersionChecker : ApplicationInitializedListener {
-    override suspend fun execute(asyncScope: CoroutineScope) {
+    override suspend fun execute() {
         if (ApplicationManager.getApplication().isHeadlessEnvironment) {
             LOG.info { "Skipping due to headless environment" }
             return

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt renamed to plugins/toolkit/jetbrains-core/src-233-241/software/aws/toolkits/jetbrains/core/startup/PluginCoreEnforcementActivity.kt/PluginCoreEnforcementActivity.kt

@@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory
 class PluginCoreEnforcementActivity : ApplicationInitializedListener {
 
     @Suppress("LazyLog")
-    override suspend fun execute(asyncScope: CoroutineScope) {
+    override suspend fun execute() {
         // can't reference anything in core
         val log = LoggerFactory.getLogger(this::class.java)
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/gettingstarted/editor/GettingStartedPanel.kt

@@ -30,7 +30,7 @@ import com.intellij.ui.dsl.builder.Panel
 import com.intellij.ui.dsl.builder.TopGap
 import com.intellij.ui.dsl.builder.actionListener
 import com.intellij.ui.dsl.builder.panel
-import com.intellij.ui.dsl.gridLayout.Gaps
+import com.intellij.ui.dsl.gridLayout.UnscaledGaps
 import com.intellij.util.Alarm
 import com.intellij.util.ui.JBFont
 import com.intellij.util.ui.JBUI
@@ -1109,7 +1109,7 @@ class GettingStartedPanel(
                     // Image.SCALE_DEFAULT is the only valid parameter for gifs
                     .getScaledInstance(PANEL_WIDTH - (indentSize * 2), -1, if (path.endsWith("gif")) Image.SCALE_DEFAULT else Image.SCALE_SMOOTH)
                 cell(JLabel(ImageIcon(image)))
-                    .customize(Gaps.EMPTY)
+                    .customize(UnscaledGaps.EMPTY)
             }
         }
     }

plugins/toolkit/jetbrains-gateway/src/software/aws/toolkits/jetbrains/gateway/CawsConnectorViewPanels.kt

@@ -489,8 +489,7 @@ class EnvironmentDetailsPanel(private val context: CawsSettings, lifetime: Lifet
                                 panel {
                                     row(message("caws.workspace.details.backend_toolkit_location")) {
                                         textFieldWithBrowseButton(
-                                            message("caws.workspace.details.toolkit_location"),
-                                            fileChooserDescriptor = FileChooserDescriptorFactory.createSingleFileDescriptor()
+                                            FileChooserDescriptorFactory.createSingleFileDescriptor()
                                         ).bindText(context::toolkitLocation)
                                     }
 

plugins/toolkit/jetbrains-rider/it/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotnetLocalLambdaRunConfigurationIntegrationTest.kt

@@ -106,7 +106,7 @@ abstract class DotnetLocalLambdaRunConfigurationIntegrationTestBase(private val
 
     @Test
     fun samIsExecutedWithFileInput() {
-        val input = Files.createTempFile(tempTestDirectory.toPath(), "tmp", null).also {
+        val input = Files.createTempFile("tmp", null).also {
             it.writeText("Hello World")
         }
 

plugins/toolkit/jetbrains-rider/tst/base/AwsReuseSolutionTestBase.kt

@@ -3,61 +3,21 @@
 
 package base
 
-import com.intellij.ide.GeneralSettings
-import com.intellij.openapi.project.Project
 import com.jetbrains.rider.projectView.solutionDirectory
-import com.jetbrains.rider.test.base.BaseTestWithSolutionBase
+import com.jetbrains.rider.test.base.BaseTestWithSolution
 import com.jetbrains.rider.test.debugger.XDebuggerTestHelper
 import com.jetbrains.rider.test.scriptingApi.getVirtualFileFromPath
-import com.jetbrains.rider.test.scriptingApi.useCachedTemplates
-import org.testng.annotations.AfterClass
-import org.testng.annotations.BeforeClass
-import software.aws.toolkits.jetbrains.utils.OpenSolutionFileParams
-import software.aws.toolkits.jetbrains.utils.openSolutionFile
-import java.io.File
-import java.time.Duration
 /**
  * Base test class that uses the same solution per test class.
  * Solution re-open logic takes time. We can avoid this by using the same solution instance per every test in a class
  */
-abstract class AwsReuseSolutionTestBase : BaseTestWithSolutionBase() {
-
-    private var myProject: Project? = null
-    var project: Project
-        get() = this.myProject!!
-        set(value) {
-            this.myProject = value
-        }
-
-    protected open val waitForCaches: Boolean get() = false
-    protected open val persistCaches: Boolean get() = false
-    protected open val restoreNuGetPackages: Boolean get() = false
+abstract class AwsReuseSolutionTestBase : BaseTestWithSolution() {
+    override val waitForCaches: Boolean get() = false
+    override val persistCaches: Boolean get() = false
+    override val restoreNuGetPackages: Boolean get() = false
 
     protected abstract fun getSolutionDirectoryName(): String
 
-    protected open fun getCustomSolutionFileName(): String? = null
-    protected open fun preprocessTempDirectory(tempDir: File) {}
-
-    // TODO: Remove when https://youtrack.jetbrains.com/issue/RIDER-47995 is fixed FIX_WHEN_MIN_IS_213
-    @BeforeClass
-    fun allowDotnetRoots() {
-        allowCustomDotnetRoots()
-    }
-
-    @BeforeClass(alwaysRun = true)
-    fun setUpClassSolution() {
-        openSolution(getSolutionDirectoryName())
-    }
-
-    @AfterClass(alwaysRun = true)
-    fun closeSolution() {
-        try {
-            closeSolutionAndResetSettings(myProject)
-        } finally {
-            myProject = null
-        }
-    }
-
     // 15 is a magic number (it's the return statement since they are all the same), but the only
     // example of it used that I could find it is used that way:
     // https://github.com/JetBrains/fsharp-support/blob/93ab17493a34a0bc0fd4c70b11adde02f81455c4/rider-fsharp/src/test/kotlin/debugger/AsyncDebuggerTest.kt#L6
@@ -67,21 +27,6 @@ abstract class AwsReuseSolutionTestBase : BaseTestWithSolutionBase() {
         XDebuggerTestHelper.toggleBreakpoint(project, getVirtualFileFromPath("src/HelloWorld/Function.cs", project.solutionDirectory), line - 1)
     }
 
-    private fun openSolution(solutionDirName: String) {
-        GeneralSettings.getInstance().isConfirmExit = false
-
-        val params = OpenSolutionFileParams()
-        params.backendLoadedTimeout = backendStartTimeout
-        params.customSolutionName = getCustomSolutionFileName()
-        params.preprocessTempDirectory = { preprocessTempDirectory(it) }
-        params.persistCaches = persistCaches
-        params.waitForCaches = waitForCaches
-        params.restoreNuGetPackages = restoreNuGetPackages
-
-        useCachedTemplates = false
-
-        myProject = openSolution(openSolutionFile(solutionDirName), params)
-    }
-
-    override val backendShellLoadTimeout: Duration = backendStartTimeout
+    override val testSolution = getSolutionDirectoryName()
+    override val backendLoadedTimeout = backendStartTimeout
 }

plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/completion/DotNetHandlerCompletionTest.kt

@@ -17,9 +17,6 @@ import java.time.Duration
 
 class DotNetHandlerCompletionTest : BaseTestWithSolution() {
     override val backendLoadedTimeout: Duration = backendStartTimeout
-    override val backendShellLoadTimeout: Duration = backendStartTimeout
-
-    override fun getSolutionDirectoryName(): String = ""
 
     override val waitForCaches = true
 

plugins/toolkit/jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt

@@ -19,9 +19,7 @@ class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
     }
 
     override val backendLoadedTimeout: Duration = backendStartTimeout
-    override val backendShellLoadTimeout: Duration = backendStartTimeout
-
-    override fun getSolutionDirectoryName(): String = "SamHelloWorldApp"
+    override val testSolution = "SamHelloWorldApp"
 
     @Test
     fun testClass_FunctionClass_Detected() = verifyLambdaGutterMark()