tmp fix for serveral bugs

This commit is contained in:
hrsh7th
2021-11-04 01:58:26 +09:00
parent 2a58b8f926
commit dc6b458fd2
2 changed files with 11 additions and 5 deletions

View File

@@ -5,6 +5,7 @@ local feedkeys = require('cmp.utils.feedkeys')
local autocmd = require('cmp.utils.autocmd') local autocmd = require('cmp.utils.autocmd')
local keymap = require('cmp.utils.keymap') local keymap = require('cmp.utils.keymap')
local misc = require('cmp.utils.misc') local misc = require('cmp.utils.misc')
local api = require('cmp.utils.api')
local cmp = {} local cmp = {}
@@ -270,10 +271,13 @@ cmp.setup = setmetatable({
}) })
autocmd.subscribe('InsertEnter', function() autocmd.subscribe('InsertEnter', function()
if config.enabled() then --Avoid invalid mode detection on `InsertEnter` autocmd.
cmp.core:prepare() vim.schedule(function()
cmp.core:on_change('InsertEnter') if config.enabled() then
end cmp.core:prepare()
cmp.core:on_change('InsertEnter')
end
end)
end) end)
autocmd.subscribe('TextChanged', function() autocmd.subscribe('TextChanged', function()

View File

@@ -1,5 +1,7 @@
local api = {} local api = {}
api.in_insert_enter_autocmd = nil
api.get_mode = function() api.get_mode = function()
if api.is_insert_mode() then if api.is_insert_mode() then
return 'i' return 'i'
@@ -17,7 +19,7 @@ api.is_insert_mode = function()
'i', 'i',
'ic', 'ic',
'ix', 'ix',
}, vim.api.nvim_get_mode().mode) or vim.v.insertmode == 'i' }, vim.api.nvim_get_mode().mode)
end end
api.is_cmdline_mode = function() api.is_cmdline_mode = function()