diff --git a/lua/cmp/config/compare.lua b/lua/cmp/config/compare.lua index d4d3f3f..0b19e53 100644 --- a/lua/cmp/config/compare.lua +++ b/lua/cmp/config/compare.lua @@ -100,12 +100,12 @@ compare.order = function(entry1, entry2) end end --- locals -compare.locals = setmetatable({ - locals_map = {}, +-- scopes +compare.scopes = setmetatable({ + scopes_map = {}, update = function(self) local config = require('cmp').get_config() - if not vim.tbl_contains(config.sorting.comparators, compare.locals) then + if not vim.tbl_contains(config.sorting.comparators, compare.scopes) then return end @@ -139,8 +139,8 @@ compare.locals = setmetatable({ for _, definition in pairs(definitions) do if scope:id() == locals.containing_scope(definition.node, buf):id() then local text = ts_utils.get_node_text(definition.node)[1] - if not self.locals_map[text] then - self.locals_map[text] = depth + if not self.scopes_map[text] then + self.scopes_map[text] = depth end end end @@ -150,8 +150,8 @@ compare.locals = setmetatable({ end, }, { __call = function(self, entry1, entry2) - local local1 = self.locals_map[entry1:get_completion_item().label] - local local2 = self.locals_map[entry2:get_completion_item().label] + local local1 = self.scopes_map[entry1:get_completion_item().label] + local local2 = self.scopes_map[entry2:get_completion_item().label] if local1 ~= local2 then if local1 == nil then return false diff --git a/lua/cmp/config/default.lua b/lua/cmp/config/default.lua index f17048a..77befd0 100644 --- a/lua/cmp/config/default.lua +++ b/lua/cmp/config/default.lua @@ -101,7 +101,7 @@ return function() compare.exact, compare.score, compare.recently_used, - -- compare.locals, + -- compare.scopes, compare.kind, compare.sort_text, compare.length, diff --git a/lua/cmp/init.lua b/lua/cmp/init.lua index 282d5fd..17d9e68 100644 --- a/lua/cmp/init.lua +++ b/lua/cmp/init.lua @@ -339,14 +339,14 @@ autocmd.subscribe('CursorMoved', function() end) autocmd.subscribe('InsertEnter', function() - cmp.config.compare.locals:update() + cmp.config.compare.scopes:update() end) cmp.event:on('complete_done', function(evt) if evt.entry then cmp.config.compare.recently_used:add_entry(evt.entry) end - cmp.config.compare.locals:update() + cmp.config.compare.scopes:update() end) cmp.event:on('confirm_done', function(evt)