Merge branch 'master' into slowSamTest

Hweinstock · Hweinstock · commit ab6288f7103e · 2024-11-08T16:47:39.000-05:00
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-15ddd682-232b-4bcd-a6e5-969f5c1c40c9.json b/packages/amazonq/.changes/next-release/Bug Fix-15ddd682-232b-4bcd-a6e5-969f5c1c40c9.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Fix suboptimal inline suggestions from Amazon Q caused by improperly formatted supplemental context"
+}
diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts
@@ -66,7 +66,7 @@ export interface Manifest {
 }
 const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
 // this LSP client in Q extension is only going to work with these LSP server versions
-const supportedLspServerVersions = ['0.1.25']
+const supportedLspServerVersions = ['0.1.27']
 
 const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node'
 
diff --git a/packages/core/src/codewhisperer/client/user-service-2.json b/packages/core/src/codewhisperer/client/user-service-2.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Fix suboptimal inline suggestions from Amazon Q caused by improperly formatted supplemental context"
 +}
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ export interface Manifest {`
`66`	`66`	`}`
`67`	`67`	`const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'`
`68`	`68`	`// this LSP client in Q extension is only going to work with these LSP server versions`
`69`		`-const supportedLspServerVersions = ['0.1.25']`
	`69`	`+const supportedLspServerVersions = ['0.1.27']`
`70`	`70`
`71`	`71`	`const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node'`
`72`	`72`