Add new testcase about multiline lines (#38)

Author: f18m

beautysh/beautysh.py

@@ -35,7 +35,8 @@ def beautify_string(self, data, path=''):
         """Beautify string (file part)."""
         tab = 0
         case_level = 0
-        continue_line = False
+        prev_line_had_continue = None
+        continue_line = None
         open_brackets = 0
         in_here_doc = False
         defer_ext_quote = False
@@ -75,7 +76,18 @@ def beautify_string(self, data, path=''):
             # remove '#' comments
             test_record = re.sub(r'(\A|\s)(#.*)', '', test_record, 1)
 
-            if(in_here_doc):  # pass on with no changes
+            # detect whether this line ends with line continuation character:
+            prev_line_had_continue = continue_line
+            continue_line = re.search(r'\\$', stripped_record)
+
+            if continue_line:
+                # remove contents of strings initiated on current line but that continue on next line
+                # (in particular we need to ignore brackets they may contain!)
+                test_record = re.sub(r'"[^"]*?\\$', '', test_record)
+
+            inside_multiline_continuation = (continue_line is not None) and (prev_line_had_continue is not None)
+
+            if(in_here_doc) or (inside_multiline_continuation):  # pass on with no changes
                 output.append(record)
                 # now test for here-doc termination string
                 if(re.search(here_string, test_record) and not
@@ -153,8 +165,7 @@ def beautify_string(self, data, path=''):
                                             test_record) is not None]
                         net = inc - outc
                         tab += min(net, 0)
-                        extab = tab + else_case + choice_case + (
-                            1 if continue_line and not open_brackets else 0)
+                        extab = tab + else_case + choice_case
                         extab = max(0, extab)
                         output.append((self.tab_str * self.tab_size * extab) +
                                       stripped_record)
@@ -166,7 +177,6 @@ def beautify_string(self, data, path=''):
             # count open brackets for line continuation
             open_brackets += len(re.findall(r'\[', test_record))
             open_brackets -= len(re.findall(r'\]', test_record))
-            continue_line = re.search(r'\\$', stripped_record)
             line += 1
         error = (tab != 0)
         if(error):

tests/indent_test1_beautified.sh

@@ -25,6 +25,15 @@ function quote_escapes1()
     echo "command to indent"
 }
 
+function quote_escapes_line_continuation2()
+{
+    local EVIL_STRING="{\"time\":{\"last\":{\"value\":1,\"type\":\"days\",\"clockType\":\"days\",\"start\":${TEST_START_TIME}},\"to\":${TEST_END_TIME},\"from\":${TEST_START_TIME_PLUS_ONE}}, \
+\"categories\":{\"category\":[${CATEGORY_FOR_EMPIRIX_EXMS_QUERY}]},\"requestedRows\":1000,\
+\"advancedFilters\":[{\"groupOperator\":\"or\",\"advancedFilter\":[{\"filter\":[{\"name\":\"${PARAM}\",\"type\":\"string\",\"condition\":\"=\",\"value\":[\"${VALUE}\"]}],\
+\"filterOperator\":\"and\"}],\"asdr\":\"common\"}]}"
+    echo "command to indent"
+}
+
 function complex_mix1()
 {
     while true; do

tests/indent_test1_raw.sh

@@ -25,6 +25,15 @@ function quote_escapes1()
 	echo "command to indent"
 }
 
+function quote_escapes_line_continuation2()
+{
+	local EVIL_STRING="{\"time\":{\"last\":{\"value\":1,\"type\":\"days\",\"clockType\":\"days\",\"start\":${TEST_START_TIME}},\"to\":${TEST_END_TIME},\"from\":${TEST_START_TIME_PLUS_ONE}}, \
+\"categories\":{\"category\":[${CATEGORY_FOR_EMPIRIX_EXMS_QUERY}]},\"requestedRows\":1000,\
+\"advancedFilters\":[{\"groupOperator\":\"or\",\"advancedFilter\":[{\"filter\":[{\"name\":\"${PARAM}\",\"type\":\"string\",\"condition\":\"=\",\"value\":[\"${VALUE}\"]}],\
+\"filterOperator\":\"and\"}],\"asdr\":\"common\"}]}"
+	echo "command to indent"
+}
+
 function complex_mix1()
 {
 	while true; do