From 06cac18d788c1373d1e38d22c9fcc0fe21ac6546 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 20 Sep 2023 14:51:02 +0300
Subject: [PATCH] Return message id in prettier_server error responses

---
 crates/prettier/src/prettier_server.js | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/crates/prettier/src/prettier_server.js b/crates/prettier/src/prettier_server.js
index 02c21811e2..2e7e1fd2e6 100644
--- a/crates/prettier/src/prettier_server.js
+++ b/crates/prettier/src/prettier_server.js
@@ -37,8 +37,15 @@ const prettierPath = path.join(prettierContainerPath, 'node_modules/prettier');
 
 async function handleBuffer(prettier) {
     for await (let messageText of readStdin()) {
-        handleMessage(messageText, prettier).catch(e => {
-            sendResponse(makeError(`error during message handling: ${e}`));
+        let message;
+        try {
+            message = JSON.parse(messageText);
+        } catch (e) {
+            sendResponse(makeError(`Failed to parse message '${messageText}': ${e}`));
+            continue;
+        }
+        handleMessage(message, prettier).catch(e => {
+            sendResponse({ id: message.id, ...makeError(`error during message handling: ${e}`) });
         });
     }
 }
@@ -117,22 +124,21 @@ async function* readStdin() {
 // ?
 // shutdown
 // error
-async function handleMessage(messageText, prettier) {
-    const message = JSON.parse(messageText);
+async function handleMessage(message, prettier) {
     const { method, id, params } = message;
     if (method === undefined) {
-        throw new Error(`Message method is undefined: ${messageText}`);
+        throw new Error(`Message method is undefined: ${JSON.stringify(message)}`);
     }
     if (id === undefined) {
-        throw new Error(`Message id is undefined: ${messageText}`);
+        throw new Error(`Message id is undefined: ${JSON.stringify(message)}`);
     }
 
     if (method === 'prettier/format') {
         if (params === undefined || params.text === undefined) {
-            throw new Error(`Message params.text is undefined: ${messageText}`);
+            throw new Error(`Message params.text is undefined: ${JSON.stringify(message)}`);
         }
         if (params.options === undefined) {
-            throw new Error(`Message params.options is undefined: ${messageText}`);
+            throw new Error(`Message params.options is undefined: ${JSON.stringify(message)}`);
         }
         const formattedText = await prettier.format(params.text, params.options);
         sendResponse({ id, result: { text: formattedText } });