Skip to content

fix(amazonq): address rebase conflicts with mainline #7861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2025
Merged

fix(amazonq): address rebase conflicts with mainline #7861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ packages/*/resources/css/icons.css
.vscode-test-web

# Generated by E2E UI Tests
packages/amazonq/test/e2e/amazonq/resources
packages/amazonq/test/e2e_new/amazonq/resources
5 changes: 4 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions packages/amazonq/.changes/next-release/Bug Fix-316fb610-0ea9-40d1-bdb7-d371a6be4a4e.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions packages/amazonq/.changes/next-release/Bug Fix-7261a487-e80a-440f-b311-2688e256a886.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions packages/amazonq/.changes/next-release/Bug Fix-9d694e40-7fc7-4504-b08c-6b22a5ebcb1c.json
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions packages/amazonq/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@
"generateIcons": "ts-node ../../scripts/generateIcons.ts",
"generateSettings": "ts-node ../../scripts/generateSettings.ts"
},
"dependencies": {
"aws-core-vscode": "file:../core/"
},
"contributesComments": {
"configuration": {
"properties": "Any settings also defined in packages/core/package.json will override same-named settings in this file."
Expand Down
8 changes: 1 addition & 7 deletions packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { getLogger } from 'aws-core-vscode/shared'
import { LanguageClient } from 'vscode-languageclient'
import { InlineCompletionItemWithReferences } from '@aws/language-server-runtimes/protocol'
import { CodeWhispererSession } from '../sessionManager'
import { AmazonQInlineCompletionItemProvider } from '../completion'
import type { AmazonQInlineCompletionItemProvider } from '../completion'

export async function showEdits(
item: InlineCompletionItemWithReferences,
Expand All @@ -37,12 +37,6 @@ export async function showEdits(
return
}

// TODO: To investigate why it fails and patch [generateDiffSvg]
if (newCode.length === 0) {
getLogger('nextEditPrediction').warn('not able to apply provided edit suggestion, skip rendering')
return
}

if (svgImage) {
// display the SVG image
await displaySvgDecoration(
Expand Down
3 changes: 1 addition & 2 deletions packages/core/src/shared/settings-amazonq.gen.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ export const amazonqSettings = {
"amazonQ.workspaceIndexMaxFileSize": {},
"amazonQ.workspaceIndexCacheDirPath": {},
"amazonQ.workspaceIndexIgnoreFilePatterns": {},
"amazonQ.ignoredSecurityIssues": {},
"amazonQ.proxy.certificateAuthority": {}
"amazonQ.ignoredSecurityIssues": {}
}

export default amazonqSettings
Loading