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

Update the whitespace docs in the default settings file (#12717)

Browse source
This commit is contained in:
Kirill Bulatov 2024-06-06 08:29:01 +03:00 • committed by GitHub
parent 89641acf2f
commit a574036efd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
assets/settings/default.json
View file

@ -131,14 +131,7 @@
// The default number of lines to expand excerpts in the multibuffer by. // The default number of lines to expand excerpts in the multibuffer by.
"expand_excerpt_lines": 3, "expand_excerpt_lines": 3,
// Globs to match against file paths to determine if a file is private. // Globs to match against file paths to determine if a file is private.
"private_files": [ "private_files": ["**/.env*", "**/*.pem", "**/*.key", "**/*.cert", "**/*.crt", "**/secrets.yml"],
"**/.env*",
"**/*.pem",
"**/*.key",
"**/*.cert",
"**/*.crt",
"**/secrets.yml"
],
// Whether to use additional LSP queries to format (and amend) the code after // Whether to use additional LSP queries to format (and amend) the code after
// every "trigger" symbol input, defined by LSP server capabilities. // every "trigger" symbol input, defined by LSP server capabilities.
"use_on_type_format": true, "use_on_type_format": true,
@ -164,6 +157,12 @@
// "none" // "none"
// 3. Draw all invisible symbols: // 3. Draw all invisible symbols:
// "all" // "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", "show_whitespaces": "selection",
// Settings related to calls in Zed // Settings related to calls in Zed
"calls": { "calls": {

2
crates/language/src/language_settings.rs
View file

@ -391,7 +391,7 @@ pub enum ShowWhitespaceSetting {
None, None,
/// Draw all invisible symbols. /// Draw all invisible symbols.
All, 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: /// For a whitespace to be on a boundary, any of the following conditions need to be met:
/// - It is a tab /// - It is a tab