Skip to content

Commit 4df4b17

Browse files
committed
Merge remote-tracking branch 'upstream/master' into custom
2 parents 1539a18 + 91f584f commit 4df4b17

File tree

86 files changed

+2905
-1752
lines changed

Some content is hidden

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

86 files changed

+2905
-1752
lines changed

docs/lsp.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ sequenceDiagram
2626

2727
## Language Server Debugging
2828

29-
1. Clone https://github.com/aws/language-servers.git and set it up in the same workspace as this project
29+
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.
3030

31-
e.g.
31+
3232

3333
```
3434
/aws-toolkit-vscode
@@ -53,9 +53,9 @@ sequenceDiagram
5353
"amazonqLSPChat": true // optional: enables chat from flare
5454
}
5555
```
56-
4. Uncomment the `__AMAZONQLSP_PATH` variable in `amazonq/.vscode/launch.json` Extension configuration
57-
1. Uncomment the `__AMAZONQLSP_UI` variable in `amazonq/.vscode/launch.json` Extension configuration if you want to debug the flare chat-client as well
56+
4. Uncomment the `__AMAZONQLSP_PATH` and `__AMAZONQLSP_UI` variables in the `amazonq/.vscode/launch.json` extension configuration
5857
5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server
58+
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
5959
6060
## Amazon Q Inline Activation
6161

package-lock.json

Lines changed: 511 additions & 1010 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.312",
44+
"@aws-toolkits/telemetry": "^1.0.317",
4545
"@playwright/browser-chromium": "^1.43.1",
4646
"@stylistic/eslint-plugin": "^2.11.0",
4747
"@types/he": "^1.2.3",
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date": "2025-04-25",
3+
"version": "1.62.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Toast message to warn users if Developer Profile is not selected"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service"
12+
}
13+
]
14+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"date": "2025-05-01",
3+
"version": "1.63.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Q profile selection hangs when a region is blocked"
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf"
12+
}
13+
]
14+
}

packages/amazonq/.changes/next-release/Bug Fix-489e72aa-bb0d-4964-bd84-002f25db6b5f.json

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Bug Fix",
3+
"description": "Enable Amazon Q LSP in AL2 instances"
4+
}

packages/amazonq/.changes/next-release/Bug Fix-8290a06f-ee3f-4235-b8af-faedb1bdfbe4.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/amazonq/.vscode/launch.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"env": {
1515
"SSMDOCUMENT_LANGUAGESERVER_PORT": "6010",
1616
"WEBPACK_DEVELOPER_SERVER": "http://localhost:8080"
17-
// "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/token-standalone.js",
17+
// Below allows for overrides used during development
18+
// "__AMAZONQLSP_PATH": "${workspaceFolder}/../../../language-servers/app/aws-lsp-codewhisperer-runtimes/out/agent-standalone.js",
1819
// "__AMAZONQLSP_UI": "${workspaceFolder}/../../../language-servers/chat-client/build/amazonq-ui.js"
1920
},
2021
"envFile": "${workspaceFolder}/.local.env",

packages/amazonq/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## 1.63.0 2025-05-01
2+
3+
- **Bug Fix** Q profile selection hangs when a region is blocked
4+
- **Feature** Agentic coding experience: Amazon Q can now write code and run shell commands on your behalf
5+
6+
## 1.62.0 2025-04-25
7+
8+
- **Bug Fix** Toast message to warn users if Developer Profile is not selected
9+
- **Bug Fix** Fix users can not log in successfully with 2+ IDE instnaces open due to throttle error throw by the service
10+
111
## 1.61.0 2025-04-22
212

313
- **Bug Fix** Some users not signaled they needed to select a Region Profile to get features working

0 commit comments

Comments
 (0)