Skip to content

Commit d906edf

Browse files
committed
Merge upstream/feature/code-diff into streaming diff animation branch
2 parents 3c4a09b + 8919c6d commit d906edf

File tree

245 files changed

+10127
-22591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

245 files changed

+10127
-22591
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ src.gen/*
3131
**/src/shared/telemetry/clienttelemetry.d.ts
3232
**/src/codewhisperer/client/codewhispererclient.d.ts
3333
**/src/codewhisperer/client/codewhispereruserclient.d.ts
34-
**/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
3534
**/src/auth/sso/oidcclientpkce.d.ts
3635

3736
# Generated by tests

buildspec/linuxTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ phases:
4848
- VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
4949
- CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
5050
- CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
51-
- test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info
51+
- test -n "${CODECOV_TOKEN}" && [ "$TARGET_BRANCH" = "master" ] && ./codecov --token=${CODECOV_TOKEN} --branch=${CODEBUILD_RESOLVED_SOURCE_VERSION} --repository=${CODEBUILD_SOURCE_REPO_URL} --file=./coverage/amazonq/lcov.info --file=./coverage/toolkit/lcov.info || true
5252

5353
reports:
5454
unit-test:

docs/lsp.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ sequenceDiagram
2525
```
2626

2727
## Language Server Debugging
28+
2829
If you want to connect a local version of language-servers to aws-toolkit-vscode, follow these steps:
2930

3031
1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-servers folder that you just cloned. Your VS code folder structure should look like below.
@@ -57,13 +58,16 @@ If you want to connect a local version of language-servers to aws-toolkit-vscode
5758
6. (Optional): Enable `"amazonq.trace.server": "on"` or `"amazonq.trace.server": "verbose"` in your VSCode settings to view detailed log messages sent to/from the language server. These log messages will show up in the "Amazon Q Language Server" output channel
5859
5960
### Breakpoints Work-Around
61+
6062
If the breakpoints in your language-servers project remain greyed out and do not trigger when you run `Launch LSP with Debugging`, your debugger may be attaching to the language server before it has launched. You can follow the work-around below to avoid this problem. If anyone fixes this issue, please remove this section.
63+
6164
1. Set your breakpoints and click `Launch LSP with Debugging`
6265
2. Once the debugging session has started, click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
6366
3. On the debug panel, click `Attach to Language Server (amazonq)` next to the red stop button
6467
4. Click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
6568
6669
## Language Server Runtimes Debugging
70+
6771
If you want to connect a local version of language-server-runtimes to aws-toolkit-vscode, follow these steps:
6872
6973
1. Clone https://github.com/aws/language-server-runtimes.git and set it up in the same workspace as this project by cmd+shift+p and "add folder to workspace" and selecting the language-server-runtimes folder that you just cloned. Your VS code folder structure should look like below.
@@ -75,6 +79,7 @@ If you want to connect a local version of language-server-runtimes to aws-toolki
7579
/amazonq
7680
/language-server-runtimes
7781
```
82+
7883
2. Inside of the language-server-runtimes project run:
7984
```
8085
npm install

package-lock.json

Lines changed: 24 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
4242
},
4343
"devDependencies": {
44-
"@aws-toolkits/telemetry": "^1.0.326",
44+
"@aws-toolkits/telemetry": "^1.0.329",
4545
"@playwright/browser-chromium": "^1.43.1",
4646
"@stylistic/eslint-plugin": "^2.11.0",
4747
"@types/he": "^1.2.3",
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-07-17",
3+
"version": "1.84.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Slightly delay rendering inline completion when user is typing"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Render first response before receiving all paginated inline completion results"
12+
},
13+
{
14+
"type": "Feature",
15+
"description": "Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab."
16+
}
17+
]
18+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-07-19",
3+
"version": "1.85.0",
4+
"entries": []
5+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-07-30",
3+
"version": "1.86.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Let Enter invoke auto completion more consistently"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Faster and more responsive inline completion UX"
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "Use documentChangeEvent as auto trigger condition"
16+
}
17+
]
18+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-07-31",
3+
"version": "1.87.0",
4+
"entries": []
5+
}

packages/amazonq/CHANGELOG.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
## 1.87.0 2025-07-31
2+
3+
- Miscellaneous non-user-facing changes
4+
5+
## 1.86.0 2025-07-30
6+
7+
- **Bug Fix** Let Enter invoke auto completion more consistently
8+
- **Bug Fix** Faster and more responsive inline completion UX
9+
- **Bug Fix** Use documentChangeEvent as auto trigger condition
10+
11+
## 1.85.0 2025-07-19
12+
13+
- Miscellaneous non-user-facing changes
14+
15+
## 1.84.0 2025-07-17
16+
17+
- **Bug Fix** Slightly delay rendering inline completion when user is typing
18+
- **Bug Fix** Render first response before receiving all paginated inline completion results
19+
- **Feature** Explain and Fix for any issue in Code Issues panel will pull the experience into chat. Also no more view details tab.
20+
121
## 1.83.0 2025-07-09
222

323
- **Feature** Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding.

0 commit comments

Comments
 (0)