helix

diff --git a/helix-lsp/src/client.rs b/helix-lsp/src/client.rs
index 5b3518e8..ee67201b 100644
--- a/helix-lsp/src/client.rs
+++ b/helix-lsp/src/client.rs

@@ -74,7 +74,7 @@ impl Client {

self: &Arc<Self>,

root_markers: &RootMarkers,

manual_roots: &[PathBuf],

- doc_path: Option<&std::path::PathBuf>,

+ doc_path: Option<&std::path::Path>,

may_support_workspace: bool,

) -> bool {

let (workspace, workspace_is_cwd) = find_workspace();

diff --git a/helix-lsp/src/lib.rs b/helix-lsp/src/lib.rs
index ecbf1084..2a910f87 100644
--- a/helix-lsp/src/lib.rs
+++ b/helix-lsp/src/lib.rs

@@ -612,7 +612,7 @@ impl Registry {

&mut self,

ls_config: &LanguageConfiguration,

- doc_path: Option<&std::path::PathBuf>,

+ doc_path: Option<&std::path::Path>,

root_dirs: &[PathBuf],

enable_snippets: bool,

) -> Result<Arc<Client>, StartupError> {

@@ -645,7 +645,7 @@ impl Registry {

&mut self,

language_config: &LanguageConfiguration,

- doc_path: Option<&std::path::PathBuf>,

+ doc_path: Option<&std::path::Path>,

root_dirs: &[PathBuf],

enable_snippets: bool,

) -> Option<Result<Arc<Client>>> {

@@ -700,7 +700,7 @@ impl Registry {

pub fn get<'a>(

&'a mut self,

language_config: &'a LanguageConfiguration,

- doc_path: Option<&'a std::path::PathBuf>,

+ doc_path: Option<&'a std::path::Path>,

root_dirs: &'a [PathBuf],

enable_snippets: bool,

) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {

@@ -888,7 +888,7 @@ fn start_client(

config: &LanguageConfiguration,

ls_config: &LanguageServerConfiguration,

- doc_path: Option<&std::path::PathBuf>,

+ doc_path: Option<&std::path::Path>,

root_dirs: &[PathBuf],

enable_snippets: bool,

) -> Result<NewClient, StartupError> {

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index eaf5d33f..20f6dd3f 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs

@@ -2640,7 +2640,7 @@ fn global_search(cx: &mut Context) {

let documents: Vec<_> = editor

.documents()

- .map(|doc| (doc.path().cloned(), doc.text().to_owned()))

+ .map(|doc| (doc.path().map(ToOwned::to_owned), doc.text().to_owned()))

.collect();

let matcher = match RegexMatcherBuilder::new()

@@ -3300,7 +3300,7 @@ fn buffer_picker(cx: &mut Context) {

let new_meta = |doc: &Document| BufferMeta {

id: doc.id(),

- path: doc.path().cloned(),

+ path: doc.path().map(ToOwned::to_owned),

is_modified: doc.is_modified(),

is_current: doc.id() == current,

focused_at: doc.focused_at,

@@ -3397,7 +3397,7 @@ fn jumplist_picker(cx: &mut Context) {

JumpMeta {

id: doc_id,

- path: doc.and_then(|d| d.path().cloned()),

+ path: doc.and_then(|doc| doc.path().map(ToOwned::to_owned)),

selection,

text,

is_current: view.doc == doc_id,

diff --git a/helix-term/src/commands/dap.rs b/helix-term/src/commands/dap.rs
index 922d0ade..08cec7fc 100644
--- a/helix-term/src/commands/dap.rs
+++ b/helix-term/src/commands/dap.rs

@@ -389,14 +389,13 @@ fn debug_parameter_prompt(

pub fn dap_toggle_breakpoint(cx: &mut Context) {

let (view, doc) = current!(cx.editor);

- let path = match doc.path() {

- Some(path) => path.clone(),

- None => {

- cx.editor

- .set_error("Can't set breakpoint: document has no path");

- return;

- }

+ let Some(path) = doc.path().map(ToOwned::to_owned) else {

+ cx.editor

+ .set_error("Can't set breakpoint: document has no path");

+ return;

};

let text = doc.text().slice(..);

let line = doc.selection(view.id).primary().cursor_line(text);

dap_toggle_breakpoint_impl(cx, path, line);

@@ -644,9 +643,8 @@ pub fn dap_disable_exceptions(cx: &mut Context) {

// TODO: both edit condition and edit log need to be stable: we might get new breakpoints from the debugger which can change offsets

pub fn dap_edit_condition(cx: &mut Context) {

if let Some((pos, breakpoint)) = get_breakpoint_at_current_line(cx.editor) {

- let path = match doc!(cx.editor).path() {

- Some(path) => path.clone(),

- None => return,

+ let Some(path) = doc!(cx.editor).path().map(ToOwned::to_owned) else {

+ return;

};

let callback = Box::pin(async move {

let call: Callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {

@@ -686,9 +684,8 @@ pub fn dap_edit_condition(cx: &mut Context) {

pub fn dap_edit_log(cx: &mut Context) {

if let Some((pos, breakpoint)) = get_breakpoint_at_current_line(cx.editor) {

- let path = match doc!(cx.editor).path() {

- Some(path) => path.clone(),

- None => return,

+ let Some(path) = doc!(cx.editor).path().map(ToOwned::to_owned) else {

+ return;

};

let callback = Box::pin(async move {

let call: Callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {

diff --git a/helix-term/src/commands/syntax.rs b/helix-term/src/commands/syntax.rs
index 1fed4754..31551130 100644
--- a/helix-term/src/commands/syntax.rs
+++ b/helix-term/src/commands/syntax.rs

@@ -324,11 +324,13 @@ pub fn syntax_workspace_symbol_picker(cx: &mut Context) {

let pattern = Arc::new(pattern);

let injector = injector.clone();

let loader = editor.syn_loader.load();

let documents: HashSet<_> = editor

.documents()

.filter_map(Document::path)

- .cloned()

+ .map(ToOwned::to_owned)

.collect();

async move {

let searcher = state.searcher_builder.build();

state.walk_builder.build_parallel().run(|| {

diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 85cf6b1d..a1f8898f 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs

@@ -222,7 +222,7 @@ fn buffer_gather_paths_impl(editor: &mut Editor, args: Args) -> Vec<DocumentId>

for arg in args {

let doc_id = editor.documents().find_map(|doc| {

let arg_path = Some(Path::new(arg.as_ref()));

- if doc.path().map(|p| p.as_path()) == arg_path || doc.relative_path() == arg_path {

+ if doc.path() == arg_path || doc.relative_path() == arg_path {

Some(doc.id())

} else {

None

@@ -1511,11 +1511,11 @@ fn reload(cx: &mut compositor::Context, _args: Args, event: PromptEvent) -> anyh

doc.reload(view, &cx.editor.diff_providers).map(|_| {

view.ensure_cursor_in_view(doc, scrolloff);

})?;

- if let Some(path) = doc.path() {

+ if let Some(path) = doc.path().map(ToOwned::to_owned) {

cx.editor

.language_servers

.file_event_handler

- .file_changed(path.clone());

+ .file_changed(path);

}

Ok(())

}

@@ -1557,11 +1557,11 @@ fn reload_all(cx: &mut compositor::Context, _args: Args, event: PromptEvent) ->

continue;

}

- if let Some(path) = doc.path() {

+ if let Some(path) = doc.path().map(ToOwned::to_owned) {

cx.editor

.language_servers

.file_event_handler

- .file_changed(path.clone());

+ .file_changed(path);

}

for view_id in view_ids {

@@ -2736,8 +2736,8 @@ fn move_buffer_impl(

let doc = doc!(cx.editor);

let old_path = doc

.path()

- .context("Scratch buffer cannot be moved. Use :write instead")?

- .clone();

+ .map(ToOwned::to_owned)

+ .context("Scratch buffer cannot be moved. Use :write instead")?;

// if new_path is a directory, append the original file name

// to move the file into that directory.

diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 3626c5dd..0e51ec7e 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs

@@ -1257,9 +1257,8 @@ impl EditorView {

let (view, doc) = current!(cxt.editor);

- let path = match doc.path() {

- Some(path) => path.clone(),

- None => return EventResult::Ignored(None),

+ let Some(path) = doc.path().map(ToOwned::to_owned) else {

+ return EventResult::Ignored(None);

};

if let Some(char_idx) =

diff --git a/helix-term/src/ui/statusline.rs b/helix-term/src/ui/statusline.rs
index 381efd90..ac542137 100644
--- a/helix-term/src/ui/statusline.rs
+++ b/helix-term/src/ui/statusline.rs

@@ -463,11 +463,11 @@ where

F: Fn(&mut RenderContext<'a>, Span<'a>) + Copy,

{

let title = {

- let path = context.doc.path();

- let path = path

+ let path = context

+ .doc

+ .path()

.as_ref()

- .map(|p| p.to_string_lossy())

- .unwrap_or_else(|| SCRATCH_BUFFER_NAME.into());

+ .map_or_else(|| SCRATCH_BUFFER_NAME.into(), |p| p.to_string_lossy());

format!(" {} ", path)

};

diff --git a/helix-term/tests/test/commands/write.rs b/helix-term/tests/test/commands/write.rs
index d1419b08..5b4dd148 100644
--- a/helix-term/tests/test/commands/write.rs
+++ b/helix-term/tests/test/commands/write.rs

@@ -118,7 +118,10 @@ async fn test_write_quit_fail() -> anyhow::Result<()> {

assert_eq!(1, docs.len());

let doc = docs.pop().unwrap();

- assert_eq!(Some(&path::normalize(file.path())), doc.path());

+ assert_eq!(

+ Some(path::normalize(file.path())),

+ doc.path().map(ToOwned::to_owned)

+ );

assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);

}),

false,

@@ -359,7 +362,10 @@ async fn test_write_scratch_to_new_path() -> anyhow::Result<()> {

assert_eq!(1, docs.len());

let doc = docs.pop().unwrap();

- assert_eq!(Some(&path::normalize(file.path())), doc.path());

+ assert_eq!(

+ Some(path::normalize(file.path())),

+ doc.path().map(ToOwned::to_owned)

+ );

}),

false,

)

@@ -385,7 +391,10 @@ async fn test_write_scratch_to_new_path_force_creates_file() -> anyhow::Result<(

assert_eq!(1, docs.len());

let doc = docs.pop().unwrap();

- assert_eq!(Some(&path::normalize(&new_path)), doc.path());

+ assert_eq!(

+ Some(path::normalize(&new_path)),

+ doc.path().map(ToOwned::to_owned)

+ );

}),

false,

)

@@ -772,7 +781,10 @@ async fn test_symlink_write_fail() -> anyhow::Result<()> {

assert_eq!(1, docs.len());

let doc = docs.pop().unwrap();

- assert_eq!(Some(&path::normalize(&symlink_path)), doc.path());

+ assert_eq!(

+ Some(path::normalize(&symlink_path)),

+ doc.path().map(ToOwned::to_owned)

+ );

assert_eq!(&Severity::Error, app.editor.get_status().unwrap().1);

}),

false,

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
index 4b3e1bba..ec88266b 100644
--- a/helix-view/src/document.rs
+++ b/helix-view/src/document.rs

@@ -2015,8 +2015,8 @@ impl Document {

#[inline]

/// File path on disk.

- pub fn path(&self) -> Option<&PathBuf> {

- self.path.as_ref()

+ pub fn path(&self) -> Option<&Path> {

+ self.path.as_deref()

}

/// File path as a URL.

@@ -2025,7 +2025,7 @@ impl Document {

}

pub fn uri(&self) -> Option<helix_core::Uri> {

- Some(self.path()?.clone().into())

+ Some(self.path()?.into())

}

#[inline]

diff --git a/helix-view/src/editor.rs b/helix-view/src/editor.rs
index 2146bc87..62cf3592 100644
--- a/helix-view/src/editor.rs
+++ b/helix-view/src/editor.rs

@@ -1648,7 +1648,7 @@ impl Editor {

let Some(doc_url) = doc.url() else {

return;

};

- let (lang, path) = (doc.language.clone(), doc.path().cloned());

+ let (lang, path) = (doc.language.clone(), doc.path());

let config = doc.config.load();

let root_dirs = &config.workspace_lsp_roots;

@@ -1664,7 +1664,7 @@ impl Editor {

// store only successfully started language servers

let language_servers = lang.as_ref().map_or_else(HashMap::default, |language| {

self.language_servers

- .get(language, path.as_ref(), root_dirs, config.lsp.snippets)

+ .get(language, path, root_dirs, config.lsp.snippets)

.filter_map(|(lang, client)| match client {

Ok(client) => Some((lang, client)),

Err(err) => {

@@ -2179,12 +2179,12 @@ impl Editor {

pub fn document_by_path<P: AsRef<Path>>(&self, path: P) -> Option<&Document> {

self.documents()

- .find(|doc| doc.path().map(|p| p == path.as_ref()).unwrap_or(false))

+ .find(|doc| doc.path().is_some_and(|p| p == path.as_ref()))

}

pub fn document_by_path_mut<P: AsRef<Path>>(&mut self, path: P) -> Option<&mut Document> {

self.documents_mut()

- .find(|doc| doc.path().map(|p| p == path.as_ref()).unwrap_or(false))

+ .find(|doc| doc.path().is_some_and(|p| p == path.as_ref()))

}

/// Returns all supported diagnostics for the document

diff --git a/helix-view/src/gutter.rs b/helix-view/src/gutter.rs
index 821889b8..f4a57f5f 100644
--- a/helix-view/src/gutter.rs
+++ b/helix-view/src/gutter.rs

@@ -284,8 +284,9 @@ fn execution_pause_indicator<'doc>(

frame

.source

.as_ref()

- .and_then(|source| source.path.as_ref())

+ .and_then(|source| source.path.as_deref())

});

let should_display_for_current_doc =

doc.path().is_some() && frame_source_path.unwrap_or(None) == doc.path();