- fix the line number scheme to be consistently 1-based, both

for the template and the module
- turn full_line_map into a list
- add another start source to help with when a render callable
begins

1 files changed, 8 insertions, 11 deletions

diff --git a/mako/template.py b/mako/template.py
index 39ff8bd..a747feb 100644
--- a/mako/template.py
+++ b/mako/template.py
@@ -605,17 +605,14 @@ class ModuleInfo(object):
         source_map['line_map'] = dict((int(k), int(v))
                                     for k, v in source_map['line_map'].items())
         if full_line_map:
-            line_map = source_map['full_line_map'] = dict(
-                (k, v) for k, v in source_map['line_map'].items()
-            )
-
-            for mod_line in reversed(sorted(line_map)):
-                tmpl_line = line_map[mod_line]
-                while mod_line > 0:
-                    mod_line -= 1
-                    if mod_line in line_map:
-                        break
-                    line_map[mod_line] = tmpl_line
+            f_line_map = source_map['full_line_map'] = []
+            line_map = source_map['line_map']
+
+            curr_templ_line = 1
+            for mod_line in range(1, max(line_map)):
+                if mod_line in line_map:
+                    curr_templ_line = line_map[mod_line]
+                f_line_map.append(curr_templ_line)
         return source_map
 
     @property