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

Use child name to append text after parent

Browse Source 
Instead of providing the number of childs to append after the parent, it
will append the comment just after the first child encountered with
child_name
This commit is contained in:
Daniel Mathiot
2021-08-23 15:23:27 +02:00
parent 03781f23d6
commit 46febe447c
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ return {
template = { template = {
annotation_convention = "google_docstrings", -- required: Which annotation convention to use (default_generator) annotation_convention = "google_docstrings", -- required: Which annotation convention to use (default_generator)
append = { position = "after", child_number = 3 }, -- optional: where to append the text (default_generator) append = { position = "after", child_name = "block" }, -- optional: where to append the text (default_generator)
use_default_comment = false, -- If you want to prefix the template with the default comment for the language (default_generator) use_default_comment = false, -- If you want to prefix the template with the default comment for the language (default_generator)
google_docstrings = { google_docstrings = {
{ nil, '"""' }, { nil, '"""' },

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

@@ -5,9 +5,11 @@ local ts_utils = require("nvim-treesitter.ts_utils")
--- @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
--- There are some special fields it can take:
--- @return table { line, content }, with line being the line to append the content --- @return table { line, content }, with line being the line to append the content
neogen.default_generator = function(parent, data, template) neogen.default_generator = function(parent, data, template)
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)
P(ts_utils.get_node_range(parent))
local commentstring, generated_template = vim.trim(vim.api.nvim_buf_get_option(0, "commentstring"):format("")) local commentstring, generated_template = vim.trim(vim.api.nvim_buf_get_option(0, "commentstring"):format(""))
local row_to_place = start_row local row_to_place = start_row
@@ -16,8 +18,13 @@ neogen.default_generator = function(parent, data, template)
local append = template.append or {} local append = template.append or {}
if append.position == "after" then if append.position == "after" then
local append_at_child = parent:child(append.child_number + 1) for child in parent:iter_children() do
row_to_place, col_to_place, _ , _ = append_at_child:range() if child:type() == append.child_name then
row_to_place, col_to_place, _ , _ = child:range()
break
end
end
end end
if not template or not template.annotation_convention then if not template or not template.annotation_convention then