Check build against 2022.1 Beta (#3106)

Author: rli

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -131,37 +131,37 @@ object IdeVersions {
             name = "2022.1",
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
-                sdkVersion = "221.4501-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "221.5080-EAP-CANDIDATE-SNAPSHOT",
                 plugins = commonPlugins + listOf(
                     "java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "PythonCore:221.4501.155",
-                    "Docker:221.4501.155"
+                    "PythonCore:221.5080.106",
+                    "Docker:221.5080.106"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
-                sdkVersion = "221.4501-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "221.5080-EAP-CANDIDATE-SNAPSHOT",
                 plugins = commonPlugins + listOf(
                     "JavaScript",
                     // Transitive dependency needed for javascript
                     // Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
                     "com.intellij.css",
                     "JavaScriptDebugger",
                     "com.intellij.database",
-                    "Pythonid:221.4501.155",
-                    "org.jetbrains.plugins.go:221.4501.155"
+                    "Pythonid:221.5080.93",
+                    "org.jetbrains.plugins.go:221.5080.93"
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2022.1-EAP3-SNAPSHOT",
+                sdkVersion = "2022.1-EAP9-SNAPSHOT",
                 plugins = commonPlugins + listOf(
                     "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
                 ),
                 netFrameworkTarget = "net472",
                 rdGenVersion = "2022.1.3",
-                nugetVersion = "2022.1.0-eap03"
+                nugetVersion = "2022.1.0-eap09"
             )
         )
     ).associateBy { it.name }

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.c
 awsSdk = "2.17.138"
 commonmark = "0.17.1"
 detekt = "1.18.1"
-intellijGradle = "1.4.0"
+intellijGradle = "1.5.2"
 intellijRemoteRobot = "0.11.11"
 jackson = "2.11.1"
 jacoco = "0.8.7"

jetbrains-core/tst-221+/software/aws/toolkits/jetbrains/core/EditorUtils.kt

@@ -17,5 +17,5 @@ fun <T : EditorNotificationProvider, U : EditorNotificationPanel> getEditorNotif
     NonBlockingReadActionImpl.waitForAsyncTaskCompletion()
 
     @Suppress("UNCHECKED_CAST")
-    return EditorNotificationsImpl.getNotificationPanels(editor)?.get(provider) as? U
+    return EditorNotificationsImpl.getNotificationPanels(editor)[provider] as? U
 }

jetbrains-core/tst/software/aws/toolkits/jetbrains/ui/ValidatingPanelTest.kt

@@ -3,7 +3,6 @@
 
 package software.aws.toolkits.jetbrains.ui
 
-import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.ui.ComponentValidator
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.testFramework.ApplicationRule
@@ -137,25 +136,6 @@ class ValidatingPanelTest {
                         textFieldComponent = this
                     }
             }
-        }.apply {
-            // HACK: 221.4501 broke validation on input. delete this entire `apply` block when on a later snapshot
-            // trick the registration logic
-            val info = ApplicationInfo.getInstance()
-            if (info.majorVersion == "2022" && info.minorVersionMainPart == "1") {
-                if (info.build.asStringWithoutProductCodeAndSnapshot() > "221.4501.171") {
-                    throw RuntimeException("Delete validating panel test hack")
-                }
-
-                // reflection so it's easier to delete the hack later
-                val clazz = contentPanel::class.java
-                val componentValidations = clazz.getMethod("getComponentValidations")
-                val setComponentValidationsOnApply = clazz.getMethod("setComponentValidationsOnApply", Map::class.java)
-                setComponentValidationsOnApply.invoke(contentPanel, componentValidations.invoke(contentPanel))
-                // and reregister the validator
-                contentPanel.registerValidators(disposableRule.disposable) { map ->
-                    updateActionButtons(map.isEmpty())
-                }
-            }
         }
 
         private fun JBTextField.validateText() = if (this.text.length < 5) ValidationInfo("Test Error, '${this.text}'.length() < 5", this) else null

jetbrains-rider/build.gradle.kts

@@ -39,6 +39,10 @@ intellijToolkit {
     ideFlavor.set(IdeFlavor.RD)
 }
 
+intellij {
+    type.set("RD")
+}
+
 sourceSets {
     main {
         java.srcDirs("$buildDir/generated-src")

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

@@ -58,6 +58,6 @@ class DotNetHandlerCompletionTest : BaseTestWithSolution() {
         assertThat(iconModel).isNotNull
         val ideaIconSecond = iconModel?.let { completionItemToIcon(project, iconModel) as? IconLoader.CachedImageIcon }
         assertThat(ideaIconSecond).isNotNull
-        assertThat(ideaIconSecond?.originalPath).isEqualTo(expectedPath.trimStart('/'))
+        assertThat(ideaIconSecond?.url?.path).endsWith(expectedPath.trimStart('/'))
     }
 }

jetbrains-ultimate/tst-213+/com/goide/vgo/VgoTestUtil.java

@@ -36,6 +36,7 @@
 import java.util.Objects;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import software.aws.toolkits.jetbrains.go.VgoCompatShims;
 
 public class VgoTestUtil {
     private static final String GOPATH = getGoTestDataPath("vgo/src/test/testData/mockGoPath").getAbsolutePath();
@@ -103,7 +104,7 @@ public static VgoModule createVgoModule(@NotNull CodeInsightTestFixture fixture,
                                             @NotNull Map<String, VgoDependency> dependencies) {
         String goModPath = modulePath != null ? FileUtil.join(modulePath, VgoUtil.GO_MOD) : VgoUtil.GO_MOD;
         PsiFile file = fixture.addFileToProject(goModPath, "module \"" + importPath + "\"");
-        return new VgoModule(file.getVirtualFile().getParent(), importPath, dependencies);
+        return VgoCompatShims.newVgoModule(file.getVirtualFile().getParent(), importPath, null, dependencies);
     }
 
     public static void setupVgoIntegration(@NotNull CodeInsightTestFixture fixture, @NotNull List<VgoModule> modules) {

jetbrains-ultimate/tst-213/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt

@@ -0,0 +1,14 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.go
+
+import com.goide.vgo.project.VgoDependency
+import com.goide.vgo.project.VgoModule
+import com.intellij.openapi.vfs.VirtualFile
+
+object VgoCompatShims {
+    @JvmStatic
+    fun newVgoModule(root: VirtualFile, importPath: String, goVersion: String?, dependencies: Map<String, VgoDependency>) =
+        VgoModule(root, importPath, dependencies)
+}

jetbrains-ultimate/tst-221+/software/aws/toolkits/jetbrains/go/VgoCompatShims.kt

@@ -0,0 +1,14 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.go
+
+import com.goide.vgo.project.VgoDependency
+import com.goide.vgo.project.VgoStandaloneModule
+import com.intellij.openapi.vfs.VirtualFile
+
+object VgoCompatShims {
+    @JvmStatic
+    fun newVgoModule(root: VirtualFile, importPath: String, goVersion: String?, dependencies: Map<String, VgoDependency>) =
+        VgoStandaloneModule(root, importPath, goVersion, dependencies.values)
+}