Merge master into feature/logs

aws-toolkit-automation · web-flow · commit 02cfc5b0f0fc · 2025-05-08T10:20:07.000-04:00
diff --git a/packages/core/src/shared/lsp/utils/platform.ts b/packages/core/src/shared/lsp/utils/platform.ts
@@ -42,7 +42,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' })
     }
     logger.debug('node process is OK')
 
@@ -72,7 +72,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
`@@ -42,7 +42,7 @@ export async function validateNodeExe(nodePath: string[], lsp: string, args: str`
`42`	`42`	`if (!ok) {`
`43`	`43`	const msg = `failed to run basic "node -e" test (exitcode=${r.exitCode}): ${proc.toString(false, true)}`
`44`	`44`	`logger.error(msg)`
`45`		- throw new ToolkitError(`amazonqLsp: ${msg}`)
	`45`	+ throw new ToolkitError(`amazonqLsp: ${msg}`, { code: 'FailedToRunNode' })
`46`	`46`	`}`
`47`	`47`	`logger.debug('node process is OK')`
`48`	`48`
`@@ -72,7 +72,8 @@ export async function validateNodeExe(nodePath: string[], lsp: string, args: str`
`72`	`72`	`})`
`73`	`73`	`if (!ok2 \|\| selfExit) {`
`74`	`74`	`throw new ToolkitError(`
`75`		- `amazonqLsp: failed to run (exitcode=${lspProc.exitCode()}): ${lspProc.toString(false, true)}`
	`75`	+ `amazonqLsp: failed to run (exitcode=${lspProc.exitCode()}): ${lspProc.toString(false, true)}`,
	`76`	`+ { code: 'FailedToStartLanguageServer' }`
`76`	`77`	`)`
`77`	`78`	`}`
`78`	`79`	`} finally {`