Skip to content

Commit 35c656f

Browse files
laura-codesslaura-codess
committed
fixed the merge conflicts
2 parents 866478a + 70d5a0a commit 35c656f

File tree

139 files changed

+19180
-5491
lines changed

Some content is hidden

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

139 files changed

+19180
-5491
lines changed

‎docs/lsp.md‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ sequenceDiagram
2626

2727
## Language Server Debugging
2828

29+
If you want to connect a local version of language-servers to aws-toolkit-vscode, follow these steps:
30+
2931
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.
3032

3133
```
@@ -55,6 +57,47 @@ sequenceDiagram
5557
5. Use the `Launch LSP with Debugging` configuration and set breakpoints in VSCode or the language server, Once you run "Launch LSP with Debugging" a new window should start, wait for the plugin to show up there. Then go to the run menu again and run "Attach to Language Server (amazonq)" after this you should be able to add breakpoints in the LSP code.
5658
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
5759
60+
### Breakpoints Work-Around
61+
62+
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+
64+
1. Set your breakpoints and click `Launch LSP with Debugging`
65+
2. Once the debugging session has started, click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
66+
3. On the debug panel, click `Attach to Language Server (amazonq)` next to the red stop button
67+
4. Click `Launch LSP with Debugging` again, then `Cancel` on any pop-ups that appear
68+
69+
## Language Server Runtimes Debugging
70+
71+
If you want to connect a local version of language-server-runtimes to aws-toolkit-vscode, follow these steps:
72+
73+
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.
74+
75+
```
76+
/aws-toolkit-vscode
77+
/toolkit
78+
/core
79+
/amazonq
80+
/language-server-runtimes
81+
```
82+
83+
2. Inside of the language-server-runtimes project run:
84+
```
85+
npm install
86+
npm run compile
87+
cd runtimes
88+
npm run prepub
89+
cd out
90+
npm link
91+
cd ../../types
92+
npm link
93+
```
94+
If you get an error running `npm run prepub`, you can instead run `npm run prepub:copyFiles` to skip cleaning and testing.
95+
3. Inside of aws-toolkit-vscode run:
96+
```
97+
npm install
98+
npm link @aws/language-server-runtimes @aws/language-server-runtimes-types
99+
```
100+
58101
## Amazon Q Inline Activation
59102
60103
- In order to get inline completion working you must open a supported file type defined in CodewhispererInlineCompletionLanguages in `packages/amazonq/src/app/inline/completion.ts`

‎package-lock.json‎

Lines changed: 8583 additions & 4974 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.324",
44+
"@aws-toolkits/telemetry": "^1.0.326",
4545
"@playwright/browser-chromium": "^1.43.1",
4646
"@stylistic/eslint-plugin": "^2.11.0",
4747
"@types/he": "^1.2.3",

‎packages/amazonq/.changes/1.80.0.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"date": "2025-07-01",
3+
"version": "1.80.0",
4+
"entries": []
5+
}

‎packages/amazonq/.changes/1.81.0.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"date": "2025-07-02",
3+
"version": "1.81.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Stop auto inline completion when deleting code"
8+
}
9+
]
10+
}

‎packages/amazonq/.changes/1.82.0.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"date": "2025-07-07",
3+
"version": "1.82.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Prompt re-authenticate if auto trigger failed with expired token"
8+
}
9+
]
10+
}

‎packages/amazonq/.changes/1.83.0.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"date": "2025-07-09",
3+
"version": "1.83.0",
4+
"entries": [
5+
{
6+
"type": "Feature",
7+
"description": "Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding."
8+
},
9+
{
10+
"type": "Feature",
11+
"description": "Added image support to Amazon Q chat, users can now upload images from their local file system"
12+
},
13+
{
14+
"type": "Removal",
15+
"description": "Deprecate \"amazon q is generating...\" UI for inline suggestion"
16+
}
17+
]
18+
}

‎packages/amazonq/CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## 1.83.0 2025-07-09
2+
3+
- **Feature** Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding.
4+
- **Feature** Added image support to Amazon Q chat, users can now upload images from their local file system
5+
- **Removal** Deprecate "amazon q is generating..." UI for inline suggestion
6+
7+
## 1.82.0 2025-07-07
8+
9+
- **Bug Fix** Prompt re-authenticate if auto trigger failed with expired token
10+
11+
## 1.81.0 2025-07-02
12+
13+
- **Bug Fix** Stop auto inline completion when deleting code
14+
15+
## 1.80.0 2025-07-01
16+
17+
- Miscellaneous non-user-facing changes
18+
119
## 1.79.0 2025-06-25
220

321
- **Bug Fix** Added automatic system certificate detection and VSCode proxy settings support

‎packages/amazonq/package.json‎

Lines changed: 44 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "amazon-q-vscode",
33
"displayName": "Amazon Q",
44
"description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
5-
"version": "1.80.0-SNAPSHOT",
5+
"version": "1.84.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],
@@ -1224,110 +1224,138 @@
12241224
"fontCharacter": "\\f1d0"
12251225
}
12261226
},
1227-
"aws-lambda-function": {
1227+
"aws-lambda-create-stack": {
12281228
"description": "AWS Contributed Icon",
12291229
"default": {
12301230
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12311231
"fontCharacter": "\\f1d1"
12321232
}
12331233
},
1234-
"aws-mynah-MynahIconBlack": {
1234+
"aws-lambda-create-stack-light": {
12351235
"description": "AWS Contributed Icon",
12361236
"default": {
12371237
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12381238
"fontCharacter": "\\f1d2"
12391239
}
12401240
},
1241-
"aws-mynah-MynahIconWhite": {
1241+
"aws-lambda-function": {
12421242
"description": "AWS Contributed Icon",
12431243
"default": {
12441244
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12451245
"fontCharacter": "\\f1d3"
12461246
}
12471247
},
1248-
"aws-mynah-logo": {
1248+
"aws-mynah-MynahIconBlack": {
12491249
"description": "AWS Contributed Icon",
12501250
"default": {
12511251
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12521252
"fontCharacter": "\\f1d4"
12531253
}
12541254
},
1255-
"aws-redshift-cluster": {
1255+
"aws-mynah-MynahIconWhite": {
12561256
"description": "AWS Contributed Icon",
12571257
"default": {
12581258
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12591259
"fontCharacter": "\\f1d5"
12601260
}
12611261
},
1262-
"aws-redshift-cluster-connected": {
1262+
"aws-mynah-logo": {
12631263
"description": "AWS Contributed Icon",
12641264
"default": {
12651265
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12661266
"fontCharacter": "\\f1d6"
12671267
}
12681268
},
1269-
"aws-redshift-database": {
1269+
"aws-redshift-cluster": {
12701270
"description": "AWS Contributed Icon",
12711271
"default": {
12721272
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12731273
"fontCharacter": "\\f1d7"
12741274
}
12751275
},
1276-
"aws-redshift-redshift-cluster-connected": {
1276+
"aws-redshift-cluster-connected": {
12771277
"description": "AWS Contributed Icon",
12781278
"default": {
12791279
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12801280
"fontCharacter": "\\f1d8"
12811281
}
12821282
},
1283-
"aws-redshift-schema": {
1283+
"aws-redshift-database": {
12841284
"description": "AWS Contributed Icon",
12851285
"default": {
12861286
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12871287
"fontCharacter": "\\f1d9"
12881288
}
12891289
},
1290-
"aws-redshift-table": {
1290+
"aws-redshift-redshift-cluster-connected": {
12911291
"description": "AWS Contributed Icon",
12921292
"default": {
12931293
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
12941294
"fontCharacter": "\\f1da"
12951295
}
12961296
},
1297-
"aws-s3-bucket": {
1297+
"aws-redshift-schema": {
12981298
"description": "AWS Contributed Icon",
12991299
"default": {
13001300
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
13011301
"fontCharacter": "\\f1db"
13021302
}
13031303
},
1304-
"aws-s3-create-bucket": {
1304+
"aws-redshift-table": {
13051305
"description": "AWS Contributed Icon",
13061306
"default": {
13071307
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
13081308
"fontCharacter": "\\f1dc"
13091309
}
13101310
},
1311-
"aws-schemas-registry": {
1311+
"aws-s3-bucket": {
13121312
"description": "AWS Contributed Icon",
13131313
"default": {
13141314
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
13151315
"fontCharacter": "\\f1dd"
13161316
}
13171317
},
1318-
"aws-schemas-schema": {
1318+
"aws-s3-create-bucket": {
13191319
"description": "AWS Contributed Icon",
13201320
"default": {
13211321
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
13221322
"fontCharacter": "\\f1de"
13231323
}
13241324
},
1325-
"aws-stepfunctions-preview": {
1325+
"aws-sagemaker-code-editor": {
13261326
"description": "AWS Contributed Icon",
13271327
"default": {
13281328
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
13291329
"fontCharacter": "\\f1df"
13301330
}
1331+
},
1332+
"aws-sagemaker-jupyter-lab": {
1333+
"description": "AWS Contributed Icon",
1334+
"default": {
1335+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
1336+
"fontCharacter": "\\f1e0"
1337+
}
1338+
},
1339+
"aws-schemas-registry": {
1340+
"description": "AWS Contributed Icon",
1341+
"default": {
1342+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
1343+
"fontCharacter": "\\f1e1"
1344+
}
1345+
},
1346+
"aws-schemas-schema": {
1347+
"description": "AWS Contributed Icon",
1348+
"default": {
1349+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
1350+
"fontCharacter": "\\f1e2"
1351+
}
1352+
},
1353+
"aws-stepfunctions-preview": {
1354+
"description": "AWS Contributed Icon",
1355+
"default": {
1356+
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
1357+
"fontCharacter": "\\f1e3"
1358+
}
13311359
}
13321360
},
13331361
"walkthroughs": [

0 commit comments

Comments
 (0)