From 5260e5e8ecadaf13e6b82cf867a909f54e15fd07 Mon Sep 17 00:00:00 2001
From: hrsh7th <629908+hrsh7th@users.noreply.github.com>
Date: Fri, 17 May 2024 22:56:28 +0900
Subject: [PATCH] use nvim_get_option_value instead of
 nvim{,_buf,_win}_get_option

---
 lua/cmp/config.lua                   | 2 +-
 lua/cmp/config/default.lua           | 2 +-
 lua/cmp/context.lua                  | 2 +-
 lua/cmp/utils/api.lua                | 2 +-
 lua/cmp/view/custom_entries_view.lua | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lua/cmp/config.lua b/lua/cmp/config.lua
index efb99c4..547ae98 100644
--- a/lua/cmp/config.lua
+++ b/lua/cmp/config.lua
@@ -108,7 +108,7 @@ config.get = function()
     end)
   else
     local bufnr = vim.api.nvim_get_current_buf()
-    local filetype = vim.api.nvim_buf_get_option(bufnr, 'filetype')
+    local filetype = vim.api.nvim_get_option_value('filetype', { buf = bufnr })
     local buffer_config = config.buffers[bufnr] or { revision = 1 }
     local filetype_config = config.filetypes[filetype] or { revision = 1 }
     return config.cache:ensure({
diff --git a/lua/cmp/config/default.lua b/lua/cmp/config/default.lua
index 37c9bef..23d0a05 100644
--- a/lua/cmp/config/default.lua
+++ b/lua/cmp/config/default.lua
@@ -9,7 +9,7 @@ return function()
   local config = {
     enabled = function()
       local disabled = false
-      disabled = disabled or (vim.api.nvim_buf_get_option(0, 'buftype') == 'prompt')
+      disabled = disabled or (vim.api.nvim_get_option_value('buftype', { buf = 0 }) == 'prompt')
       disabled = disabled or (vim.fn.reg_recording() ~= '')
       disabled = disabled or (vim.fn.reg_executing() ~= '')
       return not disabled
diff --git a/lua/cmp/context.lua b/lua/cmp/context.lua
index 86c9c29..5b567d4 100644
--- a/lua/cmp/context.lua
+++ b/lua/cmp/context.lua
@@ -43,7 +43,7 @@ context.new = function(prev_context, option)
   self.cache = cache.new()
   self.prev_context = prev_context or context.empty()
   self.option = option or { reason = types.cmp.ContextReason.None }
-  self.filetype = vim.api.nvim_buf_get_option(0, 'filetype')
+  self.filetype = vim.api.nvim_get_option_value('filetype', { buf = 0 })
   self.time = vim.loop.now()
   self.bufnr = vim.api.nvim_get_current_buf()
 
diff --git a/lua/cmp/utils/api.lua b/lua/cmp/utils/api.lua
index f304a78..968a5db 100644
--- a/lua/cmp/utils/api.lua
+++ b/lua/cmp/utils/api.lua
@@ -47,7 +47,7 @@ end
 ---@return { [1]: integer, [2]: integer }
 api.get_cursor = function()
   if api.is_cmdline_mode() then
-    return { math.min(vim.o.lines, vim.o.lines - (vim.api.nvim_get_option('cmdheight') - 1)), vim.fn.getcmdpos() - 1 }
+    return { math.min(vim.o.lines, vim.o.lines - (vim.api.nvim_get_option_value('cmdheight', {}) - 1)), vim.fn.getcmdpos() - 1 }
   end
   return vim.api.nvim_win_get_cursor(0)
 end
diff --git a/lua/cmp/view/custom_entries_view.lua b/lua/cmp/view/custom_entries_view.lua
index 03c48d7..e889416 100644
--- a/lua/cmp/view/custom_entries_view.lua
+++ b/lua/cmp/view/custom_entries_view.lua
@@ -157,7 +157,7 @@ custom_entries_view.open = function(self, offset, entries)
   width = width + self.column_width.kind + (self.column_width.menu > 0 and 1 or 0)
   width = width + self.column_width.menu + 1
 
-  local height = vim.api.nvim_get_option('pumheight')
+  local height = vim.api.nvim_get_option_value('pumheight', {})
   height = height ~= 0 and height or #self.entries
   height = math.min(height, #self.entries)