ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent re-parsing the whole file by identifying the node containing the edit, or the node immediately before and after the edit, and parsing only those. Fall back to root for empty file case

This commit is contained in:
Peter Slattery 2025-08-02 23:21:46 -07:00
parent 12322796c2
commit 30ac43ce66
2 changed files with 200 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/custom/4coder_custom_hooks.cpp
View File

@ -393,18 +393,15 @@ function void custom_render_buffer(
if (use_tree_sitter_token_coloring) { if (use_tree_sitter_token_coloring) {
Managed_Scope scope = buffer_get_managed_scope(app, buffer); Managed_Scope scope = buffer_get_managed_scope(app, buffer);
Buffer_Tree_Sitter_Data* tree_data = scope_attachment(app, scope, buffer_tree_sitter_data_id, Buffer_Tree_Sitter_Data); Buffer_Tree_Sitter_Data* tree_data = scope_attachment(app, scope, buffer_tree_sitter_data_id, Buffer_Tree_Sitter_Data);
for (int i = 0; i < tree_data->last_update_node_range_count; i++) Range_i64 last_update_range = tree_data->last_update_node_range;
{ Rect_f32 range_min = text_layout_character_on_screen(app, text_layout_id, last_update_range.min);
Range_i64 last_update_range = tree_data->last_update_node_range[i]; Rect_f32 range_max = text_layout_character_on_screen(app, text_layout_id, last_update_range.max);
Rect_f32 range_min = text_layout_character_on_screen(app, text_layout_id, last_update_range.min); Rect_f32 range;
Rect_f32 range_max = text_layout_character_on_screen(app, text_layout_id, last_update_range.max); range.x0 = Min(range_min.x0, range_max.x0);
Rect_f32 range; range.y0 = Min(range_min.y0, range_max.y0);
range.x0 = Min(range_min.x0, range_max.x0); range.x1 = Max(range_min.x1, range_max.x1);
range.y0 = Min(range_min.y0, range_max.y0); range.y1 = Max(range_min.y1, range_max.y1);
range.x1 = Max(range_min.x1, range_max.x1); draw_rectangle(app, range, 0.f, 0x33FF00FF);
range.y1 = Max(range_min.y1, range_max.y1);
draw_rectangle(app, range, 0.f, 0x33FF00FF);
}
} }
draw_set_clip(app, prev_clip); draw_set_clip(app, prev_clip);
} }

281
code/custom/4coder_tree_sitter.cpp
View File

@ -206,6 +206,14 @@ tree_sitter_query_init(Application_Links* app, Buffer_ID buffer_id, TSQuery* que
return result; return result;
} }
function Tree_Sitter_Query_Cursor
tree_sitter_query_init(Application_Links* app, Buffer_ID buffer_id, TSQuery* query, TSNode first_node)
{
Tree_Sitter_Query_Cursor result = tree_sitter_query_init(app, buffer_id, query);
result.first_node = first_node;
return result;
}
function bool function bool
tree_sitter_query_continue(Tree_Sitter_Query_Cursor* cursor, TSQueryMatch* match, u32* capture_index) tree_sitter_query_continue(Tree_Sitter_Query_Cursor* cursor, TSQueryMatch* match, u32* capture_index)
{ {
@ -477,11 +485,6 @@ tree_sitter_code_index_update_state_create(
} }
state.buffer_contents = push_whole_buffer(app, scratch, state.buffer_id); state.buffer_contents = push_whole_buffer(app, scratch, state.buffer_id);
state.query = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags]
);
state.nest_stack_first = 0; state.nest_stack_first = 0;
state.nest_stack_last = 0; state.nest_stack_last = 0;
state.last_note = 0; state.last_note = 0;
@ -509,6 +512,7 @@ tree_sitter_code_index_update_state_create(
function void function void
tree_sitter_code_index_update_process_query_match( tree_sitter_code_index_update_process_query_match(
Tree_Sitter_Code_Index_Update_State* state, Tree_Sitter_Code_Index_Update_State* state,
Tree_Sitter_Query_Cursor query,
TSQueryMatch query_match, TSQueryMatch query_match,
u32 capture_index, u32 capture_index,
Arena* scratch Arena* scratch
@ -519,7 +523,7 @@ tree_sitter_code_index_update_process_query_match(
Range_i64 type_range = tree_sitter_node_to_range(type_node); Range_i64 type_range = tree_sitter_node_to_range(type_node);
u32 length; u32 length;
const char* tmp = ts_query_capture_name_for_id(state->query.query, type_capture.index, &length); const char* tmp = ts_query_capture_name_for_id(query.query, type_capture.index, &length);
String_Const_u8 capture_name = SCu8((char*)tmp, length); String_Const_u8 capture_name = SCu8((char*)tmp, length);
if (string_match(capture_name, SCu8("scope_begin")) || string_match(capture_name, SCu8("scope_end"))) if (string_match(capture_name, SCu8("scope_begin")) || string_match(capture_name, SCu8("scope_end")))
@ -589,7 +593,6 @@ tree_sitter_code_index_update_complete(
Arena* scratch, Arena* scratch,
bool update_was_incremental bool update_was_incremental
){ ){
tree_sitter_query_end(&state->query);
if (state->ok) if (state->ok)
{ {
Code_Index_Nest* free_nests = state->index->nest_list.first; Code_Index_Nest* free_nests = state->index->nest_list.first;
@ -699,18 +702,26 @@ tree_sitter_code_index_update_full_file(Application_Links* app, Buffer_ID buffer
scratch scratch
); );
Tree_Sitter_Query_Cursor query = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags]
);
TSQueryMatch query_match; TSQueryMatch query_match;
u32 capture_index; u32 capture_index;
while (state.ok && tree_sitter_query_continue(&state.query, &query_match, &capture_index)) while (state.ok && tree_sitter_query_continue(&query, &query_match, &capture_index))
{ {
tree_sitter_code_index_update_process_query_match( tree_sitter_code_index_update_process_query_match(
&state, &state,
query,
query_match, query_match,
capture_index, capture_index,
scratch scratch
); );
} }
tree_sitter_query_end(&query);
tree_sitter_code_index_update_complete(app, &state, scratch, false); tree_sitter_code_index_update_complete(app, &state, scratch, false);
return state; return state;
} }
@ -730,13 +741,18 @@ tree_sitter_code_index_update_async(Async_Context* actx, String_Const_u8 data)
0, 0,
scratch scratch
); );
Tree_Sitter_Query_Cursor query = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags]
);
release_global_frame_mutex(app); release_global_frame_mutex(app);
TSQueryMatch query_match; TSQueryMatch query_match;
u32 capture_index; u32 capture_index;
while (state.ok && tree_sitter_query_continue(&state.query, &query_match, &capture_index)) while (state.ok && tree_sitter_query_continue(&query, &query_match, &capture_index))
{ {
tree_sitter_code_index_update_process_query_match(&state, query_match, capture_index, scratch); tree_sitter_code_index_update_process_query_match(&state, query, query_match, capture_index, scratch);
if (async_check_canceled(actx)) if (async_check_canceled(actx))
{ {
state.ok = false; state.ok = false;
@ -744,6 +760,7 @@ tree_sitter_code_index_update_async(Async_Context* actx, String_Const_u8 data)
} }
} }
tree_sitter_query_end(&query);
tree_sitter_code_index_update_complete(app, &state, scratch, false); tree_sitter_code_index_update_complete(app, &state, scratch, false);
} }
@ -774,31 +791,111 @@ tree_sitter_code_index_update_tick(Application_Links* app)
); );
// Find the largest, non-root node for us to reparse in its entirety // Find the largest, non-root node for us to reparse in its entirety
TSNode root = ts_tree_root_node(tree_data->tree);
TSNode first_node = ts_node_descendant_for_byte_range( TSNode first_node = ts_node_descendant_for_byte_range(
state.query.first_node, new_range.min, new_range.max root, new_range.min, new_range.max
); );
TSNode last_node = first_node;
bool would_reparse_entire_file = ts_node_eq(first_node, root);
printf("Initial Scope\n"); int query_count = 1;
print_tree_sitter_tree(first_node, 0, ""); Tree_Sitter_Query_Cursor queries[2];
if (!ts_node_eq(first_node, state.query.first_node)) if (would_reparse_entire_file)
{
TSNode prev_sibling = {0};
TSNode next_sibling = {0};
u32 child_count = ts_node_child_count(root);
for (u32 i = 0; i < child_count; i++)
{
TSNode child = ts_node_child(root, i);
u32 start_byte = ts_node_start_byte(child);
u32 end_byte = ts_node_end_byte(child);
if (end_byte <= new_range.min)
{
prev_sibling = child;
}
else if (start_byte >= new_range.max)
{
next_sibling = child;
break;
}
}
if (!ts_node_is_null(prev_sibling) && !ts_node_is_null(next_sibling))
{
first_node = prev_sibling;
last_node = next_sibling;
query_count = 2;
queries[0] = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags],
prev_sibling
);
queries[1] = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags],
next_sibling
);
}
else if (!ts_node_is_null(prev_sibling))
{
first_node = prev_sibling;
last_node = prev_sibling;
queries[0] = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags],
prev_sibling
);
}
else if (!ts_node_is_null(next_sibling))
{
first_node = next_sibling;
last_node = next_sibling;
queries[0] = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags],
next_sibling
);
}
else
{
first_node = root;
last_node = root;
queries[0] = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags],
root
);
}
}
else
{ {
TSNode parent = ts_node_parent(first_node); TSNode parent = ts_node_parent(first_node);
while (!ts_node_has_error(parent) && !ts_node_eq(parent, state.query.first_node)) while (!ts_node_has_error(parent) && !ts_node_eq(parent, root))
{ {
first_node = parent; first_node = parent;
parent = ts_node_parent(first_node); parent = ts_node_parent(first_node);
printf("Ascending\n");
print_tree_sitter_tree(first_node, 0, "");
} }
last_node = first_node;
queries[0] = tree_sitter_query_init(
app,
state.buffer_id,
state.language->queries.ptr[Tree_Sitter_Language_Query_Tags],
first_node
);
} }
state.query.first_node = first_node;
Range_i64 edit_range; Range_i64 edit_range;
edit_range.min = (i64)ts_node_start_byte(state.query.first_node); edit_range.min = (i64)ts_node_start_byte(first_node);
edit_range.max = (i64)ts_node_end_byte(state.query.first_node); edit_range.max = (i64)ts_node_end_byte(last_node);
tree_data->last_update_node_range[0] = edit_range; // TODO(PS): TEMP - remove me once debugging is done tree_data->last_update_node_range = edit_range; // TODO(PS): TEMP - remove me once debugging is done
tree_data->last_update_node_range_count = 1;
// Free Scope Delimiters & Notes that fall within old_range // Free Scope Delimiters & Notes that fall within old_range
Code_Index_Scope_Delim* delim = state.index->scope_delim_list.first; Code_Index_Scope_Delim* delim = state.index->scope_delim_list.first;
@ -866,82 +963,86 @@ tree_sitter_code_index_update_tick(Application_Links* app)
if (state.index->note_list.count == 0) Assert(state.index->note_list.first == 0 && state.index->note_list.first == 0); if (state.index->note_list.count == 0) Assert(state.index->note_list.first == 0 && state.index->note_list.first == 0);
Code_Index_Scope_Delim* delim_prev = before_range; Code_Index_Scope_Delim* delim_prev = before_range;
TSQueryMatch query_match; for (int i = 0; i < query_count; i++)
u32 capture_index;
while (state.ok && tree_sitter_query_continue(&state.query, &query_match, &capture_index))
{ {
// TODO(PS): @Collapse - the entire body of this while loop used to be in Tree_Sitter_Query_Cursor query = queries[i];
// tree_sitter_code_index_update_process_query_match TSQueryMatch query_match;
// After we're done, see what we can do to collapse u32 capture_index;
while (state.ok && tree_sitter_query_continue(&query, &query_match, &capture_index))
TSQueryCapture type_capture = query_match.captures[capture_index];
TSNode type_node = type_capture.node;
Range_i64 type_range = tree_sitter_node_to_range(type_node);
u32 length;
const char* tmp = ts_query_capture_name_for_id(state.query.query, type_capture.index, &length);
String_Const_u8 capture_name = SCu8((char*)tmp, length);
if (string_match(capture_name, SCu8("scope_begin")) || string_match(capture_name, SCu8("scope_end")))
{ {
Code_Index_Scope_Delim_Kind kind; // TODO(PS): @Collapse - the entire body of this while loop used to be in
String_Const_u8 delim_char = string_substring(state.buffer_contents, type_range); // tree_sitter_code_index_update_process_query_match
bool skip = false; // After we're done, see what we can do to collapse
if (delim_char.str[0] == '{') kind = CodeIndexScopeDelim_ScopeOpen;
else if (delim_char.str[0] == '}') kind = CodeIndexScopeDelim_ScopeClose; TSQueryCapture type_capture = query_match.captures[capture_index];
else if (delim_char.str[0] == '(') kind = CodeIndexScopeDelim_ParenOpen;
else if (delim_char.str[0] == ')') kind = CodeIndexScopeDelim_ParenClose; TSNode type_node = type_capture.node;
else if (delim_char.str[0] == '[') kind = CodeIndexScopeDelim_BracketOpen; Range_i64 type_range = tree_sitter_node_to_range(type_node);
else if (delim_char.str[0] == ']') kind = CodeIndexScopeDelim_BracketClose;
u32 length;
const char* tmp = ts_query_capture_name_for_id(query.query, type_capture.index, &length);
String_Const_u8 capture_name = SCu8((char*)tmp, length);
if (string_match(capture_name, SCu8("scope_begin")) || string_match(capture_name, SCu8("scope_end")))
{
Code_Index_Scope_Delim_Kind kind;
String_Const_u8 delim_char = string_substring(state.buffer_contents, type_range);
bool skip = false;
if (delim_char.str[0] == '{') kind = CodeIndexScopeDelim_ScopeOpen;
else if (delim_char.str[0] == '}') kind = CodeIndexScopeDelim_ScopeClose;
else if (delim_char.str[0] == '(') kind = CodeIndexScopeDelim_ParenOpen;
else if (delim_char.str[0] == ')') kind = CodeIndexScopeDelim_ParenClose;
else if (delim_char.str[0] == '[') kind = CodeIndexScopeDelim_BracketOpen;
else if (delim_char.str[0] == ']') kind = CodeIndexScopeDelim_BracketClose;
else skip = true; else skip = true;
if (!skip) if (!skip)
{
Code_Index_Scope_Delim* delim = code_index_new_scope_delim(
state.index, &state.index_arena, kind, type_range
);
code_index_scope_delim_insert(&state.index->scope_delim_list, delim_prev, delim);
delim_prev = delim;
}
}
else if (string_match(capture_name, SCu8("definition.class")))
{ {
Code_Index_Scope_Delim* delim = code_index_new_scope_delim( Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Type, type_range, state.nest_stack_last);
state.index, &state.index_arena, kind, type_range state.last_note_match_id = query_match.id;
); code_index_note_insert(&state.index->note_list, state.last_note, note);
code_index_scope_delim_insert(&state.index->scope_delim_list, delim_prev, delim); state.last_note = note;
delim_prev = delim; }
} else if (string_match(capture_name, SCu8("definition.function")))
} {
else if (string_match(capture_name, SCu8("definition.class"))) Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Function, type_range, state.nest_stack_last);
{ state.last_note_match_id = query_match.id;
Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Type, type_range, state.nest_stack_last); code_index_note_insert(&state.index->note_list, state.last_note, note);
state.last_note_match_id = query_match.id; state.last_note = note;
code_index_note_insert(&state.index->note_list, state.last_note, note); }
state.last_note = note; else if (string_match(capture_name, SCu8("definition.method")))
} {
else if (string_match(capture_name, SCu8("definition.function"))) Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Function, type_range, state.nest_stack_last);;
{ state.last_note_match_id = query_match.id;
Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Function, type_range, state.nest_stack_last); code_index_note_insert(&state.index->note_list, state.last_note, note);
state.last_note_match_id = query_match.id; state.last_note = note;
code_index_note_insert(&state.index->note_list, state.last_note, note); }
state.last_note = note; else if (string_match(capture_name, SCu8("definition.type")))
} {
else if (string_match(capture_name, SCu8("definition.method"))) Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Type, type_range, state.nest_stack_last);
{ state.last_note_match_id = query_match.id;
Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Function, type_range, state.nest_stack_last);; code_index_note_insert(&state.index->note_list, state.last_note, note);
state.last_note_match_id = query_match.id; state.last_note = note;
code_index_note_insert(&state.index->note_list, state.last_note, note); }
state.last_note = note; else if (string_match(capture_name, SCu8("name")))
} {
else if (string_match(capture_name, SCu8("definition.type"))) if (state.last_note != 0 && state.last_note_match_id == query_match.id)
{ {
Code_Index_Note* note = code_index_new_note(state.index, &state.index_arena, CodeIndexNote_Type, type_range, state.nest_stack_last); state.last_note->pos = Ii64_size(type_range.start, type_range.end - type_range.start);
state.last_note_match_id = query_match.id; }
code_index_note_insert(&state.index->note_list, state.last_note, note);
state.last_note = note;
}
else if (string_match(capture_name, SCu8("name")))
{
if (state.last_note != 0 && state.last_note_match_id == query_match.id)
{
state.last_note->pos = Ii64_size(type_range.start, type_range.end - type_range.start);
} }
} }
tree_sitter_query_end(&query);
} }
tree_sitter_code_index_update_complete(app, &state, scratch, true); tree_sitter_code_index_update_complete(app, &state, scratch, true);
} }