cleanup

src/function_manager.rs

@@ -1,7 +1,7 @@
 use crate::consts::is_mobile;
 use crate::function_entry::FunctionEntry;
-use crate::widgets::{move_cursor_to_end, widgets_ontop, Movement};
-use egui::{Button, Key, Modifiers, WidgetText};
+use crate::widgets::{widgets_ontop, Movement};
+use egui::{Button, Key, Modifiers, TextEdit, WidgetText};
 use emath::vec2;
 use parsing::suggestions::Hint;
 use std::ops::BitXorAssign;
@@ -128,7 +128,11 @@ impl FunctionManager {
 
 				// Push cursor to end if needed
 				if movement == Movement::Complete {
-					move_cursor_to_end(ui.ctx(), te_id);
+					let mut state =
+						unsafe { TextEdit::load_state(ui.ctx(), te_id).unwrap_unchecked() };
+					let ccursor = egui::text::CCursor::new(function.autocomplete.string.len());
+					state.set_ccursor_range(Some(egui::text::CCursorRange::one(ccursor)));
+					TextEdit::store_state(ui.ctx(), te_id, state);
 				}
 			}
 

src/widgets.rs

@@ -1,7 +1,5 @@
 use std::intrinsics::assume;
 
-use egui::{text::CCursor, text_edit::CursorRange, TextEdit};
-use epaint::text::cursor::{Cursor, PCursor, RCursor};
 use parsing::suggestions::{self, generate_hint, Hint};
 
 #[derive(PartialEq, Debug)]
@@ -101,24 +99,6 @@ impl<'a> AutoComplete<'a> {
 	}
 }
 
-/// Moves cursor of TextEdit `te_id` to the end
-pub fn move_cursor_to_end(ctx: &egui::Context, te_id: egui::Id) {
-	let mut state = unsafe { TextEdit::load_state(ctx, te_id).unwrap_unchecked() };
-	state.set_cursor_range(Some(CursorRange::one(Cursor {
-		ccursor: CCursor {
-			index: 0,
-			prefer_next_row: false,
-		},
-		rcursor: RCursor { row: 0, column: 0 },
-		pcursor: PCursor {
-			paragraph: 0,
-			offset: 10000,
-			prefer_next_row: false,
-		},
-	})));
-	TextEdit::store_state(ctx, te_id, state);
-}
-
 pub fn widgets_ontop<R>(
 	ui: &egui::Ui, id: String, re: &egui::Response, y_offset: f32,
 	add_contents: impl FnOnce(&mut egui::Ui) -> R,