templater: provide hint for multi-line templates with parse errors
Previously, we punted. Now we "rewrite" the template's newlines to r'\n' and
offset the hint appropriately.
Differential Revision: https://phab.mercurial-scm.org/D2609
--- a/mercurial/templater.py Sat Mar 03 14:23:40 2018 -0800
+++ b/mercurial/templater.py Sat Mar 03 14:30:21 2018 -0800
@@ -246,14 +246,16 @@
except error.ParseError as inst:
if len(inst.args) > 1: # has location
loc = inst.args[1]
- # TODO: Opportunity for improvement! If there is a newline in the
- # template, this hint does not point to the right place, so skip.
- if '\n' not in tmpl:
- # We want the caret to point to the place in the template that
- # failed to parse, but in a hint we get a open paren at the
- # start. Therefore, we print "loc" spaces (instead of "loc - 1")
- # to line up the caret with the location of the error.
- inst.hint = tmpl + '\n' + ' ' * (loc) + '^ ' + _('here')
+ # Offset the caret location by the number of newlines before the
+ # location of the error, since we will replace one-char newlines
+ # with the two-char literal r'\n'.
+ offset = tmpl[:loc].count('\n')
+ tmpl = tmpl.replace('\n', br'\n')
+ # We want the caret to point to the place in the template that
+ # failed to parse, but in a hint we get a open paren at the
+ # start. Therefore, we print "loc" spaces (instead of "loc - 1")
+ # to line up the caret with the location of the error.
+ inst.hint = tmpl + '\n' + ' ' * (loc + offset) + '^ ' + _('here')
raise
yield ('end', None, pos)
--- a/tests/test-log.t Sat Mar 03 14:23:40 2018 -0800
+++ b/tests/test-log.t Sat Mar 03 14:30:21 2018 -0800
@@ -2304,6 +2304,8 @@
> {shortest(node}
> line4\nline5'
hg: parse error at 28: unexpected token: end
+ (line 1\nline2\n{shortest(node}\nline4\nline5
+ ^ here)
[255]
$ cd ..