Merge master into feature/amazonqLSP #6563
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…5ec-b3b7-313ac07c87a7.json Co-authored-by: Tai Lai <[email protected]>
## Problem https://github.com/aws/aws-toolkit-vscode/blob/master/packages/core/src/codewhisperer/util/customizationUtil.ts#L116-L130 The flaw of previous implementation won't override customization if users have selected one. The team is asking 1. Ability to override regardless users are with a customization or not 2. Should respect users' selection afterward when users switch back to the customization they prefer 3. When ab service provides a new override customization arn, plugins should be able to do override again ``` // as long as there is a customization selected, override will not happen no matter what if (selectedCustomization && selectedCustomization.name !== '') { return selectedCustomization } else { const customizationFeature = FeatureConfigProvider.getFeature(Features.customizationArnOverride) const arnOverride = customizationFeature?.value.stringValue const customizationOverrideName = customizationFeature?.variation if (arnOverride === undefined) { return baseCustomization } else { return { arn: arnOverride, name: customizationOverrideName, description: baseCustomization.description, } } ``` ## Solution 1. Persist a value of "previous override arn" and do override when the provided customization arn is different than "previous override arn" --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
…6560) ## Problem - /test and /review are missing thumbs up/down telemetry - /test is missing feedback functionality <img width="545" alt="Screenshot 2025-02-11 at 1 58 42 PM" src="https://github.com/user-attachments/assets/11a46136-46a6-4d35-a7e1-e92f45b1034a" /> <img width="558" alt="Screenshot 2025-02-11 at 1 58 48 PM" src="https://github.com/user-attachments/assets/80288c37-a98c-4e8f-9e32-810238ee2695" /> ## Solution - send telemetry event for thumps up/down for /test and /review - send user feedback for /test which routes to SIM folder - No tests were added as this is UX change --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
fix(amazonq): Auto-trigger review flow on scan button click
…e invoke #6559 Problem: Remote Invoke call ListRemoteTestEvent every time the webview is instantiated. Solution: Introduce a condition for which this api calls can be made thereby reducing the spike in number failures we see in our dashboard.
## Problem Due to Java 21 support coming out, the target JDK version was no longer hardcoded as JDK17. So for SQL conversions, the target JDK was `undefined` and the `startJob` API was failing. ## Solution Hardcode JDK17 as a dummy target JDK so that we don't encounter an invalid request exception. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license. Co-authored-by: David Hasani <[email protected]>
## Problem The duplicate code detection can fail when the current branch is not rebased with the most recent version of master. This is a fairly common false-negative. To avoid this, the PR must be kept up to date with its target branch. However, the tool doesn't provide any hints/indication this is the case. ## Solution - add a hint message on failure that suggests rebasing.
…ompletion (#6567) This reverts commit 50c9121. ## Problem In the previous change, we applied prefect to every responses. However, this introduced issues with inline completion, causing it to behave inconsistently and produce unexpected completions in the next response. ## Solution To mitigate this, this PR rolls back the responses prefect change to restore stable inline completion behavior. --- - Treat all work as PUBLIC. Private `feature/x` branches will not be squash-merged at release time. - Your code changes must meet the guidelines in [CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines). - License: I confirm that my contribution is made under the terms of the Apache 2.0 license.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):