Skip to content

Commit

Permalink
Fix finding the start and end of the current query. (#239)
Browse files Browse the repository at this point in the history
1. start_request was searching forward from the cursor position. Adding
   'b' to the search flags fixed that.
2. Both start_request and end_request depended on the user having set
   'nowrapscan' to prevent wrapping around the end of the file. Such
   wrapping could result in finding the wrong query. Adding 'W' to the
   search flags fixed that, and removed the need for the stopline
   parameter.
3. Refactored the way last_line is used in end_request.
  • Loading branch information
PhilRunninger authored Oct 27, 2023
1 parent 139b4c3 commit b8d6c0a
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions lua/rest-nvim/request/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ local function start_request(bufnr, linenumber)
local oldlinenumber = linenumber
utils.move_cursor(bufnr, linenumber)

local res = vim.fn.search("^GET\\|^POST\\|^PUT\\|^PATCH\\|^DELETE", "cn")
local res = vim.fn.search("^GET\\|^POST\\|^PUT\\|^PATCH\\|^DELETE", "bcnW")
-- restore cursor position
utils.move_cursor(bufnr, oldlinenumber)

Expand All @@ -206,20 +206,19 @@ end
local function end_request(bufnr, linenumber)
-- store old cursor position
local oldlinenumber = linenumber
local last_line = vim.fn.line("$")

-- start searching for next request from the next line
-- as the current line does contain the current, not the next request
if linenumber < vim.fn.line("$") then
if linenumber < last_line then
linenumber = linenumber + 1
end
utils.move_cursor(bufnr, linenumber)

local next =
vim.fn.search("^GET\\|^POST\\|^PUT\\|^PATCH\\|^DELETE\\|^###\\", "cn", vim.fn.line("$"))
local next = vim.fn.search("^GET\\|^POST\\|^PUT\\|^PATCH\\|^DELETE\\|^###\\", "cnW")

-- restore cursor position
utils.move_cursor(bufnr, oldlinenumber)
local last_line = vim.fn.line("$")

if next == 0 or (oldlinenumber == last_line) then
return last_line
Expand Down

0 comments on commit b8d6c0a

Please sign in to comment.