From 8e5f09de1f55918282c7becf552d9fa03050218b Mon Sep 17 00:00:00 2001
From: hrsh7th <hrsh7th@gmail.com>
Date: Sun, 15 Aug 2021 23:12:52 +0900
Subject: [PATCH] Fix #23

---
 lua/cmp/menu.lua   | 5 ++---
 lua/cmp/source.lua | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lua/cmp/menu.lua b/lua/cmp/menu.lua
index d71b7c8..2203b8c 100644
--- a/lua/cmp/menu.lua
+++ b/lua/cmp/menu.lua
@@ -75,7 +75,7 @@ menu.update = check.wrap(function(self, ctx, sources)
   local has_triggered_by_symbol_source = false
   for _, s in ipairs(sources) do
     if s:has_items() then
-      if s.is_triggered_by_symbol then
+      if #s:get_entries(ctx) > 0 and s.is_triggered_by_symbol then
         has_triggered_by_symbol_source = true
         break
       end
@@ -90,8 +90,7 @@ menu.update = check.wrap(function(self, ctx, sources)
         -- source order priority bonus.
         local priority = (#sources - (i - 1)) * config.get().sorting.priority_weight
 
-        local filtered = s:get_entries(ctx)
-        for _, e in ipairs(filtered) do
+        for _, e in ipairs(s:get_entries(ctx)) do
           e.score = e.score + priority
           table.insert(entries, e)
           entry_map[e.id] = e
diff --git a/lua/cmp/source.lua b/lua/cmp/source.lua
index 609049f..82c79cd 100644
--- a/lua/cmp/source.lua
+++ b/lua/cmp/source.lua
@@ -273,7 +273,7 @@ source.complete = function(self, ctx, callback)
     },
     self.complete_dedup(function(response)
       self.revision = self.revision + 1
-      if #(misc.safe(response) and response.items or response or {}) > 0 then
+      if (misc.safe(response) and misc.safe(response.items) or misc.safe(response)) ~= nil then
         debug.log('retrieve', self.name, self.id, #(response.items or response))
         self.status = source.SourceStatus.COMPLETED
         self.incomplete = response.isIncomplete or false