Skip to content

feat(Amazonq): Remove forced read-only view from before diff on agent code changes + Increase polling rate for Q agent code summary #5015

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 12 commits into from
Oct 29, 2024
Merged

feat(Amazonq): Remove forced read-only view from before diff on agent code changes + Increase polling rate for Q agent code summary #5015

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e1e5177
feat(amazonq) Increase polling rate for Q agent code summary
JuusticeT Oct 23, 2024
35eea6a
Adjusted CodeGenerationStateTest to be aligned with new polling rate
JuusticeT Oct 23, 2024
157bc2d
Removed forced Read-Only view for before diff on Q code changes
JuusticeT Oct 23, 2024
c55035a
Reverting remove read-only view change
JuusticeT Oct 23, 2024
b5c8e44
Merge branch 'main' into main
juusticeTG Oct 23, 2024
411473d
Merge branch 'main' into main
juusticeTG Oct 24, 2024
5092f74
fix(amazonq): Fixed syntax error in CodeGenerationStateTest
JuusticeT Oct 24, 2024
d7006f8
Merge branch 'main' into main
juusticeTG Oct 25, 2024
a2f4cf1
feat(Amazonq): Remove forced read-only view from before diff on agent…
JuusticeT Oct 25, 2024
542d0bd
Merge branch 'aws:main' into ReadOnlyChange
juusticeTG Oct 28, 2024
1efe1c1
Merge branch 'main' into ReadOnlyChange
juusticeTG Oct 28, 2024
37cce2a
Merge branch 'main' into ReadOnlyChange
manodnyab Oct 29, 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-08da6a67-91d3-443f-b306-c4af3f0e0191.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Remove read-only mode on before diff of code changes generated by agent"
Copy link
Contributor

@tverney tverney Oct 28, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

nit: can't we combine these both changelogs into one? Also, toolkit team requires to specify which team this change is going into.

"Amazon Q /dev: Remove read-only mode on proposed code changes and increase pooling rate for code generation status"

}
4 changes: 4 additions & 0 deletions .changes/next-release/feature-a0ded7ea-63cd-4ed0-8ab7-6cbf31623acc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "feature",
"description" : "Provide more frequent updates about code changes made by agent"
}
2 changes: 0 additions & 2 deletions ...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,6 @@ import com.intellij.diff.DiffContentFactory
import com.intellij.diff.DiffManager
import com.intellij.diff.contents.EmptyContent
import com.intellij.diff.requests.SimpleDiffRequest
import com.intellij.diff.util.DiffUserDataKeys
import com.intellij.ide.BrowserUtil
import com.intellij.openapi.application.runInEdt
import com.intellij.openapi.command.WriteCommandAction
Expand Down Expand Up @@ -225,7 +224,6 @@ class FeatureDevController(
}

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

DiffManager.getInstance().showDiff(project, request)
}
Expand Down
4 changes: 2 additions & 2 deletions ...software/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ private suspend fun CodeGenerationState.generateCode(
messenger: MessagePublisher,
token: CancellationTokenSource?,
): CodeGenerationResult {
val pollCount = 180
val requestDelay = 10000L
val pollCount = 360
val requestDelay = 5000L

repeat(pollCount) {
if (token?.token?.isCancellationRequested() == true) {
Expand Down
2 changes: 1 addition & 1 deletion ...ware/aws/toolkits/jetbrains/services/amazonqFeatureDev/session/CodeGenerationStateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class CodeGenerationStateTest : FeatureDevTestBase() {
assertThat(actual.interaction.content).isEqualTo("")
}

verify(exactly = 180) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId) }
verify(exactly = 360) { featureDevService.getTaskAssistCodeGeneration(testConversationId, codeGenerationId) }
coVerify(exactly = 0) { featureDevService.exportTaskAssistArchiveResult(testConversationId) }
}
}
Loading