aljaz/notedeck
1
0
Fork 0
mirror of https://github.com/aljazceru/notedeck.git synced 2025-12-19 09:34:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

only show mention hints if prev char is whitespace or at first char

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-03-01 14:46:45 -05:00
parent d3bae69465
commit ea4217d4c8
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/notedeck_columns/src/post.rs
View File

@@ -541,7 +541,7 @@ impl TextBuffer for PostBuffer {
} }
} }
if first_is_desired_char(text, self.mention_indicator) { if first_is_desired_char(&self.text_buffer, text, char_index, self.mention_indicator) {
// if a mention already exists where we're inserting the delim, remove it // if a mention already exists where we're inserting the delim, remove it
let to_remove = self.get_mention(char_index).map(|old_mention| { let to_remove = self.get_mention(char_index).map(|old_mention| {
( (
@@ -673,12 +673,16 @@ impl TextBuffer for PostBuffer {
} }
} }
fn first_is_desired_char(text: &str, desired: char) -> bool { fn first_is_desired_char(
if let Some(char) = text.chars().next() { full_text: &str,
char == desired new_text: &str,
} else { new_text_index: usize,
false desired: char,
} ) -> bool {
new_text.chars().next().map_or(false, |c| {
c == desired
&& (new_text_index == 0 || full_text.chars().nth(new_text_index - 1) == Some(' '))
})
} }
#[derive(Debug)] #[derive(Debug)]
@@ -905,15 +909,24 @@ mod tests {
} }
#[test] #[test]
fn test_insert_mention_after() { fn test_insert_mention_after_text() {
let mut buf = PostBuffer::default(); let mut buf = PostBuffer::default();
buf.insert_text("test text here", 0); buf.insert_text("test text here", 0);
buf.insert_text("@jb55", 4); buf.insert_text("@jb55", 4);
assert!(buf.get_mention(4).is_some()); assert!(buf.mentions.is_empty());
}
#[test]
fn test_insert_mention_with_space_after_text() {
let mut buf = PostBuffer::default();
buf.insert_text("test text here", 0);
buf.insert_text("@jb55", 5);
assert!(buf.get_mention(5).is_some());
assert_eq!(buf.mentions.len(), 1); assert_eq!(buf.mentions.len(), 1);
assert_eq!(buf.mentions.get(&0).unwrap().bounds(), 4..9); assert_eq!(buf.mentions.get(&0).unwrap().bounds(), 5..10);
assert_eq!("test@jb55 text here", buf.as_str()); assert_eq!("test @jb55 text here", buf.as_str());
buf.select_full_mention(0, JB55()); buf.select_full_mention(0, JB55());
@@ -988,13 +1001,14 @@ mod tests {
assert_eq!(mention.bounds(), 0..5); assert_eq!(mention.bounds(), 0..5);
assert_eq!(mention.mention_type, MentionType::Finalized(JB55())); assert_eq!(mention.mention_type, MentionType::Finalized(JB55()));
buf.insert_text("@oops", 3); buf.insert_text(" ", 3);
assert_eq!(buf.as_str(), "@jb@oops55 test"); buf.insert_text("@oops", 4);
assert_eq!(buf.as_str(), "@jb @oops55 test");
assert_eq!(buf.mentions.len(), 1); assert_eq!(buf.mentions.len(), 1);
assert_eq!(buf.mention_ends.len(), 1); assert_eq!(buf.mention_ends.len(), 1);
assert_eq!(buf.mention_starts.len(), 1); assert_eq!(buf.mention_starts.len(), 1);
let mention = buf.mentions.get(&1).unwrap(); let mention = buf.mentions.get(&1).unwrap();
assert_eq!(mention.bounds(), 3..8); assert_eq!(mention.bounds(), 4..9);
assert_eq!(mention.mention_type, MentionType::Pending); assert_eq!(mention.mention_type, MentionType::Pending);
} }