Skip to content

fix(amazonq): enable syntax highlighting when viewing diff for generated unit tests #5337

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 15 commits into from
Feb 11, 2025
Merged

fix(amazonq): enable syntax highlighting when viewing diff for generated unit tests #5337

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f7fab94
enable syntax highlighting when viewing diff for generated unit tests
chungjac Feb 6, 2025
64861c8
lint
chungjac Feb 7, 2025
141e6ff
virtualFile always created and will not be null
chungjac Feb 7, 2025
73c8f17
Merge branch 'main' into view-diff-syntax-highlighting
chungjac Feb 7, 2025
3768ec0
use session.testFileName instead of extension
chungjac Feb 7, 2025
f059a0c
Merge branch 'view-diff-syntax-highlighting' of github.com:chungjac/a…
chungjac Feb 7, 2025
f9ccbbc
Merge branch 'main' into view-diff-syntax-highlighting
chungjac Feb 7, 2025
fab51c6
lint
chungjac Feb 8, 2025
3bf386b
Merge branch 'view-diff-syntax-highlighting' of github.com:chungjac/a…
chungjac Feb 8, 2025
70836d6
Merge branch 'main' into view-diff-syntax-highlighting
chungjac Feb 10, 2025
c82cc94
create temporary virtual file
chungjac Feb 11, 2025
a931c5b
Merge branch 'view-diff-syntax-highlighting' of github.com:chungjac/a…
chungjac Feb 11, 2025
1946fe0
comment
chungjac Feb 11, 2025
2e118a2
Update bugfix-3b7843b4-9673-4afa-90e8-7c4278f0d0fe.json
chungjac Feb 11, 2025
7ee1a3d
Merge branch 'main' into view-diff-syntax-highlighting
chungjac Feb 11, 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
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-3b7843b4-9673-4afa-90e8-7c4278f0d0fe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "/test syntax highlighting when viewing diff"
Copy link
Contributor

@rli rli Feb 11, 2025

Choose a reason for hiding this comment

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

Suggested change
"description" : "/test syntax highlighting when viewing diff"
"description" : "Enable syntax highlighting when viewing diff for /test"

}
11 changes: 9 additions & 2 deletions ...ware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.intellij.openapi.project.guessProjectDir
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.testFramework.LightVirtualFile
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.currentCoroutineContext
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -458,6 +459,8 @@ class CodeTestChatController(
when (message.actionID) {
"utg_view_diff" -> {
withContext(EDT) {
val virtualFile = LightVirtualFile(session.testFileName)

(DiffManager.getInstance() as DiffManagerEx).showDiffBuiltin(
context.project,
SimpleDiffRequest(
Expand All @@ -466,9 +469,13 @@ class CodeTestChatController(
getFileContentAtTestFilePath(
session.projectRoot,
session.testFileRelativePathToProjectRoot
)
),
virtualFile
),
DiffContentFactory.getInstance().create(
session.generatedTestDiffs.values.first(),
virtualFile
),
DiffContentFactory.getInstance().create(session.generatedTestDiffs.values.first()),
"Before",
"After"
)
Expand Down
Loading