mirror of
https://github.com/neovim/neovim.git
synced 2024-09-17 20:58:20 -04:00
fixup: raise TS min version
This commit is contained in:
parent
35a147fa77
commit
83b51b36aa
@ -7,23 +7,3 @@ mark_as_advanced(TREESITTER_LIBRARY TREESITTER_INCLUDE_DIR)
|
||||
add_library(treesitter INTERFACE)
|
||||
target_include_directories(treesitter SYSTEM BEFORE INTERFACE ${TREESITTER_INCLUDE_DIR})
|
||||
target_link_libraries(treesitter INTERFACE ${TREESITTER_LIBRARY})
|
||||
|
||||
# TODO(lewis6991): remove when min TS version is 0.20.9
|
||||
list(APPEND CMAKE_REQUIRED_INCLUDES "${TREESITTER_INCLUDE_DIR}")
|
||||
list(APPEND CMAKE_REQUIRED_LIBRARIES "${TREESITTER_LIBRARY}")
|
||||
check_c_source_compiles("
|
||||
#include <tree_sitter/api.h>
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
TSQueryCursor *cursor = ts_query_cursor_new();
|
||||
ts_query_cursor_set_max_start_depth(cursor, 32);
|
||||
return 0;
|
||||
}
|
||||
" TS_HAS_SET_MAX_START_DEPTH)
|
||||
list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${TREESITTER_INCLUDE_DIR}")
|
||||
list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${TREESITTER_LIBRARY}")
|
||||
|
||||
if(TS_HAS_SET_MAX_START_DEPTH)
|
||||
target_compile_definitions(treesitter INTERFACE NVIM_TS_HAS_SET_MAX_START_DEPTH)
|
||||
endif()
|
||||
|
@ -33,7 +33,7 @@ find_package(Libuv 1.28.0 REQUIRED)
|
||||
find_package(Libvterm 0.3.3 REQUIRED)
|
||||
find_package(Lpeg REQUIRED)
|
||||
find_package(Msgpack 1.0.0 REQUIRED)
|
||||
find_package(Treesitter 0.20.8 REQUIRED)
|
||||
find_package(Treesitter 0.20.9 REQUIRED)
|
||||
find_package(Unibilium 2.0 REQUIRED)
|
||||
|
||||
target_link_libraries(main_lib INTERFACE
|
||||
|
@ -1449,10 +1449,7 @@ static int node_rawquery(lua_State *L)
|
||||
cursor = ts_query_cursor_new();
|
||||
}
|
||||
|
||||
#ifdef NVIM_TS_HAS_SET_MAX_START_DEPTH
|
||||
// reset the start depth
|
||||
ts_query_cursor_set_max_start_depth(cursor, UINT32_MAX);
|
||||
#endif
|
||||
ts_query_cursor_set_match_limit(cursor, 256);
|
||||
ts_query_cursor_exec(cursor, query, node);
|
||||
|
||||
@ -1475,11 +1472,8 @@ static int node_rawquery(lua_State *L)
|
||||
if (lua_type(L, -2) == LUA_TSTRING) {
|
||||
char *k = (char *)lua_tostring(L, -2);
|
||||
if (strequal("max_start_depth", k)) {
|
||||
// TODO(lewis6991): remove ifdef when min TS version is 0.20.9
|
||||
#ifdef NVIM_TS_HAS_SET_MAX_START_DEPTH
|
||||
uint32_t max_start_depth = (uint32_t)lua_tointeger(L, -1);
|
||||
ts_query_cursor_set_max_start_depth(cursor, max_start_depth);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
lua_pop(L, 1); // pop the value; lua_next will pop the key.
|
||||
|
Loading…
Reference in New Issue
Block a user