From d25c049e617775eb2eb26c580e5dec591c94d480 Mon Sep 17 00:00:00 2001 From: wzy <32936898+Freed-Wu@users.noreply.github.com> Date: Tue, 23 Jul 2024 22:10:19 +0800 Subject: [PATCH] xkblayout: support ime.nvim (#2682) Improve document --- autoload/airline/extensions/xkblayout.vim | 8 ++++++-- doc/airline.txt | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/autoload/airline/extensions/xkblayout.vim b/autoload/airline/extensions/xkblayout.vim index b04948ed..f39fe498 100644 --- a/autoload/airline/extensions/xkblayout.vim +++ b/autoload/airline/extensions/xkblayout.vim @@ -17,9 +17,13 @@ function! airline#extensions#xkblayout#status() let keyboard_layout = FcitxCurrentIM() elseif has('nvim') try - let keyboard_layout = luaeval('require"fcitx5-ui".displayCurrentIM()') + let keyboard_layout = luaeval('require"ime".current()') catch /.*/ - let keyboard_layout = '' + try + let keyboard_layout = luaeval('require"fcitx5-ui".displayCurrentIM()') + catch /.*/ + let keyboard_layout = '' + endtry endtry else let keyboard_layout = '' diff --git a/doc/airline.txt b/doc/airline.txt index e617a319..770e48ff 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -1775,7 +1775,11 @@ details on how to use it, see e.g. let g:XkbSwitchLib = '/usr/local/lib/libInputSourceSwitcher.dylib' < Linux with fcitx (Install https://github.com/fcitx/fcitx5): - Install https://github.com/lilydjwg/fcitx.vim) to get `FcitxCurrentIM()` + Install https://github.com/lilydjwg/fcitx.vim to get `FcitxCurrentIM()` + or https://github.com/black-desk/fcitx5-ui.nvim to get + `luaeval('require"fcitx5-ui".displayCurrentIM()')` + or https://github.com/Freed-Wu/ime.nvim to get + `luaeval('require"ime".current()')` ------------------------------------- *airline-xtabline* xtabline