Merge pull request #30 from gennaro-tedesco/fix-deprecations

fixed deprecated vim APIs

Author: gennaro-tedesco

README.md

@@ -35,6 +35,7 @@ Install it using your favourite plugin manager: for instance
 ```lua
 {
   "gennaro-tedesco/nvim-jqx",
+  event = {"BufReadPost"},
   ft = { "json", "yaml" },
 },
 ```

doc/jqx.txt

@@ -1,4 +1,4 @@
-*jqx.txt*           For Neovim >= 0.8.0          Last change: 2023 February 28
+*jqx.txt*             For Neovim >= 0.8.0             Last change: 2024 May 31
 
 ==============================================================================
 Table of Contents                                      *jqx-table-of-contents*
@@ -7,6 +7,7 @@ Table of Contents                                      *jqx-table-of-contents*
   - Usage                                                          |jqx-usage|
   - Customisation                                          |jqx-customisation|
   - Feedback                                                    |jqx-feedback|
+1. Links                                                           |jqx-links|
 
 
 
@@ -27,12 +28,12 @@ INSTALLATION                                                *jqx-installation*
 
 Install it using your favourite plugin manager: for instance
 
-
 - with lazy.nvim <https://github.com/folke/lazy.nvim>
 
 >lua
     {
       "gennaro-tedesco/nvim-jqx",
+      event = {"BufReadPost"},
       ft = { "json", "yaml" },
     },
 <
@@ -63,11 +64,11 @@ file `test.json` and issue `JqxQuery <my-query>`this translates into `jq
 ".<my-query>" test.json` as shown below
 
 >
-     JqxQuery grammar
+    # JqxQuery grammar
     JqxQuery friends[2].name
     "Michael Marquez"
     
-     jq equivalent
+    # jq equivalent
     jq '.friends[2].name' test.json
     "Michael Marquez"
 <
@@ -84,8 +85,8 @@ Default commands
   <Esc>            close floating window
 Try it out directly with `nvim examples/test.json -c JqxList`.
 
-For more in-depth description and explanations check the documentation `:h
-nvim-jqx` and links therein.
+For more in-depth description and explanations check the documentation
+|nvim-jqx| and links therein.
 
 
 YAML FILES ~
@@ -137,7 +138,7 @@ autogroup
     local jqx = vim.api.nvim_create_augroup("Jqx", {})
     vim.api.nvim_clear_autocmds({ group = jqx })
     vim.api.nvim_create_autocmd("BufWinEnter", {
-        pattern = { ".json", ".yaml" },
+        pattern = { "*.json", "*.yaml" },
         desc = "preview json and yaml files on open",
         group = jqx,
         callback = function()

lua/nvim-jqx/floating.lua

@@ -6,8 +6,8 @@ local function centre_string(s)
 end
 
 local function floating_window(geometry)
-	local total_width = vim.api.nvim_get_option("columns")
-	local total_height = vim.api.nvim_get_option("lines")
+	local total_width = vim.api.nvim_get_option_value("columns", {})
+	local total_height = vim.api.nvim_get_option_value("lines", {})
 	local win_width = geometry.width <= 1 and math.ceil(total_width * geometry.width) or total_width
 	local win_height = geometry.height <= 1 and math.ceil(total_height * geometry.height) or total_height
 	local win_opts = {
@@ -23,15 +23,15 @@ local function floating_window(geometry)
 	local buf = vim.api.nvim_create_buf(false, true)
 
 	vim.api.nvim_open_win(buf, true, win_opts)
-	vim.api.nvim_win_set_option(0, "wrap", config.geometry.wrap)
+	vim.api.nvim_set_option_value("wrap", config.geometry.wrap, { win = 0 })
 	return buf
 end
 
 local function set_fw_opts(buf)
-	vim.api.nvim_buf_set_option(buf, "filetype", "jqx")
-	vim.api.nvim_buf_set_option(buf, "bufhidden", "wipe")
-	vim.api.nvim_buf_set_option(buf, "modifiable", false)
-	vim.api.nvim_buf_set_option(buf, "readonly", true)
+	vim.api.nvim_set_option_value("filetype", "jqx", { buf = buf })
+	vim.api.nvim_set_option_value("bufhidden", "wipe", { buf = buf })
+	vim.api.nvim_set_option_value("modifiable", false, { buf = buf })
+	vim.api.nvim_set_option_value("readonly", true, { buf = buf })
 	vim.api.nvim_buf_set_keymap(
 		buf,
 		"n",

lua/nvim-jqx/init.lua

@@ -31,13 +31,13 @@ end
 
 ---set keymaps in the qf to query entry on keypress
 local function set_qf_maps(ft)
-	vim.api.nvim_exec(
+	vim.api.nvim_exec2(
 		[[autocmd FileType qf nnoremap <buffer> ]]
 			.. config.query_key
 			.. [[ :lua require("nvim-jqx.jqx").on_keystroke("]]
 			.. ft
 			.. [[")<CR> ]],
-		false
+		{ output = false }
 	)
 end
 

lua/nvim-jqx/jqx.lua

@@ -24,13 +24,19 @@ end
 local function get_key_location(key, ft)
 	if ft == "json" then
 		return {
-			row = vim.api.nvim_exec([[g/^\s*"]] .. parse_key(key) .. [["/echo line('.')]], true),
-			col = vim.api.nvim_exec([[g/^\s*"]] .. parse_key(key) .. [["/execute "normal! ^" | echo col('.')-1]], true),
+			row = vim.api.nvim_exec2([[g/^\s*"]] .. parse_key(key) .. [["/echo line('.')]], { output = true }).output,
+			col = vim.api.nvim_exec2(
+				[[g/^\s*"]] .. parse_key(key) .. [["/execute "normal! ^" | echo col('.')-1]],
+				{ output = true }
+			).output,
 		}
 	elseif ft == "yaml" then
 		return {
-			row = vim.api.nvim_exec([[g/^]] .. parse_key(key) .. [[/echo line('.')]], true),
-			col = vim.api.nvim_exec([[g/^]] .. parse_key(key) .. [[/execute "normal! ^" | echo col('.')]], true),
+			row = vim.api.nvim_exec2([[g/^]] .. parse_key(key) .. [[/echo line('.')]], { output = true }).output,
+			col = vim.api.nvim_exec2(
+				[[g/^]] .. parse_key(key) .. [[/execute "normal! ^" | echo col('.')]],
+				{ output = true }
+			).output,
 		}
 	else
 		return {}