From 8496633c875c22e93c71c48c4103b54a464c388f Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Fri, 13 May 2022 21:20:37 +0200
Subject: [PATCH] Don't make r-a fail to initialize if updating the config
 fails

---
 editors/code/src/client.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/editors/code/src/client.ts b/editors/code/src/client.ts
index d28c20aa08f..7519cd3de37 100644
--- a/editors/code/src/client.ts
+++ b/editors/code/src/client.ts
@@ -49,7 +49,9 @@ export async function createClient(serverPath: string, workspace: Workspace, ext
     let initializationOptions = vscode.workspace.getConfiguration("rust-analyzer");
 
     // Update outdated user configs
-    await updateConfig(initializationOptions);
+    await updateConfig(initializationOptions).catch(err => {
+        void vscode.window.showErrorMessage(`Failed updating old config keys: ${err.message}`);
+    });
 
     if (workspace.kind === "Detached Files") {
         initializationOptions = { "detachedFiles": workspace.files.map(file => file.uri.fsPath), ...initializationOptions };