Enable Rider tests with 193 SDK

* Switch to 2019.3 SDK to verify Rider tests works (Rider tests run on local environment is available in 193 SDK only)
* Update travis and Amazon configuration to set the env variable

Author: sdubov

.travis.yml

@@ -1,6 +1,10 @@
 language: java
 install: true
 
+env:
+  global:
+    - LOCAL_ENV_RUN=true
+
 matrix:
   include:
     - os: linux

buildspec/linuxTests.yml

@@ -8,6 +8,7 @@ cache:
 env:
   variables:
     CI: true
+    LOCAL_ENV_RUN: true
 
 phases:
   install:

buildspec/windowsTests.yml

@@ -3,6 +3,7 @@ version: 0.2
 env:
   variables:
     CI: true
+    LOCAL_ENV_RUN: true
 
 phases:
   install:

gradle.properties

@@ -9,7 +9,7 @@ publishToken=
 publishChannel=
 
 # Common dependencies
-ideProfileName=2019.2
+ideProfileName=2019.3
 kotlinVersion=1.3.21
 awsSdkVersion=2.6.5
 ideaPluginVersion=0.4.9

intellijJVersions.gradle

@@ -78,7 +78,7 @@ static def ideProfiles() {
                     version: "IC-193-EAP-SNAPSHOT",
                     plugins: [
                         "yaml",
-                        "PythonCore:193.3793.14",
+                        "PythonCore:193.4386.10",
                         "java",
                         "gradle",
                         "maven",
@@ -88,12 +88,18 @@ static def ideProfiles() {
                 "IU": [
                     version: "IU-193-EAP-SNAPSHOT",
                     plugins: [
-                        "PythonCore:193.3793.14",
+                        "PythonCore:193.4386.10",
                         "yaml",
                         "JavaScriptLanguage",
                         "JavaScriptDebugger",
                         "CSS",
                     ]
+                ],
+                "RD": [
+                    version: "RD-2019.3-SNAPSHOT",
+                    plugins: [
+                        "yaml"
+                    ]
                 ]
             ]
     ]

jetbrains-core/src/software/aws/toolkits/jetbrains/ui/RegionSelector.kt

@@ -43,7 +43,7 @@ class RegionSelector : ComboBox<AwsRegion>() {
 
     private inner class Renderer : SimpleListCellRenderer<AwsRegion>() {
         override fun customize(
-            list: JList<out AwsRegion>?,
+            list: JList<out AwsRegion>,
             value: AwsRegion?,
             index: Int,
             selected: Boolean,

jetbrains-rider/build.gradle

@@ -79,17 +79,38 @@ compileKotlin.dependsOn(generateModel)
 
 test {
     useTestNG()
+    println("Configuring Rider tests. Environment variable LOCAL_ENV_RUN: ${System.getenv("LOCAL_ENV_RUN")}")
+
+    def compare = compareVersions(ideProfileName, "2019.3")
+    if (compare == -1) {
+        println("Current SDK version: ${ideProfileName}. Rider tests require 193 SDK or higher. Exclude Rider tests.")
+        def testClassToExclude = [ "DotNetLambdaHandlerResolverTest",
+                                   "LambdaGutterMarkHighlightingTest",
+                                   "DotNetLocalLambdaRunConfigurationTest",
+                                   "DotNetHandlerCompletionTest" ]
+
+        testClassToExclude.forEach { classToExclude ->
+            exclude "**/${classToExclude}.class"
+        }
+    }
+}
+
+private static int compareVersions(String version, String withVersion) {
+    List versionList = version.tokenize('.')
+    List withVersionList = withVersion.tokenize('.')
 
-    // TODO: Disable Rider tests until switching to 2019.3 SDK.
-    // Please see https://youtrack.jetbrains.com/issue/RIDER-19506.
-    def testClassToExclude = [ "DotNetLambdaHandlerResolverTest",
-                               "LambdaGutterMarkHighlightingTest",
-                               "DotNetLocalLambdaRunConfigurationTest",
-                               "DotNetHandlerCompletionTest" ]
+    def minIndices = Math.min(versionList.size(), withVersionList.size())
 
-    testClassToExclude.forEach { classToExclude ->
-        exclude "**/${classToExclude}.class"
+    for (int i = 0; i < minIndices; i++) {
+        def partInt = versionList[i].toInteger()
+        def withPartInt = withVersionList[i].toInteger()
+
+        if (partInt != withPartInt) {
+            return partInt <=> withPartInt
+        }
     }
+
+    return 0
 }
 
 runIde {

jetbrains-rider/src/software/aws/toolkits/jetbrains/icons/RiderAwsIconsPatcher.kt

@@ -33,11 +33,10 @@ internal class RiderAwsIconsPatcher : IconPathPatcher() {
         }
     }
 
-    override fun patchPath(path: String?, classLoader: ClassLoader?): String? =
-        if (path != null) myIconsOverrideMap[path] else null
+    override fun patchPath(path: String, classLoader: ClassLoader?): String? = myIconsOverrideMap[path]
 
-    override fun getContextClassLoader(path: String?, originalClassLoader: ClassLoader?): ClassLoader? =
-        if (path != null && myIconsOverrideMap.containsKey(path)) javaClass.classLoader
+    override fun getContextClassLoader(path: String, originalClassLoader: ClassLoader?): ClassLoader? =
+        if (myIconsOverrideMap.containsKey(path)) javaClass.classLoader
         else originalClassLoader
 
     private val myIconsOverrideMap = mapOf(

jetbrains-rider/src/software/aws/toolkits/jetbrains/services/lambda/dotnet/DotNetSamDebugSupport.kt

@@ -10,8 +10,6 @@ import com.intellij.execution.process.ProcessAdapter
 import com.intellij.execution.process.ProcessEvent
 import com.intellij.execution.process.ProcessHandler
 import com.intellij.execution.runners.ExecutionEnvironment
-import com.intellij.execution.ui.ConsoleView
-import com.intellij.execution.ui.ConsoleViewContentType
 import com.intellij.execution.ui.ExecutionConsole
 import com.intellij.openapi.rd.defineNestedLifetime
 import com.intellij.xdebugger.XDebugProcess
@@ -40,7 +38,6 @@ import com.jetbrains.rider.model.debuggerWorker.DotNetCoreInfo
 import com.jetbrains.rider.model.debuggerWorker.DotNetDebuggerSessionModel
 import com.jetbrains.rider.model.debuggerWorkerConnectionHelperModel
 import com.jetbrains.rider.projectView.solution
-import com.jetbrains.rider.run.ConsoleKind
 import com.jetbrains.rider.run.IDebuggerOutputListener
 import com.jetbrains.rider.run.bindToSettings
 import org.jetbrains.concurrency.AsyncPromise
@@ -280,12 +277,6 @@ class DotNetSamDebugSupport : SamDebugSupport {
         sessionModel: DotNetDebuggerSessionModel,
         outputEventsListener: IDebuggerOutputListener
     ): XDebugProcessStarter {
-        val consoleKind = ConsoleKind.ExternalConsole
-        (executionConsole as? ConsoleView)
-            ?.print(
-                "Input/Output redirection disabled: ${consoleKind.message}${System.lineSeparator()}",
-                ConsoleViewContentType.SYSTEM_OUTPUT
-            )
 
         val fireInitializedManually = env.getUserData(DotNetDebugRunner.FIRE_INITIALIZED_MANUALLY) ?: false
 
@@ -301,7 +292,8 @@ class DotNetSamDebugSupport : SamDebugSupport {
                     fireInitializedManually = fireInitializedManually,
                     customListener = outputEventsListener,
                     debugKind = OptionsUtil.toDebugKind(sessionModel.sessionProperties.debugKind.valueOrNull),
-                    project = env.project)
+                    project = env.project,
+                    sessionId = env.executionId)
         }
     }
 }

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

@@ -41,14 +41,14 @@ class DotNetHandlerCompletionTest : BaseTestWithSolution() {
     @Test
     @TestEnvironment(solution = "SamMultipleHandlersApp")
     fun testDetermineHandlers_MultipleHandlers() {
-        val handlers = project.solution.lambdaModel.determineHandlers.sync(Unit, RpcTimeouts.default)
+        val handlers = project.solution.lambdaModel.determineHandlers.sync(Unit, RpcTimeouts.default).sortedBy { it.handler }
 
         assertThat(handlers.size).isEqualTo(2)
 
-        assertThat(handlers[0].handler).isEqualTo("HelloWorld::HelloWorld.Function::FunctionHandler")
+        assertThat(handlers[0].handler).isEqualTo("HelloWorld::HelloWorld.Function2::FunctionHandler2")
         assertIconPath(handlers[0].iconId, "/resharper/PsiSymbols/Method.svg")
 
-        assertThat(handlers[1].handler).isEqualTo("HelloWorld::HelloWorld.Function2::FunctionHandler2")
+        assertThat(handlers[1].handler).isEqualTo("HelloWorld::HelloWorld.Function::FunctionHandler")
         assertIconPath(handlers[1].iconId, "/resharper/PsiSymbols/Method.svg")
     }