Skip to content

fix(amazonq): fix issue where history load crashes LSP #5690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Parent: feat(amazonq): Agentic coding experience
merged 2 commits into from
May 8, 2025
Merged

fix(amazonq): fix issue where history load crashes LSP #5690

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8bbb2
fix(amazonq): fix issue where history load crashes LSP
rli May 8, 2025
8ddd345
Merge branch 'feature/q-lsp-chat' into rli-patch-13
rli May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions ...tbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,6 @@
.executeJavaScript("window.postMessage($message)", jcefBrowser.cefBrowser.url, 0)
}

// TODO: Remove this once chat has been integrated with agents
fun post(message: String) =
jcefBrowser
.cefBrowser
.executeJavaScript("window.postMessage(JSON.stringify($message))", jcefBrowser.cefBrowser.url, 0)

// Load the chat web app into the jcefBrowser
private fun loadWebView(
isCodeTransformAvailable: Boolean,
Expand Down Expand Up @@ -118,10 +112,11 @@
val postMessageToJavaJsCode = receiveMessageQuery.inject("JSON.stringify(message)")
val connectorAdapterPath = "http://mynah/js/connectorAdapter.js"
generateQuickActionConfig()
// https://github.com/highlightjs/highlight.js/issues/1387
// language=HTML
val jsScripts = """
<script type="text/javascript" src="$connectorAdapterPath"></script>
<script type="text/javascript" src="$webUri" defer onload="init()"></script>
<script type="text/javascript" charset="UTF-8" src="$connectorAdapterPath"></script>
<script type="text/javascript" charset="UTF-8" src="$webUri" defer onload="init()"></script>

Check warning on line 119 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt#L118-L119 

Added lines #L118 - L119 were not covered by tests

<script type="text/javascript">

Expand Down Expand Up @@ -155,8 +150,7 @@
pairProgrammingAcknowledged: ${!MeetQSettings.getInstance().amazonQChatPairProgramming}
},
hybridChatConnector,
${CodeWhispererFeatureConfigService.getInstance().getFeatureConfigJsonString()}

${CodeWhispererFeatureConfigService.getInstance().getFeatureConfigJsonString()}

Check warning on line 153 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/Browser.kt#L153 

Added line #L153 was not covered by tests
);
}
</script>
Expand Down
Loading