From 661fb6293740b9f1f03744fa5ba31e475244f415 Mon Sep 17 00:00:00 2001
From: Kevin DeJong <kddejong@amazon.com>
Date: Sun, 23 Nov 2025 10:46:49 -0800
Subject: [PATCH] Reduce CFN LS error messaging

---
 .../awsService/cloudformation/extension.ts    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/awsService/cloudformation/extension.ts b/packages/core/src/awsService/cloudformation/extension.ts
index f3c858557dd..512ea6a65ed 100644
--- a/packages/core/src/awsService/cloudformation/extension.ts
+++ b/packages/core/src/awsService/cloudformation/extension.ts
@@ -13,7 +13,7 @@ import {
     CloseHandlerResult,
 } from 'vscode-languageclient/node'
 import { CloseAction, ErrorAction, Message } from 'vscode-languageclient/node'
-import { formatMessage, toString } from './utils'
+import { toString } from './utils'
 import globals from '../../shared/extensionGlobals'
 import { getServiceEnvVarConfig } from '../../shared/vscode/env'
 import { DevSettings } from '../../shared/settings'
@@ -167,21 +167,30 @@ async function startClient(context: ExtensionContext) {
         },
         errorHandler: {
             error: (error: Error, message: Message | undefined, count: number | undefined): ErrorHandlerResult => {
-                void window.showErrorMessage(formatMessage(`Error count = ${count}): ${toString(message)}`))
+                getLogger().warn(`CloudFormation LSP error (count: ${count}): ${toString(message)}`)
                 return { action: ErrorAction.Continue }
             },
             closed: (): CloseHandlerResult => {
-                void window.showWarningMessage(formatMessage(`Server connection closed`))
-                return { action: CloseAction.DoNotRestart }
+                getLogger().info('CloudFormation LSP connection closed')
+                return { action: CloseAction.DoNotRestart, message: '' }
             },
         },
+        initializationFailedHandler: () => {
+            getLogger().error('CloudFormation LSP initialization failed')
+            return false
+        },
     }
 
     client = new LanguageClient(ExtensionId, ExtensionName, serverOptions, clientOptions)
 
     const stacksManager = new StacksManager(client)
 
-    await client.start()
+    try {
+        await client.start()
+    } catch (error) {
+        getLogger().error(`CloudFormation LSP failed to start: ${toString(error)}`)
+        return
+    }
 
     const documentManager = new DocumentManager(client)
     const resourceSelector = new ResourceSelector(client)
@@ -322,9 +331,7 @@ export async function activate(context: ExtensionContext) {
             try {
                 await restartClient(context)
             } catch (error) {
-                void window.showErrorMessage(
-                    formatMessage(`Failed to restart CloudFormation language server: ${toString(error)}`)
-                )
+                getLogger().error(`Failed to restart CloudFormation language server: ${toString(error)}`)
             }
         })
     )