From 5bd3cdc2351dd62dab922ad9af59ab465879941c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Sun, 2 Feb 2025 19:48:00 -0500 Subject: [PATCH] Fix typos --- .github/workflows/gh-pages.yml | 2 +- CHANGELOG.md | 10 +++++----- book/src/editor.md | 2 +- contrib/completion/hx.elv | 2 +- contrib/completion/hx.nu | 2 +- grammars.nix | 4 ++-- runtime/queries/_typescript/locals.scm | 2 +- runtime/queries/ada/textobjects.scm | 2 +- runtime/queries/adl/textobjects.scm | 2 +- runtime/queries/cairo/textobjects.scm | 2 +- runtime/queries/circom/highlights.scm | 2 +- runtime/queries/glimmer/highlights.scm | 2 +- runtime/queries/nim/highlights.scm | 2 +- runtime/queries/nix/injections.scm | 2 +- runtime/queries/pascal/highlights.scm | 2 +- runtime/queries/pkl/highlights.scm | 2 +- runtime/queries/rust/textobjects.scm | 2 +- runtime/queries/slint/textobjects.scm | 2 +- runtime/queries/thrift/highlights.scm | 2 +- runtime/queries/yaml/injections.scm | 2 +- runtime/themes/ao.toml | 2 +- runtime/themes/iroaseta.toml | 2 +- runtime/themes/noctis.toml | 2 +- runtime/themes/vintage.toml | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index d5ccb0be86aa..d42ab1c80630 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -1,4 +1,4 @@ -name: Github Pages +name: GitHub Pages on: push: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f2925c5c637..61c05ae7d80a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -735,7 +735,7 @@ Updated languages and queries: - Recognize common Dockerfile file types ([#9772](https://github.com/helix-editor/helix/pull/9772)) - Recognize NUON files as Nu ([#9839](https://github.com/helix-editor/helix/pull/9839)) - Add textobjects for Java native functions and constructors ([#9806](https://github.com/helix-editor/helix/pull/9806)) -- Fix "braket" typeo in JSX highlights ([#9910](https://github.com/helix-editor/helix/pull/9910)) +- Fix "braket" typo in JSX highlights ([#9910](https://github.com/helix-editor/helix/pull/9910)) - Update tree-sitter-hurl ([#9775](https://github.com/helix-editor/helix/pull/9775)) - Add textobjects queries for Vala ([#8541](https://github.com/helix-editor/helix/pull/8541)) - Update tree-sitter-git-config ([9610254](https://github.com/helix-editor/helix/commit/9610254)) @@ -942,7 +942,7 @@ Updated languages and queries: - Add Fortran comment injections ([#7305](https://github.com/helix-editor/helix/pull/7305)) - Switch Vue language server to `vue-language-server` ([#7312](https://github.com/helix-editor/helix/pull/7312)) - Update tree-sitter-sql ([#7387](https://github.com/helix-editor/helix/pull/7387), [#8464](https://github.com/helix-editor/helix/pull/8464)) -- Replace the MATLAB tre-sitter grammar ([#7388](https://github.com/helix-editor/helix/pull/7388), [#7442](https://github.com/helix-editor/helix/pull/7442), [#7491](https://github.com/helix-editor/helix/pull/7491), [#7493](https://github.com/helix-editor/helix/pull/7493), [#7511](https://github.com/helix-editor/helix/pull/7511), [#7532](https://github.com/helix-editor/helix/pull/7532), [#8040](https://github.com/helix-editor/helix/pull/8040)) +- Replace the MATLAB tree-sitter grammar ([#7388](https://github.com/helix-editor/helix/pull/7388), [#7442](https://github.com/helix-editor/helix/pull/7442), [#7491](https://github.com/helix-editor/helix/pull/7491), [#7493](https://github.com/helix-editor/helix/pull/7493), [#7511](https://github.com/helix-editor/helix/pull/7511), [#7532](https://github.com/helix-editor/helix/pull/7532), [#8040](https://github.com/helix-editor/helix/pull/8040)) - Highlight TOML table headers ([#7441](https://github.com/helix-editor/helix/pull/7441)) - Recognize `cppm` file-type as C++ ([#7492](https://github.com/helix-editor/helix/pull/7492)) - Refactor ecma language queries into private and public queries ([#7207](https://github.com/helix-editor/helix/pull/7207)) @@ -1429,7 +1429,7 @@ Features: - Support underline styles and colors ([#4061](https://github.com/helix-editor/helix/pull/4061), [98c121c](https://github.com/helix-editor/helix/commit/98c121c)) - Inheritance for themes ([#3067](https://github.com/helix-editor/helix/pull/3067), [#4096](https://github.com/helix-editor/helix/pull/4096)) - Cursorcolumn ([#4084](https://github.com/helix-editor/helix/pull/4084)) -- Overhauled system for writing files and quiting ([#2267](https://github.com/helix-editor/helix/pull/2267), [#4397](https://github.com/helix-editor/helix/pull/4397)) +- Overhauled system for writing files and quitting ([#2267](https://github.com/helix-editor/helix/pull/2267), [#4397](https://github.com/helix-editor/helix/pull/4397)) - Autosave when terminal loses focus ([#3178](https://github.com/helix-editor/helix/pull/3178)) - Use OSC52 as a fallback for the system clipboard ([#3220](https://github.com/helix-editor/helix/pull/3220)) - Show git diffs in the gutter ([#3890](https://github.com/helix-editor/helix/pull/3890), [#5012](https://github.com/helix-editor/helix/pull/5012), [#4995](https://github.com/helix-editor/helix/pull/4995)) @@ -1584,7 +1584,7 @@ Themes: - Update `pop-dark` ([#4323](https://github.com/helix-editor/helix/pull/4323)) - Update `rose_pine` ([#4221](https://github.com/helix-editor/helix/pull/4221)) - Add `kanagawa` ([#4300](https://github.com/helix-editor/helix/pull/4300)) -- Add `hex_steel`, `hex_toxic` and `hex_lavendar` ([#4367](https://github.com/helix-editor/helix/pull/4367), [#4990](https://github.com/helix-editor/helix/pull/4990)) +- Add `hex_steel`, `hex_toxic` and `hex_lavender` ([#4367](https://github.com/helix-editor/helix/pull/4367), [#4990](https://github.com/helix-editor/helix/pull/4990)) - Update `tokyonight` and `tokyonight_storm` ([#4415](https://github.com/helix-editor/helix/pull/4415)) - Update `gruvbox` ([#4626](https://github.com/helix-editor/helix/pull/4626)) - Update `dark_plus` ([#4661](https://github.com/helix-editor/helix/pull/4661), [#4678](https://github.com/helix-editor/helix/pull/4678)) @@ -1751,7 +1751,7 @@ Usability improvements and fixes: - Introduce `keyword.storage` highlight scope ([#2731](https://github.com/helix-editor/helix/pull/2731)) - Handle symlinks more consistently ([#2718](https://github.com/helix-editor/helix/pull/2718)) - Improve markdown list rendering ([#2687](https://github.com/helix-editor/helix/pull/2687)) -- Update auto-pairs and idle-timout settings when the config is reloaded ([#2736](https://github.com/helix-editor/helix/pull/2736)) +- Update auto-pairs and idle-timeout settings when the config is reloaded ([#2736](https://github.com/helix-editor/helix/pull/2736)) - Fix panic on closing last buffer ([#2658](https://github.com/helix-editor/helix/pull/2658)) - Prevent modifying jumplist until jumping to a reference ([#2670](https://github.com/helix-editor/helix/pull/2670)) - Ensure `:quit` and `:quit!` take no arguments ([#2654](https://github.com/helix-editor/helix/pull/2654)) diff --git a/book/src/editor.md b/book/src/editor.md index b091eea87b4a..2baa907f9303 100644 --- a/book/src/editor.md +++ b/book/src/editor.md @@ -70,7 +70,7 @@ For instance, setting it to use OSC 52 termcodes, the configuration would be: clipboard-provider = "termcode" ``` -Alternatively, Helix can be configured to use arbitary commands for clipboard integration: +Alternatively, Helix can be configured to use arbitrary commands for clipboard integration: ```toml [editor.clipboard-provider.custom] diff --git a/contrib/completion/hx.elv b/contrib/completion/hx.elv index 42c88585c155..8d86ed7af112 100644 --- a/contrib/completion/hx.elv +++ b/contrib/completion/hx.elv @@ -20,7 +20,7 @@ var config = [ "--config" "-c" ] set edit:completion:arg-completer[hx] = {|@args| var n = (count $args) if (>= $n 3) { - # Stop completions if passed arg will take presedence + # Stop completions if passed arg will take precedence # and invalidate further input if (has-value $skips $args[-2]) { return diff --git a/contrib/completion/hx.nu b/contrib/completion/hx.nu index c93d0b52afe2..e390cdad63b4 100644 --- a/contrib/completion/hx.nu +++ b/contrib/completion/hx.nu @@ -2,7 +2,7 @@ # # NOTE: the `+N` syntax is not supported in Nushell (https://github.com/nushell/nushell/issues/13418) # so it has not been specified here and will not be proposed in the autocompletion of Nushell. -# The help message won't be overriden though, so it will still be present here +# The help message won't be overridden though, so it will still be present here def health_categories [] { let languages = ^hx --health languages | detect columns | get Language | filter { $in != null } diff --git a/grammars.nix b/grammars.nix index 5152b5204dd9..967b1b136de4 100644 --- a/grammars.nix +++ b/grammars.nix @@ -122,11 +122,11 @@ }) grammarsToBuild; extensibleGrammars = lib.makeExtensible (self: builtins.listToAttrs builtGrammars); - overlayedGrammars = lib.pipe extensibleGrammars + overlaidGrammars = lib.pipe extensibleGrammars (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays); grammarLinks = lib.mapAttrsToList (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so") - (lib.filterAttrs (n: v: lib.isDerivation v) overlayedGrammars); + (lib.filterAttrs (n: v: lib.isDerivation v) overlaidGrammars); in runCommand "consolidated-helix-grammars" {} '' mkdir -p $out diff --git a/runtime/queries/_typescript/locals.scm b/runtime/queries/_typescript/locals.scm index 041ad59d1fbf..35e3c0db7792 100644 --- a/runtime/queries/_typescript/locals.scm +++ b/runtime/queries/_typescript/locals.scm @@ -23,7 +23,7 @@ (identifier) @local.definition) ; (i?: t) -; (i?: t = 1) // Invalid but still posible to hihglight. +; (i?: t = 1) // Invalid but still possible to highlight. (optional_parameter (identifier) @local.definition) diff --git a/runtime/queries/ada/textobjects.scm b/runtime/queries/ada/textobjects.scm index 284b4125652d..433b582af726 100644 --- a/runtime/queries/ada/textobjects.scm +++ b/runtime/queries/ada/textobjects.scm @@ -8,7 +8,7 @@ ;; For navigations using textobjects, check link below: ;; https://docs.helix-editor.com/master/usage.html#navigating-using-tree-sitter-textobjects ;; -;; For Textobject queries explaination, check out link below: +;; For Textobject queries explanation, check out link below: ;; https://docs.helix-editor.com/master/guides/textobject.html (subprogram_body) @function.around diff --git a/runtime/queries/adl/textobjects.scm b/runtime/queries/adl/textobjects.scm index 36e39a2d46d6..dee01a40c01c 100644 --- a/runtime/queries/adl/textobjects.scm +++ b/runtime/queries/adl/textobjects.scm @@ -1 +1 @@ -(struct (_) @function.inside) @funtion.around +(struct (_) @function.inside) @function.around diff --git a/runtime/queries/cairo/textobjects.scm b/runtime/queries/cairo/textobjects.scm index 1bb89234e75f..4b53097beb0d 100644 --- a/runtime/queries/cairo/textobjects.scm +++ b/runtime/queries/cairo/textobjects.scm @@ -63,7 +63,7 @@ (tuple_pattern (_) @entry.around) -; Commonly used vec macro intializer is special cased +; Commonly used vec macro initializer is special cased (macro_invocation (identifier) @_id (token_tree (_) @entry.around) (#eq? @_id "array")) diff --git a/runtime/queries/circom/highlights.scm b/runtime/queries/circom/highlights.scm index 1d310bd8e087..774e1516979b 100644 --- a/runtime/queries/circom/highlights.scm +++ b/runtime/queries/circom/highlights.scm @@ -24,7 +24,7 @@ (template_definition name: (identifier) @keyword.function) -; Use contructor coloring for special functions +; Use constructor coloring for special functions (main_component_definition) @constructor ; Invocations diff --git a/runtime/queries/glimmer/highlights.scm b/runtime/queries/glimmer/highlights.scm index 789722ad0736..d0a88fe44682 100644 --- a/runtime/queries/glimmer/highlights.scm +++ b/runtime/queries/glimmer/highlights.scm @@ -30,7 +30,7 @@ ; == Mustache Statements === -; Hightlight the whole statement, to color brackets and separators +; Highlight the whole statement, to color brackets and separators (mustache_statement) @punctuation.delimiter ; An identifier in a mustache expression is a variable diff --git a/runtime/queries/nim/highlights.scm b/runtime/queries/nim/highlights.scm index 04c4e1b28d10..791e8e02363f 100644 --- a/runtime/queries/nim/highlights.scm +++ b/runtime/queries/nim/highlights.scm @@ -228,7 +228,7 @@ "isnot" ] right: (_) @type) -; types in "is" comparisions +; types in "is" comparisons (except_branch values: (expression_list diff --git a/runtime/queries/nix/injections.scm b/runtime/queries/nix/injections.scm index 2fb8918a7f1a..6b4ddc1f42c9 100644 --- a/runtime/queries/nix/injections.scm +++ b/runtime/queries/nix/injections.scm @@ -1,7 +1,7 @@ ((comment) @injection.content (#set! injection.language "comment")) -; mark arbitary languages with a comment +; mark arbitrary languages with a comment ((((comment) @injection.language) . (indented_string_expression (string_fragment) @injection.content)) (#set! injection.combined)) diff --git a/runtime/queries/pascal/highlights.scm b/runtime/queries/pascal/highlights.scm index 5368a22b87cd..ed689573421d 100644 --- a/runtime/queries/pascal/highlights.scm +++ b/runtime/queries/pascal/highlights.scm @@ -1,4 +1,4 @@ -; -- Identifier type inferrence +; -- Identifier type inference ; VERY QUESTIONABLE: Highlighting of identifiers based on spelling (exprBinary ((identifier) @constant diff --git a/runtime/queries/pkl/highlights.scm b/runtime/queries/pkl/highlights.scm index f08660d463d0..3f2f13170da4 100644 --- a/runtime/queries/pkl/highlights.scm +++ b/runtime/queries/pkl/highlights.scm @@ -126,7 +126,7 @@ (slStringLiteral) @string (mlStringLiteral) @string -(escapeSequence) @constent.character.escape +(escapeSequence) @constant.character.escape (intLiteral) @constant.numeric.integer (floatLiteral) @constant.numeric.float diff --git a/runtime/queries/rust/textobjects.scm b/runtime/queries/rust/textobjects.scm index de517d362408..e9ecb8baa370 100644 --- a/runtime/queries/rust/textobjects.scm +++ b/runtime/queries/rust/textobjects.scm @@ -69,7 +69,7 @@ (tuple_pattern (_) @entry.around) -; Commonly used vec macro intializer is special cased +; Commonly used vec macro initializer is special cased (macro_invocation (identifier) @_id (token_tree (_) @entry.around) (#eq? @_id "vec")) diff --git a/runtime/queries/slint/textobjects.scm b/runtime/queries/slint/textobjects.scm index 7e2f36096c71..258ce4e0356d 100644 --- a/runtime/queries/slint/textobjects.scm +++ b/runtime/queries/slint/textobjects.scm @@ -1,5 +1,5 @@ (function_definition - (imperative_block) @funtion.inside) @function.around + (imperative_block) @function.inside) @function.around (callback_event (imperative_block) @function.inside) @function.around diff --git a/runtime/queries/thrift/highlights.scm b/runtime/queries/thrift/highlights.scm index 567c3f9dcad3..3db4b39c794c 100644 --- a/runtime/queries/thrift/highlights.scm +++ b/runtime/queries/thrift/highlights.scm @@ -138,7 +138,7 @@ "xsd_optional" ] @keyword -; Extended Kewords +; Extended Keywords [ "package" "performs" diff --git a/runtime/queries/yaml/injections.scm b/runtime/queries/yaml/injections.scm index 46c4a9c0f4fb..a16a945a9882 100644 --- a/runtime/queries/yaml/injections.scm +++ b/runtime/queries/yaml/injections.scm @@ -20,7 +20,7 @@ ; Modified for Helix from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/yaml/injections.scm -;; Github actions: run +;; GitHub actions: run ;; Gitlab CI: scripts, before_script, after_script ;; Buildkite: command, commands (block_mapping_pair diff --git a/runtime/themes/ao.toml b/runtime/themes/ao.toml index 7313d9fa58ba..9d0ec92b7a54 100644 --- a/runtime/themes/ao.toml +++ b/runtime/themes/ao.toml @@ -39,7 +39,7 @@ "diff.minus" = { fg = "red" } "diff.delta" = { fg = "brown" } -# MARKUP, SYNAX HIGHLIGHTING AND INTERFACE HYBRID +# MARKUP, SYNTAX HIGHLIGHTING AND INTERFACE HYBRID "markup.heading" = { fg = "blaze_orange" } "markup.heading.1" = { fg = "crystal_blue", modifiers = ["bold"] } "markup.heading.2" = { fg = "sky_blue", modifiers = ["bold"] } diff --git a/runtime/themes/iroaseta.toml b/runtime/themes/iroaseta.toml index a26293d62249..0683e790de6d 100644 --- a/runtime/themes/iroaseta.toml +++ b/runtime/themes/iroaseta.toml @@ -39,7 +39,7 @@ "diff.minus" = { fg = "red" } "diff.delta" = { fg = "brown" } -# MARKUP, SYNAX HIGHLIGHTING AND INTERFACE HYBRID +# MARKUP, SYNTAX HIGHLIGHTING AND INTERFACE HYBRID "markup.heading" = { fg = "blaze_orange" } "markup.heading.1" = { fg = "crystal_blue", modifiers = ["bold"] } "markup.heading.2" = { fg = "sky_blue", modifiers = ["bold"] } diff --git a/runtime/themes/noctis.toml b/runtime/themes/noctis.toml index 5846576ed405..678658aaa4c1 100644 --- a/runtime/themes/noctis.toml +++ b/runtime/themes/noctis.toml @@ -7,7 +7,7 @@ 'property' = { fg = "red" } # Regex group names. "warning" = { fg ="yellow", modifiers = ["bold"] } # Editor warnings. -"error" = { fg = "red", modifiers = ["bold"] } # Editor errors, like mis-typing a command. +"error" = { fg = "red", modifiers = ["bold"] } # Editor errors, like mistyping a command. "info" = { fg = "mid-blue" } # Code diagnostic info in gutter (LSP). # ? Difference between info and hint ? "hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP). diff --git a/runtime/themes/vintage.toml b/runtime/themes/vintage.toml index 2aea81cbf32b..d4afbea31e11 100644 --- a/runtime/themes/vintage.toml +++ b/runtime/themes/vintage.toml @@ -9,7 +9,7 @@ keyword = "#A4A2B4" "keyword.directive" = "light-gray" namespace = "#7095bf" punctuation = "white" -"punctuation.delimeter" = "white" +"punctuation.delimiter" = "white" operator = "muddy" special = "pink" "variable.other.member" = "green"