first pass of merging in warp (doesn't build)

crates/vim/src/text_objects/block.rs

@@ -2,14 +2,12 @@
 
 use std::ops::Range;
 
-use galaxyui::text::TextBuffer;
+use galaxyui_core::text::TextBuffer;
 use itertools::Itertools;
 use string_offset::CharOffset;
 
-use crate::{
-    vim::{BracketChar, BracketEnd, BracketType},
-    vim_find_matching_bracket,
-};
+use crate::vim::{BracketChar, BracketEnd, BracketType};
+use crate::vim_find_matching_bracket;
 
 /// Vim's block-based text objects, e.g. `di{`. This includes a string of text enclosed by any pair
 /// of [`BracketType`], not including the brackets themselves.

crates/vim/src/text_objects/block_tests.rs

@@ -1,6 +1,7 @@
-use super::*;
 use unindent::Unindent;
 
+use super::*;
+
 const BLOCK: &str = "match BracketChar::try_from(c) {
         Ok(bracket) => todo!(),
         Err(_) => {

crates/vim/src/text_objects/mod.rs

@@ -7,7 +7,8 @@ mod paragraph;
 mod quote;
 mod word;
 
-pub use self::block::*;
 pub use paragraph::*;
 pub use quote::*;
 pub use word::*;
+
+pub use self::block::*;

crates/vim/src/text_objects/paragraph.rs

@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use galaxyui::text::TextBuffer;
+use galaxyui_core::text::TextBuffer;
 use string_offset::CharOffset;
 
 use crate::{find_next_paragraph_end, find_previous_paragraph_start};

crates/vim/src/text_objects/quote.rs

@@ -1,6 +1,6 @@
 use std::ops::Range;
 
-use galaxyui::text::TextBuffer;
+use galaxyui_core::text::TextBuffer;
 use itertools::Itertools;
 use string_offset::CharOffset;
 

crates/vim/src/text_objects/word.rs

@@ -1,9 +1,10 @@
 use std::ops::Range;
 
-use galaxyui::text::TextBuffer;
+use galaxyui_core::text::TextBuffer;
 use string_offset::CharOffset;
 
-use crate::{vim::WordType, word_iterator::CharacterKind};
+use crate::vim::WordType;
+use crate::word_iterator::CharacterKind;
 
 /// Vim's "inner word" text object, e.g. `diw`. This includes the series of either word chars,
 /// symbols, or whitespace around the cursor.