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

feat(ts) Add type annotation alongside parameter

Browse Source
This commit is contained in:
danymat
2022-01-10 15:57:37 +01:00
parent 31a0134181
commit 7f81a39b94
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,11 @@
local reconstruct_type_annotation = function(t)
if t then
t = vim.tbl_map(function(s)
return string.gsub(s, ":%s*", "")
end, t)
end
return t
end
local function_tree = { local function_tree = {
{ {
retrieve = "first", retrieve = "first",
@@ -8,6 +16,11 @@ local function_tree = {
node_type = "required_parameter", node_type = "required_parameter",
subtree = { subtree = {
{ retrieve = "all", node_type = "identifier", extract = true }, { retrieve = "all", node_type = "identifier", extract = true },
{
retrieve = "all",
node_type = "type_annotation",
extract = true,
},
}, },
}, },
{ {
@@ -15,6 +28,7 @@ local function_tree = {
node_type = "optional_parameter", node_type = "optional_parameter",
subtree = { subtree = {
{ retrieve = "all", node_type = "identifier", extract = true }, { retrieve = "all", node_type = "identifier", extract = true },
{ retrieve = "all", node_type = "type_annotation", extract = true },
}, },
}, },
}, },
@@ -47,8 +61,11 @@ return {
local nodes = neogen.utilities.nodes:matching_nodes_from(node, tree) local nodes = neogen.utilities.nodes:matching_nodes_from(node, tree)
local res = neogen.utilities.extractors:extract_from_matched(nodes) local res = neogen.utilities.extractors:extract_from_matched(nodes)
res.type_annotation = reconstruct_type_annotation(res.type_annotation)
results.parameters = res.identifier results.parameters = res.identifier
results.return_statement = res.return_statement results.return_statement = res.return_statement
results.type_annotation = res.type_annotation
return results return results
end, end,
}, },
@@ -61,8 +78,11 @@ return {
local nodes = neogen.utilities.nodes:matching_nodes_from(node, tree) local nodes = neogen.utilities.nodes:matching_nodes_from(node, tree)
local res = neogen.utilities.extractors:extract_from_matched(nodes) local res = neogen.utilities.extractors:extract_from_matched(nodes)
res.type_annotation = reconstruct_type_annotation(res.type_annotation)
results.parameters = res.identifier results.parameters = res.identifier
results.return_statement = res.return_statement results.return_statement = res.return_statement
results.type_annotation = res.type_annotation
return results return results
end, end,
}, },
@@ -75,8 +95,10 @@ return {
local nodes = neogen.utilities.nodes:matching_nodes_from(node, tree) local nodes = neogen.utilities.nodes:matching_nodes_from(node, tree)
local res = neogen.utilities.extractors:extract_from_matched(nodes) local res = neogen.utilities.extractors:extract_from_matched(nodes)
res.type_annotation = reconstruct_type_annotation(res.type_annotation)
results.parameters = res.identifier results.parameters = res.identifier
results.return_statement = res.return_statement results.return_statement = res.return_statement
results.type_annotation = res.type_annotation
return results return results
end, end,
}, },
@@ -138,7 +160,7 @@ return {
{ nil, "/**" }, { nil, "/**" },
{ "class_tag", " * @classdesc $1", { before_first_item = { " * ", " * @class" }, type = { "class" } } }, { "class_tag", " * @classdesc $1", { before_first_item = { " * ", " * @class" }, type = { "class" } } },
{ "parameters", " * @param {any} %s $1" }, { { "type_annotation", "parameters" }, " * @param {%s} %s $1", { required = "parameters" } },
{ "return_statement", " * @returns {$1|any}" }, { "return_statement", " * @returns {$1|any}" },
{ "type", " * @type {$1|any}", { type = { "type" } } }, { "type", " * @type {$1|any}", { type = { "type" } } },
{ nil, " */" }, { nil, " */" },