leigh/neogen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix behavior when calling different types

Browse Source 
This Closes #5 and exposes something that I was not aware of:
lua seems to perform shallow copies when doing table assignments
This commit is contained in:
Daniel Mathiot
2021-08-27 13:17:27 +02:00
parent d3d8a12315
commit b525173cd7
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lua/neogen/configurations/javascript.lua
View File

@@ -74,7 +74,7 @@ return {
jsdoc = { jsdoc = {
{ nil, "/* */", { no_results = true } }, { nil, "/* */", { no_results = true } },
{ nil, "/**" }, { nil, "/**" },
{ "class_tag", " * @classdesc", { before_first_item = { " * ", " * @class" } } }, { "class_tag", " * @classdesc", { before_first_item = { " * ", " * @class" }, type = { "class" } } },
{ "parameters", " * @param {any} %s " }, { "parameters", " * @param {any} %s " },
{ "return_statement", " * @returns {any} " }, { "return_statement", " * @returns {any} " },
{ nil, " */" }, { nil, " */" },

9
lua/neogen/generators/default.lua
View File

@@ -47,7 +47,7 @@ end
--- @param parent userdata the node used to generate the annotations --- @param parent userdata the node used to generate the annotations
--- @param data table the data from the granulator, which is a set of [type] = results --- @param data table the data from the granulator, which is a set of [type] = results
--- @param template table a template from the configuration --- @param template table a template from the configuration
--- @param type string --- @param required_type string
--- @return table { line, content, opts }, with line being the line to append the content --- @return table { line, content, opts }, with line being the line to append the content
neogen.default_generator = function(parent, data, template, required_type) neogen.default_generator = function(parent, data, template, required_type)
local start_row, start_column, end_row, end_column = ts_utils.get_node_range(parent) local start_row, start_column, end_row, end_column = ts_utils.get_node_range(parent)
@@ -86,18 +86,21 @@ neogen.default_generator = function(parent, data, template, required_type)
for _, values in ipairs(generated_template) do for _, values in ipairs(generated_template) do
local type = values[1] local type = values[1]
local formatted_string = values[2] local formatted_string = values[2]
local opts = values[3] or {} local opts = vim.deepcopy(values[3]) or {}
if not opts.type then if not opts.type then
opts.type = { required_type } opts.type = { required_type }
end end
if opts.type and vim.tbl_contains(opts.type, required_type) then
-- Will append the item before all their nodes -- Will append the item before all their nodes
if opts.before_first_item and data[type] then if opts.before_first_item and data[type] then
result = add_values_to_result(result, opts.before_first_item, prefix) result = add_values_to_result(result, opts.before_first_item, prefix)
end end
if opts.type and vim.tbl_contains(opts.type, required_type) then
-- If there is no data returned, will append the string with opts.no_results -- If there is no data returned, will append the string with opts.no_results
--P(data)
--P(opts)
if opts.no_results == true and vim.tbl_isempty(data) then if opts.no_results == true and vim.tbl_isempty(data) then
local inserted = conditional_prefix_inserter(prefix, formatted_string) local inserted = conditional_prefix_inserter(prefix, formatted_string)
table.insert(result, inserted) table.insert(result, inserted)