From a574036efd13c0ae66ef3d0e57054e798fa1124e Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 6 Jun 2024 08:29:01 +0300
Subject: [PATCH] Update the whitespace docs in the default settings file
 (#12717)

---
 assets/settings/default.json             | 15 +++++++--------
 crates/language/src/language_settings.rs |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 95f43880f1..c6026b1a9e 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -131,14 +131,7 @@
   // The default number of lines to expand excerpts in the multibuffer by.
   "expand_excerpt_lines": 3,
   // Globs to match against file paths to determine if a file is private.
-  "private_files": [
-    "**/.env*",
-    "**/*.pem",
-    "**/*.key",
-    "**/*.cert",
-    "**/*.crt",
-    "**/secrets.yml"
-  ],
+  "private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
   // Whether to use additional LSP queries to format (and amend) the code after
   // every "trigger" symbol input, defined by LSP server capabilities.
   "use_on_type_format": true,
@@ -164,6 +157,12 @@
   //   "none"
   // 3. Draw all invisible symbols:
   //   "all"
+  // 4. Draw whitespaces at boundaries only:
+  //   "boundaries"
+  // For a whitespace to be on a boundary, any of the following conditions need to be met:
+  // - It is a tab
+  // - It is adjacent to an edge (start or end)
+  // - It is adjacent to a whitespace (left or right)
   "show_whitespaces": "selection",
   // Settings related to calls in Zed
   "calls": {
diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs
index 4fb7b03880..a8462f8752 100644
--- a/crates/language/src/language_settings.rs
+++ b/crates/language/src/language_settings.rs
@@ -391,7 +391,7 @@ pub enum ShowWhitespaceSetting {
     None,
     /// Draw all invisible symbols.
     All,
-    /// Draw whitespace only at boundaries.
+    /// Draw whitespaces at boundaries only.
     ///
     /// For a whitespace to be on a boundary, any of the following conditions need to be met:
     /// - It is a tab