Skip to content
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.

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

Merge master into feature/amazonqLSP #6536

Open
wants to merge 3 commits into
base: feature/amazonqLSP
Choose a base branch
from

Conversation

aws-toolkit-automation
Copy link
Collaborator

Automatic merge failed

  • Resolve conflicts and push to this PR branch.
  • Do not squash-merge this PR. Use the "Create a merge commit" option to do a regular merge.

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):

git stash
git fetch --all
git checkout origin/feature/amazonqLSP
git merge origin/master
git commit
git push origin HEAD:refs/heads/autoMerge/feature/amazonqLSP

nkomonen-amazon and others added 2 commits February 7, 2025 17:19
#6527)

## Problem:

When a user starts up VSC, hasn't opened Q chat yet, then highlights
text and does a right click option like "send to prompt" THEN the whole
prompt fails to make it to chat.

This is because there is a race condition between the message being sent
to the webview, and the webview completed loading and ready to recieve
messages.

## Solution:

In the appToMessage publisher, verify that the chat is ready to recieve
messages based on if the webview sent the chat ui ready message.
Otherwise wait until we get it, and then send the message.

### Demo

#### Before


https://github.com/user-attachments/assets/baf86737-4a5a-4f80-86fb-9abca2c56827

#### After 


https://github.com/user-attachments/assets/c3361403-5dae-49df-a878-94722eb4fc62

---

- 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.

---------

Signed-off-by: nkomonen-amazon <[email protected]>
## Problem

Transformation results/artifacts expire after 24h, and sometimes users
forget to manually click the "Download Proposed Changes" button within
that time period.

## Solution

Auto-download the results from S3 when ready.

---

- 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]>
Copy link

github-actions bot commented Feb 7, 2025

  • This pull request modifies code in src/* but no tests were added/updated.
    • Confirm whether tests should be added or ensure the PR description explains why tests are not required.

@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner February 7, 2025 22:24
…svelte files in /dev (#6523)

## Problem

The following filetypes are not currently supported in `/dev`:

- .hbs (Handlebars)
- .gjs/.gts (Glimmer JavaScript/Glimmer TypeScript)
- .astro/.mdx (Astro)
- .svelte (Svelte)
- .erb/.rake (Ruby)

## Solution

Add .hbs, .gjs, .gts, .astro, .mdx, .svelte, .erb, and .rake to list of
supported file extensions

---

- 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants