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

fix(python): remove hints for typed parameters (#106)

Browse Source
This commit is contained in:
danymat
2022-10-17 11:30:13 +02:00
parent c164b56b79
commit e307833f26
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,11 +39,11 @@ return {
retrieve = "all", retrieve = "all",
node_type = "typed_parameter", node_type = "typed_parameter",
extract = true, extract = true,
as = i.Tparam,
}, },
{ {
retrieve = "all", retrieve = "all",
node_type = "typed_default_parameter", node_type = "typed_default_parameter",
as = "typed_parameter",
extract = true, extract = true,
subtree = { { retrieve = "all", node_type = "identifier", extract = true } }, subtree = { { retrieve = "all", node_type = "identifier", extract = true } },
}, },
@@ -81,16 +81,16 @@ return {
}, },
} }
local nodes = nodes_utils:matching_nodes_from(node, tree) local nodes = nodes_utils:matching_nodes_from(node, tree)
if nodes["typed_parameter"] then if nodes[i.Tparam] then
results["typed_parameters"] = {} results[i.Tparam] = {}
for _, n in pairs(nodes["typed_parameter"]) do for _, n in pairs(nodes[i.Tparam]) do
local type_subtree = { local type_subtree = {
{ retrieve = "all", node_type = "identifier", extract = true, as = i.Parameter }, { retrieve = "all", node_type = "identifier", extract = true, as = i.Parameter },
{ retrieve = "all", node_type = "type", extract = true, as = i.Type }, { retrieve = "all", node_type = "type", extract = true, as = i.Type },
} }
local typed_parameters = nodes_utils:matching_nodes_from(n, type_subtree) local typed_parameters = nodes_utils:matching_nodes_from(n, type_subtree)
typed_parameters = extractors:extract_from_matched(typed_parameters) typed_parameters = extractors:extract_from_matched(typed_parameters)
table.insert(results["typed_parameters"], typed_parameters) table.insert(results[i.Tparam], typed_parameters)
end end
end end
local res = extractors:extract_from_matched(nodes) local res = extractors:extract_from_matched(nodes)

2
lua/neogen/init.lua
View File

@@ -282,7 +282,7 @@ end
--- with multiple annotation conventions. --- with multiple annotation conventions.
---@tag neogen-changelog ---@tag neogen-changelog
---@toc_entry Changes in neogen plugin ---@toc_entry Changes in neogen plugin
neogen.version = "2.9.1" neogen.version = "2.9.2"
--minidoc_afterlines_end --minidoc_afterlines_end
return neogen return neogen

2
lua/neogen/templates/google_docstrings.lua
View File

@@ -14,7 +14,7 @@ return {
{ i.HasParameter, "", { type = { "func" } } }, { i.HasParameter, "", { type = { "func" } } },
{ i.HasParameter, "Args:", { type = { "func" } } }, { i.HasParameter, "Args:", { type = { "func" } } },
{ i.Parameter, " %s ($1): $1", { type = { "func" } } }, { i.Parameter, " %s ($1): $1", { type = { "func" } } },
{ { i.Parameter, i.Type }, " %s (%s): $1", { required = "typed_parameters", type = { "func" } } }, { { i.Parameter, i.Type }, " %s (%s): $1", { required = i.Tparam, type = { "func" } } },
{ i.ArbitraryArgs, " %s: $1", { type = { "func" } } }, { i.ArbitraryArgs, " %s: $1", { type = { "func" } } },
{ i.Kwargs, " %s: $1", { type = { "func" } } }, { i.Kwargs, " %s: $1", { type = { "func" } } },
{ i.ClassAttribute, " %s: $1", { before_first_item = { "", "Attributes: " } } }, { i.ClassAttribute, " %s: $1", { before_first_item = { "", "Attributes: " } } },

2
lua/neogen/templates/numpydoc.lua
View File

@@ -22,7 +22,7 @@ return {
{ {
{ i.Parameter, i.Type }, { i.Parameter, i.Type },
"%s : %s", "%s : %s",
{ after_each = " $1", required = "typed_parameters", type = { "func" } }, { after_each = " $1", required = i.Tparam, type = { "func" } },
}, },
{ {
i.ArbitraryArgs, i.ArbitraryArgs,

4
lua/neogen/templates/reST.lua
View File

@@ -1,5 +1,6 @@
local i = require("neogen.types.template").item local i = require("neogen.types.template").item
return { return {
{ nil, '""" $1 """', { no_results = true, type = { "class", "func" } } }, { nil, '""" $1 """', { no_results = true, type = { "class", "func" } } },
{ nil, '"""$1', { no_results = true, type = { "file" } } }, { nil, '"""$1', { no_results = true, type = { "file" } } },
@@ -21,8 +22,7 @@ return {
{ i.Parameter, i.Type }, { i.Parameter, i.Type },
":param %s: $1", ":param %s: $1",
{ {
after_each = ":type %s: %s $1", required = i.Tparam,
required = "typed_parameters",
type = { "func" }, type = { "func" },
}, },
}, },