Fix styling of titlebar highlights

Mikayla Maki created 2 years ago

Change summary

crates/collab_ui/src/collab_titlebar_item.rs | 4 ++--
crates/rpc/src/proto.rs                      | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

Detailed changes

crates/collab_ui/src/collab_titlebar_item.rs

@@ -201,12 +201,12 @@ impl CollabTitlebarItem {
         let mut title = String::new();
         let mut names_and_branches = names_and_branches.peekable();
         while let Some((name, entry)) = names_and_branches.next() {
+            let pre_index = index;
             push_str(&mut title, &mut index, name);
+            indices.extend((pre_index..index).into_iter());
             if let Some(branch) = entry.and_then(|entry| entry.branch()) {
                 push_str(&mut title, &mut index, "/");
-                let pre_index = index;
                 push_str(&mut title, &mut index, &branch);
-                indices.extend((pre_index..index).into_iter())
             }
             if names_and_branches.peek().is_some() {
                 push_str(&mut title, &mut index, ", ");

crates/rpc/src/proto.rs

@@ -504,7 +504,7 @@ pub fn split_worktree_update(
 
         done = message.updated_entries.is_empty() && message.removed_entries.is_empty();
 
-        // Wait to send repositories until after we've guarnteed that their associated entries
+        // Wait to send repositories until after we've guaranteed that their associated entries
         // will be read
         let updated_repositories = if done {
             mem::take(&mut message.updated_repositories)