Skip to content

feat(amazonq): automatically scroll to fix section #5198

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
merged 5 commits into from
Dec 12, 2024
Merged

feat(amazonq): automatically scroll to fix section #5198

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55d4344
feat(amazonq): automatically scroll to fix section
ctlai95 Dec 12, 2024
5a313e4
Merge branch 'main' into auto-scroll
ctlai95 Dec 12, 2024
8a7f079
Merge branch 'main' into auto-scroll
ctlai95 Dec 12, 2024
e17bcd5
use runInEdt
ctlai95 Dec 12, 2024
dbe619d
Merge branch 'main' into auto-scroll
rli Dec 12, 2024
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
4 changes: 4 additions & 0 deletions .changes/next-release/feature-ad2ca8aa-4d8d-4dc4-92f6-5ae2916e3ec6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "/review: Code fix automatically scrolls into view after generation."
}
10 changes: 10 additions & 0 deletions ...lkits/jetbrains/services/codewhisperer/codescan/CodeWhispererCodeScanIssueDetailsPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import javax.swing.JEditorPane
import javax.swing.JLabel
import javax.swing.JPanel
import javax.swing.ScrollPaneConstants
import javax.swing.SwingUtilities
import javax.swing.event.HyperlinkEvent
import javax.swing.text.html.HTMLEditorKit

Expand All @@ -71,6 +72,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
)
editorPane.revalidate()
editorPane.repaint()
SwingUtilities.invokeLater {
Copy link
Contributor

@rli rli Dec 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

runInEdt or ApplicationManager.getApplication().invokeLater. Please read the documentation block for the latter for an explaination

also note that the block inside the closure is run async if that is not that expectation

editorPane.scrollToReference("fixLoadingSection")
}

val codeFixResponse: AmazonQCodeFixSession.CodeFixResponse = amazonQCodeFixSession.runCodeFixWorkflow(issue)
if (codeFixResponse.failureResponse != null) {
Expand All @@ -81,6 +85,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
)
revalidate()
repaint()
SwingUtilities.invokeLater {
scrollToReference("fixFailureSection")
}
}
} else {
val isReferenceAllowed = CodeWhispererSettings.getInstance().isIncludeCodeWithReference()
Expand Down Expand Up @@ -115,6 +122,9 @@ internal class CodeWhispererCodeScanIssueDetailsPanel(
)
revalidate()
repaint()
SwingUtilities.invokeLater {
scrollToReference("codeFixActions")
}
}

buttonPane.apply {
Expand Down
3 changes: 3 additions & 0 deletions ...olkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ fun getCodeScanIssueDetailsHtml(
}

val fixLoadingSection = """
<a name="fixLoadingSection"></a>
<div align="center" bgcolor="#2b2b2b" style="margin: 20px;">
<font size="7" color="#ffffff" face="Arial">
&nbsp;&nbsp;&nbsp;&nbsp;...&nbsp;&nbsp;&nbsp;&nbsp;
Expand All @@ -145,6 +146,7 @@ fun getCodeScanIssueDetailsHtml(
""".trimIndent()

val fixFailureSection = """
<a name="fixFailureSection"></a>
<div align="center" bgcolor="#2b2b2b" style="margin: 20px;">
<font size="4" color="#e6e6e6" face="Arial">
<br>Amazon Q failed to generate fix. Please try again<br>
Expand Down Expand Up @@ -192,6 +194,7 @@ private fun createSuggestedFixSection(issue: CodeWhispererCodeScanIssue, suggest
|${it.code.trim()}
|```
|</div>
|<a name="codeFixActions"></a>
|<div>
| <a href="amazonq://issue/openDiff-${issue.findingId}">
| <font size="+1"><i>&#x2194;</i></font> <b>Open Diff</b>
Expand Down
Loading