This commit is contained in:
Viktor Szépe 2025-02-03 01:58:29 +01:00 committed by GitHub
parent 0ab403d428
commit e22bbf5489
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 29 additions and 29 deletions

View file

@ -1,4 +1,4 @@
name: Github Pages name: GitHub Pages
on: on:
push: push:

View file

@ -735,7 +735,7 @@ Updated languages and queries:
- Recognize common Dockerfile file types ([#9772](https://github.com/helix-editor/helix/pull/9772)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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 `pop-dark` ([#4323](https://github.com/helix-editor/helix/pull/4323))
- Update `rose_pine` ([#4221](https://github.com/helix-editor/helix/pull/4221)) - Update `rose_pine` ([#4221](https://github.com/helix-editor/helix/pull/4221))
- Add `kanagawa` ([#4300](https://github.com/helix-editor/helix/pull/4300)) - 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 `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 `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)) - 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)) - 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)) - 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)) - 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)) - 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)) - 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)) - Ensure `:quit` and `:quit!` take no arguments ([#2654](https://github.com/helix-editor/helix/pull/2654))

View file

@ -70,7 +70,7 @@ For instance, setting it to use OSC 52 termcodes, the configuration would be:
clipboard-provider = "termcode" 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 ```toml
[editor.clipboard-provider.custom] [editor.clipboard-provider.custom]

View file

@ -20,7 +20,7 @@ var config = [ "--config" "-c" ]
set edit:completion:arg-completer[hx] = {|@args| set edit:completion:arg-completer[hx] = {|@args|
var n = (count $args) var n = (count $args)
if (>= $n 3) { if (>= $n 3) {
# Stop completions if passed arg will take presedence # Stop completions if passed arg will take precedence
# and invalidate further input # and invalidate further input
if (has-value $skips $args[-2]) { if (has-value $skips $args[-2]) {
return return

View file

@ -2,7 +2,7 @@
# #
# NOTE: the `+N` syntax is not supported in Nushell (https://github.com/nushell/nushell/issues/13418) # 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. # 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 [] { def health_categories [] {
let languages = ^hx --health languages | detect columns | get Language | filter { $in != null } let languages = ^hx --health languages | detect columns | get Language | filter { $in != null }

View file

@ -122,11 +122,11 @@
}) grammarsToBuild; }) grammarsToBuild;
extensibleGrammars = extensibleGrammars =
lib.makeExtensible (self: builtins.listToAttrs builtGrammars); lib.makeExtensible (self: builtins.listToAttrs builtGrammars);
overlayedGrammars = lib.pipe extensibleGrammars overlaidGrammars = lib.pipe extensibleGrammars
(builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays); (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);
grammarLinks = lib.mapAttrsToList grammarLinks = lib.mapAttrsToList
(name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so") (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 in
runCommand "consolidated-helix-grammars" {} '' runCommand "consolidated-helix-grammars" {} ''
mkdir -p $out mkdir -p $out

View file

@ -23,7 +23,7 @@
(identifier) @local.definition) (identifier) @local.definition)
; (i?: t) ; (i?: t)
; (i?: t = 1) // Invalid but still posible to hihglight. ; (i?: t = 1) // Invalid but still possible to highlight.
(optional_parameter (optional_parameter
(identifier) @local.definition) (identifier) @local.definition)

View file

@ -8,7 +8,7 @@
;; For navigations using textobjects, check link below: ;; For navigations using textobjects, check link below:
;; https://docs.helix-editor.com/master/usage.html#navigating-using-tree-sitter-textobjects ;; 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 ;; https://docs.helix-editor.com/master/guides/textobject.html
(subprogram_body) @function.around (subprogram_body) @function.around

View file

@ -1 +1 @@
(struct (_) @function.inside) @funtion.around (struct (_) @function.inside) @function.around

View file

@ -63,7 +63,7 @@
(tuple_pattern (tuple_pattern
(_) @entry.around) (_) @entry.around)
; Commonly used vec macro intializer is special cased ; Commonly used vec macro initializer is special cased
(macro_invocation (macro_invocation
(identifier) @_id (token_tree (_) @entry.around) (identifier) @_id (token_tree (_) @entry.around)
(#eq? @_id "array")) (#eq? @_id "array"))

View file

@ -24,7 +24,7 @@
(template_definition (template_definition
name: (identifier) @keyword.function) name: (identifier) @keyword.function)
; Use contructor coloring for special functions ; Use constructor coloring for special functions
(main_component_definition) @constructor (main_component_definition) @constructor
; Invocations ; Invocations

View file

@ -30,7 +30,7 @@
; == Mustache Statements === ; == Mustache Statements ===
; Hightlight the whole statement, to color brackets and separators ; Highlight the whole statement, to color brackets and separators
(mustache_statement) @punctuation.delimiter (mustache_statement) @punctuation.delimiter
; An identifier in a mustache expression is a variable ; An identifier in a mustache expression is a variable

View file

@ -228,7 +228,7 @@
"isnot" "isnot"
] ]
right: (_) @type) right: (_) @type)
; types in "is" comparisions ; types in "is" comparisons
(except_branch (except_branch
values: (expression_list values: (expression_list

View file

@ -1,7 +1,7 @@
((comment) @injection.content ((comment) @injection.content
(#set! injection.language "comment")) (#set! injection.language "comment"))
; mark arbitary languages with a comment ; mark arbitrary languages with a comment
((((comment) @injection.language) . ((((comment) @injection.language) .
(indented_string_expression (string_fragment) @injection.content)) (indented_string_expression (string_fragment) @injection.content))
(#set! injection.combined)) (#set! injection.combined))

View file

@ -1,4 +1,4 @@
; -- Identifier type inferrence ; -- Identifier type inference
; VERY QUESTIONABLE: Highlighting of identifiers based on spelling ; VERY QUESTIONABLE: Highlighting of identifiers based on spelling
(exprBinary ((identifier) @constant (exprBinary ((identifier) @constant

View file

@ -126,7 +126,7 @@
(slStringLiteral) @string (slStringLiteral) @string
(mlStringLiteral) @string (mlStringLiteral) @string
(escapeSequence) @constent.character.escape (escapeSequence) @constant.character.escape
(intLiteral) @constant.numeric.integer (intLiteral) @constant.numeric.integer
(floatLiteral) @constant.numeric.float (floatLiteral) @constant.numeric.float

View file

@ -69,7 +69,7 @@
(tuple_pattern (tuple_pattern
(_) @entry.around) (_) @entry.around)
; Commonly used vec macro intializer is special cased ; Commonly used vec macro initializer is special cased
(macro_invocation (macro_invocation
(identifier) @_id (token_tree (_) @entry.around) (identifier) @_id (token_tree (_) @entry.around)
(#eq? @_id "vec")) (#eq? @_id "vec"))

View file

@ -1,5 +1,5 @@
(function_definition (function_definition
(imperative_block) @funtion.inside) @function.around (imperative_block) @function.inside) @function.around
(callback_event (callback_event
(imperative_block) @function.inside) @function.around (imperative_block) @function.inside) @function.around

View file

@ -138,7 +138,7 @@
"xsd_optional" "xsd_optional"
] @keyword ] @keyword
; Extended Kewords ; Extended Keywords
[ [
"package" "package"
"performs" "performs"

View file

@ -20,7 +20,7 @@
; Modified for Helix from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/yaml/injections.scm ; 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 ;; Gitlab CI: scripts, before_script, after_script
;; Buildkite: command, commands ;; Buildkite: command, commands
(block_mapping_pair (block_mapping_pair

View file

@ -39,7 +39,7 @@
"diff.minus" = { fg = "red" } "diff.minus" = { fg = "red" }
"diff.delta" = { fg = "brown" } "diff.delta" = { fg = "brown" }
# MARKUP, SYNAX HIGHLIGHTING AND INTERFACE HYBRID # MARKUP, SYNTAX HIGHLIGHTING AND INTERFACE HYBRID
"markup.heading" = { fg = "blaze_orange" } "markup.heading" = { fg = "blaze_orange" }
"markup.heading.1" = { fg = "crystal_blue", modifiers = ["bold"] } "markup.heading.1" = { fg = "crystal_blue", modifiers = ["bold"] }
"markup.heading.2" = { fg = "sky_blue", modifiers = ["bold"] } "markup.heading.2" = { fg = "sky_blue", modifiers = ["bold"] }

View file

@ -39,7 +39,7 @@
"diff.minus" = { fg = "red" } "diff.minus" = { fg = "red" }
"diff.delta" = { fg = "brown" } "diff.delta" = { fg = "brown" }
# MARKUP, SYNAX HIGHLIGHTING AND INTERFACE HYBRID # MARKUP, SYNTAX HIGHLIGHTING AND INTERFACE HYBRID
"markup.heading" = { fg = "blaze_orange" } "markup.heading" = { fg = "blaze_orange" }
"markup.heading.1" = { fg = "crystal_blue", modifiers = ["bold"] } "markup.heading.1" = { fg = "crystal_blue", modifiers = ["bold"] }
"markup.heading.2" = { fg = "sky_blue", modifiers = ["bold"] } "markup.heading.2" = { fg = "sky_blue", modifiers = ["bold"] }

View file

@ -7,7 +7,7 @@
'property' = { fg = "red" } # Regex group names. 'property' = { fg = "red" } # Regex group names.
"warning" = { fg ="yellow", modifiers = ["bold"] } # Editor warnings. "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). "info" = { fg = "mid-blue" } # Code diagnostic info in gutter (LSP).
# ? Difference between info and hint ? # ? Difference between info and hint ?
"hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP). "hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP).

View file

@ -9,7 +9,7 @@ keyword = "#A4A2B4"
"keyword.directive" = "light-gray" "keyword.directive" = "light-gray"
namespace = "#7095bf" namespace = "#7095bf"
punctuation = "white" punctuation = "white"
"punctuation.delimeter" = "white" "punctuation.delimiter" = "white"
operator = "muddy" operator = "muddy"
special = "pink" special = "pink"
"variable.other.member" = "green" "variable.other.member" = "green"