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

fix(js/ts) Do not duplicate @return (#79)

Browse Source
This commit is contained in:
danymat
2022-03-11 10:21:54 +01:00
parent 26d9289e7e
commit f2aeb078f0
2 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,14 +8,14 @@ local function_tree = {
retrieve = "first",
node_type = "formal_parameters",
subtree = {
{ retrieve = "all", node_type = "identifier", extract = true },
{ retrieve = "all", node_type = "identifier", extract = true, as = i.Parameter },
},
},
{
retrieve = "first",
node_type = "statement_block",
subtree = {
{ retrieve = "first", node_type = "return_statement", extract = true },
{ retrieve = "first", node_type = "return_statement", extract = true, as = i.Return },
},
},
}
@@ -40,42 +40,42 @@ return {
["0"] = {
extract = function(node)
local results = {}
local tree = function_tree
local nodes = nodes_utils:matching_nodes_from(node, tree)
local res = extractors:extract_from_matched(nodes)
results.parameters = res.identifier
results.return_statement = res.return_statement
return results
if res[i.Return] then
res[i.Return] = { true }
end
return res
end,
},
},
["expression_statement|variable_declaration"] = {
["0"] = {
extract = function(node)
local results = {}
local tree = { { retrieve = "all", node_type = "function", subtree = function_tree } }
local nodes = nodes_utils:matching_nodes_from(node, tree)
local res = extractors:extract_from_matched(nodes)
results.parameters = res.identifier
results.return_statement = res.return_statement
return results
if res[i.Return] then
res[i.Return] = { true }
end
return res
end,
},
},
["lexical_declaration"] = {
["1"] = {
extract = function(node)
local results = {}
local tree = { { retrieve = "all", node_type = "arrow_function", subtree = function_tree } }
local nodes = nodes_utils:matching_nodes_from(node, tree)
local res = extractors:extract_from_matched(nodes)
results.parameters = res.identifier
results.return_statement = res.return_statement
return results
if res[i.Return] then
res[i.Return] = { true }
end
return res
end,
},
},

9
lua/neogen/configurations/typescript.lua
View File

@@ -85,6 +85,9 @@ return {
local nodes = nodes_utils:matching_nodes_from(node, tree)
local res = extractors:extract_from_matched(nodes)
res[i.Tparam] = construct_type_annotation(nodes[i.Tparam])
if res[i.Return] then
res[i.Return] = { true }
end
return res
end,
},
@@ -96,6 +99,9 @@ return {
local nodes = nodes_utils:matching_nodes_from(node, tree)
local res = extractors:extract_from_matched(nodes)
res[i.Tparam] = construct_type_annotation(nodes[i.Tparam])
if res[i.Return] then
res[i.Return] = { true }
end
return res
end,
},
@@ -107,6 +113,9 @@ return {
local nodes = nodes_utils:matching_nodes_from(node, tree)
local res = extractors:extract_from_matched(nodes)
res[i.Tparam] = construct_type_annotation(nodes[i.Tparam])
if res[i.Return] then
res[i.Return] = { true }
end
return res
end,
},