Merge master into feature/emr

aws-toolkit-automation · web-flow · commit 23ffa1aaf6a3 · 2025-05-08T10:20:04.000-04:00
diff --git a/packages/core/src/shared/lsp/utils/platform.ts b/packages/core/src/shared/lsp/utils/platform.ts
@@ -40,7 +40,7 @@ export async function validateNodeExe(nodePath: string[], lsp: string, args: str
     if (!ok) {
         const msg = `failed to run basic "node -e" test (exitcode=${r.exitCode}): ${proc.toString(false, true)}`
         logger.error(msg)
-        throw new ToolkitError(`amazonqLsp: ${msg}`)
+        throw new ToolkitError(`amazonqLsp: ${msg}`, { code: 'FailedToRunNode' })
     }
 
     // Check that we can start `node …/lsp.js --stdio …`.
@@ -68,7 +68,8 @@ export async function validateNodeExe(nodePath: string[], lsp: string, args: str
         })
         if (!ok2 || selfExit) {
             throw new ToolkitError(
-                `amazonqLsp: failed to run (exitcode=${lspProc.exitCode()}): ${lspProc.toString(false, true)}`
+                `amazonqLsp: failed to run (exitcode=${lspProc.exitCode()}): ${lspProc.toString(false, true)}`,
+                { code: 'FailedToStartLanguageServer' }
             )
         }
     } finally {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ export async function validateNodeExe(nodePath: string[], lsp: string, args: str`
`40`	`40`	`if (!ok) {`
`41`	`41`	const msg = `failed to run basic "node -e" test (exitcode=${r.exitCode}): ${proc.toString(false, true)}`
`42`	`42`	`logger.error(msg)`
`43`		- throw new ToolkitError(`amazonqLsp: ${msg}`)
	`43`	+ throw new ToolkitError(`amazonqLsp: ${msg}`, { code: 'FailedToRunNode' })
`44`	`44`	`}`
`45`	`45`
`46`	`46`	// Check that we can start `node …/lsp.js --stdio …`.
`@@ -68,7 +68,8 @@ export async function validateNodeExe(nodePath: string[], lsp: string, args: str`
`68`	`68`	`})`
`69`	`69`	`if (!ok2 \|\| selfExit) {`
`70`	`70`	`throw new ToolkitError(`
`71`		- `amazonqLsp: failed to run (exitcode=${lspProc.exitCode()}): ${lspProc.toString(false, true)}`
	`71`	+ `amazonqLsp: failed to run (exitcode=${lspProc.exitCode()}): ${lspProc.toString(false, true)}`,
	`72`	`+ { code: 'FailedToStartLanguageServer' }`
`72`	`73`	`)`
`73`	`74`	`}`
`74`	`75`	`} finally {`