mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 13:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

tree-sitter: style

Browse Source
This commit is contained in:
Björn Linse
2019-06-15 13:12:59 +02:00
parent a361e09cc5
commit c1dc1bedba
2 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/lua/executor.c
View File

@@ -828,8 +828,7 @@ static int create_tslua_parser(lua_State *L)
return luaL_error(L, "string expected"); return luaL_error(L, "string expected");
} }
const char *lang_name = lua_tostring(L,1); const char *lang_name = lua_tostring(L, 1);
return tslua_push_parser(L, lang_name); return tslua_push_parser(L, lang_name);
} }

111
src/nvim/lua/treesitter.c
View File

@@ -34,38 +34,38 @@ typedef struct {
#endif #endif
static struct luaL_Reg parser_meta[] = { static struct luaL_Reg parser_meta[] = {
{"__gc", parser_gc}, { "__gc", parser_gc },
{"__tostring", parser_tostring}, { "__tostring", parser_tostring },
{"parse_buf", parser_parse_buf}, { "parse_buf", parser_parse_buf },
{"edit", parser_edit}, { "edit", parser_edit },
{"tree", parser_tree}, { "tree", parser_tree },
{NULL, NULL} { NULL, NULL }
}; };
static struct luaL_Reg tree_meta[] = { static struct luaL_Reg tree_meta[] = {
{"__gc", tree_gc}, { "__gc", tree_gc },
{"__tostring", tree_tostring}, { "__tostring", tree_tostring },
{"root", tree_root}, { "root", tree_root },
{NULL, NULL} { NULL, NULL }
}; };
static struct luaL_Reg node_meta[] = { static struct luaL_Reg node_meta[] = {
{"__tostring", node_tostring}, { "__tostring", node_tostring },
{"__len", node_child_count}, { "__len", node_child_count },
{"range", node_range}, { "range", node_range },
{"start", node_start}, { "start", node_start },
{"type", node_type}, { "type", node_type },
{"symbol", node_symbol}, { "symbol", node_symbol },
{"child_count", node_child_count}, { "child_count", node_child_count },
{"child", node_child}, { "child", node_child },
{"descendant_for_point_range", node_descendant_for_point_range}, { "descendant_for_point_range", node_descendant_for_point_range },
{"parent", node_parent}, { "parent", node_parent },
{NULL, NULL} { NULL, NULL }
}; };
PMap(cstr_t) *langs; PMap(cstr_t) *langs;
void build_meta(lua_State *L, const char* tname, const luaL_Reg *meta) void build_meta(lua_State *L, const char *tname, const luaL_Reg *meta)
{ {
if (luaL_newmetatable(L, tname)) { // [meta] if (luaL_newmetatable(L, tname)) { // [meta]
for (size_t i = 0; meta[i].name != NULL; i++) { for (size_t i = 0; meta[i].name != NULL; i++) {
@@ -86,7 +86,6 @@ void build_meta(lua_State *L, const char* tname, const luaL_Reg *meta)
/// all global state is stored in the regirstry of the lua_State /// all global state is stored in the regirstry of the lua_State
void tslua_init(lua_State *L) void tslua_init(lua_State *L)
{ {
langs = pmap_new(cstr_t)(); langs = pmap_new(cstr_t)();
// type metatables // type metatables
@@ -114,8 +113,8 @@ int ts_lua_register_lang(lua_State *L)
return luaL_error(L, "string expected"); return luaL_error(L, "string expected");
} }
const char *path = lua_tostring(L,1); const char *path = lua_tostring(L, 1);
const char *lang_name = lua_tostring(L,2); const char *lang_name = lua_tostring(L, 2);
if (pmap_has(cstr_t)(langs, lang_name)) { if (pmap_has(cstr_t)(langs, lang_name)) {
return 0; return 0;
@@ -129,12 +128,14 @@ int ts_lua_register_lang(lua_State *L)
// at exit, to keep LeakSanitizer happy. // at exit, to keep LeakSanitizer happy.
uv_lib_t lib; uv_lib_t lib;
if (uv_dlopen(path, &lib)) { if (uv_dlopen(path, &lib)) {
return luaL_error(L, "Failed to load parser: uv_dlopen: %s", uv_dlerror(&lib)); return luaL_error(L, "Failed to load parser: uv_dlopen: %s",
uv_dlerror(&lib));
} }
TSLanguage *(*lang_parser)(void); TSLanguage *(*lang_parser)(void);
if (uv_dlsym(&lib, symbol_buf, (void **)&lang_parser)) { if (uv_dlsym(&lib, symbol_buf, (void **)&lang_parser)) {
return luaL_error(L, "Failed to load parser: uv_dlsym: %s", uv_dlerror(&lib)); return luaL_error(L, "Failed to load parser: uv_dlsym: %s",
uv_dlerror(&lib));
} }
TSLanguage *lang = lang_parser(); TSLanguage *lang = lang_parser();
@@ -192,26 +193,29 @@ static int parser_tostring(lua_State *L)
return 1; return 1;
} }
static const char *input_cb(void *payload, uint32_t byte_index, TSPoint position, uint32_t *bytes_read) static const char *input_cb(void *payload, uint32_t byte_index,
TSPoint position, uint32_t *bytes_read)
{ {
buf_T *bp = payload; buf_T *bp = payload;
static char buf[200]; #define BUFSIZE 256
if ((linenr_T)position.row >= bp->b_ml.ml_line_count) { static char buf[BUFSIZE];
*bytes_read = 0; if ((linenr_T)position.row >= bp->b_ml.ml_line_count) {
return ""; *bytes_read = 0;
} return "";
char_u *line = ml_get_buf(bp, position.row+1, false); }
size_t len = STRLEN(line); char_u *line = ml_get_buf(bp, position.row+1, false);
size_t tocopy = MIN(len-position.column,200); size_t len = STRLEN(line);
size_t tocopy = MIN(len-position.column, BUFSIZE);
// TODO: translate embedded \n to \000 // TODO: translate embedded \n to \000
memcpy(buf, line+position.column, tocopy); memcpy(buf, line+position.column, tocopy);
*bytes_read = (uint32_t)tocopy; *bytes_read = (uint32_t)tocopy;
if (tocopy < 200) { if (tocopy < 200) {
buf[tocopy] = '\n'; buf[tocopy] = '\n';
(*bytes_read)++; (*bytes_read)++;
} }
return buf; return buf;
#undef BUFSIZE
} }
static int parser_parse_buf(lua_State *L) static int parser_parse_buf(lua_State *L)
@@ -223,7 +227,7 @@ static int parser_parse_buf(lua_State *L)
long bufnr = lua_tointeger(L, 2); long bufnr = lua_tointeger(L, 2);
void *payload = handle_get_buffer(bufnr); void *payload = handle_get_buffer(bufnr);
TSInput input = {payload, input_cb, TSInputEncodingUTF8}; TSInput input = { payload, input_cb, TSInputEncodingUTF8 };
TSTree *new_tree = ts_parser_parse(p->parser, p->tree, input); TSTree *new_tree = ts_parser_parse(p->parser, p->tree, input);
if (p->tree) { if (p->tree) {
ts_tree_delete(p->tree); ts_tree_delete(p->tree);
@@ -251,10 +255,9 @@ static int parser_tree(lua_State *L)
static int parser_edit(lua_State *L) static int parser_edit(lua_State *L)
{ {
if(lua_gettop(L) < 10) { if (lua_gettop(L) < 10) {
lua_pushstring(L, "not enough args to parser:edit()"); lua_pushstring(L, "not enough args to parser:edit()");
lua_error(L); return lua_error(L);
return 0; // unreachable
} }
Tslua_parser *p = parser_check(L); Tslua_parser *p = parser_check(L);
@@ -350,7 +353,7 @@ static int tree_root(lua_State *L)
static void push_node(lua_State *L, TSNode node) static void push_node(lua_State *L, TSNode node)
{ {
if (ts_node_is_null(node)) { if (ts_node_is_null(node)) {
lua_pushnil(L); // [src, nil] lua_pushnil(L); // [src, nil]
return; return;
} }
TSNode *ud = lua_newuserdata(L, sizeof(TSNode)); // [src, udata] TSNode *ud = lua_newuserdata(L, sizeof(TSNode)); // [src, udata]
@@ -466,10 +469,10 @@ static int node_descendant_for_point_range(lua_State *L)
if (!node_check(L, &node)) { if (!node_check(L, &node)) {
return 0; return 0;
} }
TSPoint start = {(uint32_t)lua_tointeger(L, 2), TSPoint start = { (uint32_t)lua_tointeger(L, 2),
(uint32_t)lua_tointeger(L, 3)}; (uint32_t)lua_tointeger(L, 3) };
TSPoint end = {(uint32_t)lua_tointeger(L, 4), TSPoint end = { (uint32_t)lua_tointeger(L, 4),
(uint32_t)lua_tointeger(L, 5)}; (uint32_t)lua_tointeger(L, 5) };
TSNode child = ts_node_descendant_for_point_range(node, start, end); TSNode child = ts_node_descendant_for_point_range(node, start, end);
lua_pushvalue(L, 1); lua_pushvalue(L, 1);