Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Support ex: in vim modelines (#58121)
Ville Skyttäbeedd3e33598
diff --git a/crates/language/src/modeline.rs b/crates/language/src/modeline.rsindex 8b7e6044492..056b93e716d 100644--- a/crates/language/src/modeline.rs+++ b/crates/language/src/modeline.rs@@ -205,13 +205,16 @@ fn parse_vim_modelines(modelines: &[&str], settings: &mut ModelineSettings) {}}+// Vim requires whitespace before the `{vi:|vim:|ex:}` marker. As an exception,+// `vi:` and `vim:` may also appear at the start of a line, but `ex:` may not as+// Vim ignores a leading `ex:` since it could be short for `example:`.static VIM_MODELINE_PATTERNS: LazyLock<Vec<Regex>> = LazyLock::new(|| {[- // Second form: [text{white}]{vi:vim:Vim:}[white]se[t] {options}:[text]+ // Second form: [text{white}]{vi:|vim:|Vim:|ex:}[white]se[t] {options}:[text]// Allow escaped colons in options: match non-colon chars or backslash followed by any char- r"(?:^|\s)(vi|vim|Vim):(?:\s*)se(?:t)?\s+((?:[^\\:]|\\.)*):",- // First form: [text{white}]{vi:vim:}[white]{options}- r"(?:^|\s+)(vi|vim):(?:\s*(.+))",+ r"(?:(?:^|\s)(?:vi|vim|Vim)|\sex):\s*se(?:t)?\s+((?:[^\\:]|\\.)*):",+ // First form: [text{white}]{vi:|vim:|ex:}[white]{options}+ r"(?:(?:^|\s)(?:vi|vim)|\sex):\s*(.+)",].iter().map(|pattern| Regex::new(pattern).expect("valid regex"))@@ -225,7 +228,7 @@ static VIM_MODELINE_PATTERNS: LazyLock<Vec<Regex>> = LazyLock::new(|| {fn parse_vim_modeline(line: &str, settings: &mut ModelineSettings) {for re in VIM_MODELINE_PATTERNS.iter() {if let Some(captures) = re.captures(line) {- if let Some(options) = captures.get(2) {+ if let Some(options) = captures.get(1) {parse_vim_settings(options.as_str().trim(), settings);break;}@@ -465,6 +468,21 @@ mod tests {..Default::default()});++ // Using `ex:` should only be interpreted when whitespace separates it+ // from the beginning of the line.+ let content = "ex: filetype=shell";+ assert_eq!(parse_modeline(&[content], &[]), None);++ let content = "\tex: filetype=shell";+ let settings = parse_modeline(&[content], &[]).unwrap();+ assert_eq!(+ settings,+ ModelineSettings {+ mode: Some("shell".to_string()),+ ..Default::default()+ }+ );}#[test]