feat: upgrade tree-sitter-http

Author: boltlessengineer

lua/rest-nvim/parser/init.lua

@@ -108,24 +108,27 @@ function M.parse_body(body_node, source, context)
   return body
 end
 
+local IN_PLACE_VARIABLE_QUERY = "(variable_declaration) @inplace_variable"
+
 ---parse all in-place variables from source
 ---@param source Source
 ---@return Context ctx
 function M.create_context(source)
+  local query = vim.treesitter.query.parse("http", IN_PLACE_VARIABLE_QUERY)
   local ctx = Context:new()
   local _, tree = utils.ts_parse_source(source)
-  for node, _ in tree:root():iter_children() do
+  for _, node in query:iter_captures(tree:root(), source) do
     if node:type() == "variable_declaration" then
       M.parse_variable_declaration(node, source, ctx)
     end
   end
   return ctx
 end
 
----@return TSNode?
+---@return TSNode? node TSNode with type `request_section`
 function M.get_cursor_request_node()
   local node = vim.treesitter.get_node()
-  return node and utils.ts_find(node, "request")
+  return node and utils.ts_find(node, "request_section")
 end
 
 ---@return TSNode[]
@@ -145,6 +148,7 @@ end
 ---@param source Source
 ---@param ctx Context
 function M.parse_variable_declaration(vd_node, source, ctx)
+  vim.validate({ node = utils.ts_node_spec(vd_node, "variable_declaration") })
   local name = assert(get_node_field_text(vd_node, "name", source))
   local value = vim.trim(assert(get_node_field_text(vd_node, "value", source)))
   value = expand_variables(value, ctx)
@@ -210,15 +214,21 @@ end
 
 ---Parse the request node and create Request object. Returns `nil` if parsing
 ---failed.
----@param req_node TSNode Tree-sitter request node
+---@param node TSNode Tree-sitter request node
 ---@param source Source
 ---@param context? Context
 ---@return Request|nil
-function M.parse(req_node, source, context)
+function M.parse(node, source, context)
+  assert(node:type() == "request_section")
   context = context or Context:new()
   -- request should not include error
-  if req_node:has_error() then
-    logger.error(utils.ts_node_error_log(req_node))
+  if node:has_error() then
+    logger.error(utils.ts_node_error_log(node))
+    return nil
+  end
+  local req_node = node:field("request")[1]
+  if not req_node then
+    logger.error("request section doesn't have request node")
     return nil
   end
   local body_node = req_node:field("body")[1]
@@ -238,6 +248,7 @@ function M.parse(req_node, source, context)
     config.encode_url and utils.escape or nil
   )
 
+  -- FIXME: use query instead
   local pre_script_nodes = collect_prev_siblings(req_node, {"pre_request_script"})
   for _, script_node in ipairs(pre_script_nodes) do
     M.parse_pre_request_script(script_node, source, context)

spec/api_spec.lua

@@ -9,7 +9,7 @@ local logger = require("rest-nvim.logger")
 
 local spy = require("luassert.spy")
 
-local function file(path)
+local function open(path)
   vim.cmd.edit(path)
   return 0
 end
@@ -31,7 +31,7 @@ describe("parser", function()
     }, parser.parse(req_node, source))
   end)
   it("parse from http file", function()
-    local source = file "spec/api.http"
+    local source = open "spec/api.http"
     local _, tree = utils.ts_parse_source(source)
     local req_node = assert(tree:root():child(0))
     assert.same({
@@ -111,7 +111,7 @@ X-DATE: {{$date}}
     local _, tree = utils.ts_parse_source(source)
     local req_node = assert(tree:root():child(0))
     local req = parser.parse(req_node, source)
-    assert.is_not_nil(req)
+    assert.not_nil(req)
     ---@cast req Request
     assert.same({
       ["x-date"] = os.date("%Y-%m-%d")
@@ -128,7 +128,7 @@ X-DATE: {{$date}}
     local _, tree = utils.ts_parse_source(source)
     local req_node = assert(tree:root():child(0))
     local req = parser.parse(req_node, source)
-    assert.is_not_nil(req)
+    assert.not_nil(req)
     ---@cast req Request
     assert.same({
       __TYPE = "json",
@@ -140,7 +140,7 @@ X-DATE: {{$date}}
   it("parse variable declaration", function ()
     local source = "@foo = bar\n"
     local _, tree = utils.ts_parse_source(source)
-    local vd_node = assert(tree:root():child(0))
+    local vd_node = assert(tree:root():child(0):child(0))
     assert.same("variable_declaration", vd_node:type())
     local c = context:new()
     parser.parse_variable_declaration(vd_node, source, c)
@@ -152,8 +152,8 @@ X-DATE: {{$date}}
     local source = "@foo = bar\n@baz = {{foo}} {{$date}}"
     local _, tree = utils.ts_parse_source(source)
     local c = context:new()
-    parser.parse_variable_declaration(assert(tree:root():child(0)), source, c)
-    parser.parse_variable_declaration(assert(tree:root():child(1)), source, c)
+    parser.parse_variable_declaration(assert(tree:root():child(0):child(0)), source, c)
+    parser.parse_variable_declaration(assert(tree:root():child(0):child(1)), source, c)
     assert.same({
       foo = "bar",
       baz = "bar " .. os.date("%Y-%m-%d"),
@@ -163,7 +163,7 @@ X-DATE: {{$date}}
     local source = "< {%\nrequest.variables.set('foo', 'bar')\n%}\n"
     local _, tree = utils.ts_parse_source(source)
     local c = context:new()
-    local script_node = tree:root():child(0)
+    local script_node = tree:root():child(0):child(0)
     assert(script_node)
     assert.same("pre_request_script", script_node:type())
     parser.parse_pre_request_script(script_node, source, c)