leigh/nvim-cmp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve incomplete handling

Browse Source
This commit is contained in:
hrsh7th
2021-11-24 12:57:04 +09:00
parent ac476e05df
commit 2e4270d028
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lua/cmp/core.lua
View File

@@ -222,7 +222,7 @@ core.complete = function(self, ctx)
end end
self:set_context(ctx) self:set_context(ctx)
for _, s in ipairs(self:get_sources({ source.SourceStatus.WAITING, source.SourceStatus.COMPLETED })) do for _, s in ipairs(self:get_sources()) do
local callback local callback
callback = (function(s_) callback = (function(s_)
return function() return function()
@@ -230,17 +230,17 @@ core.complete = function(self, ctx)
if s_.incomplete and new:changed(s_.context) then if s_.incomplete and new:changed(s_.context) then
s_:complete(new, callback) s_:complete(new, callback)
else else
for _, s__ in ipairs(self:get_sources({ source.SourceStatus.FETCHING })) do for _, s__ in ipairs(self:get_sources({ source.SourceStatus.FETCHING })) do
if s_ == s__ then if s_ == s__ then
break break
end end
if not s__.incomplete and SOURCE_TIMEOUT > s__:get_fetching_time() then if not s__.incomplete and SOURCE_TIMEOUT > s__:get_fetching_time() then
return return
end
end end
self.filter.timeout = self.view:visible() and THROTTLE_TIME or 0
self:filter()
end end
self.filter.timeout = self.view:visible() and THROTTLE_TIME or 0
self:filter()
end
end end
end)(s) end)(s)
s:complete(ctx, callback) s:complete(ctx, callback)

2
lua/cmp/source.lua
View File

@@ -255,7 +255,7 @@ source.complete = function(self, ctx, callback)
} }
elseif ctx:get_reason() ~= types.cmp.ContextReason.TriggerOnly then elseif ctx:get_reason() ~= types.cmp.ContextReason.TriggerOnly then
if self:get_keyword_length() <= (ctx.cursor.col - offset) then if self:get_keyword_length() <= (ctx.cursor.col - offset) then
if self.incomplete and self.context.cursor.col ~= ctx.cursor.col then if self.incomplete and self.context.cursor.col ~= ctx.cursor.col and self.status ~= source.SourceStatus.FETCHING then
completion_context = { completion_context = {
triggerKind = types.lsp.CompletionTriggerKind.TriggerForIncompleteCompletions, triggerKind = types.lsp.CompletionTriggerKind.TriggerForIncompleteCompletions,
} }