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

fix(py) Do not show return types when looking for return statements (#71)

Browse Source
This commit is contained in:
danymat
2022-02-22 20:42:15 +01:00
parent 218e0a63fd
commit 11c8ca46ac
2 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,20 +58,7 @@ return {
retrieve = "all", retrieve = "all",
node_type = "return_statement", node_type = "return_statement",
recursive = true, recursive = true,
subtree = { extract = true,
{
retrieve = "all",
node_type = "true|false|integer|binary_operator|expression_list|call",
as = "anonymous_return",
extract = true,
},
{
retrieve = "all",
node_type = "identifier",
as = "return_statement",
extract = true,
},
},
}, },
}, },
}, },
@@ -97,15 +84,9 @@ return {
end end
local res = extractors:extract_from_matched(nodes) local res = extractors:extract_from_matched(nodes)
if nodes["anonymous_return"] then
local _res = extractors:extract_from_matched(nodes, { type = true })
res.anonymous_return = _res.anonymous_return
end
-- Return type hints takes precedence over all other types for generating template -- Return type hints takes precedence over all other types for generating template
if res[i.ReturnTypeHint] then if res[i.ReturnTypeHint] then
res["return_statement"] = nil res["return_statement"] = nil
res["anonymous_return"] = nil
if res[i.ReturnTypeHint][1] == "None" then if res[i.ReturnTypeHint][1] == "None" then
res[i.ReturnTypeHint] = nil res[i.ReturnTypeHint] = nil
end end
@@ -134,7 +115,6 @@ return {
results[i.HasParameter] = (res.typed_parameter or res.identifier) and { true } or nil results[i.HasParameter] = (res.typed_parameter or res.identifier) and { true } or nil
results[i.Type] = res.type results[i.Type] = res.type
results[i.Parameter] = res.identifier results[i.Parameter] = res.identifier
results[i.ReturnAnonym] = res.anonymous_return
results[i.Return] = res.return_statement results[i.Return] = res.return_statement
results[i.ReturnTypeHint] = res[i.ReturnTypeHint] results[i.ReturnTypeHint] = res[i.ReturnTypeHint]
results[i.HasReturn] = (res.return_statement or res.anonymous_return or res[i.ReturnTypeHint]) results[i.HasReturn] = (res.return_statement or res.anonymous_return or res[i.ReturnTypeHint])
@@ -250,7 +230,7 @@ return {
end end
end, end,
}) })
:add_default_annotation("google_docstrings") -- :add_default_annotation("google_docstrings")
:add_annotation("numpydoc") :add_default_annotation("numpydoc")
:add_annotation("reST"), :add_annotation("reST"),
} }

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

@@ -35,12 +35,7 @@ return {
}, },
{ {
i.Return, i.Return,
"%s : $1", "$1",
{ after_each = " $1" },
},
{
i.ReturnAnonym,
"%s",
{ after_each = " $1" }, { after_each = " $1" },
}, },
{ nil, '"""' }, { nil, '"""' },