ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-07 14:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow multiple leaf-identifier completions per input, using the cursor_off -> cursor_expr_node autocompletion querying path

Browse Source
This commit is contained in:
Ryan Fleury
2025-05-01 10:38:36 -07:00
parent 80268dd770
commit 306ad2d382
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/raddbg/raddbg_core.c
+14 -3
View File
@@ -3574,8 +3574,8 @@ rd_view_ui(Rng2F32 rect)
os_set_clipboard_text(op.copy); os_set_clipboard_text(op.copy);
} }
// rjf: any valid op & autocomplete hint? -> perform autocomplete first, then re-compute op // rjf: any valid *additive* op & autocomplete hint? -> perform autocomplete first, then re-compute op
if(autocomplete_hint_string.size != 0) if(!(evt->flags & UI_EventFlag_Delete) && autocomplete_hint_string.size != 0)
{ {
take_autocomplete = 1; take_autocomplete = 1;
RD_AutocompCursorInfo autocomp_cursor_info = rd_autocomp_cursor_info_from_input_string_off(scratch.arena, string, edit_state->cursor.column-1); RD_AutocompCursorInfo autocomp_cursor_info = rd_autocomp_cursor_info_from_input_string_off(scratch.arena, string, edit_state->cursor.column-1);
@@ -6679,7 +6679,7 @@ rd_window_frame(void)
F32 row_height_px = ui_top_px_height(); F32 row_height_px = ui_top_px_height();
U64 max_row_count = (U64)floor_f32(ui_top_font_size()*30.f / row_height_px); U64 max_row_count = (U64)floor_f32(ui_top_font_size()*30.f / row_height_px);
U64 needed_row_count = Min(max_row_count, predicted_block_tree.total_row_count - 1); U64 needed_row_count = Min(max_row_count, predicted_block_tree.total_row_count - 1);
F32 width_px = floor_f32(40.f*ui_top_font_size()); F32 width_px = floor_f32(30.f*ui_top_font_size());
F32 height_px = needed_row_count*row_height_px; F32 height_px = needed_row_count*row_height_px;
// rjf: determine list top-level rect // rjf: determine list top-level rect
@@ -9777,6 +9777,8 @@ rd_autocomp_cursor_info_from_input_string_off(Arena *arena, String8 input, U64 c
} }
//- rjf: cursor is on right-hand-side of dot? -> show members of left-hand-side //- rjf: cursor is on right-hand-side of dot? -> show members of left-hand-side
B32 did_special_cursor_case = 0;
if(!did_special_cursor_case)
{ {
E_Expr *dot_expr = &e_expr_nil; E_Expr *dot_expr = &e_expr_nil;
if(cursor_expr->kind == E_ExprKind_MemberAccess && cursor_off == cursor_expr->range.max) if(cursor_expr->kind == E_ExprKind_MemberAccess && cursor_off == cursor_expr->range.max)
@@ -9789,6 +9791,7 @@ rd_autocomp_cursor_info_from_input_string_off(Arena *arena, String8 input, U64 c
} }
if(dot_expr != &e_expr_nil) if(dot_expr != &e_expr_nil)
{ {
did_special_cursor_case = 1;
E_Eval lhs_eval = e_eval_from_expr(dot_expr->first); E_Eval lhs_eval = e_eval_from_expr(dot_expr->first);
E_Eval type_of_lhs_eval = e_eval_wrapf(lhs_eval, "typeof($)"); E_Eval type_of_lhs_eval = e_eval_wrapf(lhs_eval, "typeof($)");
result.list_expr = e_full_expr_string_from_key(arena, type_of_lhs_eval.key); result.list_expr = e_full_expr_string_from_key(arena, type_of_lhs_eval.key);
@@ -9797,6 +9800,14 @@ rd_autocomp_cursor_info_from_input_string_off(Arena *arena, String8 input, U64 c
} }
} }
//- rjf: cursor is on a leaf-identifier? -> replace just that identifier, keep the original list expression
if(!did_special_cursor_case && cursor_expr->kind == E_ExprKind_LeafIdentifier)
{
did_special_cursor_case = 1;
result.filter = str8_prefix(cursor_expr->string, cursor_off - cursor_expr->range.min);
result.replaced_range = cursor_expr->range;
}
scratch_end(scratch); scratch_end(scratch);
return result; return result;
} }
src/raddbg/raddbg_widgets.c
+2 -2
View File
@@ -3573,8 +3573,8 @@ rd_cell(RD_CellParams *params, String8 string)
// rjf: map this action to an op // rjf: map this action to an op
UI_TxtOp op = ui_single_line_txt_op_from_event(scratch.arena, evt, edit_string, params->cursor[0], params->mark[0]); UI_TxtOp op = ui_single_line_txt_op_from_event(scratch.arena, evt, edit_string, params->cursor[0], params->mark[0]);
// rjf: any valid op & autocomplete hint? -> perform autocomplete first, then re-compute op // rjf: any valid *additive* op & autocomplete hint? -> perform autocomplete first, then re-compute op
if(autocomplete_hint_string.size != 0) if(!(evt->flags & UI_EventFlag_Delete) && autocomplete_hint_string.size != 0)
{ {
RD_AutocompCursorInfo autocomp_cursor_info = rd_autocomp_cursor_info_from_input_string_off(scratch.arena, edit_string, params->cursor->column-1); RD_AutocompCursorInfo autocomp_cursor_info = rd_autocomp_cursor_info_from_input_string_off(scratch.arena, edit_string, params->cursor->column-1);
String8 new_string = ui_push_string_replace_range(scratch.arena, edit_string, r1s64(autocomp_cursor_info.replaced_range.min+1, autocomp_cursor_info.replaced_range.max+1), autocomplete_hint_string); String8 new_string = ui_push_string_replace_range(scratch.arena, edit_string, r1s64(autocomp_cursor_info.replaced_range.min+1, autocomp_cursor_info.replaced_range.max+1), autocomplete_hint_string);