From decf9a145d4a1f7107fe0ce533765891960f5555 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Sun, 23 Oct 2016 15:50:46 +0100
Subject: Better line parsing (simplified).

---
 background_scripts/bg_utils.coffee | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'background_scripts/bg_utils.coffee')

diff --git a/background_scripts/bg_utils.coffee b/background_scripts/bg_utils.coffee
index 27ecb0cc..26033476 100644
--- a/background_scripts/bg_utils.coffee
+++ b/background_scripts/bg_utils.coffee
@@ -77,18 +77,12 @@ BgUtils =
             logElement.value += "#{dateString}: #{message}\n"
             logElement.scrollTop = 2000000000
 
-  # Remove comments from a list of lines and merge lines where the last character on the preceding line is "\".
-  parseLines: (lines) ->
-    previousText = []
-    for line in lines
-      line = line.replace /^\s+/g, ''
+  # Remove comments and leading/trailing whitespace from a list of lines, and merge lines where the last
+  # character on the preceding line is "\".
+  parseLines: (text) ->
+    for line in text.replace(/\\\n/g, "").split("\n").map((line) -> line.trim())
       continue if line.length == 0
       continue if line[0] in '#"'
-      if line[line.length-1] == "\\"
-        previousText.push line[...line.length-1]
-        continue
-      line = previousText.join(" ") + line
-      previousText = []
       line
 
 root.BgUtils = BgUtils
-- 
cgit v1.2.3