Seems like this probably works to fix it, but before we commit it I'd like to understand why the workspace session id is being used in the wrong way deeper in the. code.

@ConradIrwin

when a user quits zed:

• prepare_to_close(quit) is called (workspace.rs:2911)
• condition close_intent != CloseIntent::Quit is false
• remove_from_session is skipped, next time uopen zed session id stays in db, queries it & restores the workspace, This is the correct behavior

when we close a window

• prepare_to_close(CloseWindow) is called (workspace.rs:2911`)
• condition close_intent != CloseIntent::Quit is true
• remove_from_session is called -> sets session_id to NULL in db
  next launch zed uses that session+id doesnt find the row doesnt restore it

when we open a diff project in same window

• open_project calls prepare_to_close(ReplaceWindow) (multi_workspace.rs:677)
• same logic repalce window != quit so remove_from_session is called
• old project's session_id is cleared in db
  new project gets its own db row with valid session_id
  c

the bug when we close proj

• CloseProject hadnler runs (zed.rs:1079)
• it calls open_new directly which creates a fresh empty workspace
• multi_workspace.activate() replaces old workspace entity (multi_workspace.rs:313)
• old entity now dropped on drop, the on_release handler (workspace.rs:1669-1676) but it only removes reference from an inmemory list nothing withthe database
• the old project's db row still has sesssion id set
• next launch zed queries that session id, finds row, restores the closed proj.

my fix

basically adds 2 lines before open_new:

let remove_task = workspace.remove_from_session(window, cx); // clear session_id in db 
remove_task.await; // wait  for db write

tldr : we never call remove_from_session or prepare_to_close

open_project is a good example of doing it correctly? afaik

cx.spawn_in(window, async move |_this, cx| {
    let should_continue = workspace
        .update_in(cx, |workspace, window, cx| {
            workspace.prepare_to_close(crate::CloseIntent::ReplaceWindow, window, cx)  // <-- cleans up DB
        })?
        .await?;
    if should_continue {
        workspace
            .update_in(cx, |workspace, window, cx| {
                workspace.open_workspace_for_paths(true, paths, window, cx)
            })?
            .await
    } else {
        Ok(())
    }
})

hope this helps a lil bit :))

Interesting. Should we call prepare_to_close instead of remove_from_session? It looks like that method also checks for active calls etc.

Interesting. Should we call prepare_to_close instead of remove_from_session? It looks like that method also checks for active calls etc.

@ConradIrwin
i just read into it and this is def better we can also save unsaved files on top of looking at active calls. made the changes

THanks!