Merge pull request #769 from tsuyoshicho/fix/data-string-interpolation-float-fix

Data.String.Interpolation: fix float handling after 8.2.2948

Author: thinca

autoload/vital/__vital__/Data/String/Interpolation.vim

@@ -11,8 +11,8 @@ function! s:interpolate(string, ...) abort
     let expr = str[(s + len(s:_parser_config._ps)):(e - len(s:_parser_config._pend))]
     let V = s:_context_eval(expr, context)
     let str = (s > 0 ? str[0:(s-1)] : '') . V . str[(e+1):]
-    let ps = s:_parse_first_idx_range(str, s + len(V))
-    unlet V
+    let vlen = type(V) is# v:t_string ? len(V) : len(string(V))
+    let ps = s:_parse_first_idx_range(str, s + vlen)
   endwhile
   return str
 endfunction

test/Data/String/Interpolation.vimspec

@@ -51,7 +51,11 @@ Describe Data.String.Interpolation
     End
     It handle reassignment different type
       Assert Equals(g:I.interpolate('${a} ${b}', {'a': 1, 'b': '1'}), '1 1')
-      Throws /Vim(let):E806:/ g:I.interpolate('${a} ${b}', {'a': 1, 'b': 1.0E-6})
+      if !has('patch-8.2.2948')
+        Throws /Vim(let):E806:/ g:I.interpolate('${a} ${b}', {'a': 1, 'b': 1.0E-6})
+      else
+        Assert Equals(g:I.interpolate('${a} ${b}', {'a': 1, 'b': 1.0E-6}), '1 1.0e-6')
+      endif
     End
     It doesn't raise Vim(let):E704: Funcref variable name must start with a capital
       Throws /Vim(let):E729:/ g:I.interpolate('${Funcref}', {'Funcref': function('InterpolationFunc')})