From b546f50f094f379de1174c6dd884a66dcd0d3889 Mon Sep 17 00:00:00 2001
From: Alex Tylor <alex@tylor.co.uk>
Date: Fri, 22 Oct 2021 09:47:55 +0100
Subject: [PATCH] Expose get_selected_entry() from view module to main cmp
 module fixes #385 (#386)

* Expose get_selected_entry() from view module to main cmp module fixes #385

* add get_active_entry() also

* fix linting

* remove unused vars

Co-authored-by: alex.tylor <atylor@gmail.com>
---
 lua/cmp/config/mapping.lua |  2 --
 lua/cmp/core.lua           |  2 +-
 lua/cmp/init.lua           | 10 ++++++++++
 lua/cmp/utils/keymap.lua   |  2 +-
 lua/cmp/utils/window.lua   |  1 -
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lua/cmp/config/mapping.lua b/lua/cmp/config/mapping.lua
index 7d967eb..b446d55 100644
--- a/lua/cmp/config/mapping.lua
+++ b/lua/cmp/config/mapping.lua
@@ -1,5 +1,3 @@
-local api = require('cmp.utils.api')
-
 local mapping
 mapping = setmetatable({}, {
   __call = function(_, invoke, modes)
diff --git a/lua/cmp/core.lua b/lua/cmp/core.lua
index 9abb327..6c4a65b 100644
--- a/lua/cmp/core.lua
+++ b/lua/cmp/core.lua
@@ -389,7 +389,7 @@ core.confirm = function(self, e, option, callback)
               },
               ['end'] = snippet_ctx.cursor,
             },
-            newText = ''
+            newText = '',
           } })
           config.get().snippet.expand({
             body = completion_item.textEdit.newText,
diff --git a/lua/cmp/init.lua b/lua/cmp/init.lua
index 606845d..bcada40 100644
--- a/lua/cmp/init.lua
+++ b/lua/cmp/init.lua
@@ -49,6 +49,16 @@ cmp.visible = function()
   return cmp.core.view:visible() or vim.fn.pumvisible() == 1
 end
 
+---Get current selected entry or nil
+cmp.get_selected_entry = function()
+  return cmp.core.view:get_selected_entry()
+end
+
+---Get current active entry or nil
+cmp.get_active_entry = function()
+  return cmp.core.view:get_active_entry()
+end
+
 ---Close current completion
 cmp.close = function()
   if cmp.core.view:visible() then
diff --git a/lua/cmp/utils/keymap.lua b/lua/cmp/utils/keymap.lua
index ae19550..0d88f4c 100644
--- a/lua/cmp/utils/keymap.lua
+++ b/lua/cmp/utils/keymap.lua
@@ -351,7 +351,7 @@ keymap.spec = function()
       keymap.feedkeys(keymap.t('foo2'), 'n')
       keymap.feedkeys(keymap.t('bar2'), 'nt')
       keymap.feedkeys(keymap.t('baz2'), 'n', function()
-        vim.cmd[[normal! q]]
+        vim.cmd([[normal! q]])
       end)
       keymap.feedkeys(keymap.t('baz1'), 'ni')
       keymap.feedkeys(keymap.t('bar1'), 'nti')
diff --git a/lua/cmp/utils/window.lua b/lua/cmp/utils/window.lua
index 4d1a6aa..4c74275 100644
--- a/lua/cmp/utils/window.lua
+++ b/lua/cmp/utils/window.lua
@@ -1,7 +1,6 @@
 local cache = require('cmp.utils.cache')
 local misc = require('cmp.utils.misc')
 local buffer = require('cmp.utils.buffer')
-local api = require('cmp.utils.api')
 
 ---@class cmp.WindowStyle
 ---@field public relative string