From a3e29a6cd61a55315cdfcb29ba73f4de47612d55 Mon Sep 17 00:00:00 2001 From: ZyX Date: Thu, 10 Jul 2014 22:12:08 +0400 Subject: [PATCH] =?UTF-8?q?Get=20rid=20of=20lots=20of=20NotImplementedErro?= =?UTF-8?q?r=E2=80=99s=20in=20travis=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/vim.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/vim.py b/tests/vim.py index ef37db71..04a340ac 100644 --- a/tests/vim.py +++ b/tests/vim.py @@ -179,6 +179,22 @@ def eval(expr): return '0' elif expr.startswith('exists('): return '0' + elif expr.startswith('getwinvar('): + import re + match = re.match(r'^getwinvar\((\d+), "(\w+)"\)$', expr) + if not match: + raise NotImplementedError + winnr = int(match.group(1)) + varname = match.group(2) + return _emul_getwinvar(winnr, varname) + elif expr.startswith('has_key('): + import re + match = re.match(r'^has_key\(getwinvar\((\d+), ""\), "(\w+)"\)$', expr) + if not match: + raise NotImplementedError + winnr = int(match.group(1)) + varname = match.group(2) + return 0 + (varname in windows[winnr - 1].vars) elif expr == 'getbufvar("%", "NERDTreeRoot").path.str()': import os assert os.path.basename(buffers[_buffer()].name).startswith('NERD_tree_') @@ -239,12 +255,12 @@ def _emul_getbufvar(bufnr, varname): @_vim @_str_func def _emul_getwinvar(winnr, varname): - return windows[winnr].vars[varname] + return windows[winnr - 1].vars.get(varname, '') @_vim def _emul_setwinvar(winnr, varname, value): - windows[winnr].vars[varname] = value + windows[winnr - 1].vars[varname] = value @_vim