From 6f5d7a73674978dc769d4e46ea2bb93c8ea53c31 Mon Sep 17 00:00:00 2001 From: Richard Li <742829+rli@users.noreply.github.com> Date: Fri, 8 Mar 2024 09:43:03 -0800 Subject: [PATCH 1/3] Enable beta K2 compiler Kotlin 2.0 compiler should compile codebase roughly 2x faster https://kotlinlang.org/docs/whatsnew17.html#new-kotlin-k2-compiler-for-the-jvm-in-alpha --- buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts index 2bd1a1426f..4cffa816b1 100644 --- a/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/toolkit-kotlin-conventions.gradle.kts @@ -55,7 +55,7 @@ tasks.withType().all { kotlinOptions { jvmTarget = javaVersion.majorVersion apiVersion = project.kotlinTarget().get() - languageVersion = project.kotlinTarget().get() + languageVersion = "2.0" freeCompilerArgs = listOf("-Xjvm-default=all") } } From 0535b21e26328f00c19e8360bde543fe4c31f31e Mon Sep 17 00:00:00 2001 From: Richard Li Date: Fri, 5 Apr 2024 10:37:24 -0700 Subject: [PATCH 2/3] bump From 983ac7dc3c07963dc0d389d79f0afbf207341ed3 Mon Sep 17 00:00:00 2001 From: Richard Li Date: Fri, 12 Apr 2024 15:10:18 -0700 Subject: [PATCH 3/3] Fix errors --- .../services/amazonq/gettingstarted/QGettingStartedContent.kt | 3 ++- .../jetbrains/services/amazonq/webview/BrowserConnector.kt | 3 ++- .../cwc/controller/chat/messenger/ChatPromptHandler.kt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt index eb42f2b770..53c9ef2abe 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/gettingstarted/QGettingStartedContent.kt @@ -67,7 +67,8 @@ class QGettingStartedContent(val project: Project) : Disposable { AmazonQToolWindow.getStarted(project) } } - null + + JBCefJSQuery.Response(null) } receiveMessageQuery.addHandler(handler) } diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt index 1c00247430..c8cac9ec58 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt @@ -73,7 +73,8 @@ class BrowserConnector( private fun addMessageHook(browser: Browser) = callbackFlow { val handler = Function { trySend(it) - null + + Response(null) } browser.receiveMessageQuery.addHandler(handler) diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt index c51cc82e66..64fd0ae2b5 100644 --- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt +++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt @@ -54,7 +54,8 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) { return@onCompletion } // for any other exception, let the `catch` operator handle it. else if (error != null) { - throw error + // smartcast is failing on 2.0: Type mismatch: inferred type is '@R|kotlin/ParameterName|(name = String(cause)) kotlin/Throwable?' but 'kotlin/Throwable' was expected + throw error as Throwable } // Send the gathered suggestions in a final answer-part message