From 2c3911cad03ef83ef14374a8d4eae05c9630b8ea Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 15 Apr 2021 13:46:09 -0700
Subject: [PATCH] Use `bodyRanges` from message whenever available

---
 ts/sql/Client.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ts/sql/Client.ts b/ts/sql/Client.ts
index 00e2be96f8..e5ef3aae78 100644
--- a/ts/sql/Client.ts
+++ b/ts/sql/Client.ts
@@ -869,8 +869,11 @@ function handleSearchMessageJSON(
 ): Array<ClientSearchResultMessageType> {
   return messages.map(message => ({
     json: message.json,
-    ...JSON.parse(message.json),
+
+    // Empty array is a default value. `message.json` has the real field
     bodyRanges: [],
+
+    ...JSON.parse(message.json),
     snippet: message.snippet,
   }));
 }