Skip to content

Commit e8c7c07

Browse files
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents 633b05b + 928593c commit e8c7c07

File tree

121 files changed

+11325
-1840
lines changed

Some content is hidden

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

121 files changed

+11325
-1840
lines changed

package-lock.json

Lines changed: 3934 additions & 1268 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"date": "2025-02-05",
3+
"version": "1.46.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Citation links are not clickable as numbers, but appear as non-clickable texts"
8+
},
9+
{
10+
"type": "Bug Fix",
11+
"description": "Fix language server start failure in AL2023 ARM64"
12+
},
13+
{
14+
"type": "Bug Fix",
15+
"description": "/review: Auto-review issues did not populate code issues list"
16+
},
17+
{
18+
"type": "Bug Fix",
19+
"description": "Amazon Q: Fix code upload error when using /dev or /doc on Remote SSH"
20+
},
21+
{
22+
"type": "Bug Fix",
23+
"description": "/test placeholder text aligned across IDEs"
24+
},
25+
{
26+
"type": "Bug Fix",
27+
"description": "Inline: Typos in the first example suggestion"
28+
},
29+
{
30+
"type": "Feature",
31+
"description": "Inline suggestions: Pre-fetch recommendations to reduce suggestion latency."
32+
},
33+
{
34+
"type": "Feature",
35+
"description": "Added github issue link and description to the chat answer feedback form"
36+
}
37+
]
38+
}

packages/amazonq/.changes/next-release/Bug Fix-22f55c14-bd62-49d7-aa68-3ab3cc8f0929.json

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

packages/amazonq/.changes/next-release/Bug Fix-ca03bdf5-a707-479e-9405-e9ac3b73e30a.json

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

packages/amazonq/.changes/next-release/Bug Fix-dc78e630-6320-4297-9ae9-7a19891f5357.json

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

packages/amazonq/.changes/next-release/Bug Fix-e2bb3c83-52e8-4ae9-aedb-844e8780971b.json

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

packages/amazonq/.vscode/launch.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
"name": "Extension",
1010
"type": "extensionHost",
1111
"request": "launch",
12-
"debugWebviews": true,
13-
"rendererDebugOptions": {
14-
"urlFilter": "*amazonwebservices.amazon-q-vscode*",
15-
"webRoot": "${workspaceFolder}"
16-
},
1712
"runtimeExecutable": "${execPath}",
1813
"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
1914
"env": {

packages/amazonq/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## 1.46.0 2025-02-05
2+
3+
- **Bug Fix** Citation links are not clickable as numbers, but appear as non-clickable texts
4+
- **Bug Fix** Fix language server start failure in AL2023 ARM64
5+
- **Bug Fix** /review: Auto-review issues did not populate code issues list
6+
- **Bug Fix** Amazon Q: Fix code upload error when using /dev or /doc on Remote SSH
7+
- **Bug Fix** /test placeholder text aligned across IDEs
8+
- **Bug Fix** Inline: Typos in the first example suggestion
9+
- **Feature** Inline suggestions: Pre-fetch recommendations to reduce suggestion latency.
10+
- **Feature** Added github issue link and description to the chat answer feedback form
11+
112
## 1.45.0 2025-01-30
213

314
- **Bug Fix** Allow AB users with an overridden customization to go back to the default customization

packages/amazonq/package.json

Lines changed: 1 addition & 1 deletion
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.46.0-SNAPSHOT",
5+
"version": "1.47.0-SNAPSHOT",
66
"extensionKind": [
77
"workspace"
88
],

packages/amazonq/test/e2e/amazonq/testGen.test.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { qTestingFramework } from './framework/framework'
99
import sinon from 'sinon'
1010
import { Messenger } from './framework/messenger'
1111
import { FollowUpTypes } from 'aws-core-vscode/amazonq'
12-
import { registerAuthHook, using, TestFolder } from 'aws-core-vscode/test'
12+
import { registerAuthHook, using, TestFolder, closeAllEditors } from 'aws-core-vscode/test'
1313
import { loginToIdC } from './utils/setup'
1414
import { waitUntil, workspaceUtils } from 'aws-core-vscode/shared'
1515

@@ -51,10 +51,12 @@ describe('Amazon Q Test Generation', function () {
5151
assert.fail(`Failed to open ${language} file`)
5252
}
5353

54-
await vscode.window.showTextDocument(document, { preview: false })
54+
await waitUntil(async () => {
55+
await vscode.window.showTextDocument(document, { preview: false })
56+
}, {})
5557

5658
const activeEditor = vscode.window.activeTextEditor
57-
if (!activeEditor || activeEditor.document !== document) {
59+
if (!activeEditor || activeEditor.document.uri.fsPath !== document.uri.fsPath) {
5860
assert.fail(`Failed to make temp file active`)
5961
}
6062
}
@@ -80,7 +82,7 @@ describe('Amazon Q Test Generation', function () {
8082

8183
afterEach(async () => {
8284
// Close all editors to prevent conflicts with subsequent tests trying to open the same file
83-
await vscode.commands.executeCommand('workbench.action.closeAllEditors')
85+
await closeAllEditors()
8486
framework.removeTab(tab.tabID)
8587
framework.dispose()
8688
sinon.restore()
@@ -161,9 +163,11 @@ describe('Amazon Q Test Generation', function () {
161163
})
162164

163165
for (const { language, filePath } of testFiles) {
164-
describe(`${language} file`, () => {
166+
// skipping for now since this test is flaky. passes locally, but only half the time in CI
167+
// have tried retries for setupTestDocument, openTextDocument, and showTextDocument
168+
describe.skip(`${language} file`, () => {
165169
beforeEach(async () => {
166-
await setupTestDocument(filePath, language)
170+
await waitUntil(async () => await setupTestDocument(filePath, language), {})
167171

168172
tab.addChatMessage({ command: '/test' })
169173
await tab.waitForChatFinishesLoading()

0 commit comments

Comments
 (0)