Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use US English spelling of "behavior" and "customize" (#15117)

Browse source 
This PR fixes some instances that weren't using US English spellings of
"behavior" and "customize".

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-07-24 16:36:01 -04:00 • committed by GitHub
parent 9c9a0bd24f
commit 0297a42735
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/zed/src/main.rs
View file

@ -697,27 +697,27 @@ pub(crate) async fn restorable_workspace_locations(
cx: &mut AsyncAppContext,
app_state: &Arc<AppState>,
) -> Option<Vec<workspace::LocalPaths>> {
let mut restore_behaviour = cx
let mut restore_behavior = cx
.update(|cx| WorkspaceSettings::get(None, cx).restore_on_startup)
.ok()?;
let last_session_id = app_state.session.last_session_id();
if last_session_id.is_none()
&& matches!(
restore_behaviour,
workspace::RestoreOnStartupBehaviour::LastSession
restore_behavior,
workspace::RestoreOnStartupBehavior::LastSession
)
{
restore_behaviour = workspace::RestoreOnStartupBehaviour::LastWorkspace;
restore_behavior = workspace::RestoreOnStartupBehavior::LastWorkspace;
}
match restore_behaviour {
workspace::RestoreOnStartupBehaviour::LastWorkspace => {
match restore_behavior {
workspace::RestoreOnStartupBehavior::LastWorkspace => {
workspace::last_opened_workspace_paths()
.await
.map(|location| vec![location])
}
workspace::RestoreOnStartupBehaviour::LastSession => {
workspace::RestoreOnStartupBehavior::LastSession => {
if let Some(last_session_id) = last_session_id {
workspace::last_session_workspace_locations(last_session_id)
.filter(|locations| !locations.is_empty())