From 40c3099e4e4f4eafa5e1f5ccedcd8608726d2d23 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 24 Feb 2020 11:41:27 +0000
Subject: [PATCH] Avoid adding extra newlines when formating jsonata Fixes
 #2472

---
 .../@node-red/editor-client/src/vendor/jsonata/formatter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
index 382537be3..9fbab4fbf 100644
--- a/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
+++ b/packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js
@@ -59,8 +59,8 @@
                     stack.pop();
                 }
             }
-
         }
+
         // console.log(stack);
         var result = str;
         var indent = 0;
@@ -83,7 +83,7 @@
                     pre = result.substring(0,offset+f.pos+1);
                     post = result.substring(offset+f.pos+1);
                     indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
+                    result = pre+(/\n$/.test(pre)?"":"\n")+indented;
                     offset += indented.length-post.length+1;
                 } else {
                     longStack.push(false);
@@ -94,7 +94,7 @@
                     pre = result.substring(0,offset+f.pos);
                     post = result.substring(offset+f.pos);
                     indented = indentLine(post,indent);
-                    result = pre+"\n"+indented;
+                    result = pre+(/\n$/.test(pre)?"":"\n")+indented;
                     offset += indented.length-post.length+1;
                 }
                 longStack.pop();