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

fix panics (#13554)

Browse source 
Release Notes:

- Fixed a panic when editing HTML near the end of a file
- Fixed a panic when editing settings.json from inside the .zed
directory
This commit is contained in:
Conrad Irwin 2024-06-26 14:32:16 -06:00 • committed by GitHub
parent 3a08d7ab43
commit cd81dad2fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/editor/src/editor.rs
View file

@ -2914,6 +2914,9 @@ impl Editor {
let start_offset = TO::to_offset(&range.start, &buffer_snapshot); let start_offset = TO::to_offset(&range.start, &buffer_snapshot);
let end_offset = start_offset + end_difference; let end_offset = start_offset + end_difference;
let start_offset = start_offset + start_difference; let start_offset = start_offset + start_difference;
if start_offset > buffer_snapshot.len() || end_offset > buffer_snapshot.len() {
continue;
}
let start = buffer_snapshot.anchor_after(start_offset); let start = buffer_snapshot.anchor_after(start_offset);
let end = buffer_snapshot.anchor_after(end_offset); let end = buffer_snapshot.anchor_after(end_offset);
linked_edits linked_edits

6
crates/project/src/project.rs
View file

@ -8192,7 +8192,7 @@ impl Project {
} }
}; };
if abs_path.ends_with(local_settings_file_relative_path()) { if path.ends_with(local_settings_file_relative_path()) {
let settings_dir = Arc::from( let settings_dir = Arc::from(
path.ancestors() path.ancestors()
.nth(local_settings_file_relative_path().components().count()) .nth(local_settings_file_relative_path().components().count())
@ -8209,7 +8209,7 @@ impl Project {
}, },
) )
}); });
} else if abs_path.ends_with(local_tasks_file_relative_path()) { } else if path.ends_with(local_tasks_file_relative_path()) {
self.task_inventory().update(cx, |task_inventory, cx| { self.task_inventory().update(cx, |task_inventory, cx| {
if removed { if removed {
task_inventory.remove_local_static_source(&abs_path); task_inventory.remove_local_static_source(&abs_path);
@ -8229,7 +8229,7 @@ impl Project {
); );
} }
}) })
} else if abs_path.ends_with(local_vscode_tasks_file_relative_path()) { } else if path.ends_with(local_vscode_tasks_file_relative_path()) {
self.task_inventory().update(cx, |task_inventory, cx| { self.task_inventory().update(cx, |task_inventory, cx| {
if removed { if removed {
task_inventory.remove_local_static_source(&abs_path); task_inventory.remove_local_static_source(&abs_path);