diff --git a/.zed/settings.json b/.zed/settings.json index dbafa2115a..eedf2f3753 100644 --- a/.zed/settings.json +++ b/.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 } diff --git a/assets/icons/file_icons/file_types.json b/assets/icons/file_icons/file_types.json index 5a587b02cf..0ee203c3c7 100644 --- a/assets/icons/file_icons/file_types.json +++ b/assets/icons/file_icons/file_types.json @@ -329,7 +329,7 @@ }, "tcl": { "icon": "icons/file_icons/tcl.svg" - }, + }, "vcs": { "icon": "icons/file_icons/git.svg" }, diff --git a/assets/icons/mail_open.svg b/assets/icons/mail_open.svg index b63915bd73..b857037b86 100644 --- a/assets/icons/mail_open.svg +++ b/assets/icons/mail_open.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/assets/icons/trash.svg b/assets/icons/trash.svg index 94d7971f9b..b71035b99c 100644 --- a/assets/icons/trash.svg +++ b/assets/icons/trash.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/assets/icons/word_search.svg b/assets/icons/word_search.svg index adb4976bcc..beca4cbe82 100644 --- a/assets/icons/word_search.svg +++ b/assets/icons/word_search.svg @@ -3,4 +3,3 @@ - diff --git a/crates/db/README.md b/crates/db/README.md index d4ea2fee39..b734a2e3a3 100644 --- a/crates/db/README.md +++ b/crates/db/README.md @@ -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/ \ No newline at end of file +To actually use and test your queries, import the generated DB file into https://sqliteonline.com/ diff --git a/crates/languages/src/bash/redactions.scm b/crates/languages/src/bash/redactions.scm index 88b38f42fc..000cb042a5 100644 --- a/crates/languages/src/bash/redactions.scm +++ b/crates/languages/src/bash/redactions.scm @@ -1,2 +1,2 @@ (variable_assignment - value: (_) @redact) \ No newline at end of file + value: (_) @redact) diff --git a/crates/languages/src/c/highlights.scm b/crates/languages/src/c/highlights.scm index 064ec61a37..0a8c12f06f 100644 --- a/crates/languages/src/c/highlights.scm +++ b/crates/languages/src/c/highlights.scm @@ -106,4 +106,3 @@ (primitive_type) (sized_type_specifier) ] @type - diff --git a/crates/languages/src/c/injections.scm b/crates/languages/src/c/injections.scm index 845a63bd1b..2696594af2 100644 --- a/crates/languages/src/c/injections.scm +++ b/crates/languages/src/c/injections.scm @@ -4,4 +4,4 @@ (preproc_function_def value: (preproc_arg) @content - (#set! "language" "c")) \ No newline at end of file + (#set! "language" "c")) diff --git a/crates/languages/src/cpp/injections.scm b/crates/languages/src/cpp/injections.scm index eca372d577..076703c809 100644 --- a/crates/languages/src/cpp/injections.scm +++ b/crates/languages/src/cpp/injections.scm @@ -4,4 +4,4 @@ (preproc_function_def value: (preproc_arg) @content - (#set! "language" "c++")) \ No newline at end of file + (#set! "language" "c++")) diff --git a/crates/languages/src/javascript/injections.scm b/crates/languages/src/javascript/injections.scm index 2003675245..0df1691e7e 100644 --- a/crates/languages/src/javascript/injections.scm +++ b/crates/languages/src/javascript/injections.scm @@ -1,5 +1,5 @@ ((comment) @content (#set! "language" "jsdoc")) - + ((regex) @content - (#set! "language" "regex")) \ No newline at end of file + (#set! "language" "regex")) diff --git a/crates/languages/src/jsdoc/brackets.scm b/crates/languages/src/jsdoc/brackets.scm index 24453c9da9..0e1bf5ca19 100644 --- a/crates/languages/src/jsdoc/brackets.scm +++ b/crates/languages/src/jsdoc/brackets.scm @@ -1,2 +1,2 @@ ("[" @open "]" @close) -("{" @open "}" @close) \ No newline at end of file +("{" @open "}" @close) diff --git a/crates/languages/src/json/highlights.scm b/crates/languages/src/json/highlights.scm index 12bde13e51..7116805109 100644 --- a/crates/languages/src/json/highlights.scm +++ b/crates/languages/src/json/highlights.scm @@ -18,4 +18,4 @@ "}" "[" "]" -] @punctuation.bracket \ No newline at end of file +] @punctuation.bracket diff --git a/crates/languages/src/json/overrides.scm b/crates/languages/src/json/overrides.scm index 746dbc5cd9..cc966ad4c1 100644 --- a/crates/languages/src/json/overrides.scm +++ b/crates/languages/src/json/overrides.scm @@ -1 +1 @@ -(string) @string \ No newline at end of file +(string) @string diff --git a/crates/languages/src/json/redactions.scm b/crates/languages/src/json/redactions.scm index be985f018c..7359637244 100644 --- a/crates/languages/src/json/redactions.scm +++ b/crates/languages/src/json/redactions.scm @@ -1,4 +1,4 @@ (pair value: (number) @redact) (pair value: (string) @redact) (array (number) @redact) -(array (string) @redact) \ No newline at end of file +(array (string) @redact) diff --git a/crates/languages/src/ruby/brackets.scm b/crates/languages/src/ruby/brackets.scm index 957b20ecdb..f5129f8f31 100644 --- a/crates/languages/src/ruby/brackets.scm +++ b/crates/languages/src/ruby/brackets.scm @@ -11,4 +11,4 @@ (begin "begin" @open "end" @close) (module "module" @open "end" @close) (_ . "def" @open "end" @close) -(_ . "class" @open "end" @close) \ No newline at end of file +(_ . "class" @open "end" @close) diff --git a/crates/languages/src/rust/brackets.scm b/crates/languages/src/rust/brackets.scm index 0be534c48c..eeee5f0e26 100644 --- a/crates/languages/src/rust/brackets.scm +++ b/crates/languages/src/rust/brackets.scm @@ -3,4 +3,4 @@ ("{" @open "}" @close) ("<" @open ">" @close) ("\"" @open "\"" @close) -(closure_parameters "|" @open "|" @close) \ No newline at end of file +(closure_parameters "|" @open "|" @close) diff --git a/crates/languages/src/rust/injections.scm b/crates/languages/src/rust/injections.scm index 57ebea8539..0ce91f2287 100644 --- a/crates/languages/src/rust/injections.scm +++ b/crates/languages/src/rust/injections.scm @@ -4,4 +4,4 @@ (macro_rule (token_tree) @content - (#set! "language" "rust")) \ No newline at end of file + (#set! "language" "rust")) diff --git a/crates/languages/src/tsx/injections.scm b/crates/languages/src/tsx/injections.scm index 8aca54dbd2..0df1691e7e 100644 --- a/crates/languages/src/tsx/injections.scm +++ b/crates/languages/src/tsx/injections.scm @@ -2,4 +2,4 @@ (#set! "language" "jsdoc")) ((regex) @content - (#set! "language" "regex")) \ No newline at end of file + (#set! "language" "regex")) diff --git a/crates/languages/src/typescript/injections.scm b/crates/languages/src/typescript/injections.scm index 8aca54dbd2..0df1691e7e 100644 --- a/crates/languages/src/typescript/injections.scm +++ b/crates/languages/src/typescript/injections.scm @@ -2,4 +2,4 @@ (#set! "language" "jsdoc")) ((regex) @content - (#set! "language" "regex")) \ No newline at end of file + (#set! "language" "regex")) diff --git a/crates/languages/src/yaml/highlights.scm b/crates/languages/src/yaml/highlights.scm index 06081f63cb..0e66aca66d 100644 --- a/crates/languages/src/yaml/highlights.scm +++ b/crates/languages/src/yaml/highlights.scm @@ -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 \ No newline at end of file +] @punctuation.special diff --git a/crates/languages/src/yaml/outline.scm b/crates/languages/src/yaml/outline.scm index e85eb1bf8a..7ab007835f 100644 --- a/crates/languages/src/yaml/outline.scm +++ b/crates/languages/src/yaml/outline.scm @@ -1 +1 @@ -(block_mapping_pair key: (flow_node (plain_scalar (string_scalar) @name))) @item \ No newline at end of file +(block_mapping_pair key: (flow_node (plain_scalar (string_scalar) @name))) @item diff --git a/crates/terminal_view/scripts/truecolor.sh b/crates/terminal_view/scripts/truecolor.sh index 14e5d81308..c11037b100 100755 --- a/crates/terminal_view/scripts/truecolor.sh +++ b/crates/terminal_view/scripts/truecolor.sh @@ -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"; -}' \ No newline at end of file +}' diff --git a/crates/vim/test_data/test_replace_mode_undo.json b/crates/vim/test_data/test_replace_mode_undo.json index 7628a27fb4..3488030ee7 100644 --- a/crates/vim/test_data/test_replace_mode_undo.json +++ b/crates/vim/test_data/test_replace_mode_undo.json @@ -121,4 +121,4 @@ {"Key":"backspace"} {"Key":"backspace"} {"Key":"backspace"} -{"Get":{"state":"The quick browˇn\nfox jumps over\nthe lazy ˇdog.","mode":"Replace"}} \ No newline at end of file +{"Get":{"state":"The quick browˇn\nfox jumps over\nthe lazy ˇdog.","mode":"Replace"}} diff --git a/crates/zed/resources/windows/manifest.xml b/crates/zed/resources/windows/manifest.xml index 5490c54d07..5a69b43486 100644 --- a/crates/zed/resources/windows/manifest.xml +++ b/crates/zed/resources/windows/manifest.xml @@ -7,9 +7,9 @@ - diff --git a/extensions/clojure/languages/clojure/outline.scm b/extensions/clojure/languages/clojure/outline.scm index 8b13789179..e69de29bb2 100644 --- a/extensions/clojure/languages/clojure/outline.scm +++ b/extensions/clojure/languages/clojure/outline.scm @@ -1 +0,0 @@ - diff --git a/extensions/html/languages/html/overrides.scm b/extensions/html/languages/html/overrides.scm index 97accffd67..7108d48fbd 100644 --- a/extensions/html/languages/html/overrides.scm +++ b/extensions/html/languages/html/overrides.scm @@ -1,2 +1,2 @@ (comment) @comment -(quoted_attribute_value) @string \ No newline at end of file +(quoted_attribute_value) @string diff --git a/extensions/lua/languages/lua/brackets.scm b/extensions/lua/languages/lua/brackets.scm index 5f5bd60b93..62e137ef26 100644 --- a/extensions/lua/languages/lua/brackets.scm +++ b/extensions/lua/languages/lua/brackets.scm @@ -1,3 +1,3 @@ ("[" @open "]" @close) ("{" @open "}" @close) -("(" @open ")" @close) \ No newline at end of file +("(" @open ")" @close) diff --git a/extensions/lua/languages/lua/indents.scm b/extensions/lua/languages/lua/indents.scm index 71e15a0c33..ed26c5a8f0 100644 --- a/extensions/lua/languages/lua/indents.scm +++ b/extensions/lua/languages/lua/indents.scm @@ -7,4 +7,4 @@ (_ "[" "]" @end) @indent (_ "{" "}" @end) @indent -(_ "(" ")" @end) @indent \ No newline at end of file +(_ "(" ")" @end) @indent diff --git a/extensions/lua/languages/lua/outline.scm b/extensions/lua/languages/lua/outline.scm index 8bd8d88070..aa59d17247 100644 --- a/extensions/lua/languages/lua/outline.scm +++ b/extensions/lua/languages/lua/outline.scm @@ -1,3 +1,3 @@ (function_declaration "function" @context - name: (_) @name) @item \ No newline at end of file + name: (_) @name) @item diff --git a/extensions/ocaml/languages/ocaml/brackets.scm b/extensions/ocaml/languages/ocaml/brackets.scm index 6afe4638fd..269d87778d 100644 --- a/extensions/ocaml/languages/ocaml/brackets.scm +++ b/extensions/ocaml/languages/ocaml/brackets.scm @@ -4,4 +4,3 @@ ("{" @open "}" @close) ("<" @open ">" @close) ("\"" @open "\"" @close) - diff --git a/extensions/ocaml/languages/ocaml/highlights.scm b/extensions/ocaml/languages/ocaml/highlights.scm index 41db5a403e..6623e1e543 100644 --- a/extensions/ocaml/languages/ocaml/highlights.scm +++ b/extensions/ocaml/languages/ocaml/highlights.scm @@ -131,7 +131,7 @@ (extension) (item_extension) (quoted_extension) - (quoted_item_extension) + (quoted_item_extension) "%" ] @attribute diff --git a/extensions/ocaml/languages/ocaml/indents.scm b/extensions/ocaml/languages/ocaml/indents.scm index 10995d15ab..319d2fd971 100644 --- a/extensions/ocaml/languages/ocaml/indents.scm +++ b/extensions/ocaml/languages/ocaml/indents.scm @@ -3,7 +3,7 @@ (type_binding) (method_definition) - + (external) (value_specification) (method_specification) diff --git a/extensions/ocaml/languages/ocaml/outline.scm b/extensions/ocaml/languages/ocaml/outline.scm index 16f449664a..c7f39c219b 100644 --- a/extensions/ocaml/languages/ocaml/outline.scm +++ b/extensions/ocaml/languages/ocaml/outline.scm @@ -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 diff --git a/extensions/racket/languages/racket/outline.scm b/extensions/racket/languages/racket/outline.scm index 604e052a63..6001548303 100644 --- a/extensions/racket/languages/racket/outline.scm +++ b/extensions/racket/languages/racket/outline.scm @@ -7,4 +7,4 @@ (list . (symbol) @name) ] (#match? @start-symbol "^define") -) @item \ No newline at end of file +) @item diff --git a/extensions/scheme/languages/scheme/outline.scm b/extensions/scheme/languages/scheme/outline.scm index 604e052a63..6001548303 100644 --- a/extensions/scheme/languages/scheme/outline.scm +++ b/extensions/scheme/languages/scheme/outline.scm @@ -7,4 +7,4 @@ (list . (symbol) @name) ] (#match? @start-symbol "^define") -) @item \ No newline at end of file +) @item diff --git a/extensions/toml/languages/toml/outline.scm b/extensions/toml/languages/toml/outline.scm index d232d489b6..0b37949628 100644 --- a/extensions/toml/languages/toml/outline.scm +++ b/extensions/toml/languages/toml/outline.scm @@ -12,4 +12,4 @@ (pair . - (_) @name) @item \ No newline at end of file + (_) @name) @item diff --git a/extensions/toml/languages/toml/redactions.scm b/extensions/toml/languages/toml/redactions.scm index fd11a02927..a906e9ac7b 100644 --- a/extensions/toml/languages/toml/redactions.scm +++ b/extensions/toml/languages/toml/redactions.scm @@ -1 +1 @@ -(pair (bare_key) "=" (_) @redact) \ No newline at end of file +(pair (bare_key) "=" (_) @redact) diff --git a/script/licenses/template.hbs.md b/script/licenses/template.hbs.md index a41aee8a4c..cc986588fb 100644 --- a/script/licenses/template.hbs.md +++ b/script/licenses/template.hbs.md @@ -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}} \ No newline at end of file +{{/each}}