From 344a09a4f878381ebacfb12be4c42b7ff38ba80e Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Tue, 22 Aug 2023 01:02:25 +0200 Subject: [PATCH] Rename word_boundaries to word_characters --- crates/language/src/buffer.rs | 2 +- crates/language/src/language.rs | 4 ++-- crates/zed/src/languages/php/config.toml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs index ad457c3236..d032e8e025 100644 --- a/crates/language/src/buffer.rs +++ b/crates/language/src/buffer.rs @@ -3013,7 +3013,7 @@ pub fn char_kind(language: Option<&Arc>, c: char) -> CharKind { return CharKind::Word; } if let Some(language) = language { - if language.config.word_boundaries.contains(&c) { + if language.config.word_characters.contains(&c) { return CharKind::Word; } } diff --git a/crates/language/src/language.rs b/crates/language/src/language.rs index f5e07a077d..82245d67ca 100644 --- a/crates/language/src/language.rs +++ b/crates/language/src/language.rs @@ -345,7 +345,7 @@ pub struct LanguageConfig { #[serde(default)] pub overrides: HashMap, #[serde(default)] - pub word_boundaries: HashSet, + pub word_characters: HashSet, } #[derive(Debug, Default)] @@ -413,7 +413,7 @@ impl Default for LanguageConfig { block_comment: Default::default(), overrides: Default::default(), collapsed_placeholder: Default::default(), - word_boundaries: Default::default(), + word_characters: Default::default(), } } } diff --git a/crates/zed/src/languages/php/config.toml b/crates/zed/src/languages/php/config.toml index be97b80e5e..60dd233555 100644 --- a/crates/zed/src/languages/php/config.toml +++ b/crates/zed/src/languages/php/config.toml @@ -10,4 +10,4 @@ brackets = [ { start = "\"", end = "\"", close = true, newline = false, not_in = ["string"] }, ] collapsed_placeholder = "/* ... */" -word_boundaries = ["$"] +word_characters = ["$"]