Merge pull request #7861 from Hweinstock/fixFeatureBranch

fix(amazonq): address rebase conflicts with mainline

Author: laura-codess

.gitignore

@@ -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

package-lock.json

@@ -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."

packages/amazonq/.changes/next-release/Bug Fix-316fb610-0ea9-40d1-bdb7-d371a6be4a4e.json

@@ -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,
@@ -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(

packages/amazonq/.changes/next-release/Bug Fix-7261a487-e80a-440f-b311-2688e256a886.json

@@ -36,8 +36,7 @@ export const amazonqSettings = {
     "amazonQ.workspaceIndexMaxFileSize": {},
     "amazonQ.workspaceIndexCacheDirPath": {},
     "amazonQ.workspaceIndexIgnoreFilePatterns": {},
-    "amazonQ.ignoredSecurityIssues": {},
-    "amazonQ.proxy.certificateAuthority": {}
+    "amazonQ.ignoredSecurityIssues": {}
 }
 
 export default amazonqSettings