Fix connected execution terminal name in 222 (#3178)

Author: rli

jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt renamed to jetbrains-core/src-212-221/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt

@@ -1,11 +1,15 @@
-// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
 package software.aws.toolkits.jetbrains.core.terminal
 
 import com.intellij.openapi.project.Project
 import org.jetbrains.plugins.terminal.LocalTerminalDirectRunner
 
-class AwsLocalTerminalRunner(project: Project, private val applyConnection: (MutableMap<String, String>) -> Unit) : LocalTerminalDirectRunner(project) {
+class AwsLocalTerminalRunner(
+    project: Project,
+    private val termName: String,
+    private val applyConnection: (MutableMap<String, String>) -> Unit
+) : LocalTerminalDirectRunner(project) {
     override fun getInitialCommand(envs: MutableMap<String, String>): MutableList<String> = super.getInitialCommand(envs.apply(applyConnection))
 }

jetbrains-core/src-222+/software/aws/toolkits/jetbrains/core/terminal/AwsLocalTerminalRunner.kt

@@ -0,0 +1,25 @@
+// Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.core.terminal
+
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.project.Project
+import com.intellij.terminal.JBTerminalWidget
+import org.jetbrains.plugins.terminal.LocalTerminalDirectRunner
+
+class AwsLocalTerminalRunner(
+    project: Project,
+    private val termName: String,
+    private val applyConnection: (MutableMap<String, String>) -> Unit
+) : LocalTerminalDirectRunner(project) {
+    override fun getInitialCommand(envs: MutableMap<String, String>): MutableList<String> = super.getInitialCommand(envs.apply(applyConnection))
+    override fun createTerminalWidget(parent: Disposable, currentWorkingDirectory: String?, deferSessionStartUntilUiShown: Boolean): JBTerminalWidget {
+        val widget = super.createTerminalWidget(parent, currentWorkingDirectory, deferSessionStartUntilUiShown)
+        return widget.apply {
+            terminalTitle.change {
+                tag = termName
+            }
+        }
+    }
+}

jetbrains-core/src/software/aws/toolkits/jetbrains/core/terminal/OpenAwsLocalTerminal.kt

@@ -55,7 +55,7 @@ class OpenAwsLocalTerminal : DumbAwareAction(
                         return@executeOnPooledThread
                     }
                     runInEdt {
-                        val runner = AwsLocalTerminalRunner(project) { envs ->
+                        val runner = AwsLocalTerminalRunner(project, connection.shortName) { envs ->
                             connection.region.mergeWithExistingEnvironmentVariables(envs, replace = true)
                             when (val identifier = connection.credentials.identifier) {
                                 is ProfileCredentialsIdentifier -> envs[ProfileFileSystemSetting.AWS_PROFILE.environmentVariable()] = identifier.profileName

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/tests/OpenAwsLocalTerminalTest.kt

@@ -46,7 +46,7 @@ class OpenAwsLocalTerminalTest {
                     findText(Predicate { it.text.startsWith("AWS: ") }).text.substringAfter("AWS: ")
                 }
                 step("confirm terminal tab showing with connection $connection") {
-                    findByXpath("//div[@accessiblename='$connection' and @class='ContentTabLabel' and @text='$connection']")
+                    findByXpath("//div[@class='ContentTabLabel' and contains(@text,'$connection')]")
                 }
                 val terminal = step("find terminal window") {
                     findByXpath("//div[@class='ShellTerminalWidget' and @name='terminal']")