Skip to content

fix(amazonq): Removed read-only view from before diff for generated code #4992

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

Closed
juusticeTG wants to merge 2 commits into from
Closed

fix(amazonq): Removed read-only view from before diff for generated code #4992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbc9a19
fix(amazonq): Removed read-only view from before diff for generated code
JuusticeT Oct 21, 2024
34cf5a5
Merge branch 'aws:main' into main
juusticeTG Oct 21, 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/bugfix-a1fa678d-47d0-4cb8-bd0c-350f5eaf4ae4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Fix issue where before diff of generated code is read-only"
}
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# _3.34_ (2024-10-21)
- **(Bug Fix)** Fix issue where before diff of generated code is read-only

Comment on lines +1 to +3
Copy link
Contributor

@rli rli Oct 21, 2024

Choose a reason for hiding this comment

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

this file is not meant to be edited manually

# _3.33_ (2024-10-17)
- **(Feature)** Add support for 2024.3
- **(Bug Fix)** `@workspace` cannot properly locate certain folders for certain project setup
Expand Down
1 change: 0 additions & 1 deletion ...ware/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.intellij.diff.DiffManager
import com.intellij.diff.contents.EmptyContent
import com.intellij.diff.requests.SimpleDiffRequest
import com.intellij.diff.util.DiffUserDataKeys

Check warning on line 11 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

View workflow job for this annotation

GitHub Actions / qodana

Unused import directive 

Unused import directive
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.application.runInEdt
import com.intellij.openapi.command.WriteCommandAction
Expand Down Expand Up @@ -219,7 +219,6 @@
}

val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null)
request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true)
Copy link
Contributor

@rli rli Oct 21, 2024

Choose a reason for hiding this comment

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

isn't the diff view supposed to be read-only? do user edits in the diff view propagate back to the editor?


DiffManager.getInstance().showDiff(project, request)
}
Expand Down
Loading