.zed/settings.json π
@@ -21,5 +21,7 @@
"formatter": "prettier"
}
},
- "formatter": "auto"
+ "formatter": "auto",
+ "remove_trailing_whitespace_on_save": true,
+ "ensure_final_newline_on_save": true
}
Joseph T. Lyons created
I saved the `file_types.json` file and got a diff because it had some
trailing whitespace. I ran
[`lineman`](https://github.com/JosephTLyons/lineman) on the codebase.
I've done this before, but this time, I've added in the following
settings to our `.zed` local settings, to make sure every future save
respects our desire to have consistent whitespace formatting.
```json
"remove_trailing_whitespace_on_save": true,
"ensure_final_newline_on_save": true
```
Release Notes:
- N/A
.zed/settings.json | 4 +++-
assets/icons/file_icons/file_types.json | 2 +-
assets/icons/mail_open.svg | 2 +-
assets/icons/trash.svg | 2 +-
assets/icons/word_search.svg | 0
crates/db/README.md | 2 +-
crates/languages/src/bash/redactions.scm | 2 +-
crates/languages/src/c/highlights.scm | 1 -
crates/languages/src/c/injections.scm | 2 +-
crates/languages/src/cpp/injections.scm | 2 +-
crates/languages/src/javascript/injections.scm | 4 ++--
crates/languages/src/jsdoc/brackets.scm | 2 +-
crates/languages/src/json/highlights.scm | 2 +-
crates/languages/src/json/overrides.scm | 2 +-
crates/languages/src/json/redactions.scm | 2 +-
crates/languages/src/ruby/brackets.scm | 2 +-
crates/languages/src/rust/brackets.scm | 2 +-
crates/languages/src/rust/injections.scm | 2 +-
crates/languages/src/tsx/injections.scm | 2 +-
crates/languages/src/typescript/injections.scm | 2 +-
crates/languages/src/yaml/highlights.scm | 6 +++---
crates/languages/src/yaml/outline.scm | 2 +-
crates/terminal_view/scripts/truecolor.sh | 2 +-
crates/vim/test_data/test_replace_mode_undo.json | 2 +-
crates/zed/resources/windows/manifest.xml | 6 +++---
extensions/clojure/languages/clojure/outline.scm | 1 -
extensions/html/languages/html/overrides.scm | 2 +-
extensions/lua/languages/lua/brackets.scm | 2 +-
extensions/lua/languages/lua/indents.scm | 2 +-
extensions/lua/languages/lua/outline.scm | 2 +-
extensions/ocaml/languages/ocaml/brackets.scm | 1 -
extensions/ocaml/languages/ocaml/highlights.scm | 2 +-
extensions/ocaml/languages/ocaml/indents.scm | 2 +-
extensions/ocaml/languages/ocaml/outline.scm | 4 ++--
extensions/racket/languages/racket/outline.scm | 2 +-
extensions/scheme/languages/scheme/outline.scm | 2 +-
extensions/toml/languages/toml/outline.scm | 2 +-
extensions/toml/languages/toml/redactions.scm | 2 +-
script/licenses/template.hbs.md | 6 +++---
39 files changed, 45 insertions(+), 46 deletions(-)
@@ -21,5 +21,7 @@
"formatter": "prettier"
}
},
- "formatter": "auto"
+ "formatter": "auto",
+ "remove_trailing_whitespace_on_save": true,
+ "ensure_final_newline_on_save": true
}
@@ -329,7 +329,7 @@
},
"tcl": {
"icon": "icons/file_icons/tcl.svg"
- },
+ },
"vcs": {
"icon": "icons/file_icons/git.svg"
},
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-mail-open"><path d="M21.2 8.4c.5.38.8.97.8 1.6v10a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V10a2 2 0 0 1 .8-1.6l8-6a2 2 0 0 1 2.4 0l8 6Z"/><path d="m22 10-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 10"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-mail-open"><path d="M21.2 8.4c.5.38.8.97.8 1.6v10a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V10a2 2 0 0 1 .8-1.6l8-6a2 2 0 0 1 2.4 0l8 6Z"/><path d="m22 10-8.97 5.7a1.94 1.94 0 0 1-2.06 0L2 10"/></svg>
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trash-2"><path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/><line x1="10" x2="10" y1="11" y2="17"/><line x1="14" x2="14" y1="11" y2="17"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-trash-2"><path d="M3 6h18"/><path d="M19 6v14c0 1-1 2-2 2H7c-1 0-2-1-2-2V6"/><path d="M8 6V4c0-1 1-2 2-2h4c1 0 2 1 2 2v2"/><line x1="10" x2="10" y1="11" y2="17"/><line x1="14" x2="14" y1="11" y2="17"/></svg>
@@ -3,4 +3,3 @@
@@ -2,4 +2,4 @@
First, craft your test data. The examples folder shows a template for building a test-db, and can be ran with `cargo run --example [your-example]`.
-To actually use and test your queries, import the generated DB file into https://sqliteonline.com/
+To actually use and test your queries, import the generated DB file into https://sqliteonline.com/
@@ -1,2 +1,2 @@
(variable_assignment
- value: (_) @redact)
+ value: (_) @redact)
@@ -106,4 +106,3 @@
(primitive_type)
(sized_type_specifier)
] @type
-
@@ -4,4 +4,4 @@
(preproc_function_def
value: (preproc_arg) @content
- (#set! "language" "c"))
+ (#set! "language" "c"))
@@ -4,4 +4,4 @@
(preproc_function_def
value: (preproc_arg) @content
- (#set! "language" "c++"))
+ (#set! "language" "c++"))
@@ -1,5 +1,5 @@
((comment) @content
(#set! "language" "jsdoc"))
-
+
((regex) @content
- (#set! "language" "regex"))
+ (#set! "language" "regex"))
@@ -1,2 +1,2 @@
("[" @open "]" @close)
-("{" @open "}" @close)
+("{" @open "}" @close)
@@ -18,4 +18,4 @@
"}"
"["
"]"
-] @punctuation.bracket
+] @punctuation.bracket
@@ -1 +1 @@
-(string) @string
+(string) @string
@@ -1,4 +1,4 @@
(pair value: (number) @redact)
(pair value: (string) @redact)
(array (number) @redact)
-(array (string) @redact)
+(array (string) @redact)
@@ -11,4 +11,4 @@
(begin "begin" @open "end" @close)
(module "module" @open "end" @close)
(_ . "def" @open "end" @close)
-(_ . "class" @open "end" @close)
+(_ . "class" @open "end" @close)
@@ -3,4 +3,4 @@
("{" @open "}" @close)
("<" @open ">" @close)
("\"" @open "\"" @close)
-(closure_parameters "|" @open "|" @close)
+(closure_parameters "|" @open "|" @close)
@@ -4,4 +4,4 @@
(macro_rule
(token_tree) @content
- (#set! "language" "rust"))
+ (#set! "language" "rust"))
@@ -2,4 +2,4 @@
(#set! "language" "jsdoc"))
((regex) @content
- (#set! "language" "regex"))
+ (#set! "language" "regex"))
@@ -2,4 +2,4 @@
(#set! "language" "jsdoc"))
((regex) @content
- (#set! "language" "regex"))
+ (#set! "language" "regex"))
@@ -20,10 +20,10 @@
[
(anchor_name)
(alias_name)
- (tag)
+ (tag)
] @type
-key: (flow_node (plain_scalar (string_scalar) @property))
+key: (flow_node (plain_scalar (string_scalar) @property))
[
","
@@ -46,4 +46,4 @@ key: (flow_node (plain_scalar (string_scalar) @property))
"&"
"---"
"..."
-] @punctuation.special
+] @punctuation.special
@@ -1 +1 @@
-(block_mapping_pair key: (flow_node (plain_scalar (string_scalar) @name))) @item
+(block_mapping_pair key: (flow_node (plain_scalar (string_scalar) @name))) @item
@@ -16,4 +16,4 @@ awk -v term_cols="${width:-$(tput cols || echo 80)}" -v term_lines="${height:-1}
if (colnum%term_cols==term_cols) printf "\n";
}
printf "\n";
-}'
+}'
@@ -121,4 +121,4 @@
{"Key":"backspace"}
{"Key":"backspace"}
{"Key":"backspace"}
-{"Get":{"state":"The quick browΛn\nfox jumps over\nthe lazy Λdog.","mode":"Replace"}}
+{"Get":{"state":"The quick browΛn\nfox jumps over\nthe lazy Λdog.","mode":"Replace"}}
@@ -7,9 +7,9 @@
</asmv3:application>
<dependency>
<dependentAssembly>
- <assemblyIdentity type='win32'
- name='Microsoft.Windows.Common-Controls'
- version='6.0.0.0' processorArchitecture='*'
+ <assemblyIdentity type='win32'
+ name='Microsoft.Windows.Common-Controls'
+ version='6.0.0.0' processorArchitecture='*'
publicKeyToken='6595b64144ccf1df' />
</dependentAssembly>
</dependency>
@@ -1 +0,0 @@
-
@@ -1,2 +1,2 @@
(comment) @comment
-(quoted_attribute_value) @string
+(quoted_attribute_value) @string
@@ -1,3 +1,3 @@
("[" @open "]" @close)
("{" @open "}" @close)
-("(" @open ")" @close)
+("(" @open ")" @close)
@@ -7,4 +7,4 @@
(_ "[" "]" @end) @indent
(_ "{" "}" @end) @indent
-(_ "(" ")" @end) @indent
+(_ "(" ")" @end) @indent
@@ -1,3 +1,3 @@
(function_declaration
"function" @context
- name: (_) @name) @item
+ name: (_) @name) @item
@@ -4,4 +4,3 @@
("{" @open "}" @close)
("<" @open ">" @close)
("\"" @open "\"" @close)
-
@@ -131,7 +131,7 @@
(extension)
(item_extension)
(quoted_extension)
- (quoted_item_extension)
+ (quoted_item_extension)
"%"
] @attribute
@@ -3,7 +3,7 @@
(type_binding)
(method_definition)
-
+
(external)
(value_specification)
(method_specification)
@@ -17,7 +17,7 @@
"module" @context
"type" @context
name: (_) @name) @item
-
+
(type_definition
"type" @context
(type_binding name: (_) @name)) @item
@@ -25,7 +25,7 @@
(value_specification
"val" @context
(value_name) @name) @item
-
+
(class_definition
"class" @context
(class_binding
@@ -7,4 +7,4 @@
(list . (symbol) @name)
]
(#match? @start-symbol "^define")
-) @item
+) @item
@@ -7,4 +7,4 @@
(list . (symbol) @name)
]
(#match? @start-symbol "^define")
-) @item
+) @item
@@ -12,4 +12,4 @@
(pair
.
- (_) @name) @item
+ (_) @name) @item
@@ -1 +1 @@
-(pair (bare_key) "=" (_) @redact)
+(pair (bare_key) "=" (_) @redact)
@@ -8,14 +8,14 @@
{{#each licenses}}
#### {{name}}
-
+
##### Used by:
{{#each used_by}}
* [{{crate.name}} {{crate.version}}]({{#if crate.repository}} {{crate.repository}} {{else}} https://crates.io/crates/{{crate.name}} {{/if}})
{{/each}}
-
+
{{text}}
--------------------------------------------------------------------------------
-{{/each}}
+{{/each}}