From f1f9a4d15d4fdba5f51eb37dca0472a1b64f999f Mon Sep 17 00:00:00 2001 From: Aidan Ton Date: Mon, 24 Mar 2025 10:09:19 -0700 Subject: [PATCH 1/3] /review: passing referenceTrackerConfiguration to StartCodeFixJob --- .../feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json | 4 ++++ .../codewhisperer/codescan/AmazonQCodeFixSession.kt | 9 +++++++++ .../codewhispererruntime/service-2.json | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 .changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json diff --git a/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json b/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json new file mode 100644 index 00000000000..651f3f3e877 --- /dev/null +++ b/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json @@ -0,0 +1,4 @@ +{ + "type" : "feature", + "description" : "/review: passing referenceTrackerConfiguration to StartCodeFixJob" +} \ No newline at end of file diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/AmazonQCodeFixSession.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/AmazonQCodeFixSession.kt index a1452f74cfa..899fbd030a7 100644 --- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/AmazonQCodeFixSession.kt +++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/AmazonQCodeFixSession.kt @@ -14,6 +14,7 @@ import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeFixJobR import software.amazon.awssdk.services.codewhispererruntime.model.GetCodeFixJobResponse import software.amazon.awssdk.services.codewhispererruntime.model.Position import software.amazon.awssdk.services.codewhispererruntime.model.Range +import software.amazon.awssdk.services.codewhispererruntime.model.RecommendationsWithReferencesPreference import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeFixJobRequest import software.amazon.awssdk.services.codewhispererruntime.model.StartCodeFixJobResponse import software.amazon.awssdk.services.codewhispererruntime.model.UploadContext @@ -28,6 +29,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWh import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererZipUploadManager import software.aws.toolkits.jetbrains.services.codewhisperer.util.getTelemetryErrorMessage +import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings import software.aws.toolkits.resources.message import java.io.File import java.nio.file.Path @@ -161,12 +163,19 @@ class AmazonQCodeFixSession(val project: Project) { codeFixName: String? = null, ruleId: String? = null, ): StartCodeFixJobResponse { + val includeCodeWithReference = if (CodeWhispererSettings.getInstance().isIncludeCodeWithReference()) { + RecommendationsWithReferencesPreference.ALLOW + } else { + RecommendationsWithReferencesPreference.BLOCK + } + val request = StartCodeFixJobRequest.builder() .uploadId(uploadId) .snippetRange(snippetRange) .codeFixName(codeFixName) .ruleId(ruleId) .description(description) + .referenceTrackerConfiguration { it.recommendationsWithReferences(includeCodeWithReference) } .build() return try { diff --git a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json index ac1f5d6e357..a434cd9560b 100644 --- a/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json +++ b/plugins/core/sdk-codegen/codegen-resources/codewhispererruntime/service-2.json @@ -2082,7 +2082,8 @@ "uploadId": { "shape": "UploadId" }, "description": { "shape": "StartCodeFixJobRequestDescriptionString" }, "ruleId": { "shape": "StartCodeFixJobRequestRuleIdString" }, - "codeFixName": { "shape": "CodeFixName" } + "codeFixName": { "shape": "CodeFixName" }, + "referenceTrackerConfiguration": { "shape": "ReferenceTrackerConfiguration" } } }, "StartCodeFixJobRequestDescriptionString": { From 19d55aca4d551f9549331204899407cd0facc595 Mon Sep 17 00:00:00 2001 From: atontb <104926752+atonaamz@users.noreply.github.com> Date: Thu, 27 Mar 2025 12:32:28 -0700 Subject: [PATCH 2/3] Update changelog description --- .../feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json b/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json index 651f3f3e877..1837aea7302 100644 --- a/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json +++ b/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json @@ -1,4 +1,4 @@ { "type" : "feature", - "description" : "/review: passing referenceTrackerConfiguration to StartCodeFixJob" -} \ No newline at end of file + "description" : "/review: Enable checkbox to accept or block code fix with references" +} From 89f47e401d9841945bf6cfa22535ec2ce1aac713 Mon Sep 17 00:00:00 2001 From: atontb <104926752+atonaamz@users.noreply.github.com> Date: Thu, 27 Mar 2025 15:10:31 -0700 Subject: [PATCH 3/3] Update .changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json Co-authored-by: Richard Li <742829+rli@users.noreply.github.com> --- .../feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json b/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json index 1837aea7302..b74af2af422 100644 --- a/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json +++ b/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json @@ -1,4 +1,4 @@ { - "type" : "feature", - "description" : "/review: Enable checkbox to accept or block code fix with references" + "type" : "bugfix", + "description" : "/review: Respect user option to allow code suggestions with references" }