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

Sanitize another pair of brackets when hovering over a path in the terminal (#23776)

Browse source 
Closes https://github.com/zed-industries/zed/issues/23774

Release Notes:

- Improved terminal hover word matching
This commit is contained in:
Kirill Bulatov 2025-01-28 16:03:48 +02:00 • committed by GitHub
parent b74a273934
commit a5957bfaeb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/terminal/src/terminal.rs
View file

@ -929,22 +929,18 @@ impl Terminal {
} else if let Some(word_match) = regex_match_at(term, point, &mut self.word_regex) {
let file_path = term.bounds_to_string(*word_match.start(), *word_match.end());
let (sanitized_match, sanitized_word) = if file_path.starts_with('[')
&& file_path.ends_with(']')
// this is to avoid sanitizing the match '[]' to an empty string,
// which would be considered a valid navigation target
&& file_path.len() > 2
{
(
Match::new(
word_match.start().add(term, Boundary::Cursor, 1),
word_match.end().sub(term, Boundary::Cursor, 1),
),
file_path[1..file_path.len() - 1].to_owned(),
)
} else {
(word_match, file_path)
};
let (sanitized_match, sanitized_word) =
if is_path_surrounded_by_common_symbols(&file_path) {
(
Match::new(
word_match.start().add(term, Boundary::Cursor, 1),
word_match.end().sub(term, Boundary::Cursor, 1),
),
file_path[1..file_path.len() - 1].to_owned(),
)
} else {
(word_match, file_path)
};
Some((sanitized_word, false, sanitized_match))
} else {
@ -1793,6 +1789,14 @@ impl Terminal {
}
}
fn is_path_surrounded_by_common_symbols(path: &str) -> bool {
// Avoid detecting `[]` or `()` strings as paths, surrounded by common symbols
path.len() > 2
// The rest of the brackets and various quotes cannot be matched by the [`WORD_REGEX`] hence not checked for.
&& (path.starts_with('[') && path.ends_with(']')
|| path.starts_with('(') && path.ends_with(')'))
}
const TASK_DELIMITER: &str = "⏵ ";
fn task_summary(task: &TaskState, error_code: Option<i32>) -> (bool, String, String) {
let escaped_full_label = task.full_label.replace("\r\n", "\r").replace('\n', "\r");