Skip to content

Function body #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tjdevries wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Function body #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e078e9
wip: continue stuff
tjdevries Apr 19, 2021
b15a7bc
use function_body instead of body:
tjdevries Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions corpus/documentation.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ end
name: (function_name (identifier))
(function_body_paren)
(function_body_paren)
body: (return_statement (boolean))
(function_body (return_statement (boolean)))
(function_end)))

==================
Expand All @@ -77,8 +77,8 @@ end
(identifier))
(function_body_paren)
(function_body_paren)
body: (return_statement
(boolean))
(function_body (return_statement
(boolean)))
(function_end)))

==================
Expand All @@ -103,8 +103,8 @@ end
(identifier))
(function_body_paren)
(function_body_paren)
body: (return_statement
(boolean))
(function_body (return_statement
(boolean)))
(function_end)))

==================
Expand All @@ -126,7 +126,7 @@ end
name: (function_name (identifier))
(function_body_paren)
(function_body_paren)
body: (return_statement (boolean))
(function_body (return_statement (boolean)))
(function_end)))

==================
Expand Down Expand Up @@ -163,7 +163,7 @@ end
(function_body_paren)
(parameter_list (identifier) (identifier))
(function_body_paren)
body: (return_statement (boolean))
(function_body (return_statement (boolean)))
(function_end)))

==================
Expand Down Expand Up @@ -300,7 +300,7 @@ end
(parameter_list
(identifier) (identifier) (identifier))
(function_body_paren)
(function_call
(function_body (function_call
(identifier)
(table_argument
(fieldlist
Expand All @@ -322,7 +322,7 @@ end
(fieldlist
(field (identifier))
(field (string))
(field (boolean))))))))
(field (boolean)))))))))
(function_end)))

==================
Expand Down Expand Up @@ -382,8 +382,8 @@ return x
(function_body_paren)
(parameter_list (identifier) (identifier) (identifier))
(function_body_paren)
(return_statement
(binary_operation (identifier) (binary_operation (identifier) (identifier))))
(function_body (return_statement
(binary_operation (identifier) (binary_operation (identifier) (identifier)))))
(function_end))
(module_return_statement (identifier)))

Expand Down Expand Up @@ -411,7 +411,7 @@ end
(function_body_paren)
(parameter_list (identifier))
(function_body_paren)
(return_statement (identifier) (identifier))
(function_body (return_statement (identifier) (identifier)))
(function_end)))

==================
Expand Down Expand Up @@ -487,10 +487,10 @@ end
(function_body_paren)
(parameter_list (identifier))
(function_body_paren)
(return_statement
(function_body (return_statement
(function_call (identifier) (function_call_paren)
(function_arguments (tableconstructor) (identifier))
(function_call_paren)))
(function_call_paren))))
(function_end))
)

Expand Down Expand Up @@ -526,10 +526,10 @@ end
(function_body_paren)
(parameter_list (identifier))
(function_body_paren)
(return_statement
(function_body (return_statement
(function_call (identifier) (function_call_paren)
(function_arguments (identifier) (identifier))
(function_call_paren)))
(function_call_paren))))
(function_end))
)

Expand Down
21 changes: 11 additions & 10 deletions corpus/functions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function x() return 5 end
name: (function_name (identifier))
(function_body_paren)
(function_body_paren)
body: (return_statement (number))
(function_body (return_statement (number)))
(function_end)))

==================
Expand All @@ -30,7 +30,7 @@ function t.x() return 5 end
name: (function_name (identifier) (table_dot) (identifier))
(function_body_paren)
(function_body_paren)
body: (return_statement (number))
(function_body (return_statement (number)))
(function_end)))

==================
Expand All @@ -47,7 +47,7 @@ function t:x() return 5 end
name: (function_name (identifier) (table_colon) (identifier))
(function_body_paren)
(function_body_paren)
body: (return_statement (number))
(function_body (return_statement (number)))
(function_end)))

==================
Expand All @@ -65,12 +65,13 @@ local function f() print("hi"); return 5 end
name: (identifier)
(function_body_paren)
(function_body_paren)
body: (function_call
prefix: (identifier)
(function_call_paren)
args: (function_arguments (string))
(function_call_paren))
body: (return_statement (number))
(function_body
(function_call
prefix: (identifier)
(function_call_paren)
args: (function_arguments (string))
(function_call_paren))
(return_statement (number)))
(function_end)))

==================
Expand All @@ -89,7 +90,7 @@ local function t.x() return 5 end
(ERROR (UNEXPECTED 'x'))
(function_body_paren)
(function_body_paren)
(return_statement (number))
(function_body (return_statement (number)))
(function_end)))

==================
Expand Down
55 changes: 37 additions & 18 deletions corpus/gh_issue_005.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ return m
(program
(variable_declaration (local) (variable_declarator (identifier)) (tableconstructor))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number)))
(function_end))
(module_return_statement (identifier)))

==================
Expand Down Expand Up @@ -117,37 +119,54 @@ return m
(program
(variable_declaration (local) (variable_declarator (identifier)) (tableconstructor))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(function_statement (emmy_documentation (emmy_header))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren) (return_statement (number)) (function_end))
(function_start) (function_name (identifier) (table_dot) (identifier)) (function_body_paren) (function_body_paren)
(function_body (return_statement (number))) (function_end))
(module_return_statement (identifier)))
10 changes: 5 additions & 5 deletions grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ module.exports = grammar({
$.field_separator,
$.prefix_exp,

$.function_body,
$.function_impl,
$._multi_comment,
],

Expand Down Expand Up @@ -178,15 +178,15 @@ module.exports = grammar({
$.function_start,
// TODO: It's weird that we're capturing this white space in the name of functions.
/\s*/,
$.function_body
$.function_impl
),

function_body: ($) =>
function_impl: ($) =>
seq(
alias($.left_paren, $.function_body_paren),
optional($.parameter_list),
alias($.right_paren, $.function_body_paren),
field("body", optional($._block)),
alias(optional($._block), $.function_body),
alias("end", $.function_end)
),

Expand Down Expand Up @@ -396,7 +396,7 @@ module.exports = grammar({
),
seq($.function_start, /\s*/, field("name", $.function_name))
),
$.function_body
$.function_impl
),

// }}}
Expand Down
31 changes: 31 additions & 0 deletions lua/ts_lua/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
R('plenary')

local plenary_debug = require('plenary.debug_utils')

local Path = require('plenary.path')
local Iter = require('plenary.iterators')

local ts_lua_dir = vim.fn.fnamemodify(plenary_debug.sourced_filepath(), ":h:h:h")

local M = {}

M.setup = function(opts)
opts = opts or {}

if opts.enable_grammar then
local queries_dir = Path:new(ts_lua_dir) / "queries" / "lua"
local queries = Iter.iter(vim.fn.glob(queries_dir:absolute() .. "/*", false, true))

queries
:map(function(v) return Path:new(v) end)
:for_each(function(query)
print(query.stem)
-- vim.treesitter.set_query("lua", query:head()
end)

end
end

M.setup { enable_grammar = true }

return M
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"nan": "^2.14.2"
},
"devDependencies": {
"tree-sitter-cli": "^0.19.3"
"tree-sitter-cli": "^0.19.4"
}
}
10 changes: 10 additions & 0 deletions plugin/ts_lua.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

let s:source_file = expand("<sfile>")

if get(g:, 'ts_lua_skip_queries', v:false)
finish
endif

for file in glob(fnamemodify(s:source_file, ":h:h") . "/queries/lua/*", v:false, v:true)
call v:lua.vim.treesitter.set_query("lua", fnamemodify(file, ":t:r"), join(readfile(file), "\n"))
endfor
7 changes: 7 additions & 0 deletions queries/lua/injections.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,10 @@

(#eq? @_prefix_2 "cdef")
)

(
(function_call
prefix: (identifier) @_prefix_1
args: (string_argument) @lua)

(#eq? @_prefix_1 "exec_lua"))
19 changes: 19 additions & 0 deletions queries/lua/locals.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
;; Variable and field declarations
((variable_declarator
(identifier) @definition.var))

;; Parameters
(parameter_list (identifier) @definition.parameter)


;; Scopes
[
(program)
(function_statement)
(function_start)
(if_statement)
(for_statement)
(repeat_statement)
(while_statement)
(do_statement)
] @scope
Loading