Skip to content

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

mvcninja and others added 30 commits October 16, 2024 09:58
## Problem
The LSP cannot start in AL2023 arm64.

## Solution

Update the binary of linux arm64 to make it compatible with both AL2023
and Ubuntu arm64

---

- 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.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner February 4, 2025 17:51
@github-actions
Copy link

github-actions bot commented Feb 4, 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.

silviac98 and others added 3 commits February 4, 2025 12:52
…on in JSON ASL files. (#6478)

## Feature description

Step Functions: Upgrade amazon-states-language-service to 1.15. This new
version enhance autocomplete for variable and JSONata expression in JSON
ASL files.


[Variables and
JSONata](https://aws.amazon.com/blogs/compute/simplifying-developer-experience-with-variables-and-jsonata-in-aws-step-functions/)
was a Step Funtions feature released in 2024 Nov

### Demo:

![jsonata-autocomplete](https://github.com/user-attachments/assets/ee9d01e7-8458-480a-8568-d34a6b862b87)

---

- 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: Silvia Chen <[email protected]>
…#6475)

## Problem
Users are not able to track their feedback/request through the feedback
form. There should be a description for it and a link for Github issue
links.

## Solution
- Added description field to the feedback form which accepts markdown
strings (through MynahUI
[v4.22.0](https://github.com/aws/mynah-ui/releases/tag/v4.22.0))

<img width="532" alt="image"
src="https://github.com/user-attachments/assets/0f3fce7c-9efa-423b-9801-89743cfea42e"
/>

---

_**Notes:** Feel free to change the link, or update the text. Also, if
you want to add telemetry records for these link clicks, feel free to
add that._

---

- 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.
## Problem
Regression in API Back off and retry. Not necessary for VSC.

## Solution
This reverts commit 3a03e95.

---

- 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.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner February 4, 2025 18:51
## Problem
Add doc generation V2 telemetry

---

- 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.
@aws-toolkit-automation aws-toolkit-automation requested a review from a team as a code owner February 4, 2025 20:13
zixlin7 and others added 20 commits February 4, 2025 12:40
…6419)

## Problem
To support complex recommendations broken into multiple chunks, we need
the ability to immediately show user next recommendation when they
accept previous one

## Solution
pre-fetch next recommendation predicting user accept first
recommendation when showing them to user, and if user did accept first
recommendation, immediately show next recommendation

---

- 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: Will Lo <[email protected]>
## Problem

Issues detected by auto-review feature are not populating the code
issues treeview list unless you run a manual `/review` first.

<img width="1594" alt="Screenshot 2025-02-04 at 3 00 08 PM"
src="https://github.com/user-attachments/assets/4b817fad-a17e-4ce6-8374-fb81634f18b1"
/>

This issue is happening because `vscode.window.createTreeView` is hidden
inside `SecurityIssuesTree` class which only gets invoked when you call
`SecurityIssuesTree.instance.focus()`. Since we don't want to focus the
tree view for auto-reviews, the treeview itself is never created.

## Solution

Move the treeview creation to activation so that it always gets created
when the extension is activated


---

- 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.
…ormation (#6499)

## Problem
This metric is currently being spammed in telemetry at unusual volume.
It is suspected that this is connected to this change:
https://github.com/aws/aws-toolkit-vscode/pull/5979/files, but the
connection is not yet clear.

## Solution
- use the `withTelemetryContext` decorator to emit a `function_call`
metric to capture additional information. This metric should allow us to
determine what is calling this function so much. Added techdebt test to
remove this debugging information before the following release.
- debounce the current emit line that is causing the high volume
emission.


## Future Work 
- `debounce` reimplements a special case of `debounceWithCancel`, these
can be redone to reduce code and improve reliability.

---

- 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.
## Problem
- valid language tests are flaky, specifically the "before each" hook is
failing in the CI for valid language

## Solution
- skip valid language tests for now

These changes will be helpful for when we come back to this issue:
- use closeAllEditors function in existing testUtils file
- retries for setting up and opening text file
…#6385)

## Problem
LSP downloading processes does not emit any telemetry. 

## Solution

### Refactoring
- separate verification from core downloading steps so that we can
capture it as its own telemetry event.
- Note: this refactor means that if all the downloaded content cannot be
verified, no files will be written to disk.
- Introduce abstraction of `StageResolver` to make telemetry
instrumentation more natural.

### Metric Behavior
- metric for each stage of the LSP setup process.
- can be emitted multiple times per stage to capture specific error
codes. See tests for examples.
- Commons repo PR: aws/aws-toolkit-common#961
- bumped commons version to
[1.0.296](aws/aws-toolkit-common@8df7a87)
to include this change.

### Testing
- adds basic tests for `ManifestResolver` in
`packages/core/src/test/shared/lsp/manifestResolver.test.ts`.
- adds basic tests for `LanguageServerResolver` in
`packages/core/src/test/shared/lsp/lspResolver.test.ts`.
- Currently `LanguageServerResolver` only supports mac, so its tests
skip on non-mac platforms. There is a techdebt test to address this.

## Future Work
- Update logging messages to be LSP specific. 

---

- 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.
## Problem
If you have amazon q locally and start a debugging session, pressing
stop can sometimes crash the entirety of vscode

## Solution
remove
[debugWebviews](https://github.com/microsoft/vscode-js-debug/blob/main/OPTIONS.md#rendererdebugoptions)/[rendererDebugOptions](https://github.com/microsoft/vscode-js-debug/blob/main/OPTIONS.md#rendererdebugoptions)
from amazon q's launch config since they cause the local amazon q
webview to attach to the debug instance which coincidentally ends up
crashing vscode when extension debugging is stopped

---

- 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.
## Problem
A line in
[packages/core/package.nls.json](https://github.com/aws/aws-toolkit-vscode/compare/master...witness-me:fix-lint?expand=1#diff-4d90099a916e267c6fa8cfeeec9c569c4889dc50cb53178e1c748d0d37ff501e)
contains extra space, which is inconsistent with current code style

## Solution
Remove extra space

---

- 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: Vlad Nikolaenko <[email protected]>
## Problem
Update support for enVar in the webview

---

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

When API calls fail, it can be difficult to debug without the requestId.

## Solution

Log entire error to ensure we have all relevant details, not just the
error message.

---

- 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
`debounce` is reimplemented in multiple places. There is `debounce`:
https://github.com/aws/aws-toolkit-vscode/blob/100eb0737789d9d5ba4b04e055730b467bd97e14/packages/core/src/shared/utilities/functionUtils.ts#L89-L108
`cancellableDebounce`:
https://github.com/aws/aws-toolkit-vscode/blob/100eb0737789d9d5ba4b04e055730b467bd97e14/packages/core/src/shared/utilities/functionUtils.ts#L114-L147
and a very similar function `keyedDebounce`:
https://github.com/aws/aws-toolkit-vscode/blob/100eb0737789d9d5ba4b04e055730b467bd97e14/packages/core/src/auth/auth.ts#L107-L122

These functions should share common implementation logic, and live in
the same place for easier discoverability.

## Solution
- reimplement `debounce` in terms of `cancellableDebounce` since its a
special case.
- move these functions to shared, common location. 
- augment `debounce` to allow the callback to take arguments. 

---

- 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.
@jpinkney-aws jpinkney-aws merged commit 9f511f1 into feature/amazonqLSP Feb 7, 2025
24 of 26 checks passed
@jpinkney-aws jpinkney-aws deleted the autoMerge/feature/amazonqLSP branch February 7, 2025 15:36
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.