patrick
/
odin_editor
mirror of https://github.com/pcleavelin/odin_editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move filebuffer panel to new buffer pool

main
Patrick Cleaveliln 2025-07-26 21:10:12 +00:00
parent 614a04973c
commit f6a3f99c45
4 changed files with 178 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/core.odin
View File

@ -51,6 +51,7 @@ State :: struct {
current_panel: Maybe(int), current_panel: Maybe(int),
panels: util.StaticList(Panel), panels: util.StaticList(Panel),
buffers: util.StaticList(FileBuffer),
} }
Register :: struct { Register :: struct {
@ -100,7 +101,7 @@ PanelType :: union {
} }
FileBufferPanel :: struct { FileBufferPanel :: struct {
buffer: FileBuffer, buffer_id: int,
viewed_symbol: Maybe(string), viewed_symbol: Maybe(string),
search_buffer: FileBuffer, search_buffer: FileBuffer,
@ -143,6 +144,26 @@ current_buffer :: proc(state: ^State) -> ^FileBuffer {
return nil return nil
} }
new_buffer_virtual :: proc(state: ^State) -> (id: int, buffer: ^FileBuffer, ok: bool) {
return util.append(&state.buffers, new_virtual_file_buffer(context.allocator))
}
new_buffer_file :: proc(state: ^State, file_path: string) -> (id: int, buffer: ^FileBuffer, ok: bool) {
new_buffer, err := new_file_buffer(context.allocator, file_path, state.directory)
if err.type != .None {
ok = false
return
}
return util.append(&state.buffers, new_buffer)
}
new_buffer :: proc{new_buffer_file, new_buffer_virtual}
get_buffer :: proc(state: ^State, buffer_id: int) -> Maybe(^FileBuffer) {
return util.get(&state.buffers, buffer_id)
}
yank_whole_line :: proc(state: ^State, buffer: ^FileBuffer) { yank_whole_line :: proc(state: ^State, buffer: ^FileBuffer) {
if state.yank_register.data != nil { if state.yank_register.data != nil {
delete(state.yank_register.data) delete(state.yank_register.data)

1
src/main.odin
View File

@ -160,6 +160,7 @@ main :: proc() {
command_arena = mem.arena_allocator(&_command_arena), command_arena = mem.arena_allocator(&_command_arena),
panels = util.make_static_list(core.Panel, 128), panels = util.make_static_list(core.Panel, 128),
buffers = util.make_static_list(core.FileBuffer, 64),
directory = os.get_current_directory(), directory = os.get_current_directory(),
log_buffer = core.new_virtual_file_buffer(context.allocator), log_buffer = core.new_virtual_file_buffer(context.allocator),

236
src/panels/file_buffer.odin
View File

@ -41,9 +41,6 @@ make_file_buffer_panel :: proc(file_path: string, line: int = 0, col: int = 0) -
col = col, col = col,
}, },
drop = proc(panel: ^core.Panel, state: ^core.State) { drop = proc(panel: ^core.Panel, state: ^core.State) {
panel_state := &panel.type.(core.FileBufferPanel)
ts.delete_state(&panel_state.buffer.tree)
}, },
create = proc(panel: ^core.Panel, state: ^core.State) { create = proc(panel: ^core.Panel, state: ^core.State) {
context.allocator = panel.allocator context.allocator = panel.allocator
@ -61,20 +58,22 @@ make_file_buffer_panel :: proc(file_path: string, line: int = 0, col: int = 0) -
panel_state.search_buffer = core.new_virtual_file_buffer(panel.allocator) panel_state.search_buffer = core.new_virtual_file_buffer(panel.allocator)
if len(panel_state.file_path) == 0 { if len(panel_state.file_path) == 0 {
panel_state.buffer = core.new_virtual_file_buffer(panel.allocator) if buffer_id, _, ok := core.new_buffer(state); ok {
} else { panel_state.buffer_id = buffer_id
buffer, err := core.new_file_buffer(panel.allocator, panel_state.file_path, state.directory) } else {
if err.type != .None { log.error("failed to create buffer")
log.error("Failed to create file buffer:", err);
return;
} }
} else {
if buffer_id, buffer, ok := core.new_buffer(state, panel_state.file_path); ok {
buffer.history.cursor.line = panel_state.line
buffer.history.cursor.col = panel_state.col
buffer.top_line = buffer.history.cursor.line
core.update_file_buffer_index_from_cursor(buffer)
buffer.history.cursor.line = panel_state.line panel_state.buffer_id = buffer_id
buffer.history.cursor.col = panel_state.col } else {
buffer.top_line = buffer.history.cursor.line log.error("failed to create buffer")
core.update_file_buffer_index_from_cursor(&buffer) }
panel_state.buffer = buffer
} }
leader_actions := core.new_input_actions(show_help = true) leader_actions := core.new_input_actions(show_help = true)
@ -96,26 +95,29 @@ make_file_buffer_panel :: proc(file_path: string, line: int = 0, col: int = 0) -
if panel_state.is_searching { if panel_state.is_searching {
return &panel_state.search_buffer, true return &panel_state.search_buffer, true
} else { } else {
return &panel_state.buffer, true buffer, ok = core.get_buffer(state, panel_state.buffer_id).?
return
} }
}, },
on_buffer_input = proc(panel: ^core.Panel, state: ^core.State) { on_buffer_input = proc(panel: ^core.Panel, state: ^core.State) {
panel_state := &panel.type.(core.FileBufferPanel) panel_state := &panel.type.(core.FileBufferPanel)
run_query(panel_state, &panel_state.buffer) buffer := core.get_buffer(state, panel_state.buffer_id).?
run_query(panel_state, buffer)
if panel_state.is_searching { if panel_state.is_searching {
if len(panel_state.query_results) > 0 { if len(panel_state.query_results) > 0 {
for result, i in panel_state.query_results { for result, i in panel_state.query_results {
cursor := panel_state.buffer.history.cursor cursor := buffer.history.cursor
if result.line >= cursor.line || (result.line == cursor.line && result.col >= cursor.col) { if result.line >= cursor.line || (result.line == cursor.line && result.col >= cursor.col) {
core.move_cursor_to_location(&panel_state.buffer, result.line, result.col) core.move_cursor_to_location(buffer, result.line, result.col)
break break
} }
if i == len(panel_state.query_results)-1 { if i == len(panel_state.query_results)-1 {
result := panel_state.query_results[0] result := panel_state.query_results[0]
core.move_cursor_to_location(&panel_state.buffer, result.line, result.col) core.move_cursor_to_location(buffer, result.line, result.col)
} }
} }
} }
@ -123,6 +125,7 @@ make_file_buffer_panel :: proc(file_path: string, line: int = 0, col: int = 0) -
}, },
render = proc(panel: ^core.Panel, state: ^core.State) -> (ok: bool) { render = proc(panel: ^core.Panel, state: ^core.State) -> (ok: bool) {
panel_state := &panel.type.(core.FileBufferPanel) panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
s := transmute(^ui.State)state.ui s := transmute(^ui.State)state.ui
@ -133,7 +136,7 @@ make_file_buffer_panel :: proc(file_path: string, line: int = 0, col: int = 0) -
}, },
) )
{ {
render_file_buffer(state, s, &panel_state.buffer) render_file_buffer(state, s, buffer)
if panel_state.is_searching { if panel_state.is_searching {
ui.open_element(s, nil, ui.open_element(s, nil,
{ {
@ -248,7 +251,7 @@ file_buffer_leader_actions :: proc(input_map: ^core.InputActions) {
core.register_key_action(input_map, .K, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .K, proc(state: ^core.State, user_data: rawptr) {
panel := transmute(^core.Panel)user_data panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel) panel_state := &panel.type.(core.FileBufferPanel)
buffer := &panel_state.buffer buffer := core.get_buffer(state, panel_state.buffer_id).?
ts.update_cursor(&buffer.tree, buffer.history.cursor.line, buffer.history.cursor.col) ts.update_cursor(&buffer.tree, buffer.history.cursor.line, buffer.history.cursor.col)
panel_state.viewed_symbol = ts.print_node_type(&buffer.tree) panel_state.viewed_symbol = ts.print_node_type(&buffer.tree)
@ -259,13 +262,17 @@ file_buffer_leader_actions :: proc(input_map: ^core.InputActions) {
file_buffer_go_actions :: proc(input_map: ^core.InputActions) { file_buffer_go_actions :: proc(input_map: ^core.InputActions) {
core.register_key_action(input_map, .H, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .H, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_start_of_line(buffer); core.move_cursor_start_of_line(buffer);
core.reset_input_map(state) core.reset_input_map(state)
}, "move to beginning of line"); }, "move to beginning of line");
core.register_key_action(input_map, .L, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .L, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_end_of_line(buffer); core.move_cursor_end_of_line(buffer);
core.reset_input_map(state) core.reset_input_map(state)
@ -274,7 +281,9 @@ file_buffer_go_actions :: proc(input_map: ^core.InputActions) {
file_buffer_delete_actions :: proc(input_map: ^core.InputActions) { file_buffer_delete_actions :: proc(input_map: ^core.InputActions) {
core.register_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)
@ -295,50 +304,68 @@ file_buffer_input_actions :: proc(input_map: ^core.InputActions) {
// Cursor Movement // Cursor Movement
{ {
core.register_key_action(input_map, .W, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .W, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_forward_start_of_word(buffer); core.move_cursor_forward_start_of_word(buffer);
}, "move forward one word"); }, "move forward one word");
core.register_key_action(input_map, .E, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .E, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_forward_end_of_word(buffer); core.move_cursor_forward_end_of_word(buffer);
}, "move forward to end of word"); }, "move forward to end of word");
core.register_key_action(input_map, .B, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .B, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_backward_start_of_word(buffer); core.move_cursor_backward_start_of_word(buffer);
}, "move backward one word"); }, "move backward one word");
core.register_key_action(input_map, .K, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .K, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_up(buffer); core.move_cursor_up(buffer);
}, "move up one line"); }, "move up one line");
core.register_key_action(input_map, .J, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .J, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_down(buffer); core.move_cursor_down(buffer);
}, "move down one line"); }, "move down one line");
core.register_key_action(input_map, .H, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .H, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_left(buffer); core.move_cursor_left(buffer);
}, "move left one char"); }, "move left one char");
core.register_key_action(input_map, .L, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .L, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.move_cursor_right(buffer); core.move_cursor_right(buffer);
}, "move right one char"); }, "move right one char");
core.register_ctrl_key_action(input_map, .U, proc(state: ^core.State, user_data: rawptr) { core.register_ctrl_key_action(input_map, .U, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.scroll_file_buffer(buffer, .Up); core.scroll_file_buffer(buffer, .Up);
}, "scroll buffer up"); }, "scroll buffer up");
core.register_ctrl_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) { core.register_ctrl_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.scroll_file_buffer(buffer, .Down); core.scroll_file_buffer(buffer, .Down);
}, "scroll buffer up"); }, "scroll buffer up");
@ -365,7 +392,9 @@ file_buffer_input_actions :: proc(input_map: ^core.InputActions) {
// Save file // Save file
core.register_ctrl_key_action(input_map, .S, proc(state: ^core.State, user_data: rawptr) { core.register_ctrl_key_action(input_map, .S, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
if err := core.save_buffer_to_disk(state, buffer); err != nil { if err := core.save_buffer_to_disk(state, buffer); err != nil {
log.errorf("failed to save buffer to disk: %v", err) log.errorf("failed to save buffer to disk: %v", err)
@ -395,7 +424,9 @@ file_buffer_input_actions :: proc(input_map: ^core.InputActions) {
}, "search buffer") }, "search buffer")
core.register_key_action(input_map, .V, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .V, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
state.mode = .Visual; state.mode = .Visual;
core.reset_input_map(state) core.reset_input_map(state)
@ -418,19 +449,20 @@ file_buffer_input_actions :: proc(input_map: ^core.InputActions) {
core.register_key_action(input_map, .N, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .N, proc(state: ^core.State, user_data: rawptr) {
panel := transmute(^core.Panel)user_data panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel) panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
if len(panel_state.query_results) > 0 { if len(panel_state.query_results) > 0 {
for result, i in panel_state.query_results { for result, i in panel_state.query_results {
cursor := panel_state.buffer.history.cursor cursor := buffer.history.cursor
if result.line > cursor.line || (result.line == cursor.line && result.col > cursor.col) { if result.line > cursor.line || (result.line == cursor.line && result.col > cursor.col) {
core.move_cursor_to_location(&panel_state.buffer, result.line, result.col) core.move_cursor_to_location(buffer, result.line, result.col)
break break
} }
if i == len(panel_state.query_results)-1 { if i == len(panel_state.query_results)-1 {
result := panel_state.query_results[0] result := panel_state.query_results[0]
core.move_cursor_to_location(&panel_state.buffer, result.line, result.col) core.move_cursor_to_location(buffer, result.line, result.col)
} }
} }
} }
@ -439,7 +471,9 @@ file_buffer_input_actions :: proc(input_map: ^core.InputActions) {
file_buffer_visual_actions :: proc(input_map: ^core.InputActions) { file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
core.register_key_action(input_map, .ESCAPE, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .ESCAPE, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
state.mode = .Normal; state.mode = .Normal;
core.reset_input_map(state) core.reset_input_map(state)
@ -451,14 +485,18 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
// Cursor Movement // Cursor Movement
{ {
core.register_key_action(input_map, .W, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .W, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
core.move_cursor_forward_start_of_word(buffer, cursor = &sel_cur.end); core.move_cursor_forward_start_of_word(buffer, cursor = &sel_cur.end);
}, "move forward one word"); }, "move forward one word");
core.register_key_action(input_map, .E, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .E, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
@ -466,7 +504,9 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
}, "move forward to end of word"); }, "move forward to end of word");
core.register_key_action(input_map, .B, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .B, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
@ -474,28 +514,36 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
}, "move backward one word"); }, "move backward one word");
core.register_key_action(input_map, .K, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .K, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
core.move_cursor_up(buffer, cursor = &sel_cur.end); core.move_cursor_up(buffer, cursor = &sel_cur.end);
}, "move up one line"); }, "move up one line");
core.register_key_action(input_map, .J, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .J, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
core.move_cursor_down(buffer, cursor = &sel_cur.end); core.move_cursor_down(buffer, cursor = &sel_cur.end);
}, "move down one line"); }, "move down one line");
core.register_key_action(input_map, .H, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .H, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
core.move_cursor_left(buffer, cursor = &sel_cur.end); core.move_cursor_left(buffer, cursor = &sel_cur.end);
}, "move left one char"); }, "move left one char");
core.register_key_action(input_map, .L, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .L, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
@ -503,14 +551,18 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
}, "move right one char"); }, "move right one char");
core.register_ctrl_key_action(input_map, .U, proc(state: ^core.State, user_data: rawptr) { core.register_ctrl_key_action(input_map, .U, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
core.scroll_file_buffer(buffer, .Up, cursor = &sel_cur.end); core.scroll_file_buffer(buffer, .Up, cursor = &sel_cur.end);
}, "scroll buffer up"); }, "scroll buffer up");
core.register_ctrl_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) { core.register_ctrl_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
sel_cur := &(buffer.selection.?); sel_cur := &(buffer.selection.?);
@ -521,7 +573,9 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
// Text Modification // Text Modification
{ {
core.register_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .D, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)
@ -536,7 +590,9 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
}, "delete selection"); }, "delete selection");
core.register_key_action(input_map, .C, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .C, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)
@ -555,7 +611,9 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
// Copy-Paste // Copy-Paste
{ {
core.register_key_action(input_map, .Y, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .Y, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.yank_selection(state, buffer) core.yank_selection(state, buffer)
@ -567,7 +625,9 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
}, "Yank Line"); }, "Yank Line");
core.register_key_action(input_map, .P, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .P, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)
@ -586,7 +646,9 @@ file_buffer_visual_actions :: proc(input_map: ^core.InputActions) {
file_buffer_text_input_actions :: proc(input_map: ^core.InputActions) { file_buffer_text_input_actions :: proc(input_map: ^core.InputActions) {
core.register_key_action(input_map, .I, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .I, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)
@ -594,7 +656,9 @@ file_buffer_text_input_actions :: proc(input_map: ^core.InputActions) {
sdl2.StartTextInput(); sdl2.StartTextInput();
}, "enter insert mode"); }, "enter insert mode");
core.register_key_action(input_map, .A, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .A, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)
@ -604,14 +668,18 @@ file_buffer_text_input_actions :: proc(input_map: ^core.InputActions) {
}, "enter insert mode after character (append)"); }, "enter insert mode after character (append)");
core.register_key_action(input_map, .U, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .U, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.pop_snapshot(&buffer.history, true) core.pop_snapshot(&buffer.history, true)
ts.parse_buffer(&buffer.tree, core.tree_sitter_file_buffer_input(buffer)) ts.parse_buffer(&buffer.tree, core.tree_sitter_file_buffer_input(buffer))
}, "Undo"); }, "Undo");
core.register_ctrl_key_action(input_map, .R, proc(state: ^core.State, user_data: rawptr) { core.register_ctrl_key_action(input_map, .R, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.recover_snapshot(&buffer.history) core.recover_snapshot(&buffer.history)
ts.parse_buffer(&buffer.tree, core.tree_sitter_file_buffer_input(buffer)) ts.parse_buffer(&buffer.tree, core.tree_sitter_file_buffer_input(buffer))
@ -620,33 +688,33 @@ file_buffer_text_input_actions :: proc(input_map: ^core.InputActions) {
// TODO: add shift+o to insert newline above current one // TODO: add shift+o to insert newline above current one
core.register_key_action(input_map, .O, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .O, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)
if buffer := buffer; buffer != nil { core.move_cursor_end_of_line(buffer);
core.move_cursor_end_of_line(buffer);
char := core.get_character_at_piece_table_index(core.buffer_piece_table(buffer), buffer.history.cursor.index)
char := core.get_character_at_piece_table_index(core.buffer_piece_table(buffer), buffer.history.cursor.index) indent := core.get_buffer_indent(buffer)
indent := core.get_buffer_indent(buffer) if char == '{' {
if char == '{' { // TODO: update tab to be configurable
// TODO: update tab to be configurable indent += 4
indent += 4
}
if char != '\n' {
core.move_cursor_right(buffer, stop_at_end = false)
}
core.insert_content(buffer, []u8{'\n'})
for i in 0..<indent {
core.insert_content(buffer, []u8{' '})
}
state.mode = .Insert;
sdl2.StartTextInput();
} }
if char != '\n' {
core.move_cursor_right(buffer, stop_at_end = false)
}
core.insert_content(buffer, []u8{'\n'})
for i in 0..<indent {
core.insert_content(buffer, []u8{' '})
}
state.mode = .Insert;
sdl2.StartTextInput();
}, "insert mode on newline"); }, "insert mode on newline");
// Copy-Paste // Copy-Paste
@ -656,7 +724,9 @@ file_buffer_text_input_actions :: proc(input_map: ^core.InputActions) {
defer core.register_key_action(input_map, .Y, yank_actions) defer core.register_key_action(input_map, .Y, yank_actions)
core.register_key_action(&yank_actions, .Y, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(&yank_actions, .Y, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.yank_whole_line(state, buffer) core.yank_whole_line(state, buffer)
@ -665,7 +735,9 @@ file_buffer_text_input_actions :: proc(input_map: ^core.InputActions) {
} }
core.register_key_action(input_map, .P, proc(state: ^core.State, user_data: rawptr) { core.register_key_action(input_map, .P, proc(state: ^core.State, user_data: rawptr) {
buffer := &(&(transmute(^core.Panel)user_data).type.(core.FileBufferPanel)).buffer panel := transmute(^core.Panel)user_data
panel_state := &panel.type.(core.FileBufferPanel)
buffer := core.get_buffer(state, panel_state.buffer_id).?
core.push_new_snapshot(&buffer.history) core.push_new_snapshot(&buffer.history)

1
src/tests/tests.odin
View File

@ -19,6 +19,7 @@ new_test_editor :: proc() -> core.State {
source_font_height = 16, source_font_height = 16,
panels = util.make_static_list(core.Panel, 128), panels = util.make_static_list(core.Panel, 128),
buffers = util.make_static_list(core.FileBuffer, 64),
directory = "test_directory", directory = "test_directory",
}; };