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

exit mention on double space

Browse Source 
Signed-off-by: kernelkind <kernelkind@gmail.com>
This commit is contained in:
kernelkind
2025-03-01 15:20:23 -05:00
parent ea4217d4c8
commit 83caa9f814
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -330,6 +330,14 @@ impl PostBuffer {
} }
} }
pub fn delete_mention(&mut self, mention_key: usize) {
if let Some(mention_info) = self.mentions.get(&mention_key) {
self.mention_starts.remove(&mention_info.start_index);
self.mention_ends.remove(&mention_info.end_index);
self.mentions.remove(&mention_key);
}
}
pub fn is_empty(&self) -> bool { pub fn is_empty(&self) -> bool {
self.text_buffer.is_empty() self.text_buffer.is_empty()
} }
@@ -510,6 +518,7 @@ impl TextBuffer for PostBuffer {
.map(|(&k, _)| k) .map(|(&k, _)| k)
.collect(); .collect();
let mut break_mentions = Vec::new();
for cur_end in pending_ends_to_update { for cur_end in pending_ends_to_update {
let mention_key = if let Some(mention_key) = self.mention_ends.get(&cur_end) { let mention_key = if let Some(mention_key) = self.mention_ends.get(&cur_end) {
*mention_key *mention_key
@@ -531,6 +540,13 @@ impl TextBuffer for PostBuffer {
self.mention_starts.insert(new_start, mention_key); self.mention_starts.insert(new_start, mention_key);
mention_info.start_index = new_start; mention_info.start_index = new_start;
} else { } else {
if char_index == mention_info.end_index
&& first_is_desired_char(&self.text_buffer, text, char_index, ' ')
{
// if the user wrote a double space at the end of the mention, break it
break_mentions.push(mention_key);
}
// text is being inserted inside this mention. Make sure it is in the pending state // text is being inserted inside this mention. Make sure it is in the pending state
mention_info.mention_type = MentionType::Pending; mention_info.mention_type = MentionType::Pending;
} }
@@ -541,6 +557,10 @@ impl TextBuffer for PostBuffer {
} }
} }
for mention_key in break_mentions {
self.delete_mention(mention_key);
}
if first_is_desired_char(&self.text_buffer, text, char_index, 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| {