From 5c8b52bc346d0521815e2a57ba8b6f663a35f86e Mon Sep 17 00:00:00 2001 From: Foo Date: Tue, 22 Mar 2016 15:23:25 +0300 Subject: [PATCH] Fix return value of vim_getbufoption, use new command-t matcher Now it uses _vim_to_python to transform its return value. Should fix tests. --- powerline/bindings/vim/__init__.py | 2 +- powerline/matchers/vim/__init__.py | 4 ++-- powerline/matchers/vim/plugin/commandt.py | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/powerline/bindings/vim/__init__.py b/powerline/bindings/vim/__init__.py index e617943a..b754c1f3 100644 --- a/powerline/bindings/vim/__init__.py +++ b/powerline/bindings/vim/__init__.py @@ -273,7 +273,7 @@ def _vim_to_python(value): if hasattr(vim, 'options'): def vim_getbufoption(info, option): - return info['buffer'].options[str(option)] + return _vim_to_python(info['buffer'].options[str(option)]) def vim_getoption(option): return vim.options[str(option)] diff --git a/powerline/matchers/vim/__init__.py b/powerline/matchers/vim/__init__.py index b2bad4cc..f6de45ed 100644 --- a/powerline/matchers/vim/__init__.py +++ b/powerline/matchers/vim/__init__.py @@ -7,7 +7,7 @@ from powerline.bindings.vim import vim_getbufoption, buffer_name def help(matcher_info): - return str(vim_getbufoption(matcher_info, 'buftype')) == 'help' + return vim_getbufoption(matcher_info, 'buftype') == 'help' def cmdwin(matcher_info): @@ -16,4 +16,4 @@ def cmdwin(matcher_info): def quickfix(matcher_info): - return str(vim_getbufoption(matcher_info, 'buftype')) == 'quickfix' + return vim_getbufoption(matcher_info, 'buftype') == 'quickfix' diff --git a/powerline/matchers/vim/plugin/commandt.py b/powerline/matchers/vim/plugin/commandt.py index e4236f3e..7eefe9b7 100644 --- a/powerline/matchers/vim/plugin/commandt.py +++ b/powerline/matchers/vim/plugin/commandt.py @@ -3,9 +3,12 @@ from __future__ import (unicode_literals, division, absolute_import, print_funct import os -from powerline.bindings.vim import buffer_name +from powerline.bindings.vim import vim_getbufoption, buffer_name def commandt(matcher_info): name = buffer_name(matcher_info) - return name and os.path.basename(name) == b'GoToFile' + return ( + vim_getbufoption(matcher_info, 'filetype') == 'command-t' + or (name and os.path.basename(name) == b'GoToFile') + )