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

Undo a refactor of buffer_path_log_err (#27828)

Browse source 
Accidentally included this in #27822

Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2025-04-01 01:43:40 -06:00 • committed by GitHub
parent 8075c2458f
commit 5343f1cdaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/assistant2/src/context_store.rs
View file

@ -633,21 +633,17 @@ fn collect_buffer_info_and_text(
pub fn buffer_path_log_err(buffer: &Buffer, cx: &App) -> Option<Arc<Path>> { pub fn buffer_path_log_err(buffer: &Buffer, cx: &App) -> Option<Arc<Path>> {
if let Some(file) = buffer.file() { if let Some(file) = buffer.file() {
Some(file_path(file, cx)) let mut path = file.path().clone();
if path.as_os_str().is_empty() {
path = file.full_path(cx).into();
}
Some(path)
} else { } else {
log::error!("Buffer that had a path unexpectedly no longer has a path."); log::error!("Buffer that had a path unexpectedly no longer has a path.");
None None
} }
} }
pub fn file_path(file: &Arc<dyn File>, cx: &App) -> Arc<Path> {
let mut path = file.path().clone();
if path.as_os_str().is_empty() {
path = file.full_path(cx).into();
}
return path;
}
fn to_fenced_codeblock(path: &Path, content: Rope) -> SharedString { fn to_fenced_codeblock(path: &Path, content: Rope) -> SharedString {
let path_extension = path.extension().and_then(|ext| ext.to_str()); let path_extension = path.extension().and_then(|ext| ext.to_str());
let path_string = path.to_string_lossy(); let path_string = path.to_string_lossy();