From 8c10e3e125c5eefdb4f047d8d2a519c308a2ce50 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 22 Jan 2025 22:19:45 +0900 Subject: Revert "nvim/denops: disable denops as work-around for crash bug in deno 2.1.6" This reverts commit 96b5e581f394f3196a8dcc6f132f2d10a9ef387b. --- .config/nvim/lua/vimrc/plugins.lua | 120 ++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/.config/nvim/lua/vimrc/plugins.lua b/.config/nvim/lua/vimrc/plugins.lua index 6661e3b..b6de176 100644 --- a/.config/nvim/lua/vimrc/plugins.lua +++ b/.config/nvim/lua/vimrc/plugins.lua @@ -5,71 +5,67 @@ return { 'nvim-lua/plenary.nvim', }, -- skkeleton depends on it. - -- TODO: disable it temporarily. - -- https://github.com/vim-denops/denops.vim/issues/433 - -- { - -- 'vim-denops/denops.vim', - -- }, + { + 'vim-denops/denops.vim', + }, -- Text editing {{{1 -- IME {{{2 -- SKK (Simple Kana to Kanji conversion program) for Vim. - -- TODO: disable it temporarily. - -- https://github.com/vim-denops/denops.vim/issues/433 - -- { - -- 'vim-skk/skkeleton', - -- config = function() - -- local vimrc = require('vimrc') - -- local my_env = require('vimrc.my_env') - -- - -- vimrc.autocmd('User', { - -- pattern = 'skkeleton-initialize-pre', - -- callback = function() - -- vim.fn['skkeleton#config']({ - -- -- Change default markers because they are EAW (East Asian Width) characters. - -- markerHenkan = '[!]', - -- markerHenkanSelect = '[#]', - -- eggLikeNewline = true, - -- userDictionary = my_env.skk_dir .. '/jisyo', - -- globalDictionaries = {my_env.skk_dir .. '/jisyo.L'}, - -- }) - -- vim.fn['skkeleton#register_kanatable']('rom', { - -- ['z '] = {' '}, - -- ['0.'] = {'0.'}, - -- ['1.'] = {'1.'}, - -- ['2.'] = {'2.'}, - -- ['3.'] = {'3.'}, - -- ['4.'] = {'4.'}, - -- ['5.'] = {'5.'}, - -- ['6.'] = {'6.'}, - -- ['7.'] = {'7.'}, - -- ['8.'] = {'8.'}, - -- ['9.'] = {'9.'}, - -- [':'] = {':'}, - -- ['z:'] = {':'}, - -- ['jk'] = 'escape', - -- }) - -- end, - -- }) - -- - -- vimrc.autocmd('User', { - -- pattern = 'skkeleton-initialize-post', - -- callback = function() - -- vim.fn['skkeleton#register_keymap']('input', '', nil) - -- vim.fn['skkeleton#register_keymap']('input', '', 'newline') - -- vim.fn['skkeleton#register_keymap']('henkan', '', 'newline') - -- -- Custom highlight for henkan markers. - -- vim.cmd([=[syntax match skkMarker '\[[!#]\]']=]) - -- vim.cmd([=[hi link skkMarker Special]=]) - -- end, - -- }) - -- - -- vim.cmd([[ - -- imap (skkeleton-enable) - -- cmap (skkeleton-enable) - -- tmap (skkeleton-enable) - -- ]]) - -- end, - -- }, + { + 'vim-skk/skkeleton', + config = function() + local vimrc = require('vimrc') + local my_env = require('vimrc.my_env') + + vimrc.autocmd('User', { + pattern = 'skkeleton-initialize-pre', + callback = function() + vim.fn['skkeleton#config']({ + -- Change default markers because they are EAW (East Asian Width) characters. + markerHenkan = '[!]', + markerHenkanSelect = '[#]', + eggLikeNewline = true, + userDictionary = my_env.skk_dir .. '/jisyo', + globalDictionaries = {my_env.skk_dir .. '/jisyo.L'}, + }) + vim.fn['skkeleton#register_kanatable']('rom', { + ['z '] = {' '}, + ['0.'] = {'0.'}, + ['1.'] = {'1.'}, + ['2.'] = {'2.'}, + ['3.'] = {'3.'}, + ['4.'] = {'4.'}, + ['5.'] = {'5.'}, + ['6.'] = {'6.'}, + ['7.'] = {'7.'}, + ['8.'] = {'8.'}, + ['9.'] = {'9.'}, + [':'] = {':'}, + ['z:'] = {':'}, + ['jk'] = 'escape', + }) + end, + }) + + vimrc.autocmd('User', { + pattern = 'skkeleton-initialize-post', + callback = function() + vim.fn['skkeleton#register_keymap']('input', '', nil) + vim.fn['skkeleton#register_keymap']('input', '', 'newline') + vim.fn['skkeleton#register_keymap']('henkan', '', 'newline') + -- Custom highlight for henkan markers. + vim.cmd([=[syntax match skkMarker '\[[!#]\]']=]) + vim.cmd([=[hi link skkMarker Special]=]) + end, + }) + + vim.cmd([[ + imap (skkeleton-enable) + cmap (skkeleton-enable) + tmap (skkeleton-enable) + ]]) + end, + }, -- Operators {{{2 -- Support for user-defined operators. { -- cgit v1.2.3-70-g09d2