Skip to content

Commit 6b39dfa

Browse files
committed
Merge branch 'master' into lint/indexImports
2 parents 879a6cf + 2b047ac commit 6b39dfa

Some content is hidden

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

43 files changed

+405
-239
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,7 @@ module.exports = {
214214
],
215215
},
216216
],
217+
218+
'prettier/prettier': ['error', { endOfLine: 'auto' }],
217219
},
218220
}
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": "Fix inline completion supplementalContext length exceeding maximum in certain cases"
4+
}
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": "User-selected customizations are sometimes not being persisted."
4+
}
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": "Amazon q /dev: Remove hard-coded limits and instead rely server-side data to communicate number of code generations remaining"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "Adds capability to send new context commands to AB groups"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "feat(amazonq): Add error message for updated README too large"
4+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type": "Feature",
3+
"description": "Enhance Q inline completion context fetching for better suggestion quality"
4+
}

packages/amazonq/package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,6 @@
218218
"id": "aws.AmazonQChatView",
219219
"name": "%AWS.amazonq.chat%",
220220
"when": "!aws.isWebExtHost && !aws.amazonq.showLoginView"
221-
},
222-
{
223-
"id": "aws.AmazonQNeverShowBadge",
224-
"name": "",
225-
"when": "false"
226221
}
227222
],
228223
"aws-codewhisperer-reference-log": [

packages/amazonq/src/app/chat/activation.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ export async function activate(context: ExtensionContext) {
6161
void vscode.env.openExternal(vscode.Uri.parse(amazonq.amazonQHelpUrl))
6262
})
6363

64-
await amazonq.activateBadge()
6564
void setupLsp()
6665
void setupAuthNotification()
6766
}

packages/amazonq/test/e2e/amazonq/welcome.test.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import sinon from 'sinon'
99
import { Messenger } from './framework/messenger'
1010
import { MynahUIDataModel } from '@aws/mynah-ui'
1111
import { assertQuickActions } from './assert'
12+
import { FeatureContext } from 'aws-core-vscode/shared'
1213

1314
describe('Amazon Q Welcome page', function () {
1415
let framework: qTestingFramework
@@ -17,8 +18,15 @@ describe('Amazon Q Welcome page', function () {
1718

1819
const availableCommands = ['/dev', '/test', '/review', '/doc', '/transform']
1920

21+
const highlightCommand: FeatureContext = {
22+
name: 'highlightCommand',
23+
value: {
24+
stringValue: '@highlight',
25+
},
26+
variation: 'highlight command desc',
27+
}
2028
beforeEach(() => {
21-
framework = new qTestingFramework('welcome', true, [], 0)
29+
framework = new qTestingFramework('welcome', true, [['highlightCommand', highlightCommand]], 0)
2230
tab = framework.getTabs()[0] // use the default tab that gets created
2331
store = tab.getStore()
2432
})
@@ -33,13 +41,13 @@ describe('Amazon Q Welcome page', function () {
3341
assertQuickActions(tab, availableCommands)
3442
})
3543

36-
it('Shows @workspace', async () => {
44+
it('Shows context commands', async () => {
3745
assert.deepStrictEqual(
3846
store.contextCommands
3947
?.map((x) => x.commands)
4048
.flat()
4149
.map((x) => x.command),
42-
['@workspace']
50+
['@workspace', '@highlight']
4351
)
4452
})
4553

0 commit comments

Comments
 (0)