From 60226229174b7a2069f5a1f2887f7aff524714a2 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Fri, 10 Jan 2020 17:26:34 +0100
Subject: [PATCH] Handle another double quote special case

---
 .../__tests__/utils_string_expanding.txt      | 30 +++++++++++++++++++
 .../public/np_ready/lib/utils/utils.ts        | 14 +++++++++
 2 files changed, 44 insertions(+)

diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt b/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt
index 88467ab3672cd7..7de874c244e74f 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt
@@ -52,3 +52,33 @@ Correctly handle new lines in triple quotes
     SELECT * FROM "TABLE"
     """
 }
+==========
+Single quotes escaped special case, start and end
+-------------------------------------
+{
+  "query": "\"test\""
+}
+-------------------------------------
+{
+  "query": "\"test\""
+}
+==========
+Single quotes escaped special case, start
+-------------------------------------
+{
+  "query": "\"test"
+}
+-------------------------------------
+{
+  "query": "\"test"
+}
+==========
+Single quotes escaped special case, end
+-------------------------------------
+{
+  "query": "test\""
+}
+-------------------------------------
+{
+  "query": "test\""
+}
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts b/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts
index a7f59acf1d77b6..0b10938abe7042 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts
+++ b/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts
@@ -84,6 +84,20 @@ export function expandLiteralStrings(data: string) {
     // Expand to triple quotes if there are _any_ slashes
     if (string.match(/\\./)) {
       const firstDoubleQuoteIdx = string.indexOf('"');
+      const lastDoubleQuoteIdx = string.lastIndexOf('"');
+
+      // Handle a special case where we may have a value like "\"test\"". We don't
+      // want to expand this to """"test"""" - so we terminate before processing the string
+      // further if we detect this either at the start or end of the double quote section.
+
+      if (string[firstDoubleQuoteIdx + 1] === '\\' && string[firstDoubleQuoteIdx + 2] === '"') {
+        return string;
+      }
+
+      if (string[lastDoubleQuoteIdx - 1] === '"' && string[lastDoubleQuoteIdx - 2] === '\\') {
+        return string;
+      }
+
       const colonAndAnySpacing = string.slice(0, firstDoubleQuoteIdx);
       const rawStringifiedValue = string.slice(firstDoubleQuoteIdx, string.length);
       // Remove one level of JSON stringification