From b27ef82ecd2c04f011025bdd3b96b87817872b9e Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Thu, 10 Aug 2023 17:03:01 +0800 Subject: [PATCH] refactor: `current_name` --- core/src/manager/tab.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/manager/tab.rs b/core/src/manager/tab.rs index 3117dba8..78706e25 100644 --- a/core/src/manager/tab.rs +++ b/core/src/manager/tab.rs @@ -271,8 +271,13 @@ impl Tab { true } - pub fn current_name(&self) -> &str { - self.current.cwd.file_name().and_then(|name| name.to_str()).unwrap_or_default() + pub fn current_name(&self) -> Option<&str> { + self + .current + .cwd + .file_name() + .and_then(|name| name.to_str()) + .or_else(|| self.current.cwd.to_str()) } }