From e965de17f9f400c289419d862eeabf6bbabc4222 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Thu, 15 Aug 2019 14:53:27 -0700
Subject: [PATCH] Still show nunjucks tag label when render error present

---
 .../codemirror/extensions/nunjucks-tags.js    | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js b/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js
index 9dc111bb1e..a725076fa6 100644
--- a/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js
+++ b/packages/insomnia-app/app/ui/components/codemirror/extensions/nunjucks-tags.js
@@ -240,16 +240,16 @@ async function _updateElementText(render, mark, text, renderContext, isVariableU
   let dataIgnore = '';
   let dataError = '';
 
-  try {
-    const str = text.replace(/\\/g, '');
-    const tagMatch = str.match(/{% *([^ ]+) *.*%}/);
-    const cleanedStr = str
-      .replace(/^{%/, '')
-      .replace(/%}$/, '')
-      .replace(/^{{/, '')
-      .replace(/}}$/, '')
-      .trim();
+  const str = text.replace(/\\/g, '');
+  const tagMatch = str.match(/{% *([^ ]+) *.*%}/);
+  const cleanedStr = str
+    .replace(/^{%/, '')
+    .replace(/%}$/, '')
+    .replace(/^{{/, '')
+    .replace(/}}$/, '')
+    .trim();
 
+  try {
     if (tagMatch) {
       const tagData = tokenizeTag(str);
       const tagDefinition = (await getTagDefinitions()).find(d => d.name === tagData.name);
@@ -281,9 +281,7 @@ async function _updateElementText(render, mark, text, renderContext, isVariableU
     }
     dataError = 'off';
   } catch (err) {
-    const fullMessage = err.message.replace(/\[.+,.+]\s*/, '');
-    let message = fullMessage;
-    title = message;
+    title = err.message.replace(/\[.+,.+]\s*/, '');
     dataError = 'on';
   }
 
@@ -291,7 +289,7 @@ async function _updateElementText(render, mark, text, renderContext, isVariableU
   el.setAttribute('data-ignore', dataIgnore);
   if (dataError === 'on') {
     el.setAttribute('data-error', dataError);
-    el.innerHTML = '<label><i class="fa fa-exclamation-triangle"></i></label>' + innerHTML;
+    el.innerHTML = '<label><i class="fa fa-exclamation-triangle"></i></label>' + cleanedStr;
   } else {
     el.innerHTML = '<label></label>' + innerHTML;
   }