Skip to content

Desktop: Fix reorder not beeing persisted #4002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timon-schelling wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Desktop: Fix reorder not beeing persisted #4002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion desktop/src/app.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ impl App {
self.persistent_data.set_current_document(id);
}
DesktopFrontendMessage::PersistenceUpdateDocumentsList { ids } => {
self.persistent_data.set_document_order(ids);
self.persistent_data.force_document_order(ids);
}
DesktopFrontendMessage::PersistenceWritePreferences { preferences } => {
preferences::write(preferences);
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/persist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ impl PersistentData {
self.flush();
}

pub(crate) fn set_document_order(&mut self, order: Vec<DocumentId>) {
pub(crate) fn force_document_order(&mut self, order: Vec<DocumentId>) {
self.document_order = Some(order);
self.documents.force_order(self.document_order.as_ref().unwrap());
Comment on lines 71 to +72
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot Apr 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The unwrap() call can be avoided by reordering the operations. Passing a reference to order before moving it into self.document_order is more idiomatic and avoids an unnecessary unwrap() on a value that was just assigned.

Suggested change
self.document_order = Some(order);
self.documents.force_order(self.document_order.as_ref().unwrap());
self.documents.force_order(&order);
self.document_order = Some(order);

self.flush();
}

Expand Down Expand Up @@ -148,7 +149,7 @@ impl DocumentStore {
})
}

fn force_order(&mut self, desired_order: &Vec<DocumentId>) {
fn force_order(&mut self, desired_order: &[DocumentId]) {
let mut ordered_prefix_len = 0;
for id in desired_order {
if let Some(offset) = self.0[ordered_prefix_len..].iter().position(|meta| meta.id == *id) {
Expand All @@ -159,7 +160,6 @@ impl DocumentStore {
ordered_prefix_len += 1;
}
}
self.0.truncate(ordered_prefix_len);
}

fn document_ids(&self) -> Vec<DocumentId> {
Expand Down
Loading