Assign count for continued lines in script (#69)

Author: blueyed

covimerage/__init__.py

@@ -463,7 +463,8 @@ def map_function(self, f):
 
         # Assign counts from function to script.
         for [f_lnum, f_line] in f.lines.items():
-            s_line = script.lines[script_lnum + f_lnum]
+            s_lnum = script_lnum + f_lnum
+            s_line = script.lines[s_lnum]
 
             # XXX: might not be the same, since function lines
             # are joined, while script lines might be spread
@@ -472,8 +473,7 @@ def map_function(self, f):
             if script_source != f_line.line:
                 while True:
                     try:
-                        peek = script.lines[script_lnum +
-                                            f_lnum + 1]
+                        peek = script.lines[script_lnum + f_lnum + 1]
                     except KeyError:
                         pass
                     else:
@@ -494,6 +494,14 @@ def map_function(self, f):
                     s_line.count += f_line.count
                 else:
                     s_line.count = f_line.count
+
+                # Assign count to continued lines.
+                i = s_lnum + 1
+                n = len(script.lines)
+                while i < n and RE_CONTINUING_LINE.match(script.lines[i].line):
+                    script.lines[i].count = s_line.count
+                    i += 1
+
             if f_line.self_time:
                 if s_line.self_time:
                     s_line.self_time += f_line.self_time

tests/fixtures/dict_function_with_continued_lines.profile

@@ -10,6 +10,7 @@ count  total (s)   self (s)
                               if a:arg
                                 echom
                                       \ a:arg
+                                      \ .'.'
                               else
                                 echom a:arg
                               endif
@@ -25,10 +26,10 @@ Total time:   0.000079
  Self time:   0.000079
 
 count  total (s)   self (s)
-    3              0.000010   if a:arg
-    2              0.000031     echom a:arg
-    2              0.000004   else
-    1              0.000017     echom a:arg
+    3              0.000008   if a:arg
+    2              0.000059     echom a:arg .'.'
+    2              0.000003   else
+    1              0.000114     echom a:arg
     1              0.000002   endif
 
 FUNCTIONS SORTED ON TOTAL TIME

tests/test_main.py

@@ -248,7 +248,8 @@ def test_profile_parse_dict_function_with_continued_lines():
         (1, 'function! obj.dict_function(arg) abort'),
         (3, '  if a:arg'),
         (2, '    echom'),
-        (N, '          \\ a:arg'),
+        (2, '          \\ a:arg'),
+        (2, '          \\ .\'.\''),
         (2, '  else'),
         (1, '    echom a:arg'),
         (1, '  endif'),

tests/test_plugin/dict_function_with_continued_lines.vim

@@ -4,6 +4,7 @@ function! obj.dict_function(arg) abort
   if a:arg
     echom
           \ a:arg
+          \ .'.'
   else
     echom a:arg
   endif