on master help sign in
513 files changed+33450−12863
since splitsnapshots
unifiedsplit
.envrc+1 .github/ISSUE_TEMPLATE/bug_report.yaml+10 .github/workflows/build.yml+15−7 .github/workflows/cachix.yml+3−3 .github/workflows/gh-pages.yml+5−5 .github/workflows/release.yml+27−16 .ignore−3 CHANGELOG.md+651−1 Cargo.lock+1006−910 Cargo.toml+17 README.md+3−85 VERSION−1 book/book.toml+5−1 book/custom.css+231 book/src/SUMMARY.md+6−5 book/src/commands.md+1−1 book/src/configuration.md+95−53 book/src/from-vim.md+3−3 book/src/generated/lang-support.md+64−23 book/src/generated/typable-cmd.md+17−6 book/src/guides/README.md+1−1 book/src/guides/adding_languages.md+45−35 book/src/guides/indent.md+320−44 book/src/guides/injection.md+57 book/src/guides/textobject.md+7−9 book/src/install.md+240−100 book/src/keymap.md+73−61 book/src/lang-support.md+2−2 book/src/languages.md+117−38 book/src/remapping.md+9−10 book/src/themes.md+125−98 book/src/usage.md+131−93 book/theme/book.js−660 book/theme/css/chrome.css−499 book/theme/css/general.css−233 book/theme/css/print.css−54 book/theme/css/variables.css−411 book/theme/highlight.css−56 book/theme/highlight.js−6 book/theme/index.hbs+87−51 contrib/Helix.appdata.xml+21 contrib/Helix.desktop+3−1 docs/CONTRIBUTING.md+17−4 docs/releases.md+13−6 docs/vision.md+1−1 flake.lock+39−173 flake.nix+171−142 grammars.nix+24−21 helix-core/Cargo.toml+22−16 helix-core/src/diagnostic.rs+6−1 helix-core/src/doc_formatter/test.rs+8−48 helix-core/src/fuzzy.rs+43 helix-core/src/graphemes.rs+1−1 helix-core/src/history.rs+2−2 helix-core/src/indent.rs+618−145 helix-core/src/lib.rs+8−49 helix-core/src/line_ending.rs+2−2 helix-core/src/match_brackets.rs+232−29 helix-core/src/movement.rs+195−15 helix-core/src/path.rs+27−8 helix-core/src/position.rs+41−16 helix-core/src/register.rs−81 helix-core/src/rope_reader.rs+37 helix-core/src/selection.rs+102−49 helix-core/src/shellwords.rs+2−2 helix-core/src/surround.rs+111−29 helix-core/src/syntax.rs+444−170 helix-core/src/test.rs+139−18 helix-core/src/text_annotations.rs+26−26 helix-core/src/textobject.rs+3−3 helix-core/src/transaction.rs+309−51 helix-core/src/wrap.rs+4−2 helix-core/tests/data/indent/cpp.cpp+48 helix-core/tests/data/indent/indent.rs−1 helix-core/tests/data/indent/languages.toml+13 helix-core/tests/indent.rs+187−26 helix-dap/Cargo.toml+11−9 helix-dap/src/client.rs+27−6 helix-dap/src/transport.rs+28−18 helix-dap/src/types.rs+11−2 helix-event/Cargo.toml+16 helix-event/src/lib.rs+8 helix-event/src/redraw.rs+49 helix-loader/Cargo.toml+16−12 helix-loader/build.rs+56−5 helix-loader/src/config.rs+32−31 helix-loader/src/grammar.rs+135−55 helix-loader/src/lib.rs+165−54 helix-lsp/Cargo.toml+17−13 helix-lsp/src/client.rs+463−55 helix-lsp/src/file_event.rs+193 helix-lsp/src/lib.rs+449−102 helix-lsp/src/snippet.rs+1010 helix-lsp/src/transport.rs+52−21 helix-parsec/Cargo.toml+14 helix-parsec/src/lib.rs+574 helix-term/Cargo.toml+33−24 helix-term/src/application.rs+402−274 helix-term/src/args.rs+29 helix-term/src/commands.rs+1200−678 helix-term/src/commands/dap.rs+90−57 helix-term/src/commands/lsp.rs+828−490 helix-term/src/commands/typed.rs+1316−746 helix-term/src/compositor.rs+12 helix-term/src/config.rs+110−30 helix-term/src/health.rs+74−24 helix-term/src/keymap.rs+119−166 helix-term/src/keymap/default.rs+16−8 helix-term/src/keymap/macros.rs+3−4 helix-term/src/main.rs+36−31 helix-term/src/ui/completion.rs+214−112 helix-term/src/ui/document.rs+91−49 helix-term/src/ui/editor.rs+233−134 helix-term/src/ui/fuzzy_match.rs−239 helix-term/src/ui/fuzzy_match/test.rs−47 helix-term/src/ui/lsp.rs+5−3 helix-term/src/ui/markdown.rs+24−18 helix-term/src/ui/menu.rs+74−40 helix-term/src/ui/mod.rs+112−183 helix-term/src/ui/overlay.rs+1−1 helix-term/src/ui/picker.rs+630−575 helix-term/src/ui/popup.rs+44−18 helix-term/src/ui/prompt.rs+70−53 helix-term/src/ui/statusline.rs+44−7 helix-term/src/ui/text.rs+1−1 helix-term/tests/integration.rs+3−5 helix-term/tests/test/auto_indent.rs+3−9 helix-term/tests/test/auto_pairs.rs+5−11 helix-term/tests/test/commands.rs+212−162 helix-term/tests/test/commands/movement.rs+452 helix-term/tests/test/write.rs → helix-term/tests/test/commands/write.rs+254−7 helix-term/tests/test/helpers.rs+53−26 helix-term/tests/test/languages/go.rs+41 helix-term/tests/test/languages/mod.rs+4 helix-term/tests/test/languages/yaml.rs+819 helix-term/tests/test/movement.rs+54−43 helix-term/tests/test/splits.rs+8−6 helix-tui/Cargo.toml+17−15 helix-tui/src/backend/crossterm.rs+168−45 helix-tui/src/backend/mod.rs+5−1 helix-tui/src/backend/test.rs+17 helix-tui/src/buffer.rs+43−2 helix-tui/src/lib.rs+9−3 helix-tui/src/terminal.rs+26−14 helix-tui/src/text.rs+3−1 helix-tui/src/widgets/block.rs+2−7 helix-tui/src/widgets/mod.rs+2−2 helix-tui/src/widgets/table.rs+19−7 helix-vcs/Cargo.toml+15−11 helix-vcs/src/diff.rs+48−35 helix-vcs/src/diff/line_cache.rs+15−7 helix-vcs/src/diff/worker.rs+12−15 helix-vcs/src/diff/worker/test.rs+4−8 helix-vcs/src/git.rs+67−33 helix-vcs/src/git/test.rs+6−6 helix-vcs/src/lib.rs+32−5 helix-view/Cargo.toml+23−18 helix-view/src/clipboard.rs+8−3 helix-view/src/document.rs+771−174 helix-view/src/editor.rs+336−134 helix-view/src/graphics.rs+3−2 helix-view/src/gutter.rs+64−43 helix-view/src/handlers/dap.rs+2−3 helix-view/src/info.rs+5−25 helix-view/src/input.rs+67−3 helix-view/src/keyboard.rs+1 helix-view/src/lib.rs+1 helix-view/src/register.rs+333 helix-view/src/theme.rs+79−47 helix-view/src/tree.rs+6−8 helix-view/src/view.rs+88−41 languages.toml+1105−303 logo.svg+1−1 runtime/queries/_javascript/highlights.scm+36 runtime/queries/_javascript/locals.scm+14 runtime/queries/_javascript/tags.scm+88 runtime/queries/_jsx/highlights.scm+43 runtime/queries/_jsx/indents.scm+6 runtime/queries/_typescript/highlights.scm+142 runtime/queries/_typescript/indents.scm+5 runtime/queries/_typescript/locals.scm+33 runtime/queries/_typescript/tags.scm+23 runtime/queries/_typescript/textobjects.scm+6 runtime/queries/agda/highlights.scm+124 runtime/queries/bash/indents.scm+1 runtime/queries/bash/textobjects.scm+9 runtime/queries/blueprint/highlights.scm+61 runtime/queries/c/highlights.scm+1 runtime/queries/c/indents.scm+19−1 runtime/queries/cairo/highlights.scm+1−94 runtime/queries/cairo/indents.scm+1 runtime/queries/cairo/injections.scm+2−4 runtime/queries/cairo/locals.scm+1 runtime/queries/cairo/textobjects.scm+1 runtime/queries/capnp/folds.scm+14 runtime/queries/capnp/highlights.scm+141 runtime/queries/capnp/indents.scm+19 runtime/queries/capnp/injections.scm+2 runtime/queries/capnp/locals.scm+96 runtime/queries/comment/highlights.scm+20−4 runtime/queries/common-lisp/indents.scm+1 runtime/queries/cpp/highlights.scm+1−1 runtime/queries/dart/highlights.scm+3−1 runtime/queries/dbml/highlights.scm+44 runtime/queries/dockerfile/highlights.scm+4−1 runtime/queries/dtd/highlights.scm+39 runtime/queries/dtd/injections.scm+2 runtime/queries/ecma/README.md+14 runtime/queries/ecma/highlights.scm+49−21 runtime/queries/ecma/indents.scm+6 runtime/queries/ecma/locals.scm+17−3 runtime/queries/elm/textobjects.scm+63 runtime/queries/erlang/highlights.scm+10−10 runtime/queries/forth/highlights.scm+7 runtime/queries/fortran/injections.scm+2 runtime/queries/fsharp/highlights.scm+196 runtime/queries/fsharp/locals.scm+25 runtime/queries/gas/highlights.scm+21 runtime/queries/gas/injections.scm+2 runtime/queries/gas/textobjects.scm+2 runtime/queries/gdscript/highlights.scm+86−29 runtime/queries/gdscript/indents.scm+1−1 runtime/queries/gemini/highlights.scm+26 runtime/queries/git-commit/highlights.scm+5−1 runtime/queries/git-commit/textobjects.scm+2 runtime/queries/gleam/highlights.scm+17−5 runtime/queries/gn/highlights.scm+42 runtime/queries/gn/injections.scm+15 runtime/queries/gn/locals.scm+16 runtime/queries/go/highlights.scm+67−26 runtime/queries/go/indents.scm+16−4 runtime/queries/go/locals.scm+11−3 runtime/queries/godot-resource/injections.scm+16 runtime/queries/hare/highlights.scm+4−1 runtime/queries/haskell-persistent/folds.scm+3 runtime/queries/haskell-persistent/highlights.scm+37 runtime/queries/haskell-persistent/locals.scm+1 runtime/queries/haskell/highlights.scm+24−11 runtime/queries/haskell/injections.scm+12 runtime/queries/haskell/textobjects.scm+1−1 runtime/queries/hurl/highlights.scm+127 runtime/queries/hurl/indents.scm+11 runtime/queries/hurl/injections.scm+14 runtime/queries/janet/highlights.scm+1 runtime/queries/java/highlights.scm+81−2 runtime/queries/java/indents.scm+35 runtime/queries/javascript/highlights.scm+2−37 runtime/queries/javascript/indents.scm+3−1 runtime/queries/javascript/injections.scm+3−1 runtime/queries/javascript/locals.scm+3−1 runtime/queries/javascript/tags.scm+2−87 runtime/queries/javascript/textobjects.scm+3−1 runtime/queries/jinja/highlights.scm+7 runtime/queries/jinja/injections.scm+4 runtime/queries/json5/highlights.scm+11 runtime/queries/jsx/highlights.scm+2−36 runtime/queries/jsx/indents.scm+2−8 runtime/queries/jsx/injections.scm+3−1 runtime/queries/jsx/locals.scm+3−1 runtime/queries/jsx/tags.scm+3 runtime/queries/jsx/textobjects.scm+3−1 runtime/queries/julia/indents.scm+16 runtime/queries/julia/injections.scm+6 runtime/queries/julia/textobjects.scm+46 runtime/queries/just/folds.scm+4 runtime/queries/just/highlights.scm+33 runtime/queries/just/indents.scm+3 runtime/queries/just/injections.scm+16 runtime/queries/just/locals.scm+10 runtime/queries/just/textobjects.scm+48 runtime/queries/kdl/highlights.scm+4−4 runtime/queries/kdl/indents.scm+3 runtime/queries/kdl/textobjects.scm+27 runtime/queries/kotlin/highlights.scm+4−1 runtime/queries/kotlin/locals.scm+15 runtime/queries/log/highlights.scm+10 runtime/queries/lpf/highlights.scm+19 runtime/queries/make/highlights.scm+6−1 runtime/queries/make/injections.scm+3 runtime/queries/markdoc/highlights.scm+16 runtime/queries/markdoc/injections.scm+2 runtime/queries/markdown.inline/injections.scm+6−1 runtime/queries/markdown/highlights.scm+10−1 runtime/queries/markdown/injections.scm+4 runtime/queries/matlab/context.scm+41 runtime/queries/matlab/folds.scm+11 runtime/queries/matlab/highlights.scm+108−77 runtime/queries/matlab/indents.scm+23 runtime/queries/matlab/injections.scm+2 runtime/queries/matlab/locals.scm+19 runtime/queries/matlab/textobjects.scm+9 runtime/queries/nasm/highlights.scm+126 runtime/queries/nasm/injections.scm+2 runtime/queries/nasm/textobjects.scm+15 runtime/queries/nickel/highlights.scm+2−2 runtime/queries/nickel/indents.scm+1−1 runtime/queries/nickel/injections.scm+3 runtime/queries/nim/highlights.scm+315 runtime/queries/nim/indents.scm+54 runtime/queries/nim/textobjects.scm+19 runtime/queries/nix/highlights.scm+6−1 runtime/queries/nix/injections.scm+29−3 runtime/queries/nu/folds.scm−4 runtime/queries/nu/highlights.scm+276−44 runtime/queries/nu/injections.scm+1−1 runtime/queries/nu/locals.scm−13 runtime/queries/nunjucks/highlights.scm+1 runtime/queries/nunjucks/injections.scm+1 runtime/queries/ocaml/highlights.scm+2 runtime/queries/odin/highlights.scm+18−133 runtime/queries/odin/indents.scm+16 runtime/queries/odin/injections.scm+2 runtime/queries/opencl/highlights.scm+150 runtime/queries/opencl/indents.scm+1 runtime/queries/opencl/injections.scm+1 runtime/queries/opencl/textobjects.scm+1 runtime/queries/perl/fold.scm+19 runtime/queries/perl/highlights.scm+72−155 runtime/queries/perl/indents.scm+25−11 runtime/queries/perl/injections.scm+3−1 runtime/queries/perl/textobjects.scm+10−13 runtime/queries/php/highlights.scm+229−40 runtime/queries/php/injections.scm+19 runtime/queries/pod/highlights.scm+61 runtime/queries/prql/highlights.scm+143 runtime/queries/prql/injections.scm+8 runtime/queries/purescript/highlights.scm+164−1 runtime/queries/purescript/injections.scm+2−1 runtime/queries/purescript/locals.scm+4−1 runtime/queries/purescript/textobjects.scm+13 runtime/queries/python/highlights.scm+7−1 runtime/queries/python/indents.scm+9 runtime/queries/racket/indents.scm+1 runtime/queries/regex/highlights.scm+1−1 runtime/queries/rego/highlights.scm+68 runtime/queries/rego/injections.scm+2 runtime/queries/robot/highlights.scm+59 runtime/queries/ron/highlights.scm+43−1 runtime/queries/ron/indents.scm+12−1 runtime/queries/ron/injections.scm+2−1 runtime/queries/rst/highlights.scm+38 runtime/queries/ruby/highlights.scm+82−38 runtime/queries/ruby/injections.scm+6 runtime/queries/rust/highlights.scm+7 runtime/queries/rust/indents.scm+69−2 runtime/queries/rust/injections.scm+10−4 runtime/queries/rust/locals.scm+14−1 runtime/queries/rust/textobjects.scm+4−1 runtime/queries/scala/locals.scm+29 runtime/queries/scheme/highlights.scm+5 runtime/queries/scheme/indents.scm+43 runtime/queries/slint/highlights.scm+118−72 runtime/queries/slint/indents.scm+6−5 runtime/queries/slint/injections.scm+2 runtime/queries/slint/locals.scm+1−1 runtime/queries/smali/folds.scm+12 runtime/queries/smali/highlights.scm+216 runtime/queries/smali/indents.scm+31 runtime/queries/smali/injections.scm+2 runtime/queries/smali/locals.scm+42 runtime/queries/smithy/highlights.scm+102 runtime/queries/sql/highlights.scm+326−176 runtime/queries/strace/highlights.scm+8 runtime/queries/svelte/indents.scm+18 runtime/queries/svelte/injections.scm+10 runtime/queries/sway/highlights.scm+336 runtime/queries/sway/indents.scm+71 runtime/queries/sway/injections.scm+2 runtime/queries/sway/locals.scm+17 runtime/queries/sway/textobjects.scm+52 runtime/queries/t32/highlights.scm+227 runtime/queries/t32/injections.scm+2 runtime/queries/templ/highlights.scm+99 runtime/queries/templ/injections.scm+4 runtime/queries/todotxt/highlights.scm+6 runtime/queries/toml/highlights.scm+15−2 runtime/queries/tsx/highlights.scm+3−1 runtime/queries/tsx/indents.scm+3−1 runtime/queries/tsx/injections.scm+3−1 runtime/queries/tsx/locals.scm+3 runtime/queries/tsx/tags.scm+3 runtime/queries/tsx/textobjects.scm+3−1 runtime/queries/typescript/highlights.scm+2−76 runtime/queries/typescript/indents.scm+2−6 runtime/queries/typescript/injections.scm+3−1 runtime/queries/typescript/locals.scm+3−2 runtime/queries/typescript/tags.scm+2−22 runtime/queries/typescript/textobjects.scm+2−7 runtime/queries/typst/highlights.scm+77 runtime/queries/typst/injections.scm+6 runtime/queries/unison/highlights.scm+87 runtime/queries/unison/injections.scm+1 runtime/queries/v/highlights.scm+158−67 runtime/queries/v/indents.scm+16 runtime/queries/v/injections.scm+6 runtime/queries/v/textobjects.scm+27 runtime/queries/vhdl/highlights.scm+338 runtime/queries/webc/highlights.scm+1 runtime/queries/webc/injections.scm+1 runtime/queries/wren/highlights.scm+82 runtime/queries/wren/indents.scm+29 runtime/queries/wren/injections.scm+3 runtime/queries/wren/locals.scm+21 runtime/queries/wren/textobjects.scm+16 runtime/queries/yaml/indents.scm+35−1 runtime/queries/yaml/injections.scm+52 runtime/queries/yuck/highlights.scm+88−47 runtime/queries/yuck/injections.scm+1−1 runtime/queries/zig/highlights.scm+5−2 runtime/queries/zig/textobjects.scm+3−3 runtime/themes/README.md+8 runtime/themes/acme.toml+2 runtime/themes/adwaita-dark.toml+172 runtime/themes/amberwood.toml+138 runtime/themes/autumn.toml+72−64 runtime/themes/autumn_night.toml+13−11 runtime/themes/ayu_dark.toml+12−2 runtime/themes/ayu_evolve.toml+2 runtime/themes/ayu_light.toml+13−3 runtime/themes/ayu_mirage.toml+12−2 runtime/themes/base16_transparent.toml+7−1 runtime/themes/boo_berry.toml+1 runtime/themes/catppuccin_frappe.toml+2 runtime/themes/catppuccin_latte.toml+2 runtime/themes/catppuccin_macchiato.toml+2 runtime/themes/catppuccin_mocha.toml+24−14 runtime/themes/cyan_light.toml+154 runtime/themes/darcula-solid.toml+1−4 runtime/themes/darcula.toml+11−4 runtime/themes/dark_high_contrast.toml+6−1 runtime/themes/dark_plus.toml+2 runtime/themes/dracula.toml+128−70 runtime/themes/dracula_at_night.toml+2 runtime/themes/emacs.toml+1 runtime/themes/everblush.toml+115 runtime/themes/everforest_dark.toml+75−54 runtime/themes/everforest_light.toml+75−54 runtime/themes/ferra.toml+83 runtime/themes/flatwhite.toml+3 runtime/themes/fleet_dark.toml+8−6 runtime/themes/gruber-darker.toml+114 runtime/themes/gruvbox.toml+2 runtime/themes/gruvbox_dark_hard.toml+2−96 runtime/themes/gruvbox_dark_soft.toml+7 runtime/themes/gruvbox_light.toml+1−77 runtime/themes/horizon-dark.toml+80 runtime/themes/jellybeans.toml+1−1 runtime/themes/kanagawa.toml+32−24 runtime/themes/kaolin-dark.toml+108 runtime/themes/kaolin-light.toml+60 runtime/themes/kaolin-valley-dark.toml+73 runtime/themes/licenses/everforest.LICENSE+21 runtime/themes/licenses/modus_vivendi.LICENSE+5 runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSE+5 runtime/themes/licenses/modus_vivendi_tinted.LICENSE+5 runtime/themes/licenses/modus_vivendi_tritanopia.LICENSE+5 runtime/themes/licenses/poimandres.LICENSE+21 runtime/themes/licenses/serika-syntax.LICENSE+21 runtime/themes/licenses/sonokai.LICENSE+21 runtime/themes/licenses/starlight.LICENSE+24 runtime/themes/material_darker.toml+20 runtime/themes/material_deep_ocean.toml+123 runtime/themes/material_oceanic.toml+21 runtime/themes/material_palenight.toml+19 runtime/themes/mellow.toml+1 runtime/themes/merionette.toml+98 runtime/themes/modus_operandi.toml+194 runtime/themes/modus_operandi_deuteranopia.toml+46 runtime/themes/modus_operandi_tinted.toml+45 runtime/themes/modus_operandi_tritanopia.toml+73 runtime/themes/modus_vivendi.toml+242 runtime/themes/modus_vivendi_deuteranopia.toml+158 runtime/themes/modus_vivendi_tinted.toml+144 runtime/themes/modus_vivendi_tritanopia.toml+186 runtime/themes/molokai.toml+48 runtime/themes/monokai.toml+7−2 runtime/themes/naysayer.toml+91 runtime/themes/new_moon.toml+124 runtime/themes/nightfox.toml+9−4 runtime/themes/noctis.toml+34−32 runtime/themes/nord-night.toml+23 runtime/themes/nord.toml+162−102 runtime/themes/onedark.toml+5 runtime/themes/onedarker.toml+3 runtime/themes/onelight.toml+150−89 runtime/themes/papercolor-dark.toml+67−115 runtime/themes/papercolor-light.toml+194−102 runtime/themes/poimandres.toml+113 runtime/themes/poimandres_storm.toml+19 runtime/themes/pop-dark.toml+9−5 runtime/themes/rasmus.toml+1 runtime/themes/rose_pine.toml+36−32 runtime/themes/rose_pine_dawn.toml+1−1 runtime/themes/rose_pine_moon.toml+1−1 runtime/themes/serika-dark.toml+2−1 runtime/themes/serika-light.toml+1 runtime/themes/solarized_dark.toml+1 runtime/themes/solarized_light.toml+1 runtime/themes/spacebones_light.toml+1 runtime/themes/starlight.toml+113 runtime/themes/tokyonight.toml+1 runtime/themes/varua.toml+2 runtime/themes/vim_dark_high_contrast.toml+72 runtime/themes/yellowed.toml+135 runtime/themes/zed_onedark.toml+110 runtime/themes/zed_onelight.toml+55 runtime/themes/zenburn.toml+3−1 runtime/tutor+165−11 rust-toolchain.toml+2−2 theme.toml+3−1 xtask/Cargo.toml+12−6 xtask/src/docgen.rs+6−5 xtask/src/themelint.rs+2
.envrc+1
@@ -1,5 +1,6 @@
11watch_file shell.nix
22watch_file flake.lock
3+watch_file rust-toolchain.toml
34
45# try to use flakes, if it fails use normal nix (ie. shell.nix)
56use flake || use nix
.github/ISSUE_TEMPLATE/bug_report.yaml+10
@@ -55,6 +55,16 @@ body:
5555 placeholder: wezterm 20220101-133340-7edc5b5a
5656 validations:
5757 required: true
58+ - type: input
59+ id: installation-method
60+ attributes:
61+ label: Installation Method
62+ description: >
63+ How you installed Helix - from a package manager like Homebrew or the
64+ AUR, built from source, downloaded a binary from the releases page, etc.
65+ placeholder: "source / brew / nixpkgs / flake / releases page"
66+ validations:
67+ required: true
5868 - type: input
5969 id: helix-version
6070 attributes:
.github/workflows/build.yml+15−7
@@ -14,7 +14,7 @@ jobs:
1414 runs-on: ubuntu-latest
1515 steps:
1616 - name: Checkout sources
17− uses: actions/checkout@v3
17+ uses: actions/checkout@v4
1818 - name: Install stable toolchain
1919 uses: helix-editor/rust-toolchain@v1
2020 with:
@@ -22,6 +22,8 @@ jobs:
2222 override: true
2323
2424 - uses: Swatinem/rust-cache@v2
25+ with:
26+ shared-key: "build"
2527
2628 - name: Run cargo check
2729 run: cargo check
@@ -34,12 +36,14 @@ jobs:
3436 HELIX_LOG_LEVEL: info
3537 steps:
3638 - name: Checkout sources
37− uses: actions/checkout@v3
39+ uses: actions/checkout@v4
3840
3941 - name: Install stable toolchain
40− uses: dtolnay/rust-toolchain@1.63
42+ uses: dtolnay/rust-toolchain@1.70
4143
4244 - uses: Swatinem/rust-cache@v2
45+ with:
46+ shared-key: "build"
4347
4448 - name: Cache test tree-sitter grammar
4549 uses: actions/cache@v3
@@ -63,14 +67,16 @@ jobs:
6367 runs-on: ubuntu-latest
6468 steps:
6569 - name: Checkout sources
66− uses: actions/checkout@v3
70+ uses: actions/checkout@v4
6771
6872 - name: Install stable toolchain
69− uses: dtolnay/rust-toolchain@1.63
73+ uses: dtolnay/rust-toolchain@1.70
7074 with:
7175 components: rustfmt, clippy
7276
7377 - uses: Swatinem/rust-cache@v2
78+ with:
79+ shared-key: "build"
7480
7581 - name: Run cargo fmt
7682 run: cargo fmt --all --check
@@ -88,12 +94,14 @@ jobs:
8894 runs-on: ubuntu-latest
8995 steps:
9096 - name: Checkout sources
91− uses: actions/checkout@v3
97+ uses: actions/checkout@v4
9298
9399 - name: Install stable toolchain
94− uses: dtolnay/rust-toolchain@1.63
100+ uses: dtolnay/rust-toolchain@1.70
95101
96102 - uses: Swatinem/rust-cache@v2
103+ with:
104+ shared-key: "build"
97105
98106 - name: Validate queries
99107 run: cargo xtask query-check
.github/workflows/cachix.yml+3−3
@@ -11,13 +11,13 @@ jobs:
1111 runs-on: ubuntu-latest
1212 steps:
1313 - name: Checkout sources
14− uses: actions/checkout@v3
14+ uses: actions/checkout@v4
1515
1616 - name: Install nix
17− uses: cachix/install-nix-action@v19
17+ uses: cachix/install-nix-action@v24
1818
1919 - name: Authenticate with Cachix
20− uses: cachix/cachix-action@v12
20+ uses: cachix/cachix-action@v13
2121 with:
2222 name: helix
2323 authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
.github/workflows/gh-pages.yml+5−5
@@ -11,7 +11,7 @@ jobs:
1111 deploy:
1212 runs-on: ubuntu-latest
1313 steps:
14− - uses: actions/checkout@v3
14+ - uses: actions/checkout@v4
1515
1616 - name: Setup mdBook
1717 uses: peaceiris/actions-mdbook@v1
@@ -26,16 +26,16 @@ jobs:
2626 OUTDIR=$(basename ${{ github.ref }})
2727 echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
2828
29− - name: Deploy
29+ - name: Deploy stable
3030 uses: peaceiris/actions-gh-pages@v3
31+ if: startswith(github.ref, 'refs/tags/')
3132 with:
3233 github_token: ${{ secrets.GITHUB_TOKEN }}
3334 publish_dir: ./book/book
34− destination_dir: ./${{ env.OUTDIR }}
3535
36− - name: Deploy stable
36+ - name: Deploy
3737 uses: peaceiris/actions-gh-pages@v3
38− if: startswith(github.ref, 'refs/tags/')
3938 with:
4039 github_token: ${{ secrets.GITHUB_TOKEN }}
4140 publish_dir: ./book/book
41+ destination_dir: ./${{ env.OUTDIR }}
.github/workflows/release.yml+27−16
@@ -23,7 +23,7 @@ jobs:
2323 runs-on: ubuntu-latest
2424 steps:
2525 - name: Checkout sources
26− uses: actions/checkout@v3
26+ uses: actions/checkout@v4
2727
2828 - name: Install stable toolchain
2929 uses: dtolnay/rust-toolchain@stable
@@ -36,7 +36,7 @@ jobs:
3636 - name: Bundle grammars
3737 run: tar cJf grammars.tar.xz -C runtime/grammars/sources .
3838
39− - uses: actions/upload-artifact@v3
39+ - uses: actions/upload-artifact@v4
4040 with:
4141 name: grammars
4242 path: grammars.tar.xz
@@ -70,11 +70,11 @@ jobs:
7070 rust: stable
7171 target: aarch64-unknown-linux-gnu
7272 cross: true
73− - build: riscv64-linux
74− os: ubuntu-latest
75− rust: stable
76− target: riscv64gc-unknown-linux-gnu
77− cross: true
73+ # - build: riscv64-linux
74+ # os: ubuntu-latest
75+ # rust: stable
76+ # target: riscv64gc-unknown-linux-gnu
77+ # cross: true
7878 - build: x86_64-macos
7979 os: macos-latest
8080 rust: stable
@@ -85,6 +85,7 @@ jobs:
8585 rust: stable
8686 target: x86_64-pc-windows-msvc
8787 cross: false
88+ # 23.03: build issues
8889 - build: aarch64-macos
8990 os: macos-latest
9091 rust: stable
@@ -102,10 +103,10 @@ jobs:
102103
103104 steps:
104105 - name: Checkout sources
105− uses: actions/checkout@v3
106+ uses: actions/checkout@v4
106107
107108 - name: Download grammars
108− uses: actions/download-artifact@v3
109+ uses: actions/download-artifact@v4
109110
110111 - name: Move grammars under runtime
111112 if: "!startsWith(matrix.os, 'windows')"
@@ -113,6 +114,12 @@ jobs:
113114 mkdir -p runtime/grammars/sources
114115 tar xJf grammars/grammars.tar.xz -C runtime/grammars/sources
115116
117+ # The rust-toolchain action ignores rust-toolchain.toml files.
118+ # Removing this before building with cargo ensures that the rust-toolchain
119+ # is considered the same between installation and usage.
120+ - name: Remove the rust-toolchain.toml file
121+ run: rm rust-toolchain.toml
122+
116123 - name: Install ${{ matrix.rust }} toolchain
117124 uses: dtolnay/rust-toolchain@master
118125 with:
@@ -153,8 +160,12 @@ jobs:
153160
154161 - name: Build AppImage
155162 shell: bash
156− if: matrix.build == 'aarch64-linux' || matrix.build == 'x86_64-linux'
163+ if: matrix.build == 'x86_64-linux'
157164 run: |
165+ # Required as of 22.x https://github.com/AppImage/AppImageKit/wiki/FUSE
166+ sudo add-apt-repository universe
167+ sudo apt install libfuse2
168+
158169 mkdir dist
159170
160171 name=dev
@@ -209,7 +220,7 @@ jobs:
209220 fi
210221 cp -r runtime dist
211222
212− - uses: actions/upload-artifact@v3
223+ - uses: actions/upload-artifact@v4
213224 with:
214225 name: bins-${{ matrix.build }}
215226 path: dist
@@ -220,9 +231,9 @@ jobs:
220231 runs-on: ubuntu-latest
221232 steps:
222233 - name: Checkout sources
223− uses: actions/checkout@v3
234+ uses: actions/checkout@v4
224235
225− - uses: actions/download-artifact@v3
236+ - uses: actions/download-artifact@v4
226237
227238 - name: Build archive
228239 shell: bash
@@ -244,7 +255,7 @@ jobs:
244255 exe=".exe"
245256 fi
246257 pkgname=helix-$GITHUB_REF_NAME-$platform
247− mkdir $pkgname
258+ mkdir -p $pkgname
248259 cp $source/LICENSE $source/README.md $pkgname
249260 mkdir $pkgname/contrib
250261 cp -r $source/contrib/completion $pkgname/contrib
@@ -252,7 +263,7 @@ jobs:
252263 mv bins-$platform/hx$exe $pkgname
253264 chmod +x $pkgname/hx$exe
254265
255− if [[ "$platform" = "aarch64-linux" || "$platform" = "x86_64-linux" ]]; then
266+ if [[ "$platform" = "x86_64-linux" ]]; then
256267 mv bins-$platform/helix-*.AppImage* dist/
257268 fi
258269
@@ -277,7 +288,7 @@ jobs:
277288 overwrite: true
278289
279290 - name: Upload binaries as artifact
280− uses: actions/upload-artifact@v3
291+ uses: actions/upload-artifact@v4
281292 if: env.preview == 'true'
282293 with:
283294 name: release
.ignore−3
@@ -1,5 +1,2 @@
11# Things that we don't want ripgrep to search that we do want in git
22# https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#automatic-filtering
3−
4−# Minified JS vendored from mdbook
5−book/theme/highlight.js
CHANGELOG.md+651−1
@@ -1,3 +1,653 @@
1+# 23.10 (2023-10-24)
2+
3+A big shout out to all the contributors! We had 118 contributors in this release.
4+
5+Breaking changes:
6+
7+- Support multiple language servers per language ([#2507](https://github.com/helix-editor/helix/pull/2507))
8+ - This is a breaking change to language configuration
9+
10+Features:
11+
12+- Support multiple language servers per language ([#2507](https://github.com/helix-editor/helix/pull/2507), [#7082](https://github.com/helix-editor/helix/pull/7082), [#7286](https://github.com/helix-editor/helix/pull/7286), [#8374](https://github.com/helix-editor/helix/pull/8374))
13+- Add a statusline element for the selected register ([#7222](https://github.com/helix-editor/helix/pull/7222))
14+- Add `%`, `#`, `.`, `*` and `+` special registers ([#6985](https://github.com/helix-editor/helix/pull/6985))
15+- Add initial support for LSP DidChangeWatchedFiles notifications ([#7665](https://github.com/helix-editor/helix/pull/7665))
16+- Search buffer contents in `global_search` ([#5652](https://github.com/helix-editor/helix/pull/5652))
17+- Add a "smart tab" command that intelligently jumps the cursor on tab ([#4443](https://github.com/helix-editor/helix/pull/4443))
18+- Add a statusline element for whether a file is read-only ([#7222](https://github.com/helix-editor/helix/pull/7222), [#7875](https://github.com/helix-editor/helix/pull/7875))
19+- Syntax highlight regex prompts ([#7738](https://github.com/helix-editor/helix/pull/7738))
20+- Allow defining alignment in indent queries ([#5355](https://github.com/helix-editor/helix/pull/5355))
21+- Show visual feedback in `surround_replace` ([#7588](https://github.com/helix-editor/helix/pull/7588))
22+- Switch to Nucleo for fuzzy matching ([#7814](https://github.com/helix-editor/helix/pull/7814), [#8148](https://github.com/helix-editor/helix/pull/8148), [#8192](https://github.com/helix-editor/helix/pull/8192), [#8194](https://github.com/helix-editor/helix/pull/8194))
23+- Insert a trailing newline on write ([#8157](https://github.com/helix-editor/helix/pull/8157))
24+- Add a `-w`/`--working-dir` CLI flag for specifying a working directory on startup ([#8223](https://github.com/helix-editor/helix/pull/8223), [#8498](https://github.com/helix-editor/helix/pull/8498), [#8520](https://github.com/helix-editor/helix/pull/8520))
25+- Accept a `+N` CLI argument to set the first file's line number ([#8521](https://github.com/helix-editor/helix/pull/8521))
26+- Accept Helix-specific ignore files in `.helix/ignore` and `~/.config/helix/ignore` ([#8099](https://github.com/helix-editor/helix/pull/8099))
27+
28+Commands:
29+
30+- `merge_selections` (`A-minus`) - merge all selections into one selection that covers all ranges ([#7053](https://github.com/helix-editor/helix/pull/7053))
31+- `move_prev_long_word_end` and `extend_prev_long_word_end` - move/extend to the end of the previous WORD ([#6905](https://github.com/helix-editor/helix/pull/6905))
32+- `reverse_selection_contents` - swaps the values of each selection so they are reversed ([#7329](https://github.com/helix-editor/helix/pull/7329))
33+- Add `:rl` and `:rla` aliases for `:reload` and `:reload-all` ([#7158](https://github.com/helix-editor/helix/pull/7158))
34+- `yank_joined` - join the selections and yank to the selected register ([#7195](https://github.com/helix-editor/helix/pull/7195))
35+- `:write-all!` (`:wa!`) - forcibly write all buffers to disk and create any necessary subdirectories ([#7577](https://github.com/helix-editor/helix/pull/7577))
36+- `:redraw` - clear re-render the UI ([#6949](https://github.com/helix-editor/helix/pull/6949))
37+- `:tree-sitter-highlight-name` - show the theme scope name of the highlight under the cursor ([#8170](https://github.com/helix-editor/helix/pull/8170))
38+
39+Usability improvements:
40+
41+- Allow cycling option values at runtime ([#4411](https://github.com/helix-editor/helix/pull/4411), [#7240](https://github.com/helix-editor/helix/pull/7240), [#7877](https://github.com/helix-editor/helix/pull/7877))
42+- Exit gracefully on termination signals ([#7236](https://github.com/helix-editor/helix/pull/7236))
43+- Add plaintext matching fallback to tree-sitter pair matching ([#4288](https://github.com/helix-editor/helix/pull/4288))
44+- Persist register selection in pending keymaps ([0e08349](https://github.com/helix-editor/helix/commit/0e08349))
45+- Propagate the count and register to command palette commands ([b394997](https://github.com/helix-editor/helix/commit/b394997))
46+- Auto indent on `insert_at_line_start` ([#5837](https://github.com/helix-editor/helix/pull/5837))
47+- Add a config option to control whether LSP completions are automatically inserted on preview ([#7189](https://github.com/helix-editor/helix/pull/7189))
48+- Add a config option for default line endings ([#5621](https://github.com/helix-editor/helix/pull/5621), [#7357](https://github.com/helix-editor/helix/pull/7357))
49+- Allow ANSI colors in themes ([#5119](https://github.com/helix-editor/helix/pull/5119))
50+- Match pairs that don't form a standalone tree-sitter node ([#7242](https://github.com/helix-editor/helix/pull/7242))
51+- Allow indent sizes of up to 16 columns ([#7429](https://github.com/helix-editor/helix/pull/7429))
52+- Improve performance of mapping positions through changes ([#7408](https://github.com/helix-editor/helix/pull/7408), [8d39a81](https://github.com/helix-editor/helix/commit/8d39a81), [#7471](https://github.com/helix-editor/helix/pull/7471))
53+- Mark buffers created from stdin as modified ([#7431](https://github.com/helix-editor/helix/pull/7431))
54+- Forcibly shut down uninitialized language servers ([#7449](https://github.com/helix-editor/helix/pull/7449))
55+- Add filename completer for shell prompts ([#7569](https://github.com/helix-editor/helix/pull/7569))
56+- Allow binding F13-F24 ([#7672](https://github.com/helix-editor/helix/pull/7672))
57+- Resolve LSP code actions ([#7677](https://github.com/helix-editor/helix/pull/7677), [#8421](https://github.com/helix-editor/helix/pull/8421))
58+- Save an undo checkpoint before accepting completions ([#7747](https://github.com/helix-editor/helix/pull/7747))
59+- Include gitignored files in debugger completions ([#7936](https://github.com/helix-editor/helix/pull/7936))
60+- Make editor remember the last search register ([#5244](https://github.com/helix-editor/helix/pull/5244))
61+- Open directories with `goto_file` ([#7909](https://github.com/helix-editor/helix/pull/7909))
62+- Use relative path to open buffer in `goto_file` (`gf`) ([#7965](https://github.com/helix-editor/helix/pull/7965))
63+- Support `default` color in themes ([#8083](https://github.com/helix-editor/helix/pull/8083), [#8114](https://github.com/helix-editor/helix/pull/8114))
64+- Toggle between relative and absolute line numbers when the terminal loses focus ([#7955](https://github.com/helix-editor/helix/pull/7955))
65+- Lower default idle-timeout to 250ms ([060e73a](https://github.com/helix-editor/helix/commit/060e73a))
66+- Allow theming diff gutters separately from other diff colors ([#8343](https://github.com/helix-editor/helix/pull/8343))
67+- Style bold/italic/strikethrough in markdown doc popups ([#8385](https://github.com/helix-editor/helix/pull/8385))
68+- Maintain the cursor position and view when splitting with `:hsplit`/`:vsplit` ([#8109](https://github.com/helix-editor/helix/pull/8109))
69+- Accept `-` in macros outside of `<`/`>` ([#8475](https://github.com/helix-editor/helix/pull/8475))
70+- Show all language servers for each language in `--health` ([#7315](https://github.com/helix-editor/helix/pull/7315))
71+- Don't break on hyphens in `:reflow` ([#8569](https://github.com/helix-editor/helix/pull/8569))
72+
73+Fixes:
74+
75+- Update diagnostics correctly on language server exit ([#7111](https://github.com/helix-editor/helix/pull/7111))
76+- Fix off-by-one in `select_references_to_symbol_under_cursor` ([#7132](https://github.com/helix-editor/helix/pull/7132))
77+- Extend selection with repeat-last-motion only if the original motion extended the selection ([#7159](https://github.com/helix-editor/helix/pull/7159))
78+- Fix undefined behavior in the diff gutter ([#7227](https://github.com/helix-editor/helix/pull/7227))
79+- Check that tab width is non-zero ([#7178](https://github.com/helix-editor/helix/pull/7178))
80+- Fix styles being overwritten in table rows with multiple cells ([#7281](https://github.com/helix-editor/helix/pull/7281))
81+- Add file for `--log` CLI arg in help text ([#7307](https://github.com/helix-editor/helix/pull/7307))
82+- Fix underflow when repeating a completion that has a negative shift position ([#7322](https://github.com/helix-editor/helix/pull/7322))
83+- Prefer longer matches in `select_next_sibling` and `select_prev_sibling` ([#7332](https://github.com/helix-editor/helix/pull/7332))
84+- Preview scratch buffers in the jumplist picker ([#7331](https://github.com/helix-editor/helix/pull/7331))
85+- Fix chunking by bytes in tree-sitter parsing ([#7417](https://github.com/helix-editor/helix/pull/7417))
86+- Discard LSP publishDiagnostic from uninitialized servers ([#7467](https://github.com/helix-editor/helix/pull/7467))
87+- Use negotiated position encoding for LSP workspace edits ([#7469](https://github.com/helix-editor/helix/pull/7469))
88+- Fix error message for unknown gutter types in config ([#7534](https://github.com/helix-editor/helix/pull/7534))
89+- Fix `:log-open` when `--log` CLI arg is specified ([#7573](https://github.com/helix-editor/helix/pull/7573), [#7585](https://github.com/helix-editor/helix/pull/7585))
90+- Fix debouncing of LSP messages to fix the last message sticking around ([#7538](https://github.com/helix-editor/helix/pull/7538), [#8023](https://github.com/helix-editor/helix/pull/8023))
91+- Fix crash when the current working directory is deleted ([#7185](https://github.com/helix-editor/helix/pull/7185))
92+- Fix piping to Helix on macOS ([#5468](https://github.com/helix-editor/helix/pull/5468))
93+- Fix crash when parsing overlapping injections ([#7621](https://github.com/helix-editor/helix/pull/7621))
94+- Clear the statusline when the prompt is visible ([#7646](https://github.com/helix-editor/helix/pull/7646))
95+- Fix range formatting error message typo ([#7823](https://github.com/helix-editor/helix/pull/7823))
96+- Skip rendering gutters when gutter width exceeds view width ([#7821](https://github.com/helix-editor/helix/pull/7821))
97+- Center the picker preview using visual lines ([#7837](https://github.com/helix-editor/helix/pull/7837))
98+- Align view correctly for background buffers opened with `A-ret` ([#7691](https://github.com/helix-editor/helix/pull/7691))
99+- Fix cursor resetting to block when quitting via a keybind ([#7931](https://github.com/helix-editor/helix/pull/7931))
100+- Remove path completions for the `:new` command ([#8010](https://github.com/helix-editor/helix/pull/8010))
101+- Use binary path resolved by `which` for formatter commands ([#8064](https://github.com/helix-editor/helix/pull/8064))
102+- Handle crossterm's `hidden` modifier ([#8120](https://github.com/helix-editor/helix/pull/8120))
103+- Clear completion when switching between windows with the mouse ([#8118](https://github.com/helix-editor/helix/pull/8118))
104+- Eagerly remove the last picker (`<space>'`) when the picker has many items ([#8127](https://github.com/helix-editor/helix/pull/8127))
105+- Fix find commands for buffers with non-LF line-endings ([#8111](https://github.com/helix-editor/helix/pull/8111))
106+- Detect the tmux clipboard provider on macOS ([#8182](https://github.com/helix-editor/helix/pull/8182))
107+- Fix syntax highlighting in dynamic picker preview pane ([#8206](https://github.com/helix-editor/helix/pull/8206))
108+- Recognize HTML code tags with attributes as code in markdown previews ([#8397](https://github.com/helix-editor/helix/pull/8397))
109+- Fix multicursor snippet placeholder directions ([#8423](https://github.com/helix-editor/helix/pull/8423))
110+- Only show diagnostic highlights when diagnostics are enabled for a language server ([#8551](https://github.com/helix-editor/helix/pull/8551))
111+
112+Themes:
113+
114+- Improve the selection color in `ferra` ([#7138](https://github.com/helix-editor/helix/pull/7138))
115+- Add `variable.other.member` theming to `spacebones_light` ([#7125](https://github.com/helix-editor/helix/pull/7125))
116+- Update `autumn` and theme the soft-wrap indicator ([#7229](https://github.com/helix-editor/helix/pull/7229))
117+- Add `gruvbox_dark_soft` ([#7139](https://github.com/helix-editor/helix/pull/7139))
118+- Add `merionette` ([#7186](https://github.com/helix-editor/helix/pull/7186))
119+- Add `zed_onedark` and `zed_onelight` ([#7250](https://github.com/helix-editor/helix/pull/7250))
120+- Use light-gray for `onedarker` inlay hint theming ([#7433](https://github.com/helix-editor/helix/pull/7433))
121+- Update the Nord theme to follow the style guidelines ([#7490](https://github.com/helix-editor/helix/pull/7490))
122+- Tune `dark_plus` inlay hint colors ([#7611](https://github.com/helix-editor/helix/pull/7611))
123+- Add `naysayer` ([#7570](https://github.com/helix-editor/helix/pull/7570))
124+- Add `kaolin-dark`, `kaolin-light` and `kaolin-valley-dark` ([#7151](https://github.com/helix-editor/helix/pull/7151))
125+- Fix selection highlighting in gruvbox variants ([#7717](https://github.com/helix-editor/helix/pull/7717))
126+- Add soft-wrap indicator to `gruvbox` ([#7736](https://github.com/helix-editor/helix/pull/7736))
127+- Add missing palette definitions in `everforest_dark` ([#7739](https://github.com/helix-editor/helix/pull/7739))
128+- Increase diagnostics clarity in `pop-dark` ([#7702](https://github.com/helix-editor/helix/pull/7702))
129+- Add `vim_dark_high_contrast` ([#7785](https://github.com/helix-editor/helix/pull/7785))
130+- Add `new_moon` ([#7834](https://github.com/helix-editor/helix/pull/7834))
131+- Add `yellowed` ([#7849](https://github.com/helix-editor/helix/pull/7849))
132+- Improve comment readability for `autumn` ([#7939](https://github.com/helix-editor/helix/pull/7939))
133+- Distinguish active bufferline buffer in `monokai` ([#7983](https://github.com/helix-editor/helix/pull/7983))
134+- Update ruler colors in `nord` ([#7995](https://github.com/helix-editor/helix/pull/7995))
135+- Update Catppuccin themes ([#8102](https://github.com/helix-editor/helix/pull/8102))
136+- Add text focus scope and diagnostics undercurls for `nord` ([#8165](https://github.com/helix-editor/helix/pull/8165))
137+- Add material theme collection ([#8211](https://github.com/helix-editor/helix/pull/8211))
138+- Improve indent line color in `dracula` ([#8266](https://github.com/helix-editor/helix/pull/8266))
139+- Clean up and refactor `papercolor` to use inheritance ([#8276](https://github.com/helix-editor/helix/pull/8276))
140+- Fix `zenburn` inlay hint color ([#8278](https://github.com/helix-editor/helix/pull/8278)a)
141+- Fix picker crash when previewing an invalid range ([e9d0bd7](https://github.com/helix-editor/helix/commit/e9d0bd7))
142+- Correctly center items in the picker preview ([13d4463](https://github.com/helix-editor/helix/commit/13d4463))
143+- Add `cyan_light` ([#8293](https://github.com/helix-editor/helix/pull/8293), [#8587](https://github.com/helix-editor/helix/pull/8587))
144+- Theme HTML tags in `onedark` ([#8409](https://github.com/helix-editor/helix/pull/8409))
145+- Refine `darcula` and `darcula-solid` themes ([#8412](https://github.com/helix-editor/helix/pull/8412))
146+- Improve `nord` highlights ([#8414](https://github.com/helix-editor/helix/pull/8414))
147+- Add `nord-night` ([#8549](https://github.com/helix-editor/helix/pull/8549))
148+
149+New languages:
150+
151+- Blueprint ([#7213](https://github.com/helix-editor/helix/pull/7213), [#8161](https://github.com/helix-editor/helix/pull/8161))
152+- Forth ([#7256](https://github.com/helix-editor/helix/pull/7256), [#7334](https://github.com/helix-editor/helix/pull/7334))
153+- t32 ([#7140](https://github.com/helix-editor/helix/pull/7140), [#7811](https://github.com/helix-editor/helix/pull/7811))
154+- WebC ([#7290](https://github.com/helix-editor/helix/pull/7290))
155+- Persistent DSL for Haskell ([#7261](https://github.com/helix-editor/helix/pull/7261))
156+- F# ([#7619](https://github.com/helix-editor/helix/pull/7619), [#8024](https://github.com/helix-editor/helix/pull/8024))
157+- Wren ([#7765](https://github.com/helix-editor/helix/pull/7765), [#7819](https://github.com/helix-editor/helix/pull/7819))
158+- Unison ([#7724](https://github.com/helix-editor/helix/pull/7724))
159+- Todo.txt ([#7835](https://github.com/helix-editor/helix/pull/7835))
160+- Jinja and Handlebars ([#7233](https://github.com/helix-editor/helix/pull/7233))
161+- Pod ([#7907](https://github.com/helix-editor/helix/pull/7907))
162+- Strace ([#7928](https://github.com/helix-editor/helix/pull/7928))
163+- Gemini ([#8070](https://github.com/helix-editor/helix/pull/8070))
164+- GNU Assembler (GAS) ([#8291](https://github.com/helix-editor/helix/pull/8291))
165+- JSON5 ([#8473](https://github.com/helix-editor/helix/pull/8473))
166+- TEMPL ([#8540](https://github.com/helix-editor/helix/pull/8540))
167+
168+Updated languages and queries:
169+
170+- Add one to the ruler numbers for git-commit ([#7072](https://github.com/helix-editor/helix/pull/7072))
171+- Recognize XAML files as XML ([#7083](https://github.com/helix-editor/helix/pull/7083))
172+- Recognize `Cargo.lock` as TOML ([#7095](https://github.com/helix-editor/helix/pull/7095))
173+- Use Rust grammar for Cairo ([c6d1430](https://github.com/helix-editor/helix/commit/c6d1430))
174+- Update tree-sitter-nickel ([#7059](https://github.com/helix-editor/helix/pull/7059), [#7551](https://github.com/helix-editor/helix/pull/7551))
175+- Tune auto-pair characters for Nickel ([#7059](https://github.com/helix-editor/helix/pull/7059))
176+- Recognize `Vagrantfile` as Ruby ([#7112](https://github.com/helix-editor/helix/pull/7112))
177+- Recognize hidden justfiles as Just ([#7088](https://github.com/helix-editor/helix/pull/7088))
178+- Update Java and TypeScript highlight queries ([#7145](https://github.com/helix-editor/helix/pull/7145))
179+- Recognize `.zimrc` as Bash ([#7146](https://github.com/helix-editor/helix/pull/7146))
180+- Recognize `.gir` as XML ([#7152](https://github.com/helix-editor/helix/pull/7152))
181+- Update tree-sitter-scala ([#7147](https://github.com/helix-editor/helix/pull/7147))
182+- Recognize make file-type as Makefile ([#7212](https://github.com/helix-editor/helix/pull/7212))
183+- Update tree-sitter-verilog ([#7262](https://github.com/helix-editor/helix/pull/7262))
184+- Update tree-sitter-cpp ([#7285](https://github.com/helix-editor/helix/pull/7285))
185+- Support core mode for delve debugger ([#7300](https://github.com/helix-editor/helix/pull/7300))
186+- Add Fortran comment injections ([#7305](https://github.com/helix-editor/helix/pull/7305))
187+- Switch Vue language server to `vue-language-server` ([#7312](https://github.com/helix-editor/helix/pull/7312))
188+- Update tree-sitter-sql ([#7387](https://github.com/helix-editor/helix/pull/7387), [#8464](https://github.com/helix-editor/helix/pull/8464))
189+- 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))
190+- Highlight TOML table headers ([#7441](https://github.com/helix-editor/helix/pull/7441))
191+- Recognize `cppm` file-type as C++ ([#7492](https://github.com/helix-editor/helix/pull/7492))
192+- Refactor ecma language queries into private and public queries ([#7207](https://github.com/helix-editor/helix/pull/7207))
193+- Update tree-sitter-dart ([#7576](https://github.com/helix-editor/helix/pull/7576))
194+- Add shebang for nushell files ([#7606](https://github.com/helix-editor/helix/pull/7606))
195+- Recognize systemd files as INI ([#7592](https://github.com/helix-editor/helix/pull/7592))
196+- Update TypeScript, TSX and Svelte grammars ([#6874](https://github.com/helix-editor/helix/pull/6874))
197+- Enable inlay hints in the Svelte language server ([#7622](https://github.com/helix-editor/helix/pull/7622))
198+- Recognize `Brewfile`s as Ruby ([#7629](https://github.com/helix-editor/helix/pull/7629))
199+- Add more file-types for R ([#7633](https://github.com/helix-editor/helix/pull/7633))
200+- Switch tree-sitter-perl to official upstream parser ([#7644](https://github.com/helix-editor/helix/pull/7644), [#7947](https://github.com/helix-editor/helix/pull/7947))
201+- Fix predicate typo in comment highlights ([#7732](https://github.com/helix-editor/helix/pull/7732))
202+- Update tree-sitter-prql ([#7771](https://github.com/helix-editor/helix/pull/7771))
203+- Recognize `.gitf` as JSON ([#7781](https://github.com/helix-editor/helix/pull/7781))
204+- Switch V language server to `v-analyzer` ([#7760](https://github.com/helix-editor/helix/pull/7760))
205+- Add protobuf language servers ([#7796](https://github.com/helix-editor/helix/pull/7796))
206+- Update tree-sitter-zig ([#7803](https://github.com/helix-editor/helix/pull/7803))
207+- Update tree-sitter-hare ([#7784](https://github.com/helix-editor/helix/pull/7784))
208+- Add Java indent queries ([#7844](https://github.com/helix-editor/helix/pull/7844))
209+- Update tree-sitter-scheme ([979933b](https://github.com/helix-editor/helix/commit/979933b))
210+- Recognize `scm` as Scheme instead of TSQ ([5707151](https://github.com/helix-editor/helix/commit/5707151))
211+- Update tree-sitter-git-commit ([#7831](https://github.com/helix-editor/helix/pull/7831))
212+- Update JavaScript, TypeScript and TSX grammars ([#7852](https://github.com/helix-editor/helix/pull/7852))
213+- Update tree-sitter-nu ([#7873](https://github.com/helix-editor/helix/pull/7873))
214+- Fix YAML indentation ([#6768](https://github.com/helix-editor/helix/pull/6768))
215+- Add `csharp-ls`, Pyright, Pylyzer and add roots for Python ([#7897](https://github.com/helix-editor/helix/pull/7897), [#8032](https://github.com/helix-editor/helix/pull/8032))
216+- Update tree-sitter-slint ([#7893](https://github.com/helix-editor/helix/pull/7893))
217+- Recognize more ZSH file-types as Bash ([#7930](https://github.com/helix-editor/helix/pull/7930))
218+- Recognize `star` extension as Starlark ([#7922](https://github.com/helix-editor/helix/pull/7922))
219+- Fix inline HTML tag highlighting in markdown ([#7960](https://github.com/helix-editor/helix/pull/7960))
220+- Update tree-sitter-robot ([#7970](https://github.com/helix-editor/helix/pull/7970))
221+- Highlight Dart 3 `sealed` and `base` keywords ([#7974](https://github.com/helix-editor/helix/pull/7974))
222+- Add configuration for `ltex-ls` to the default `languages.toml` ([#7838](https://github.com/helix-editor/helix/pull/7838))
223+- Update tree-sitter-strace ([#8087](https://github.com/helix-editor/helix/pull/8087))
224+- Update tree-sitter-gleam, enable auto-format ([#8085](https://github.com/helix-editor/helix/pull/8085))
225+- Update tree-sitter-esdl ([#8222](https://github.com/helix-editor/helix/pull/8222))
226+- Expand ignore file-types ([#8220](https://github.com/helix-editor/helix/pull/8220))
227+- Recognize feed related formats as XML ([#8232](https://github.com/helix-editor/helix/pull/8232))
228+- Improve YAML injections ([#8217](https://github.com/helix-editor/helix/pull/8217))
229+- Add shebangs for TypeScript, Julia, Java and OCaml ([95e994a](https://github.com/helix-editor/helix/commit/95e994a))
230+- Highlight abbreviations in Scheme ([ef23847](https://github.com/helix-editor/helix/commit/ef23847))
231+- Remove backtic auto-pair in OCaml ([#8260](https://github.com/helix-editor/helix/pull/8260))
232+- Recognize `flake.lock` as JSON ([#8304](https://github.com/helix-editor/helix/pull/8304))
233+- Add Python test script injection for Nix ([b4494e1](https://github.com/helix-editor/helix/commit/b4494e1))
234+- Fix Nix comment injection precedence ([37e48f4](https://github.com/helix-editor/helix/commit/37e48f4))
235+- Recognize editorconfig files as INI ([#8308](https://github.com/helix-editor/helix/pull/8308))
236+- Recognize `.babelrc` as JSON ([#8309](https://github.com/helix-editor/helix/pull/8309))
237+- Switch Purescript to its own tree-sitter parser ([#8306](https://github.com/helix-editor/helix/pull/8306), [#8338](https://github.com/helix-editor/helix/pull/8338), [#8527](https://github.com/helix-editor/helix/pull/8527))
238+- Update Unison highlights ([#8315](https://github.com/helix-editor/helix/pull/8315))
239+- Recognize `.webmanifest` as JSON ([#8342](https://github.com/helix-editor/helix/pull/8342))
240+- Recognize polkit policy files as XML ([#8369](https://github.com/helix-editor/helix/pull/8369))
241+- Recognize polkit rules files as JavaScript ([#8370](https://github.com/helix-editor/helix/pull/8370))
242+- Update Go highlight queries ([#8399](https://github.com/helix-editor/helix/pull/8399))
243+- Add shebangs for Makefiles ([#8410](https://github.com/helix-editor/helix/pull/8410))
244+- Add file-type associations from VSCode ([#8388](https://github.com/helix-editor/helix/pull/8388))
245+- Add validation to JSON/CSS language server configs ([#8433](https://github.com/helix-editor/helix/pull/8433))
246+- Add a configuration for the tailwind language server ([#8442](https://github.com/helix-editor/helix/pull/8442))
247+- Add a configuration for the ansible language server ([#7973](https://github.com/helix-editor/helix/pull/7973))
248+- Add a configuration for the GraphQL language server ([#8492](https://github.com/helix-editor/helix/pull/8492))
249+- Indent while statements in Bash ([#8528](https://github.com/helix-editor/helix/pull/8528))
250+- Update tree-sitter-haskell and queries ([#8558](https://github.com/helix-editor/helix/pull/8558))
251+
252+Packaging:
253+
254+- Add an overlay to the Nix flake ([#7078](https://github.com/helix-editor/helix/pull/7078))
255+- Check for `git` before fetching or building grammars ([#7320](https://github.com/helix-editor/helix/pull/7320))
256+- Refactor Nix flake to use Crane ([#7763](https://github.com/helix-editor/helix/pull/7763))
257+- Remove the aarch64 appimage from the release CI ([#7832](https://github.com/helix-editor/helix/pull/7832))
258+- Add desktop and icon files to Nix flake output ([#7979](https://github.com/helix-editor/helix/pull/7979))
259+- Build flake packages with the latest stable Rust ([#8133](https://github.com/helix-editor/helix/pull/8133))
260+
261+# 23.05 (2023-05-18)
262+
263+23.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!
264+
265+Features:
266+
267+- Add a config option to exclude declaration from LSP references request ([#6886](https://github.com/helix-editor/helix/pull/6886))
268+- Enable injecting languages based on their file extension and shebang ([#3970](https://github.com/helix-editor/helix/pull/3970))
269+- Sort the buffer picker by most recent access ([#2980](https://github.com/helix-editor/helix/pull/2980))
270+- Perform syntax highlighting in the picker asynchronously ([#7028](https://github.com/helix-editor/helix/pull/7028))
271+
272+Commands:
273+
274+- `:update` is now aliased as `:u` ([#6835](https://github.com/helix-editor/helix/pull/6835))
275+- Add `extend_to_first_nonwhitespace` which acts the same as `goto_first_nonwhitespace` but always extends ([#6837](https://github.com/helix-editor/helix/pull/6837))
276+- Add `:clear-register` for clearing the given register or all registers ([#5695](https://github.com/helix-editor/helix/pull/5695))
277+- Add `:write-buffer-close` and `:write-buffer-close!` ([#6947](https://github.com/helix-editor/helix/pull/6947))
278+
279+Fixes:
280+
281+- Normalize LSP workspace paths ([#6517](https://github.com/helix-editor/helix/pull/6517))
282+- Robustly handle invalid LSP ranges ([#6512](https://github.com/helix-editor/helix/pull/6512))
283+- Fix line number display for LSP goto pickers ([#6559](https://github.com/helix-editor/helix/pull/6559))
284+- Fix toggling of `soft-wrap.enable` option ([#6656](https://github.com/helix-editor/helix/pull/6656), [58e457a](https://github.com/helix-editor/helix/commit/58e457a), [#6742](https://github.com/helix-editor/helix/pull/6742))
285+- Handle `workspace/configuration` requests from stopped language servers ([#6693](https://github.com/helix-editor/helix/pull/6693))
286+- Fix possible crash from opening the jumplist picker ([#6672](https://github.com/helix-editor/helix/pull/6672))
287+- Fix theme preview returning to current theme on line and word deletions ([#6694](https://github.com/helix-editor/helix/pull/6694))
288+- Re-run crate build scripts on changes to revision and grammar repositories ([#6743](https://github.com/helix-editor/helix/pull/6743))
289+- Fix crash on opening from suspended state ([#6764](https://github.com/helix-editor/helix/pull/6764))
290+- Fix unwrap bug in DAP ([#6786](https://github.com/helix-editor/helix/pull/6786))
291+- Always build tree-sitter parsers with C++14 and C11 ([#6792](https://github.com/helix-editor/helix/pull/6792), [#6834](https://github.com/helix-editor/helix/pull/6834), [#6845](https://github.com/helix-editor/helix/pull/6845))
292+- Exit with a non-zero statuscode when tree-sitter parser builds fail ([#6795](https://github.com/helix-editor/helix/pull/6795))
293+- Flip symbol range in LSP goto commands ([#6794](https://github.com/helix-editor/helix/pull/6794))
294+- Fix runtime toggling of the `mouse` option ([#6675](https://github.com/helix-editor/helix/pull/6675))
295+- Fix panic in inlay hint computation when view anchor is out of bounds ([#6883](https://github.com/helix-editor/helix/pull/6883))
296+- Significantly improve performance of git discovery on slow file systems ([#6890](https://github.com/helix-editor/helix/pull/6890))
297+- Downgrade gix log level to info ([#6915](https://github.com/helix-editor/helix/pull/6915))
298+- Conserve BOM and properly support saving UTF16 files ([#6497](https://github.com/helix-editor/helix/pull/6497))
299+- Correctly handle completion re-request ([#6594](https://github.com/helix-editor/helix/pull/6594))
300+- Fix offset encoding in LSP `didChange` notifications ([#6921](https://github.com/helix-editor/helix/pull/6921))
301+- Change `gix` logging level to info ([#6915](https://github.com/helix-editor/helix/pull/6915))
302+- Improve error message when writes fail because parent directories do not exist ([#7014](https://github.com/helix-editor/helix/pull/7014))
303+- Replace DAP variables popup instead of pushing more popups ([#7034](https://github.com/helix-editor/helix/pull/7034))
304+- Disable tree-sitter for files after parsing for 500ms ([#7028](https://github.com/helix-editor/helix/pull/7028))
305+- Fix crash when deleting with multiple cursors ([#6024](https://github.com/helix-editor/helix/pull/6024))
306+- Fix selection sliding when deleting forwards in append mode ([#6024](https://github.com/helix-editor/helix/pull/6024))
307+- Fix completion on paths containing spaces ([#6779](https://github.com/helix-editor/helix/pull/6779))
308+
309+Themes:
310+
311+- Style inlay hints in `dracula` theme ([#6515](https://github.com/helix-editor/helix/pull/6515))
312+- Style inlay hints in `onedark` theme ([#6503](https://github.com/helix-editor/helix/pull/6503))
313+- Style inlay hints and the soft-wrap indicator in `varua` ([#6568](https://github.com/helix-editor/helix/pull/6568), [#6589](https://github.com/helix-editor/helix/pull/6589))
314+- Style inlay hints in `emacs` theme ([#6569](https://github.com/helix-editor/helix/pull/6569))
315+- Update `base16_transparent` and `dark_high_contrast` themes ([#6577](https://github.com/helix-editor/helix/pull/6577))
316+- Style inlay hints for `mellow` and `rasmus` themes ([#6583](https://github.com/helix-editor/helix/pull/6583))
317+- Dim pane divider for `base16_transparent` theme ([#6534](https://github.com/helix-editor/helix/pull/6534))
318+- Style inlay hints in `zenburn` theme ([#6593](https://github.com/helix-editor/helix/pull/6593))
319+- Style inlay hints in `boo_berry` theme ([#6625](https://github.com/helix-editor/helix/pull/6625))
320+- Add `ferra` theme ([#6619](https://github.com/helix-editor/helix/pull/6619), [#6776](https://github.com/helix-editor/helix/pull/6776))
321+- Style inlay hints in `nightfox` theme ([#6655](https://github.com/helix-editor/helix/pull/6655))
322+- Fix `ayu` theme family markup code block background ([#6538](https://github.com/helix-editor/helix/pull/6538))
323+- Improve whitespace and search match colors in `rose_pine` theme ([#6679](https://github.com/helix-editor/helix/pull/6679))
324+- Highlight selected items in `base16_transparent` theme ([#6716](https://github.com/helix-editor/helix/pull/6716))
325+- Adjust everforest to resemble original more closely ([#5866](https://github.com/helix-editor/helix/pull/5866))
326+- Refactor `dracula` theme ([#6552](https://github.com/helix-editor/helix/pull/6552), [#6767](https://github.com/helix-editor/helix/pull/6767), [#6855](https://github.com/helix-editor/helix/pull/6855), [#6987](https://github.com/helix-editor/helix/pull/6987))
327+- Style inlay hints in `darcula` theme ([#6732](https://github.com/helix-editor/helix/pull/6732))
328+- Style inlay hints in `kanagawa` theme ([#6773](https://github.com/helix-editor/helix/pull/6773))
329+- Improve `ayu_dark` theme ([#6622](https://github.com/helix-editor/helix/pull/6622))
330+- Refactor `noctis` theme multiple cursor highlighting ([96720e7](https://github.com/helix-editor/helix/commit/96720e7))
331+- Refactor `noctis` theme whitespace rendering and indent guides ([f2ccc03](https://github.com/helix-editor/helix/commit/f2ccc03))
332+- Add `amberwood` theme ([#6924](https://github.com/helix-editor/helix/pull/6924))
333+- Update `nightfox` theme ([#7061](https://github.com/helix-editor/helix/pull/7061))
334+
335+Language support:
336+
337+- R language server: use the `--no-echo` flag to silence output ([#6570](https://github.com/helix-editor/helix/pull/6570))
338+- Recognize CUDA files as C++ ([#6521](https://github.com/helix-editor/helix/pull/6521))
339+- Add support for Hurl ([#6450](https://github.com/helix-editor/helix/pull/6450))
340+- Add textobject queries for Julia ([#6588](https://github.com/helix-editor/helix/pull/6588))
341+- Update Ruby highlight queries ([#6587](https://github.com/helix-editor/helix/pull/6587))
342+- Add xsd to XML file-types ([#6631](https://github.com/helix-editor/helix/pull/6631))
343+- Support Robot Framework ([#6611](https://github.com/helix-editor/helix/pull/6611))
344+- Update Gleam tree-sitter parser ([#6641](https://github.com/helix-editor/helix/pull/6641))
345+- Update git-commit tree-sitter parser ([#6692](https://github.com/helix-editor/helix/pull/6692))
346+- Update Haskell tree-sitter parser ([#6317](https://github.com/helix-editor/helix/pull/6317))
347+- Add injection queries for Haskell quasiquotes ([#6474](https://github.com/helix-editor/helix/pull/6474))
348+- Highlight C/C++ escape sequences ([#6724](https://github.com/helix-editor/helix/pull/6724))
349+- Support Markdoc ([#6432](https://github.com/helix-editor/helix/pull/6432))
350+- Support OpenCL ([#6473](https://github.com/helix-editor/helix/pull/6473))
351+- Support DTD ([#6644](https://github.com/helix-editor/helix/pull/6644))
352+- Fix constant highlighting in Python queries ([#6751](https://github.com/helix-editor/helix/pull/6751))
353+- Support Just ([#6453](https://github.com/helix-editor/helix/pull/6453))
354+- Fix Go locals query for `var_spec` identifiers ([#6763](https://github.com/helix-editor/helix/pull/6763))
355+- Update Markdown tree-sitter parser ([#6785](https://github.com/helix-editor/helix/pull/6785))
356+- Fix Haskell workspace root for cabal projects ([#6828](https://github.com/helix-editor/helix/pull/6828))
357+- Avoid extra indentation in Go switches ([#6817](https://github.com/helix-editor/helix/pull/6817))
358+- Fix Go workspace roots ([#6884](https://github.com/helix-editor/helix/pull/6884))
359+- Set PerlNavigator as the default Perl language server ([#6860](https://github.com/helix-editor/helix/pull/6860))
360+- Highlight more sqlx macros in Rust ([#6793](https://github.com/helix-editor/helix/pull/6793))
361+- Switch Odin tree-sitter grammar ([#6766](https://github.com/helix-editor/helix/pull/6766))
362+- Recognize `poetry.lock` as TOML ([#6928](https://github.com/helix-editor/helix/pull/6928))
363+- Recognize Jupyter notebooks as JSON ([#6927](https://github.com/helix-editor/helix/pull/6927))
364+- Add language server configuration for Crystal ([#6948](https://github.com/helix-editor/helix/pull/6948))
365+- Add `build.gradle.kts` to Java and Scala roots ([#6970](https://github.com/helix-editor/helix/pull/6970))
366+- Recognize `sty` and `cls` files as latex ([#6986](https://github.com/helix-editor/helix/pull/6986))
367+- Update Dockerfile tree-sitter grammar ([#6895](https://github.com/helix-editor/helix/pull/6895))
368+- Add comment injections for Odin ([#7027](https://github.com/helix-editor/helix/pull/7027))
369+- Recognize `gml` as XML ([#7055](https://github.com/helix-editor/helix/pull/7055))
370+- Recognize `geojson` as JSON ([#7054](https://github.com/helix-editor/helix/pull/7054))
371+
372+Packaging:
373+
374+- Update the Nix flake dependencies, remove a deprecated option ([#6546](https://github.com/helix-editor/helix/pull/6546))
375+- Fix and re-enable aarch64-macos release binary builds ([#6504](https://github.com/helix-editor/helix/pull/6504))
376+- The git dependency on `tree-sitter` has been replaced with a regular crates.io dependency ([#6608](https://github.com/helix-editor/helix/pull/6608))
377+
378+# 23.03 (2023-03-31)
379+
380+23.03 brings some long-awaited and exciting features. Thank you to everyone involved! This release saw changes from 102 contributors.
381+
382+For the full log, check out the [git log](https://github.com/helix-editor/helix/compare/22.12..23.03).
383+Also check out the [release notes](https://helix-editor.com/news/release-23-03-highlights/) for more commentary on larger features.
384+
385+Breaking changes:
386+
387+- Select diagnostic range in `goto_*_diag` commands ([#4713](https://github.com/helix-editor/helix/pull/4713), [#5164](https://github.com/helix-editor/helix/pull/5164), [#6193](https://github.com/helix-editor/helix/pull/6193))
388+- Remove jump behavior from `increment`/`decrement` ([#4123](https://github.com/helix-editor/helix/pull/4123), [#5929](https://github.com/helix-editor/helix/pull/5929))
389+- Select change range in `goto_*_change` commands ([#5206](https://github.com/helix-editor/helix/pull/5206))
390+- Split file modification indicator from filename statusline elements ([#4731](https://github.com/helix-editor/helix/pull/4731), [#6036](https://github.com/helix-editor/helix/pull/6036))
391+- Jump to symbol ranges in LSP goto commands ([#5986](https://github.com/helix-editor/helix/pull/5986))
392+- Workspace detection now stops at the first `.helix/` directory (merging multiple `.helix/languages.toml` configurations is no longer supported) ([#5748](https://github.com/helix-editor/helix/pull/5748))
393+
394+Features:
395+
396+- Dynamic workspace symbol picker ([#5055](https://github.com/helix-editor/helix/pull/5055))
397+- Soft-wrap ([#5420](https://github.com/helix-editor/helix/pull/5420), [#5786](https://github.com/helix-editor/helix/pull/5786), [#5893](https://github.com/helix-editor/helix/pull/5893), [#6142](https://github.com/helix-editor/helix/pull/6142), [#6440](https://github.com/helix-editor/helix/pull/6440))
398+- Initial support for LSP snippet completions ([#5864](https://github.com/helix-editor/helix/pull/5864), [b1f7528](https://github.com/helix-editor/helix/commit/b1f7528), [#6263](https://github.com/helix-editor/helix/pull/6263), [bbf4800](https://github.com/helix-editor/helix/commit/bbf4800), [90348b8](https://github.com/helix-editor/helix/commit/90348b8), [f87299f](https://github.com/helix-editor/helix/commit/f87299f), [#6371](https://github.com/helix-editor/helix/pull/6371), [9fe3adc](https://github.com/helix-editor/helix/commit/9fe3adc))
399+- Add a statusline element for showing the current version control HEAD ([#5682](https://github.com/helix-editor/helix/pull/5682))
400+- Display LSP type hints ([#5420](https://github.com/helix-editor/helix/pull/5420), [#5934](https://github.com/helix-editor/helix/pull/5934), [#6312](https://github.com/helix-editor/helix/pull/6312))
401+- Enable the Kitty keyboard protocol on terminals with support ([#4939](https://github.com/helix-editor/helix/pull/4939), [#6170](https://github.com/helix-editor/helix/pull/6170), [#6194](https://github.com/helix-editor/helix/pull/6194), [#6438](https://github.com/helix-editor/helix/pull/6438))
402+- Add a statusline element for the basename of the current file ([#5318](https://github.com/helix-editor/helix/pull/5318))
403+- Add substring matching syntax for the picker ([#5658](https://github.com/helix-editor/helix/pull/5658))
404+- Support LSP `textDocument/prepareRename` ([#6103](https://github.com/helix-editor/helix/pull/6103))
405+- Allow multiple runtime directories with priorities ([#5411](https://github.com/helix-editor/helix/pull/5411))
406+- Allow configuring whether to insert or replace completions ([#5728](https://github.com/helix-editor/helix/pull/5728))
407+- Allow per-workspace config file `.helix/config.toml` ([#5748](https://github.com/helix-editor/helix/pull/5748))
408+- Add `workspace-lsp-roots` config option to support multiple LSP roots for use with monorepos ([#5748](https://github.com/helix-editor/helix/pull/5748))
409+
410+Commands:
411+
412+- `:pipe-to` which pipes selections into a shell command and ignores output ([#4931](https://github.com/helix-editor/helix/pull/4931))
413+- `merge_consecutive_selections` (`A-_`) combines all consecutive selections ([#5047](https://github.com/helix-editor/helix/pull/5047))
414+- `rotate_view_reverse` which focuses the previous view ([#5356](https://github.com/helix-editor/helix/pull/5356))
415+- `goto_declaration` (`gD`, requires LSP) which jumps to a symbol's declaration ([#5646](https://github.com/helix-editor/helix/pull/5646))
416+- `file_picker_in_current_buffer_directory` ([#4666](https://github.com/helix-editor/helix/pull/4666))
417+- `:character-info` which shows information about the character under the cursor ([#4000](https://github.com/helix-editor/helix/pull/4000))
418+- `:toggle-option` for toggling config options at runtime ([#4085](https://github.com/helix-editor/helix/pull/4085))
419+- `dap_restart` for restarting a debug session in DAP ([#5651](https://github.com/helix-editor/helix/pull/5651))
420+- `:lsp-stop` to stop the language server of the current buffer ([#5964](https://github.com/helix-editor/helix/pull/5964))
421+- `:reset-diff-change` for resetting a diff hunk to its original text ([#4974](https://github.com/helix-editor/helix/pull/4974))
422+- `:config-open-workspace` for opening the config file local to the current workspace ([#5748](https://github.com/helix-editor/helix/pull/5748))
423+
424+Usability improvements:
425+
426+- Remove empty detail section in completion menu when LSP doesn't send details ([#4902](https://github.com/helix-editor/helix/pull/4902))
427+- Pass client information on LSP initialization ([#4904](https://github.com/helix-editor/helix/pull/4904))
428+- Allow specifying environment variables for language servers in language config ([#4004](https://github.com/helix-editor/helix/pull/4004))
429+- Allow detached git worktrees to be recognized as root paths ([#5097](https://github.com/helix-editor/helix/pull/5097))
430+- Improve error message handling for theme loading failures ([#5073](https://github.com/helix-editor/helix/pull/5073))
431+- Print the names of binaries required for LSP/DAP in health-check ([#5195](https://github.com/helix-editor/helix/pull/5195))
432+- Improve sorting in the picker in cases of ties ([#5169](https://github.com/helix-editor/helix/pull/5169))
433+- Add theming for prompt suggestions ([#5104](https://github.com/helix-editor/helix/pull/5104))
434+- Open a file picker when using `:open` on directories ([#2707](https://github.com/helix-editor/helix/pull/2707), [#5278](https://github.com/helix-editor/helix/pull/5278))
435+- Reload language config with `:config-reload` ([#5239](https://github.com/helix-editor/helix/pull/5239), [#5381](https://github.com/helix-editor/helix/pull/5381), [#5431](https://github.com/helix-editor/helix/pull/5431))
436+- Improve indent queries for python when the tree is errored ([#5332](https://github.com/helix-editor/helix/pull/5332))
437+- Picker: Open files without closing the picker with `A-ret` ([#4435](https://github.com/helix-editor/helix/pull/4435))
438+- Allow theming cursors by primary/secondary and by mode ([#5130](https://github.com/helix-editor/helix/pull/5130))
439+- Allow configuration of the minimum width for the line-numbers gutter ([#4724](https://github.com/helix-editor/helix/pull/4724), [#5696](https://github.com/helix-editor/helix/pull/5696))
440+- Use filename completer for `:run-shell-command` command ([#5729](https://github.com/helix-editor/helix/pull/5729))
441+- Surround with line-endings with `ms<ret>` ([#4571](https://github.com/helix-editor/helix/pull/4571))
442+- Hide duplicate symlinks in file pickers ([#5658](https://github.com/helix-editor/helix/pull/5658))
443+- Tabulate buffer picker contents ([#5777](https://github.com/helix-editor/helix/pull/5777))
444+- Add an option to disable LSP ([#4425](https://github.com/helix-editor/helix/pull/4425))
445+- Short-circuit tree-sitter and word object motions ([#5851](https://github.com/helix-editor/helix/pull/5851))
446+- Add exit code to failed command message ([#5898](https://github.com/helix-editor/helix/pull/5898))
447+- Make `m` textobject look for pairs enclosing selections ([#3344](https://github.com/helix-editor/helix/pull/3344))
448+- Negotiate LSP position encoding ([#5894](https://github.com/helix-editor/helix/pull/5894), [a48d1a4](https://github.com/helix-editor/helix/commit/a48d1a4))
449+- Display deprecated LSP completions with strikethrough ([#5932](https://github.com/helix-editor/helix/pull/5932))
450+- Add JSONRPC request ID to failed LSP/DAP request log messages ([#6010](https://github.com/helix-editor/helix/pull/6010), [#6018](https://github.com/helix-editor/helix/pull/6018))
451+- Ignore case when filtering LSP completions ([#6008](https://github.com/helix-editor/helix/pull/6008))
452+- Show current language when no arguments are passed to `:set-language` ([#5895](https://github.com/helix-editor/helix/pull/5895))
453+- Refactor and rewrite all book documentation ([#5534](https://github.com/helix-editor/helix/pull/5534))
454+- Separate diagnostic picker message and code ([#6095](https://github.com/helix-editor/helix/pull/6095))
455+- Add a config option to bypass undercurl detection ([#6253](https://github.com/helix-editor/helix/pull/6253))
456+- Only complete appropriate arguments for typed commands ([#5966](https://github.com/helix-editor/helix/pull/5966))
457+- Discard outdated LSP diagnostics ([3c9d5d0](https://github.com/helix-editor/helix/commit/3c9d5d0))
458+- Discard outdated LSP workspace edits ([b6a4927](https://github.com/helix-editor/helix/commit/b6a4927))
459+- Run shell commands asynchronously ([#6373](https://github.com/helix-editor/helix/pull/6373))
460+- Show diagnostic codes in LSP diagnostic messages ([#6378](https://github.com/helix-editor/helix/pull/6378))
461+- Highlight the current line in a DAP debug session ([#5957](https://github.com/helix-editor/helix/pull/5957))
462+- Hide signature help if it overlaps with the completion menu ([#5523](https://github.com/helix-editor/helix/pull/5523), [7a69c40](https://github.com/helix-editor/helix/commit/7a69c40))
463+
464+Fixes:
465+
466+- Fix behavior of `auto-completion` flag for completion-on-trigger ([#5042](https://github.com/helix-editor/helix/pull/5042))
467+- Reset editor mode when changing buffers ([#5072](https://github.com/helix-editor/helix/pull/5072))
468+- Respect scrolloff settings in mouse movements ([#5255](https://github.com/helix-editor/helix/pull/5255))
469+- Avoid trailing `s` when only one file is opened ([#5189](https://github.com/helix-editor/helix/pull/5189))
470+- Fix erroneous indent between closers of auto-pairs ([#5330](https://github.com/helix-editor/helix/pull/5330))
471+- Expand `~` when parsing file paths in `:open` ([#5329](https://github.com/helix-editor/helix/pull/5329))
472+- Fix theme inheritance for default themes ([#5218](https://github.com/helix-editor/helix/pull/5218))
473+- Fix `extend_line` with a count when the current line(s) are selected ([#5288](https://github.com/helix-editor/helix/pull/5288))
474+- Prompt: Fix autocompletion for paths containing periods ([#5175](https://github.com/helix-editor/helix/pull/5175))
475+- Skip serializing JSONRPC params if params is null ([#5471](https://github.com/helix-editor/helix/pull/5471))
476+- Fix interaction with the `xclip` clipboard provider ([#5426](https://github.com/helix-editor/helix/pull/5426))
477+- Fix undo/redo execution from the command palette ([#5294](https://github.com/helix-editor/helix/pull/5294))
478+- Fix highlighting of non-block cursors ([#5575](https://github.com/helix-editor/helix/pull/5575))
479+- Fix panic when nooping in `join_selections` and `join_selections_space` ([#5423](https://github.com/helix-editor/helix/pull/5423))
480+- Fix selecting a changed file in global search ([#5639](https://github.com/helix-editor/helix/pull/5639))
481+- Fix initial syntax highlight layer sort order ([#5196](https://github.com/helix-editor/helix/pull/5196))
482+- Fix UTF-8 length handling for shellwords ([#5738](https://github.com/helix-editor/helix/pull/5738))
483+- Remove C-j and C-k bindings from the completion menu ([#5070](https://github.com/helix-editor/helix/pull/5070))
484+- Always commit to history when pasting ([#5790](https://github.com/helix-editor/helix/pull/5790))
485+- Properly handle LSP position encoding ([#5711](https://github.com/helix-editor/helix/pull/5711))
486+- Fix infinite loop in `copy_selection_on_prev_line` ([#5888](https://github.com/helix-editor/helix/pull/5888))
487+- Fix completion popup positioning ([#5842](https://github.com/helix-editor/helix/pull/5842))
488+- Fix a panic when uncommenting a line with only a comment token ([#5933](https://github.com/helix-editor/helix/pull/5933))
489+- Fix panic in `goto_window_center` at EOF ([#5987](https://github.com/helix-editor/helix/pull/5987))
490+- Ignore invalid file URIs sent by a language server ([#6000](https://github.com/helix-editor/helix/pull/6000))
491+- Decode LSP URIs for the workspace diagnostics picker ([#6016](https://github.com/helix-editor/helix/pull/6016))
492+- Fix incorrect usages of `tab_width` with `indent_width` ([#5918](https://github.com/helix-editor/helix/pull/5918))
493+- DAP: Send Disconnect if the Terminated event is received ([#5532](https://github.com/helix-editor/helix/pull/5532))
494+- DAP: Validate key and index exist when requesting variables ([#5628](https://github.com/helix-editor/helix/pull/5628))
495+- Check LSP renaming support before prompting for rename text ([#6257](https://github.com/helix-editor/helix/pull/6257))
496+- Fix indent guide rendering ([#6136](https://github.com/helix-editor/helix/pull/6136))
497+- Fix division by zero panic ([#6155](https://github.com/helix-editor/helix/pull/6155))
498+- Fix lacking space panic ([#6109](https://github.com/helix-editor/helix/pull/6109))
499+- Send error replies for malformed and unhandled LSP requests ([#6058](https://github.com/helix-editor/helix/pull/6058))
500+- Fix table column calculations for dynamic pickers ([#5920](https://github.com/helix-editor/helix/pull/5920))
501+- Skip adding jumplist entries for `:<n>` line number previews ([#5751](https://github.com/helix-editor/helix/pull/5751))
502+- Fix completion race conditions ([#6173](https://github.com/helix-editor/helix/pull/6173))
503+- Fix `shrink_selection` with multiple cursors ([#6093](https://github.com/helix-editor/helix/pull/6093))
504+- Fix indentation calculation for lines with mixed tabs/spaces ([#6278](https://github.com/helix-editor/helix/pull/6278))
505+- No-op `client/registerCapability` LSP requests ([#6258](https://github.com/helix-editor/helix/pull/6258))
506+- Send the STOP signal to all processes in the process group ([#3546](https://github.com/helix-editor/helix/pull/3546))
507+- Fix workspace edit client capabilities declaration ([7bf168d](https://github.com/helix-editor/helix/commit/7bf168d))
508+- Fix highlighting in picker results with multiple columns ([#6333](https://github.com/helix-editor/helix/pull/6333))
509+- Canonicalize paths before stripping the current dir as a prefix ([#6290](https://github.com/helix-editor/helix/pull/6290))
510+- Fix truncation behavior for long path names in the file picker ([#6410](https://github.com/helix-editor/helix/pull/6410), [67783dd](https://github.com/helix-editor/helix/commit/67783dd))
511+- Fix theme reloading behavior in `:config-reload` ([ab819d8](https://github.com/helix-editor/helix/commit/ab819d8))
512+
513+Themes:
514+
515+- Update `serika` ([#5038](https://github.com/helix-editor/helix/pull/5038), [#6344](https://github.com/helix-editor/helix/pull/6344))
516+- Update `flatwhite` ([#5036](https://github.com/helix-editor/helix/pull/5036), [#6323](https://github.com/helix-editor/helix/pull/6323))
517+- Update `autumn` ([#5051](https://github.com/helix-editor/helix/pull/5051), [#5397](https://github.com/helix-editor/helix/pull/5397), [#6280](https://github.com/helix-editor/helix/pull/6280), [#6316](https://github.com/helix-editor/helix/pull/6316))
518+- Update `acme` ([#5019](https://github.com/helix-editor/helix/pull/5019), [#5486](https://github.com/helix-editor/helix/pull/5486), [#5488](https://github.com/helix-editor/helix/pull/5488))
519+- Update `gruvbox` themes ([#5066](https://github.com/helix-editor/helix/pull/5066), [#5333](https://github.com/helix-editor/helix/pull/5333), [#5540](https://github.com/helix-editor/helix/pull/5540), [#6285](https://github.com/helix-editor/helix/pull/6285), [#6295](https://github.com/helix-editor/helix/pull/6295))
520+- Update `base16_transparent` ([#5105](https://github.com/helix-editor/helix/pull/5105))
521+- Update `dark_high_contrast` ([#5105](https://github.com/helix-editor/helix/pull/5105))
522+- Update `dracula` ([#5236](https://github.com/helix-editor/helix/pull/5236), [#5627](https://github.com/helix-editor/helix/pull/5627), [#6414](https://github.com/helix-editor/helix/pull/6414))
523+- Update `monokai_pro_spectrum` ([#5250](https://github.com/helix-editor/helix/pull/5250), [#5602](https://github.com/helix-editor/helix/pull/5602))
524+- Update `rose_pine` ([#5267](https://github.com/helix-editor/helix/pull/5267), [#5489](https://github.com/helix-editor/helix/pull/5489), [#6384](https://github.com/helix-editor/helix/pull/6384))
525+- Update `kanagawa` ([#5273](https://github.com/helix-editor/helix/pull/5273), [#5571](https://github.com/helix-editor/helix/pull/5571), [#6085](https://github.com/helix-editor/helix/pull/6085))
526+- Update `emacs` ([#5334](https://github.com/helix-editor/helix/pull/5334))
527+- Add `github` themes ([#5353](https://github.com/helix-editor/helix/pull/5353), [efeec12](https://github.com/helix-editor/helix/commit/efeec12))
528+ - Dark themes: `github_dark`, `github_dark_colorblind`, `github_dark_dimmed`, `github_dark_high_contrast`, `github_dark_tritanopia`
529+ - Light themes: `github_light`, `github_light_colorblind`, `github_light_dimmed`, `github_light_high_contrast`, `github_light_tritanopia`
530+- Update `solarized` variants ([#5445](https://github.com/helix-editor/helix/pull/5445), [#6327](https://github.com/helix-editor/helix/pull/6327))
531+- Update `catppuccin` variants ([#5404](https://github.com/helix-editor/helix/pull/5404), [#6107](https://github.com/helix-editor/helix/pull/6107), [#6269](https://github.com/helix-editor/helix/pull/6269), [#6464](https://github.com/helix-editor/helix/pull/6464))
532+- Use curly underlines in built-in themes ([#5419](https://github.com/helix-editor/helix/pull/5419))
533+- Update `zenburn` ([#5573](https://github.com/helix-editor/helix/pull/5573))
534+- Rewrite `snazzy` ([#3971](https://github.com/helix-editor/helix/pull/3971))
535+- Add `monokai_aqua` ([#5578](https://github.com/helix-editor/helix/pull/5578))
536+- Add `markup.strikethrough` to existing themes ([#5619](https://github.com/helix-editor/helix/pull/5619))
537+- Update `sonokai` ([#5440](https://github.com/helix-editor/helix/pull/5440))
538+- Update `onedark` ([#5755](https://github.com/helix-editor/helix/pull/5755))
539+- Add `ayu_evolve` ([#5638](https://github.com/helix-editor/helix/pull/5638), [#6028](https://github.com/helix-editor/helix/pull/6028), [#6225](https://github.com/helix-editor/helix/pull/6225))
540+- Add `jellybeans` ([#5719](https://github.com/helix-editor/helix/pull/5719))
541+- Update `fleet_dark` ([#5605](https://github.com/helix-editor/helix/pull/5605), [#6266](https://github.com/helix-editor/helix/pull/6266), [#6324](https://github.com/helix-editor/helix/pull/6324), [#6375](https://github.com/helix-editor/helix/pull/6375))
542+- Add `darcula-solid` ([#5778](https://github.com/helix-editor/helix/pull/5778))
543+- Remove text background from monokai themes ([#6009](https://github.com/helix-editor/helix/pull/6009))
544+- Update `pop_dark` ([#5992](https://github.com/helix-editor/helix/pull/5992), [#6208](https://github.com/helix-editor/helix/pull/6208), [#6227](https://github.com/helix-editor/helix/pull/6227), [#6292](https://github.com/helix-editor/helix/pull/6292))
545+- Add `everblush` ([#6086](https://github.com/helix-editor/helix/pull/6086))
546+- Add `adwaita-dark` ([#6042](https://github.com/helix-editor/helix/pull/6042), [#6342](https://github.com/helix-editor/helix/pull/6342))
547+- Update `papercolor` ([#6162](https://github.com/helix-editor/helix/pull/6162))
548+- Update `onelight` ([#6192](https://github.com/helix-editor/helix/pull/6192), [#6276](https://github.com/helix-editor/helix/pull/6276))
549+- Add `molokai` ([#6260](https://github.com/helix-editor/helix/pull/6260))
550+- Update `ayu` variants ([#6329](https://github.com/helix-editor/helix/pull/6329))
551+- Update `tokyonight` variants ([#6349](https://github.com/helix-editor/helix/pull/6349))
552+- Update `nord` variants ([#6376](https://github.com/helix-editor/helix/pull/6376))
553+
554+New languages:
555+
556+- BibTeX ([#5064](https://github.com/helix-editor/helix/pull/5064))
557+- Mermaid.js ([#5147](https://github.com/helix-editor/helix/pull/5147))
558+- Crystal ([#4993](https://github.com/helix-editor/helix/pull/4993), [#5205](https://github.com/helix-editor/helix/pull/5205))
559+- MATLAB/Octave ([#5192](https://github.com/helix-editor/helix/pull/5192))
560+- `tfvars` (uses HCL) ([#5396](https://github.com/helix-editor/helix/pull/5396))
561+- Ponylang ([#5416](https://github.com/helix-editor/helix/pull/5416))
562+- DHall ([1f6809c](https://github.com/helix-editor/helix/commit/1f6809c))
563+- Sagemath ([#5649](https://github.com/helix-editor/helix/pull/5649))
564+- MSBuild ([#5793](https://github.com/helix-editor/helix/pull/5793))
565+- pem ([#5797](https://github.com/helix-editor/helix/pull/5797))
566+- passwd ([#4959](https://github.com/helix-editor/helix/pull/4959))
567+- hosts ([#4950](https://github.com/helix-editor/helix/pull/4950), [#5914](https://github.com/helix-editor/helix/pull/5914))
568+- uxntal ([#6047](https://github.com/helix-editor/helix/pull/6047))
569+- Yuck ([#6064](https://github.com/helix-editor/helix/pull/6064), [#6242](https://github.com/helix-editor/helix/pull/6242))
570+- GNU gettext PO ([#5996](https://github.com/helix-editor/helix/pull/5996))
571+- Sway ([#6023](https://github.com/helix-editor/helix/pull/6023))
572+- NASM ([#6068](https://github.com/helix-editor/helix/pull/6068))
573+- PRQL ([#6126](https://github.com/helix-editor/helix/pull/6126))
574+- reStructuredText ([#6180](https://github.com/helix-editor/helix/pull/6180))
575+- Smithy ([#6370](https://github.com/helix-editor/helix/pull/6370))
576+- VHDL ([#5826](https://github.com/helix-editor/helix/pull/5826))
577+- Rego (OpenPolicy Agent) ([#6415](https://github.com/helix-editor/helix/pull/6415))
578+- Nim ([#6123](https://github.com/helix-editor/helix/pull/6123))
579+
580+Updated languages and queries:
581+
582+- Use diff syntax for patch files ([#5085](https://github.com/helix-editor/helix/pull/5085))
583+- Add Haskell textobjects ([#5061](https://github.com/helix-editor/helix/pull/5061))
584+- Fix commonlisp configuration ([#5091](https://github.com/helix-editor/helix/pull/5091))
585+- Update Scheme ([bae890d](https://github.com/helix-editor/helix/commit/bae890d))
586+- Add indent queries for Bash ([#5149](https://github.com/helix-editor/helix/pull/5149))
587+- Recognize `c++` as a C++ extension ([#5183](https://github.com/helix-editor/helix/pull/5183))
588+- Enable HTTP server in `metals` (Scala) config ([#5551](https://github.com/helix-editor/helix/pull/5551))
589+- Change V-lang language server to `v ls` from `vls` ([#5677](https://github.com/helix-editor/helix/pull/5677))
590+- Inject comment grammar into Nix ([#5208](https://github.com/helix-editor/helix/pull/5208))
591+- Update Rust highlights ([#5238](https://github.com/helix-editor/helix/pull/5238), [#5349](https://github.com/helix-editor/helix/pull/5349))
592+- Fix HTML injection within Markdown ([#5265](https://github.com/helix-editor/helix/pull/5265))
593+- Fix comment token for godot ([#5276](https://github.com/helix-editor/helix/pull/5276))
594+- Expand injections for Vue ([#5268](https://github.com/helix-editor/helix/pull/5268))
595+- Add `.bash_aliases` as a Bash file-type ([#5347](https://github.com/helix-editor/helix/pull/5347))
596+- Fix comment token for sshclientconfig ([#5351](https://github.com/helix-editor/helix/pull/5351))
597+- Update Prisma ([#5417](https://github.com/helix-editor/helix/pull/5417))
598+- Update C++ ([#5457](https://github.com/helix-editor/helix/pull/5457))
599+- Add more file-types for Python ([#5593](https://github.com/helix-editor/helix/pull/5593))
600+- Update tree-sitter-scala ([#5576](https://github.com/helix-editor/helix/pull/5576))
601+- Add an injection regex for Lua ([#5606](https://github.com/helix-editor/helix/pull/5606))
602+- Add `build.gradle` to java roots configuration ([#5641](https://github.com/helix-editor/helix/pull/5641))
603+- Add Hub PR files to markdown file-types ([#5634](https://github.com/helix-editor/helix/pull/5634))
604+- Add an external formatter configuration for Cue ([#5679](https://github.com/helix-editor/helix/pull/5679))
605+- Add injections for builders and writers to Nix ([#5629](https://github.com/helix-editor/helix/pull/5629))
606+- Update tree-sitter-xml to fix whitespace parsing ([#5685](https://github.com/helix-editor/helix/pull/5685))
607+- Add `Justfile` to the make file-types configuration ([#5687](https://github.com/helix-editor/helix/pull/5687))
608+- Update tree-sitter-sql and highlight queries ([#5683](https://github.com/helix-editor/helix/pull/5683), [#5772](https://github.com/helix-editor/helix/pull/5772))
609+- Use the bash grammar and queries for env language ([#5720](https://github.com/helix-editor/helix/pull/5720))
610+- Add podspec files to ruby file-types ([#5811](https://github.com/helix-editor/helix/pull/5811))
611+- Recognize `.C` and `.H` file-types as C++ ([#5808](https://github.com/helix-editor/helix/pull/5808))
612+- Recognize plist and mobileconfig files as XML ([#5863](https://github.com/helix-editor/helix/pull/5863))
613+- Fix `select` indentation in Go ([#5713](https://github.com/helix-editor/helix/pull/5713))
614+- Check for external file modifications when writing ([#5805](https://github.com/helix-editor/helix/pull/5805))
615+- Recognize containerfiles as dockerfile syntax ([#5873](https://github.com/helix-editor/helix/pull/5873))
616+- Update godot grammar and queries ([#5944](https://github.com/helix-editor/helix/pull/5944), [#6186](https://github.com/helix-editor/helix/pull/6186))
617+- Improve DHall highlights ([#5959](https://github.com/helix-editor/helix/pull/5959))
618+- Recognize `.env.dist` and `source.env` as env language ([#6003](https://github.com/helix-editor/helix/pull/6003))
619+- Update tree-sitter-git-rebase ([#6030](https://github.com/helix-editor/helix/pull/6030), [#6094](https://github.com/helix-editor/helix/pull/6094))
620+- Improve SQL highlights ([#6041](https://github.com/helix-editor/helix/pull/6041))
621+- Improve markdown highlights and inject LaTeX ([#6100](https://github.com/helix-editor/helix/pull/6100))
622+- Add textobject queries for Elm ([#6084](https://github.com/helix-editor/helix/pull/6084))
623+- Recognize graphql schema file type ([#6159](https://github.com/helix-editor/helix/pull/6159))
624+- Improve highlighting in comments ([#6143](https://github.com/helix-editor/helix/pull/6143))
625+- Improve highlighting for JavaScript/TypeScript/ECMAScript languages ([#6205](https://github.com/helix-editor/helix/pull/6205))
626+- Improve PHP highlights ([#6203](https://github.com/helix-editor/helix/pull/6203), [#6250](https://github.com/helix-editor/helix/pull/6250), [#6299](https://github.com/helix-editor/helix/pull/6299))
627+- Improve Go highlights ([#6204](https://github.com/helix-editor/helix/pull/6204))
628+- Highlight unchecked sqlx functions as SQL in Rust ([#6256](https://github.com/helix-editor/helix/pull/6256))
629+- Improve Erlang highlights ([cdd6c8d](https://github.com/helix-editor/helix/commit/cdd6c8d))
630+- Improve Nix highlights ([fb4d703](https://github.com/helix-editor/helix/commit/fb4d703))
631+- Improve gdscript highlights ([#6311](https://github.com/helix-editor/helix/pull/6311))
632+- Improve Vlang highlights ([#6279](https://github.com/helix-editor/helix/pull/6279))
633+- Improve Makefile highlights ([#6339](https://github.com/helix-editor/helix/pull/6339))
634+- Remove auto-pair for `'` in OCaml ([#6381](https://github.com/helix-editor/helix/pull/6381))
635+- Fix indents in switch statements in ECMA languages ([#6369](https://github.com/helix-editor/helix/pull/6369))
636+- Recognize xlb and storyboard file-types as XML ([#6407](https://github.com/helix-editor/helix/pull/6407))
637+- Recognize cts and mts file-types as TypeScript ([#6424](https://github.com/helix-editor/helix/pull/6424))
638+- Recognize SVG file-type as XML ([#6431](https://github.com/helix-editor/helix/pull/6431))
639+- Add theme scopes for (un)checked list item markup scopes ([#6434](https://github.com/helix-editor/helix/pull/6434))
640+- Update git commit grammar and add the comment textobject ([#6439](https://github.com/helix-editor/helix/pull/6439), [#6493](https://github.com/helix-editor/helix/pull/6493))
641+- Recognize ARB file-type as JSON ([#6452](https://github.com/helix-editor/helix/pull/6452))
642+- Inject markdown into markdown strings in Julia ([#6489](https://github.com/helix-editor/helix/pull/6489))
643+
644+Packaging:
645+
646+- Fix Nix flake devShell for darwin hosts ([#5368](https://github.com/helix-editor/helix/pull/5368))
647+- Add Appstream metadata file to `contrib/` ([#5643](https://github.com/helix-editor/helix/pull/5643))
648+- Increase the MSRV to 1.65 ([#5570](https://github.com/helix-editor/helix/pull/5570), [#6185](https://github.com/helix-editor/helix/pull/6185))
649+- Expose the Nix flake's `wrapper` ([#5994](https://github.com/helix-editor/helix/pull/5994))
650+
1651# 22.12 (2022-12-06)
2652
3653This is a great big release filled with changes from a 99 contributors. A big _thank you_ to you all!
@@ -1206,7 +1856,7 @@ to distinguish it in bug reports..
12061856
12071857- The `runtime/` directory is now properly detected on binary releases and
12081858 on cargo run. `~/.config/helix/runtime` can also be used.
1209−- Registers can now be selected via " (for example `"ay`)
1859+- Registers can now be selected via " (for example, `"ay`)
12101860- Support for Nix files was added
12111861- Movement is now fully tested and matches Kakoune implementation
12121862- A per-file LSP symbol picker was added to space+s
Cargo.lock+1006−910
@@ -3,43 +3,54 @@
33version = 3
44
55[[package]]
6−name = "adler"
7−version = "1.0.2"
6+name = "addr2line"
7+version = "0.20.0"
88source = "registry+https://github.com/rust-lang/crates.io-index"
9−checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
9+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
10+dependencies = [
11+ "gimli",
12+]
1013
1114[[package]]
12−name = "ahash"
13−version = "0.7.6"
15+name = "adler"
16+version = "1.0.2"
1417source = "registry+https://github.com/rust-lang/crates.io-index"
15−checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
16−dependencies = [
17− "getrandom",
18− "once_cell",
19− "version_check",
20−]
18+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
2119
2220[[package]]
2321name = "ahash"
24−version = "0.8.3"
22+version = "0.8.6"
2523source = "registry+https://github.com/rust-lang/crates.io-index"
26−checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
24+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
2725dependencies = [
2826 "cfg-if",
2927 "getrandom",
3028 "once_cell",
3129 "version_check",
30+ "zerocopy",
3231]
3332
3433[[package]]
3534name = "aho-corasick"
36−version = "0.7.20"
35+version = "1.1.2"
3736source = "registry+https://github.com/rust-lang/crates.io-index"
38−checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
37+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
3938dependencies = [
4039 "memchr",
4140]
4241
42+[[package]]
43+name = "allocator-api2"
44+version = "0.2.14"
45+source = "registry+https://github.com/rust-lang/crates.io-index"
46+checksum = "c4f263788a35611fba42eb41ff811c5d0360c58b97402570312a350736e2542e"
47+
48+[[package]]
49+name = "android-tzdata"
50+version = "0.1.1"
51+source = "registry+https://github.com/rust-lang/crates.io-index"
52+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
53+
4354[[package]]
4455name = "android_system_properties"
4556version = "0.1.5"
@@ -51,9 +62,9 @@ dependencies = [
5162
5263[[package]]
5364name = "anyhow"
54−version = "1.0.69"
65+version = "1.0.76"
5566source = "registry+https://github.com/rust-lang/crates.io-index"
56−checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
67+checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
5768
5869[[package]]
5970name = "arc-swap"
@@ -61,21 +72,27 @@ version = "1.6.0"
6172source = "registry+https://github.com/rust-lang/crates.io-index"
6273checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
6374
64−[[package]]
65−name = "atoi"
66−version = "2.0.0"
67−source = "registry+https://github.com/rust-lang/crates.io-index"
68−checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
69−dependencies = [
70− "num-traits",
71−]
72−
7375[[package]]
7476name = "autocfg"
7577version = "1.1.0"
7678source = "registry+https://github.com/rust-lang/crates.io-index"
7779checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
7880
81+[[package]]
82+name = "backtrace"
83+version = "0.3.68"
84+source = "registry+https://github.com/rust-lang/crates.io-index"
85+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
86+dependencies = [
87+ "addr2line",
88+ "cc",
89+ "cfg-if",
90+ "libc",
91+ "miniz_oxide",
92+ "object",
93+ "rustc-demangle",
94+]
95+
7996[[package]]
8097name = "bitflags"
8198version = "1.3.2"
@@ -83,60 +100,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
83100checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
84101
85102[[package]]
86−name = "bstr"
87−version = "0.2.17"
103+name = "bitflags"
104+version = "2.4.1"
88105source = "registry+https://github.com/rust-lang/crates.io-index"
89−checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
90−dependencies = [
91− "lazy_static",
92− "memchr",
93− "regex-automata",
94−]
106+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
95107
96108[[package]]
97109name = "bstr"
98−version = "1.0.1"
110+version = "1.8.0"
99111source = "registry+https://github.com/rust-lang/crates.io-index"
100−checksum = "fca0852af221f458706eb0725c03e4ed6c46af9ac98e6a689d5e634215d594dd"
112+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
101113dependencies = [
102114 "memchr",
103− "once_cell",
104115 "regex-automata",
105116 "serde",
106117]
107118
108119[[package]]
109120name = "btoi"
110−version = "0.4.2"
121+version = "0.4.3"
111122source = "registry+https://github.com/rust-lang/crates.io-index"
112−checksum = "97c0869a9faa81f8bbf8102371105d6d0a7b79167a04c340b04ab16892246a11"
123+checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
113124dependencies = [
114125 "num-traits",
115126]
116127
117128[[package]]
118129name = "bumpalo"
119−version = "3.11.1"
120−source = "registry+https://github.com/rust-lang/crates.io-index"
121−checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
122−
123−[[package]]
124−name = "bytecount"
125−version = "0.6.3"
130+version = "3.12.0"
126131source = "registry+https://github.com/rust-lang/crates.io-index"
127−checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
132+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
128133
129134[[package]]
130135name = "bytes"
131−version = "1.3.0"
132−source = "registry+https://github.com/rust-lang/crates.io-index"
133−checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
134−
135−[[package]]
136−name = "bytesize"
137−version = "1.1.0"
136+version = "1.4.0"
138137source = "registry+https://github.com/rust-lang/crates.io-index"
139−checksum = "6c58ec36aac5066d5ca17df51b3e70279f5670a72102f5752cb7e7c856adfc70"
138+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
140139
141140[[package]]
142141name = "cassowary"
@@ -145,20 +144,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
145144checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
146145
147146[[package]]
148−name = "castaway"
149−version = "0.2.2"
147+name = "cc"
148+version = "1.0.84"
150149source = "registry+https://github.com/rust-lang/crates.io-index"
151−checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
150+checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
152151dependencies = [
153− "rustversion",
152+ "libc",
154153]
155154
156−[[package]]
157−name = "cc"
158−version = "1.0.79"
159−source = "registry+https://github.com/rust-lang/crates.io-index"
160−checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
161−
162155[[package]]
163156name = "cfg-if"
164157version = "1.0.0"
@@ -178,25 +171,23 @@ dependencies = [
178171
179172[[package]]
180173name = "chrono"
181−version = "0.4.23"
174+version = "0.4.31"
182175source = "registry+https://github.com/rust-lang/crates.io-index"
183−checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
176+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
184177dependencies = [
178+ "android-tzdata",
185179 "iana-time-zone",
186− "num-integer",
187180 "num-traits",
188− "winapi",
181+ "windows-targets 0.48.0",
189182]
190183
191184[[package]]
192185name = "clipboard-win"
193−version = "4.5.0"
186+version = "5.0.0"
194187source = "registry+https://github.com/rust-lang/crates.io-index"
195−checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
188+checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
196189dependencies = [
197190 "error-code",
198− "str-buf",
199− "winapi",
200191]
201192
202193[[package]]
@@ -215,17 +206,6 @@ dependencies = [
215206 "unicode-width",
216207]
217208
218−[[package]]
219−name = "compact_str"
220−version = "0.6.1"
221−source = "registry+https://github.com/rust-lang/crates.io-index"
222−checksum = "5138945395949e7dfba09646dc9e766b548ff48e23deb5246890e6b64ae9e1b9"
223−dependencies = [
224− "castaway",
225− "itoa",
226− "ryu",
227−]
228−
229209[[package]]
230210name = "content_inspector"
231211version = "0.2.4"
@@ -237,9 +217,15 @@ dependencies = [
237217
238218[[package]]
239219name = "core-foundation-sys"
240−version = "0.8.3"
220+version = "0.8.4"
241221source = "registry+https://github.com/rust-lang/crates.io-index"
242−checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
222+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
223+
224+[[package]]
225+name = "cov-mark"
226+version = "1.1.0"
227+source = "registry+https://github.com/rust-lang/crates.io-index"
228+checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3"
243229
244230[[package]]
245231name = "crc32fast"
@@ -250,27 +236,62 @@ dependencies = [
250236 "cfg-if",
251237]
252238
239+[[package]]
240+name = "crossbeam-channel"
241+version = "0.5.8"
242+source = "registry+https://github.com/rust-lang/crates.io-index"
243+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
244+dependencies = [
245+ "cfg-if",
246+ "crossbeam-utils",
247+]
248+
249+[[package]]
250+name = "crossbeam-deque"
251+version = "0.8.3"
252+source = "registry+https://github.com/rust-lang/crates.io-index"
253+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
254+dependencies = [
255+ "cfg-if",
256+ "crossbeam-epoch",
257+ "crossbeam-utils",
258+]
259+
260+[[package]]
261+name = "crossbeam-epoch"
262+version = "0.9.15"
263+source = "registry+https://github.com/rust-lang/crates.io-index"
264+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
265+dependencies = [
266+ "autocfg",
267+ "cfg-if",
268+ "crossbeam-utils",
269+ "memoffset",
270+ "scopeguard",
271+]
272+
253273[[package]]
254274name = "crossbeam-utils"
255−version = "0.8.14"
275+version = "0.8.16"
256276source = "registry+https://github.com/rust-lang/crates.io-index"
257−checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f"
277+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
258278dependencies = [
259279 "cfg-if",
260280]
261281
262282[[package]]
263283name = "crossterm"
264−version = "0.25.0"
284+version = "0.27.0"
265285source = "registry+https://github.com/rust-lang/crates.io-index"
266−checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
286+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
267287dependencies = [
268− "bitflags",
288+ "bitflags 2.4.1",
269289 "crossterm_winapi",
290+ "filedescriptor",
270291 "futures-core",
271292 "libc",
272293 "mio",
273− "parking_lot 0.12.1",
294+ "parking_lot",
274295 "signal-hook",
275296 "signal-hook-mio",
276297 "winapi",
@@ -278,18 +299,18 @@ dependencies = [
278299
279300[[package]]
280301name = "crossterm_winapi"
281−version = "0.9.0"
302+version = "0.9.1"
282303source = "registry+https://github.com/rust-lang/crates.io-index"
283−checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
304+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
284305dependencies = [
285306 "winapi",
286307]
287308
288309[[package]]
289310name = "cxx"
290−version = "1.0.82"
311+version = "1.0.94"
291312source = "registry+https://github.com/rust-lang/crates.io-index"
292−checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
313+checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
293314dependencies = [
294315 "cc",
295316 "cxxbridge-flags",
@@ -299,9 +320,9 @@ dependencies = [
299320
300321[[package]]
301322name = "cxx-build"
302−version = "1.0.82"
323+version = "1.0.94"
303324source = "registry+https://github.com/rust-lang/crates.io-index"
304−checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
325+checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
305326dependencies = [
306327 "cc",
307328 "codespan-reporting",
@@ -309,191 +330,154 @@ dependencies = [
309330 "proc-macro2",
310331 "quote",
311332 "scratch",
312− "syn",
333+ "syn 2.0.38",
313334]
314335
315336[[package]]
316337name = "cxxbridge-flags"
317−version = "1.0.82"
338+version = "1.0.94"
318339source = "registry+https://github.com/rust-lang/crates.io-index"
319−checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
340+checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
320341
321342[[package]]
322343name = "cxxbridge-macro"
323−version = "1.0.82"
344+version = "1.0.94"
324345source = "registry+https://github.com/rust-lang/crates.io-index"
325−checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
346+checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
326347dependencies = [
327348 "proc-macro2",
328349 "quote",
329− "syn",
350+ "syn 2.0.38",
330351]
331352
332353[[package]]
333−name = "dashmap"
334−version = "5.4.0"
354+name = "dunce"
355+version = "1.0.4"
335356source = "registry+https://github.com/rust-lang/crates.io-index"
336−checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
337−dependencies = [
338− "cfg-if",
339− "hashbrown 0.12.3",
340− "lock_api",
341− "once_cell",
342− "parking_lot_core 0.9.4",
343−]
357+checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
344358
345359[[package]]
346−name = "dirs"
347−version = "4.0.0"
360+name = "either"
361+version = "1.8.1"
348362source = "registry+https://github.com/rust-lang/crates.io-index"
349−checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
350−dependencies = [
351− "dirs-sys",
352−]
363+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
353364
354365[[package]]
355−name = "dirs-next"
356−version = "2.0.0"
366+name = "encoding_rs"
367+version = "0.8.33"
357368source = "registry+https://github.com/rust-lang/crates.io-index"
358−checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
369+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
359370dependencies = [
360371 "cfg-if",
361− "dirs-sys-next",
362372]
363373
364374[[package]]
365−name = "dirs-sys"
366−version = "0.3.7"
367−source = "registry+https://github.com/rust-lang/crates.io-index"
368−checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
369−dependencies = [
370− "libc",
371− "redox_users",
372− "winapi",
373−]
374−
375−[[package]]
376−name = "dirs-sys-next"
377−version = "0.1.2"
375+name = "encoding_rs_io"
376+version = "0.1.7"
378377source = "registry+https://github.com/rust-lang/crates.io-index"
379−checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
378+checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83"
380379dependencies = [
381− "libc",
382− "redox_users",
383− "winapi",
380+ "encoding_rs",
384381]
385382
386383[[package]]
387−name = "either"
388−version = "1.8.0"
384+name = "equivalent"
385+version = "1.0.0"
389386source = "registry+https://github.com/rust-lang/crates.io-index"
390−checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
387+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
391388
392389[[package]]
393−name = "encoding_rs"
394−version = "0.8.32"
390+name = "errno"
391+version = "0.3.8"
395392source = "registry+https://github.com/rust-lang/crates.io-index"
396−checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
393+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
397394dependencies = [
398− "cfg-if",
395+ "libc",
396+ "windows-sys 0.52.0",
399397]
400398
401399[[package]]
402−name = "encoding_rs_io"
403−version = "0.1.7"
400+name = "error-code"
401+version = "3.0.0"
404402source = "registry+https://github.com/rust-lang/crates.io-index"
405−checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83"
406−dependencies = [
407− "encoding_rs",
408−]
403+checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
409404
410405[[package]]
411−name = "error-code"
412−version = "2.3.1"
406+name = "etcetera"
407+version = "0.8.0"
413408source = "registry+https://github.com/rust-lang/crates.io-index"
414−checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
409+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
415410dependencies = [
416− "libc",
417− "str-buf",
411+ "cfg-if",
412+ "home",
413+ "windows-sys 0.48.0",
418414]
419415
420416[[package]]
421−name = "etcetera"
422−version = "0.4.0"
417+name = "faster-hex"
418+version = "0.9.0"
423419source = "registry+https://github.com/rust-lang/crates.io-index"
424−checksum = "d017fce18e4e9bfa75e1db51f49f4487bd3f8a7df509b24a46474a956ee962fd"
420+checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
425421dependencies = [
426− "cfg-if",
427− "dirs-next",
428− "thiserror",
422+ "serde",
429423]
430424
431425[[package]]
432426name = "fastrand"
433−version = "1.8.0"
427+version = "2.0.0"
434428source = "registry+https://github.com/rust-lang/crates.io-index"
435−checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
436−dependencies = [
437− "instant",
438−]
429+checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
439430
440431[[package]]
441432name = "fern"
442−version = "0.6.1"
433+version = "0.6.2"
443434source = "registry+https://github.com/rust-lang/crates.io-index"
444−checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a"
435+checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
445436dependencies = [
446437 "log",
447438]
448439
449440[[package]]
450−name = "filetime"
451−version = "0.2.18"
441+name = "filedescriptor"
442+version = "0.8.2"
452443source = "registry+https://github.com/rust-lang/crates.io-index"
453−checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
444+checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
454445dependencies = [
455− "cfg-if",
456446 "libc",
457− "redox_syscall",
458− "windows-sys",
447+ "thiserror",
448+ "winapi",
459449]
460450
461451[[package]]
462452name = "flate2"
463−version = "1.0.25"
453+version = "1.0.27"
464454source = "registry+https://github.com/rust-lang/crates.io-index"
465−checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
455+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
466456dependencies = [
467457 "crc32fast",
468458 "miniz_oxide",
469459]
470460
471−[[package]]
472−name = "fnv"
473−version = "1.0.7"
474−source = "registry+https://github.com/rust-lang/crates.io-index"
475−checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
476−
477461[[package]]
478462name = "form_urlencoded"
479−version = "1.1.0"
463+version = "1.2.1"
480464source = "registry+https://github.com/rust-lang/crates.io-index"
481−checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
465+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
482466dependencies = [
483467 "percent-encoding",
484468]
485469
486470[[package]]
487471name = "futures-core"
488−version = "0.3.26"
472+version = "0.3.30"
489473source = "registry+https://github.com/rust-lang/crates.io-index"
490−checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
474+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
491475
492476[[package]]
493477name = "futures-executor"
494−version = "0.3.26"
478+version = "0.3.29"
495479source = "registry+https://github.com/rust-lang/crates.io-index"
496−checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
480+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
497481dependencies = [
498482 "futures-core",
499483 "futures-task",
@@ -502,15 +486,15 @@ dependencies = [
502486
503487[[package]]
504488name = "futures-task"
505−version = "0.3.26"
489+version = "0.3.30"
506490source = "registry+https://github.com/rust-lang/crates.io-index"
507−checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
491+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
508492
509493[[package]]
510494name = "futures-util"
511−version = "0.3.26"
495+version = "0.3.30"
512496source = "registry+https://github.com/rust-lang/crates.io-index"
513−checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
497+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
514498dependencies = [
515499 "futures-core",
516500 "futures-task",
@@ -519,20 +503,11 @@ dependencies = [
519503 "slab",
520504]
521505
522−[[package]]
523−name = "fuzzy-matcher"
524−version = "0.3.7"
525−source = "registry+https://github.com/rust-lang/crates.io-index"
526−checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
527−dependencies = [
528− "thread_local",
529−]
530−
531506[[package]]
532507name = "getrandom"
533−version = "0.2.8"
508+version = "0.2.9"
534509source = "registry+https://github.com/rust-lang/crates.io-index"
535−checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
510+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
536511dependencies = [
537512 "cfg-if",
538513 "libc",
@@ -540,556 +515,519 @@ dependencies = [
540515]
541516
542517[[package]]
543−name = "git-actor"
544−version = "0.17.0"
545−source = "registry+https://github.com/rust-lang/crates.io-index"
546−checksum = "d9e5fd7bc63ad527d64584f8d01f99b89c051f5fbb8144b58ae5f812775065cf"
547−dependencies = [
548− "bstr 1.0.1",
549− "btoi",
550− "git-date",
551− "itoa",
552− "nom",
553− "quick-error",
554−]
555−
556−[[package]]
557−name = "git-attributes"
558−version = "0.8.0"
559−source = "registry+https://github.com/rust-lang/crates.io-index"
560−checksum = "f8013dfce47c1e29236d732308933e2c77af5355ec5105755d26faf7764d3f7b"
561−dependencies = [
562− "bstr 1.0.1",
563− "compact_str",
564− "git-features",
565− "git-glob",
566− "git-path",
567− "git-quote",
518+name = "gimli"
519+version = "0.27.3"
520+source = "registry+https://github.com/rust-lang/crates.io-index"
521+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
522+
523+[[package]]
524+name = "gix"
525+version = "0.57.0"
526+source = "registry+https://github.com/rust-lang/crates.io-index"
527+checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
528+dependencies = [
529+ "gix-actor",
530+ "gix-commitgraph",
531+ "gix-config",
532+ "gix-date",
533+ "gix-diff",
534+ "gix-discover",
535+ "gix-features",
536+ "gix-fs",
537+ "gix-glob",
538+ "gix-hash",
539+ "gix-hashtable",
540+ "gix-lock",
541+ "gix-macros",
542+ "gix-object",
543+ "gix-odb",
544+ "gix-pack",
545+ "gix-path",
546+ "gix-ref",
547+ "gix-refspec",
548+ "gix-revision",
549+ "gix-revwalk",
550+ "gix-sec",
551+ "gix-tempfile",
552+ "gix-trace",
553+ "gix-traverse",
554+ "gix-url",
555+ "gix-utils",
556+ "gix-validate",
557+ "once_cell",
558+ "parking_lot",
559+ "smallvec",
568560 "thiserror",
569− "unicode-bom",
561+ "unicode-normalization",
570562]
571563
572564[[package]]
573−name = "git-bitmap"
574−version = "0.2.0"
565+name = "gix-actor"
566+version = "0.29.0"
575567source = "registry+https://github.com/rust-lang/crates.io-index"
576−checksum = "44304093ac66a0ada1b243c15c3a503a165a1d0f50bec748f4e5a9b84a0d0722"
568+checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
577569dependencies = [
578− "quick-error",
570+ "bstr",
571+ "btoi",
572+ "gix-date",
573+ "itoa",
574+ "thiserror",
575+ "winnow 0.5.28",
579576]
580577
581578[[package]]
582−name = "git-chunk"
583−version = "0.4.0"
579+name = "gix-chunk"
580+version = "0.4.6"
584581source = "registry+https://github.com/rust-lang/crates.io-index"
585−checksum = "3090baa2f4a3fe488a9b3e31090b83259aaf930bf0634af34c18117274f8f1a8"
582+checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
586583dependencies = [
587584 "thiserror",
588585]
589586
590587[[package]]
591−name = "git-command"
592−version = "0.2.1"
588+name = "gix-commitgraph"
589+version = "0.23.0"
593590source = "registry+https://github.com/rust-lang/crates.io-index"
594−checksum = "215145cc1686a45bc6f9872b153a0d3f3c40a1b94173a928325e1b53dfa5e2af"
591+checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
595592dependencies = [
596− "bstr 1.0.1",
593+ "bstr",
594+ "gix-chunk",
595+ "gix-features",
596+ "gix-hash",
597+ "memmap2",
598+ "thiserror",
597599]
598600
599601[[package]]
600−name = "git-config"
601−version = "0.15.0"
602+name = "gix-config"
603+version = "0.33.0"
602604source = "registry+https://github.com/rust-lang/crates.io-index"
603−checksum = "c9da662fd64ac69772158dcf04777da6266f0f36bc9a310b3eb2d805bb696315"
605+checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
604606dependencies = [
605− "bstr 1.0.1",
606− "git-config-value",
607− "git-features",
608− "git-glob",
609− "git-path",
610− "git-ref",
611− "git-sec",
607+ "bstr",
608+ "gix-config-value",
609+ "gix-features",
610+ "gix-glob",
611+ "gix-path",
612+ "gix-ref",
613+ "gix-sec",
612614 "memchr",
613− "nom",
614615 "once_cell",
615616 "smallvec",
616617 "thiserror",
617618 "unicode-bom",
619+ "winnow 0.5.28",
618620]
619621
620622[[package]]
621−name = "git-config-value"
622−version = "0.10.0"
623+name = "gix-config-value"
624+version = "0.14.2"
623625source = "registry+https://github.com/rust-lang/crates.io-index"
624−checksum = "989a90c1c630513a153c685b4249b96fdf938afc75bf7ef2ae1ccbd3d799f5db"
626+checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
625627dependencies = [
626− "bitflags",
627− "bstr 1.0.1",
628− "git-path",
628+ "bitflags 2.4.1",
629+ "bstr",
630+ "gix-path",
629631 "libc",
630632 "thiserror",
631633]
632634
633635[[package]]
634−name = "git-credentials"
635−version = "0.9.0"
636−source = "registry+https://github.com/rust-lang/crates.io-index"
637−checksum = "97cd6bbe001afd6356b35ef13f2a6b0f0abc0133d1b2ecaec1033bdd769616d6"
638−dependencies = [
639− "bstr 1.0.1",
640− "git-command",
641− "git-config-value",
642− "git-path",
643− "git-prompt",
644− "git-sec",
645− "git-url",
646− "thiserror",
647−]
648−
649−[[package]]
650−name = "git-date"
651−version = "0.4.0"
636+name = "gix-date"
637+version = "0.8.2"
652638source = "registry+https://github.com/rust-lang/crates.io-index"
653−checksum = "412c9b89026505bd24d5f8acafa578de6eea3b271ece307a73b8e646e671302a"
639+checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
654640dependencies = [
655− "bstr 1.0.1",
641+ "bstr",
656642 "itoa",
657643 "thiserror",
658644 "time",
659645]
660646
661647[[package]]
662−name = "git-diff"
663−version = "0.26.0"
648+name = "gix-diff"
649+version = "0.39.0"
664650source = "registry+https://github.com/rust-lang/crates.io-index"
665−checksum = "ca87474422d26d606d04cec6bedfabcd92a0a74102cd7936785358ced6a4a25a"
651+checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
666652dependencies = [
667− "git-hash",
668− "git-object",
669− "imara-diff",
653+ "bstr",
654+ "gix-hash",
655+ "gix-object",
670656 "thiserror",
671657]
672658
673659[[package]]
674−name = "git-discover"
675−version = "0.12.0"
660+name = "gix-discover"
661+version = "0.28.0"
676662source = "registry+https://github.com/rust-lang/crates.io-index"
677−checksum = "1e9e26e0bc434643228cd418185bd28ca5c7cf831bde1da434807391c27ac40e"
663+checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
678664dependencies = [
679− "bstr 1.0.1",
680− "git-hash",
681− "git-path",
682− "git-ref",
683− "git-sec",
665+ "bstr",
666+ "dunce",
667+ "gix-hash",
668+ "gix-path",
669+ "gix-ref",
670+ "gix-sec",
684671 "thiserror",
685672]
686673
687674[[package]]
688−name = "git-features"
689−version = "0.26.0"
675+name = "gix-features"
676+version = "0.37.0"
690677source = "registry+https://github.com/rust-lang/crates.io-index"
691−checksum = "5ff74064fa007c5beefa89a64bb72834f32b3c497750a56c79c6802bbdb311f9"
678+checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
692679dependencies = [
693680 "crc32fast",
694681 "flate2",
695− "git-hash",
682+ "gix-hash",
683+ "gix-trace",
696684 "libc",
697685 "once_cell",
698686 "prodash",
699− "quick-error",
700687 "sha1_smol",
688+ "thiserror",
701689 "walkdir",
702690]
703691
704692[[package]]
705−name = "git-glob"
706−version = "0.5.1"
693+name = "gix-fs"
694+version = "0.9.0"
707695source = "registry+https://github.com/rust-lang/crates.io-index"
708−checksum = "3908404c9b76ac7b3f636a104142378d3eaa78623cbc6eb7c7f0651979d48e8a"
696+checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
709697dependencies = [
710− "bitflags",
711− "bstr 1.0.1",
698+ "gix-features",
712699]
713700
714701[[package]]
715−name = "git-hash"
716−version = "0.10.1"
702+name = "gix-glob"
703+version = "0.15.0"
717704source = "registry+https://github.com/rust-lang/crates.io-index"
718−checksum = "1532d82bf830532f8d545c5b7b568e311e3593f16cf7ee9dd0ce03c74b12b99d"
705+checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
719706dependencies = [
720− "hex",
721− "thiserror",
707+ "bitflags 2.4.1",
708+ "bstr",
709+ "gix-features",
710+ "gix-path",
722711]
723712
724713[[package]]
725−name = "git-hashtable"
726−version = "0.1.0"
714+name = "gix-hash"
715+version = "0.14.0"
727716source = "registry+https://github.com/rust-lang/crates.io-index"
728−checksum = "c52b625ad8cc360a0b7f426266f21fb07bd49b8f4ccf1b3ca7bc89424db1dec4"
717+checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
729718dependencies = [
730− "git-hash",
731− "hashbrown 0.13.2",
719+ "faster-hex",
720+ "thiserror",
732721]
733722
734723[[package]]
735−name = "git-index"
736−version = "0.12.1"
724+name = "gix-hashtable"
725+version = "0.5.0"
737726source = "registry+https://github.com/rust-lang/crates.io-index"
738−checksum = "485da97dd4f69c7d9a8dc238cd6f4a726387ffc34573489e8e0d2bee266e3454"
739−dependencies = [
740− "atoi",
741− "bitflags",
742− "bstr 1.0.1",
743− "filetime",
744− "git-bitmap",
745− "git-features",
746− "git-hash",
747− "git-lock",
748− "git-object",
749− "git-traverse",
750− "itoa",
751− "memmap2",
752− "smallvec",
753− "thiserror",
727+checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
728+dependencies = [
729+ "gix-hash",
730+ "hashbrown 0.14.3",
731+ "parking_lot",
754732]
755733
756734[[package]]
757−name = "git-lock"
758−version = "3.0.0"
735+name = "gix-lock"
736+version = "12.0.0"
759737source = "registry+https://github.com/rust-lang/crates.io-index"
760−checksum = "89e4f05b8a68c3a5dd83a6651c76be384e910fe283072184fdab9d77f87ccec2"
738+checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
761739dependencies = [
762− "fastrand",
763− "git-tempfile",
764− "quick-error",
740+ "gix-tempfile",
741+ "gix-utils",
742+ "thiserror",
765743]
766744
767745[[package]]
768−name = "git-mailmap"
769−version = "0.9.0"
746+name = "gix-macros"
747+version = "0.1.2"
770748source = "registry+https://github.com/rust-lang/crates.io-index"
771−checksum = "0316b4346f3e162ade368209efb8a609b587793c74aa3b8de0ec01a4f3580120"
749+checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
772750dependencies = [
773− "bstr 1.0.1",
774− "git-actor",
775− "quick-error",
751+ "proc-macro2",
752+ "quote",
753+ "syn 2.0.38",
776754]
777755
778756[[package]]
779−name = "git-object"
780−version = "0.26.0"
757+name = "gix-object"
758+version = "0.40.0"
781759source = "registry+https://github.com/rust-lang/crates.io-index"
782−checksum = "3f8563e2d6f524d7053f3106714f99ecdc3adbba2cb7108c09d71a02579f2e19"
760+checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
783761dependencies = [
784− "bstr 1.0.1",
762+ "bstr",
785763 "btoi",
786− "git-actor",
787− "git-features",
788− "git-hash",
789− "git-validate",
790− "hex",
764+ "gix-actor",
765+ "gix-date",
766+ "gix-features",
767+ "gix-hash",
768+ "gix-validate",
791769 "itoa",
792− "nom",
793770 "smallvec",
794771 "thiserror",
772+ "winnow 0.5.28",
795773]
796774
797775[[package]]
798−name = "git-odb"
799−version = "0.40.0"
776+name = "gix-odb"
777+version = "0.56.0"
800778source = "registry+https://github.com/rust-lang/crates.io-index"
801−checksum = "616115a0e3daff6e08842758d24547b37a6eb6d0e2eedd95a740c3aaa2750333"
779+checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
802780dependencies = [
803781 "arc-swap",
804− "git-features",
805− "git-hash",
806− "git-object",
807− "git-pack",
808− "git-path",
809− "git-quote",
810− "parking_lot 0.12.1",
782+ "gix-date",
783+ "gix-features",
784+ "gix-hash",
785+ "gix-object",
786+ "gix-pack",
787+ "gix-path",
788+ "gix-quote",
789+ "parking_lot",
811790 "tempfile",
812791 "thiserror",
813792]
814793
815794[[package]]
816−name = "git-pack"
817−version = "0.30.0"
795+name = "gix-pack"
796+version = "0.46.0"
818797source = "registry+https://github.com/rust-lang/crates.io-index"
819−checksum = "7cd16b88f4b66041f41ca510c28bd81c4ee7363c5a544b3d62b4170432965871"
798+checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
820799dependencies = [
821− "bytesize",
822800 "clru",
823− "dashmap",
824− "git-chunk",
825− "git-diff",
826− "git-features",
827− "git-hash",
828− "git-hashtable",
829− "git-object",
830− "git-path",
831− "git-tempfile",
832− "git-traverse",
801+ "gix-chunk",
802+ "gix-features",
803+ "gix-hash",
804+ "gix-hashtable",
805+ "gix-object",
806+ "gix-path",
807+ "gix-tempfile",
833808 "memmap2",
834− "parking_lot 0.12.1",
809+ "parking_lot",
835810 "smallvec",
836811 "thiserror",
837812]
838813
839814[[package]]
840−name = "git-path"
841−version = "0.7.0"
842−source = "registry+https://github.com/rust-lang/crates.io-index"
843−checksum = "e40e68481a06da243d3f4dfd86a4be39c24eefb535017a862e845140dcdb878a"
844−dependencies = [
845− "bstr 1.0.1",
846− "thiserror",
847−]
848−
849−[[package]]
850−name = "git-prompt"
851−version = "0.3.0"
815+name = "gix-path"
816+version = "0.10.2"
852817source = "registry+https://github.com/rust-lang/crates.io-index"
853−checksum = "3612a486e507dd431ef0f7108eeaafc8fd1ed7bd0f205a88554f6f91fe5dccbf"
818+checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
854819dependencies = [
855− "git-command",
856− "git-config-value",
857− "nix",
858− "parking_lot 0.12.1",
820+ "bstr",
821+ "gix-trace",
822+ "home",
823+ "once_cell",
859824 "thiserror",
860825]
861826
862827[[package]]
863−name = "git-quote"
864−version = "0.4.0"
828+name = "gix-quote"
829+version = "0.4.9"
865830source = "registry+https://github.com/rust-lang/crates.io-index"
866−checksum = "1dd11f4e7f251ab297545faa4c5a4517f4985a43b9c16bf96fa49107f58e837f"
831+checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
867832dependencies = [
868− "bstr 1.0.1",
833+ "bstr",
869834 "btoi",
870− "quick-error",
835+ "thiserror",
871836]
872837
873838[[package]]
874−name = "git-ref"
875−version = "0.23.0"
839+name = "gix-ref"
840+version = "0.40.0"
876841source = "registry+https://github.com/rust-lang/crates.io-index"
877−checksum = "5e6767925a6fc4af5c5a81e348d1d851c1b3ab2b512bd7f562ac11be37c14468"
878−dependencies = [
879− "git-actor",
880− "git-features",
881− "git-hash",
882− "git-lock",
883− "git-object",
884− "git-path",
885− "git-tempfile",
886− "git-validate",
842+checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
843+dependencies = [
844+ "gix-actor",
845+ "gix-date",
846+ "gix-features",
847+ "gix-fs",
848+ "gix-hash",
849+ "gix-lock",
850+ "gix-object",
851+ "gix-path",
852+ "gix-tempfile",
853+ "gix-validate",
887854 "memmap2",
888− "nom",
889855 "thiserror",
856+ "winnow 0.5.28",
890857]
891858
892859[[package]]
893−name = "git-refspec"
894−version = "0.7.0"
860+name = "gix-refspec"
861+version = "0.21.0"
895862source = "registry+https://github.com/rust-lang/crates.io-index"
896−checksum = "ddf310ed5f2829ac0af96e7d4aebd4ae4b89f0718a7ae3666d09b02b2c5a1dfd"
863+checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
897864dependencies = [
898− "bstr 1.0.1",
899− "git-hash",
900− "git-revision",
901− "git-validate",
865+ "bstr",
866+ "gix-hash",
867+ "gix-revision",
868+ "gix-validate",
902869 "smallvec",
903870 "thiserror",
904871]
905872
906873[[package]]
907−name = "git-repository"
908−version = "0.32.0"
909−source = "registry+https://github.com/rust-lang/crates.io-index"
910−checksum = "993277960cb7e2d3991a11c1ec6951c1d142de052c26a18d2db64304e52d3741"
911−dependencies = [
912− "git-actor",
913− "git-attributes",
914− "git-config",
915− "git-credentials",
916− "git-date",
917− "git-diff",
918− "git-discover",
919− "git-features",
920− "git-glob",
921− "git-hash",
922− "git-hashtable",
923− "git-index",
924− "git-lock",
925− "git-mailmap",
926− "git-object",
927− "git-odb",
928− "git-pack",
929− "git-path",
930− "git-prompt",
931− "git-ref",
932− "git-refspec",
933− "git-revision",
934− "git-sec",
935− "git-tempfile",
936− "git-traverse",
937− "git-url",
938− "git-validate",
939− "git-worktree",
940− "log",
941− "once_cell",
942− "prodash",
943− "signal-hook",
944− "smallvec",
874+name = "gix-revision"
875+version = "0.25.0"
876+source = "registry+https://github.com/rust-lang/crates.io-index"
877+checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
878+dependencies = [
879+ "bstr",
880+ "gix-date",
881+ "gix-hash",
882+ "gix-hashtable",
883+ "gix-object",
884+ "gix-revwalk",
885+ "gix-trace",
945886 "thiserror",
946− "unicode-normalization",
947887]
948888
949889[[package]]
950−name = "git-revision"
951−version = "0.10.0"
890+name = "gix-revwalk"
891+version = "0.11.0"
952892source = "registry+https://github.com/rust-lang/crates.io-index"
953−checksum = "4f9a6bd28c9d1676bb96f428cd09614ae18a0087d7cea1cebfd177e25f99b2af"
893+checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
954894dependencies = [
955− "bstr 1.0.1",
956− "git-date",
957− "git-hash",
958− "git-hashtable",
959− "git-object",
895+ "gix-commitgraph",
896+ "gix-date",
897+ "gix-hash",
898+ "gix-hashtable",
899+ "gix-object",
900+ "smallvec",
960901 "thiserror",
961902]
962903
963904[[package]]
964−name = "git-sec"
965−version = "0.6.0"
905+name = "gix-sec"
906+version = "0.10.2"
966907source = "registry+https://github.com/rust-lang/crates.io-index"
967−checksum = "9e1802e8252fa223b0ad89a393aed461132174ced1e6842a41f56dc92a3fc14f"
908+checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
968909dependencies = [
969− "bitflags",
970− "dirs",
971− "git-path",
910+ "bitflags 2.4.1",
911+ "gix-path",
972912 "libc",
973− "windows",
913+ "windows 0.52.0",
974914]
975915
976916[[package]]
977−name = "git-tempfile"
978−version = "3.0.0"
917+name = "gix-tempfile"
918+version = "12.0.0"
979919source = "registry+https://github.com/rust-lang/crates.io-index"
980−checksum = "a6bb4dee86c8cae5a078cfaac3b004ef99c31548ed86218f23a7ff9b4b74f3be"
920+checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
981921dependencies = [
982− "dashmap",
922+ "gix-fs",
983923 "libc",
984924 "once_cell",
985− "signal-hook",
986− "signal-hook-registry",
925+ "parking_lot",
987926 "tempfile",
988927]
989928
990929[[package]]
991−name = "git-traverse"
992−version = "0.22.0"
930+name = "gix-trace"
931+version = "0.1.5"
993932source = "registry+https://github.com/rust-lang/crates.io-index"
994−checksum = "bd356da21ec00f69b9d4f105df4cb85543c746b18f4b7fc81529ce77713cdb29"
933+checksum = "bda62acb44dd86a40c7c3762a5403cfc1ac789ea559df54085cedf79864f809e"
934+
935+[[package]]
936+name = "gix-traverse"
937+version = "0.36.0"
938+source = "registry+https://github.com/rust-lang/crates.io-index"
939+checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
995940dependencies = [
996− "git-hash",
997− "git-hashtable",
998− "git-object",
941+ "gix-commitgraph",
942+ "gix-date",
943+ "gix-hash",
944+ "gix-hashtable",
945+ "gix-object",
946+ "gix-revwalk",
947+ "smallvec",
999948 "thiserror",
1000949]
1001950
1002951[[package]]
1003−name = "git-url"
1004−version = "0.13.0"
952+name = "gix-url"
953+version = "0.26.0"
1005954source = "registry+https://github.com/rust-lang/crates.io-index"
1006−checksum = "c85af407ed0dbb8d8da2a7241827d2fd5681186d9dab3570fc8dd8d6152ec48f"
955+checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
1007956dependencies = [
1008− "bstr 1.0.1",
1009− "git-features",
1010− "git-path",
957+ "bstr",
958+ "gix-features",
959+ "gix-path",
1011960 "home",
1012961 "thiserror",
1013962 "url",
1014963]
1015964
1016965[[package]]
1017−name = "git-validate"
1018−version = "0.7.1"
966+name = "gix-utils"
967+version = "0.1.7"
1019968source = "registry+https://github.com/rust-lang/crates.io-index"
1020−checksum = "0431cf9352c596dc7c8ec9066ee551ce54e63c86c3c767e5baf763f6019ff3c2"
969+checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
1021970dependencies = [
1022− "bstr 1.0.1",
1023− "thiserror",
971+ "fastrand",
1024972]
1025973
1026974[[package]]
1027−name = "git-worktree"
1028−version = "0.12.0"
975+name = "gix-validate"
976+version = "0.8.2"
1029977source = "registry+https://github.com/rust-lang/crates.io-index"
1030−checksum = "ca3bc63878f134e08ed52dba5d82422798c01a3f2e48c38ae9a2f7ff9194f362"
978+checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
1031979dependencies = [
1032− "bstr 1.0.1",
1033− "git-attributes",
1034− "git-features",
1035− "git-glob",
1036− "git-hash",
1037− "git-index",
1038− "git-object",
1039− "git-path",
1040− "io-close",
980+ "bstr",
1041981 "thiserror",
1042982]
1043983
1044984[[package]]
1045985name = "globset"
1046−version = "0.4.9"
986+version = "0.4.14"
1047987source = "registry+https://github.com/rust-lang/crates.io-index"
1048−checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a"
988+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
1049989dependencies = [
1050990 "aho-corasick",
1051− "bstr 0.2.17",
1052− "fnv",
991+ "bstr",
1053992 "log",
1054− "regex",
993+ "regex-automata",
994+ "regex-syntax",
1055995]
1056996
1057997[[package]]
1058998name = "grep-matcher"
1059−version = "0.1.5"
999+version = "0.1.7"
10601000source = "registry+https://github.com/rust-lang/crates.io-index"
1061−checksum = "6d27563c33062cd33003b166ade2bb4fd82db1fd6a86db764dfdad132d46c1cc"
1001+checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"
10621002dependencies = [
10631003 "memchr",
10641004]
10651005
10661006[[package]]
10671007name = "grep-regex"
1068−version = "0.1.10"
1008+version = "0.1.12"
10691009source = "registry+https://github.com/rust-lang/crates.io-index"
1070−checksum = "1345f8d33c89f2d5b081f2f2a41175adef9fd0bed2fea6a26c96c2deb027e58e"
1010+checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"
10711011dependencies = [
1072− "aho-corasick",
1073− "bstr 0.2.17",
1012+ "bstr",
10741013 "grep-matcher",
10751014 "log",
1076− "regex",
1015+ "regex-automata",
10771016 "regex-syntax",
1078− "thread_local",
10791017]
10801018
10811019[[package]]
10821020name = "grep-searcher"
1083−version = "0.1.10"
1021+version = "0.1.13"
10841022source = "registry+https://github.com/rust-lang/crates.io-index"
1085−checksum = "48852bd08f9b4eb3040ecb6d2f4ade224afe880a9a0909c5563cc59fa67932cc"
1023+checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"
10861024dependencies = [
1087− "bstr 0.2.17",
1088− "bytecount",
1025+ "bstr",
10891026 "encoding_rs",
10901027 "encoding_rs_io",
10911028 "grep-matcher",
10921029 "log",
1030+ "memchr",
10931031 "memmap2",
10941032]
10951033
@@ -1098,34 +1036,36 @@ name = "hashbrown"
10981036version = "0.12.3"
10991037source = "registry+https://github.com/rust-lang/crates.io-index"
11001038checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1101−dependencies = [
1102− "ahash 0.7.6",
1103−]
11041039
11051040[[package]]
11061041name = "hashbrown"
1107−version = "0.13.2"
1042+version = "0.14.3"
11081043source = "registry+https://github.com/rust-lang/crates.io-index"
1109−checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
1044+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
11101045dependencies = [
1111− "ahash 0.8.3",
1046+ "ahash",
1047+ "allocator-api2",
11121048]
11131049
11141050[[package]]
11151051name = "helix-core"
1116−version = "0.6.0"
1052+version = "23.10.0"
11171053dependencies = [
1118− "ahash 0.8.3",
1054+ "ahash",
11191055 "arc-swap",
1120− "bitflags",
1056+ "bitflags 2.4.1",
11211057 "chrono",
1058+ "dunce",
11221059 "encoding_rs",
11231060 "etcetera",
1124− "hashbrown 0.13.2",
1061+ "hashbrown 0.14.3",
11251062 "helix-loader",
11261063 "imara-diff",
1064+ "indoc",
11271065 "log",
1066+ "nucleo",
11281067 "once_cell",
1068+ "parking_lot",
11291069 "quickcheck",
11301070 "regex",
11311071 "ropey",
@@ -1144,7 +1084,7 @@ dependencies = [
11441084
11451085[[package]]
11461086name = "helix-dap"
1147−version = "0.6.0"
1087+version = "23.10.0"
11481088dependencies = [
11491089 "anyhow",
11501090 "fern",
@@ -1157,33 +1097,47 @@ dependencies = [
11571097 "which",
11581098]
11591099
1100+[[package]]
1101+name = "helix-event"
1102+version = "23.10.0"
1103+dependencies = [
1104+ "parking_lot",
1105+ "tokio",
1106+]
1107+
11601108[[package]]
11611109name = "helix-loader"
1162−version = "0.6.0"
1110+version = "23.10.0"
11631111dependencies = [
11641112 "anyhow",
11651113 "cc",
1114+ "dunce",
11661115 "etcetera",
11671116 "libloading",
11681117 "log",
11691118 "once_cell",
11701119 "serde",
1120+ "tempfile",
11711121 "threadpool",
11721122 "toml",
11731123 "tree-sitter",
1124+ "which",
11741125]
11751126
11761127[[package]]
11771128name = "helix-lsp"
1178−version = "0.6.0"
1129+version = "23.10.0"
11791130dependencies = [
11801131 "anyhow",
11811132 "futures-executor",
11821133 "futures-util",
1134+ "globset",
11831135 "helix-core",
11841136 "helix-loader",
1137+ "helix-parsec",
11851138 "log",
11861139 "lsp-types",
1140+ "parking_lot",
11871141 "serde",
11881142 "serde_json",
11891143 "thiserror",
@@ -1192,9 +1146,13 @@ dependencies = [
11921146 "which",
11931147]
11941148
1149+[[package]]
1150+name = "helix-parsec"
1151+version = "23.10.0"
1152+
11951153[[package]]
11961154name = "helix-term"
1197−version = "0.6.0"
1155+version = "23.10.0"
11981156dependencies = [
11991157 "anyhow",
12001158 "arc-swap",
@@ -1203,11 +1161,11 @@ dependencies = [
12031161 "crossterm",
12041162 "fern",
12051163 "futures-util",
1206− "fuzzy-matcher",
12071164 "grep-regex",
12081165 "grep-searcher",
12091166 "helix-core",
12101167 "helix-dap",
1168+ "helix-event",
12111169 "helix-loader",
12121170 "helix-lsp",
12131171 "helix-tui",
@@ -1215,8 +1173,11 @@ dependencies = [
12151173 "helix-view",
12161174 "ignore",
12171175 "indoc",
1176+ "libc",
12181177 "log",
1178+ "nucleo",
12191179 "once_cell",
1180+ "open",
12201181 "pulldown-cmark",
12211182 "serde",
12221183 "serde_json",
@@ -1227,18 +1188,21 @@ dependencies = [
12271188 "tokio",
12281189 "tokio-stream",
12291190 "toml",
1191+ "url",
12301192 "which",
12311193]
12321194
12331195[[package]]
12341196name = "helix-tui"
1235−version = "0.6.0"
1197+version = "23.10.0"
12361198dependencies = [
1237− "bitflags",
1199+ "bitflags 2.4.1",
12381200 "cassowary",
12391201 "crossterm",
12401202 "helix-core",
12411203 "helix-view",
1204+ "log",
1205+ "once_cell",
12421206 "serde",
12431207 "termini",
12441208 "unicode-segmentation",
@@ -1246,30 +1210,34 @@ dependencies = [
12461210
12471211[[package]]
12481212name = "helix-vcs"
1249−version = "0.6.0"
1213+version = "23.10.0"
12501214dependencies = [
1251− "git-repository",
1215+ "anyhow",
1216+ "arc-swap",
1217+ "gix",
12521218 "helix-core",
1219+ "helix-event",
12531220 "imara-diff",
12541221 "log",
1255− "parking_lot 0.12.1",
1222+ "parking_lot",
12561223 "tempfile",
12571224 "tokio",
12581225]
12591226
12601227[[package]]
12611228name = "helix-view"
1262−version = "0.6.0"
1229+version = "23.10.0"
12631230dependencies = [
12641231 "anyhow",
12651232 "arc-swap",
1266− "bitflags",
1233+ "bitflags 2.4.1",
12671234 "chardetng",
12681235 "clipboard-win",
12691236 "crossterm",
12701237 "futures-util",
12711238 "helix-core",
12721239 "helix-dap",
1240+ "helix-event",
12731241 "helix-loader",
12741242 "helix-lsp",
12751243 "helix-tui",
@@ -1277,6 +1245,8 @@ dependencies = [
12771245 "libc",
12781246 "log",
12791247 "once_cell",
1248+ "parking_lot",
1249+ "rustix",
12801250 "serde",
12811251 "serde_json",
12821252 "slotmap",
@@ -1289,46 +1259,34 @@ dependencies = [
12891259
12901260[[package]]
12911261name = "hermit-abi"
1292−version = "0.1.19"
1262+version = "0.2.6"
12931263source = "registry+https://github.com/rust-lang/crates.io-index"
1294−checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
1264+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
12951265dependencies = [
12961266 "libc",
12971267]
12981268
1299−[[package]]
1300−name = "hex"
1301−version = "0.4.3"
1302−source = "registry+https://github.com/rust-lang/crates.io-index"
1303−checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
1304−
13051269[[package]]
13061270name = "home"
1307−version = "0.5.4"
1271+version = "0.5.5"
13081272source = "registry+https://github.com/rust-lang/crates.io-index"
1309−checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
1273+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
13101274dependencies = [
1311− "winapi",
1275+ "windows-sys 0.48.0",
13121276]
13131277
1314−[[package]]
1315−name = "human_format"
1316−version = "1.0.3"
1317−source = "registry+https://github.com/rust-lang/crates.io-index"
1318−checksum = "86cce260d758a9aa3d7c4b99d55c815a540f8a37514ba6046ab6be402a157cb0"
1319−
13201278[[package]]
13211279name = "iana-time-zone"
1322−version = "0.1.53"
1280+version = "0.1.56"
13231281source = "registry+https://github.com/rust-lang/crates.io-index"
1324−checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
1282+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
13251283dependencies = [
13261284 "android_system_properties",
13271285 "core-foundation-sys",
13281286 "iana-time-zone-haiku",
13291287 "js-sys",
13301288 "wasm-bindgen",
1331− "winapi",
1289+ "windows 0.48.0",
13321290]
13331291
13341292[[package]]
@@ -1343,9 +1301,9 @@ dependencies = [
13431301
13441302[[package]]
13451303name = "idna"
1346−version = "0.3.0"
1304+version = "0.5.0"
13471305source = "registry+https://github.com/rust-lang/crates.io-index"
1348−checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
1306+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
13491307dependencies = [
13501308 "unicode-bidi",
13511309 "unicode-normalization",
@@ -1353,18 +1311,16 @@ dependencies = [
13531311
13541312[[package]]
13551313name = "ignore"
1356−version = "0.4.18"
1314+version = "0.4.21"
13571315source = "registry+https://github.com/rust-lang/crates.io-index"
1358−checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d"
1316+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
13591317dependencies = [
1360− "crossbeam-utils",
1318+ "crossbeam-deque",
13611319 "globset",
1362− "lazy_static",
13631320 "log",
13641321 "memchr",
1365− "regex",
1322+ "regex-automata",
13661323 "same-file",
1367− "thread_local",
13681324 "walkdir",
13691325 "winapi-util",
13701326]
@@ -1375,91 +1331,91 @@ version = "0.1.5"
13751331source = "registry+https://github.com/rust-lang/crates.io-index"
13761332checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
13771333dependencies = [
1378− "ahash 0.8.3",
1334+ "ahash",
13791335 "hashbrown 0.12.3",
13801336]
13811337
13821338[[package]]
13831339name = "indexmap"
1384−version = "1.9.2"
1340+version = "2.0.0"
13851341source = "registry+https://github.com/rust-lang/crates.io-index"
1386−checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
1342+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
13871343dependencies = [
1388− "autocfg",
1389− "hashbrown 0.12.3",
1344+ "equivalent",
1345+ "hashbrown 0.14.3",
13901346]
13911347
13921348[[package]]
13931349name = "indoc"
1394−version = "2.0.0"
1350+version = "2.0.4"
13951351source = "registry+https://github.com/rust-lang/crates.io-index"
1396−checksum = "6fe2b9d82064e8a0226fddb3547f37f28eaa46d0fc210e275d835f08cf3b76a7"
1352+checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
13971353
13981354[[package]]
1399−name = "instant"
1400−version = "0.1.12"
1355+name = "is-docker"
1356+version = "0.2.0"
14011357source = "registry+https://github.com/rust-lang/crates.io-index"
1402−checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
1358+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
14031359dependencies = [
1404− "cfg-if",
1360+ "once_cell",
14051361]
14061362
14071363[[package]]
1408−name = "io-close"
1409−version = "0.3.7"
1364+name = "is-wsl"
1365+version = "0.4.0"
14101366source = "registry+https://github.com/rust-lang/crates.io-index"
1411−checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
1367+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
14121368dependencies = [
1413− "libc",
1414− "winapi",
1369+ "is-docker",
1370+ "once_cell",
14151371]
14161372
14171373[[package]]
14181374name = "itoa"
1419−version = "1.0.4"
1375+version = "1.0.6"
14201376source = "registry+https://github.com/rust-lang/crates.io-index"
1421−checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
1377+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
14221378
14231379[[package]]
14241380name = "js-sys"
1425−version = "0.3.60"
1381+version = "0.3.61"
14261382source = "registry+https://github.com/rust-lang/crates.io-index"
1427−checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
1383+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
14281384dependencies = [
14291385 "wasm-bindgen",
14301386]
14311387
1432−[[package]]
1433−name = "lazy_static"
1434−version = "1.4.0"
1435−source = "registry+https://github.com/rust-lang/crates.io-index"
1436−checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
1437−
14381388[[package]]
14391389name = "libc"
1440−version = "0.2.139"
1390+version = "0.2.151"
14411391source = "registry+https://github.com/rust-lang/crates.io-index"
1442−checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
1392+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
14431393
14441394[[package]]
14451395name = "libloading"
1446−version = "0.7.4"
1396+version = "0.8.1"
14471397source = "registry+https://github.com/rust-lang/crates.io-index"
1448−checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
1398+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
14491399dependencies = [
14501400 "cfg-if",
1451− "winapi",
1401+ "windows-sys 0.48.0",
14521402]
14531403
14541404[[package]]
14551405name = "link-cplusplus"
1456−version = "1.0.7"
1406+version = "1.0.8"
14571407source = "registry+https://github.com/rust-lang/crates.io-index"
1458−checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
1408+checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
14591409dependencies = [
14601410 "cc",
14611411]
14621412
1413+[[package]]
1414+name = "linux-raw-sys"
1415+version = "0.4.11"
1416+source = "registry+https://github.com/rust-lang/crates.io-index"
1417+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
1418+
14631419[[package]]
14641420name = "lock_api"
14651421version = "0.4.9"
@@ -1472,20 +1428,17 @@ dependencies = [
14721428
14731429[[package]]
14741430name = "log"
1475−version = "0.4.17"
1431+version = "0.4.20"
14761432source = "registry+https://github.com/rust-lang/crates.io-index"
1477−checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
1478−dependencies = [
1479− "cfg-if",
1480−]
1433+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
14811434
14821435[[package]]
14831436name = "lsp-types"
1484−version = "0.94.0"
1437+version = "0.95.0"
14851438source = "registry+https://github.com/rust-lang/crates.io-index"
1486−checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
1439+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
14871440dependencies = [
1488− "bitflags",
1441+ "bitflags 1.3.2",
14891442 "serde",
14901443 "serde_json",
14911444 "serde_repr",
@@ -1494,85 +1447,69 @@ dependencies = [
14941447
14951448[[package]]
14961449name = "memchr"
1497−version = "2.5.0"
1450+version = "2.6.3"
14981451source = "registry+https://github.com/rust-lang/crates.io-index"
1499−checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
1452+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
15001453
15011454[[package]]
15021455name = "memmap2"
1503−version = "0.5.8"
1456+version = "0.9.0"
15041457source = "registry+https://github.com/rust-lang/crates.io-index"
1505−checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
1458+checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
15061459dependencies = [
15071460 "libc",
15081461]
15091462
15101463[[package]]
1511−name = "minimal-lexical"
1512−version = "0.2.1"
1464+name = "memoffset"
1465+version = "0.9.0"
15131466source = "registry+https://github.com/rust-lang/crates.io-index"
1514−checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
1467+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
1468+dependencies = [
1469+ "autocfg",
1470+]
15151471
15161472[[package]]
15171473name = "miniz_oxide"
1518−version = "0.6.2"
1474+version = "0.7.1"
15191475source = "registry+https://github.com/rust-lang/crates.io-index"
1520−checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
1476+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
15211477dependencies = [
15221478 "adler",
15231479]
15241480
15251481[[package]]
15261482name = "mio"
1527−version = "0.8.5"
1483+version = "0.8.9"
15281484source = "registry+https://github.com/rust-lang/crates.io-index"
1529−checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
1485+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
15301486dependencies = [
15311487 "libc",
15321488 "log",
15331489 "wasi",
1534− "windows-sys",
1535−]
1536−
1537−[[package]]
1538−name = "nix"
1539−version = "0.26.1"
1540−source = "registry+https://github.com/rust-lang/crates.io-index"
1541−checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
1542−dependencies = [
1543− "bitflags",
1544− "cfg-if",
1545− "libc",
1546− "static_assertions",
1490+ "windows-sys 0.48.0",
15471491]
15481492
15491493[[package]]
1550−name = "nom"
1551−version = "7.1.1"
1494+name = "nucleo"
1495+version = "0.2.1"
15521496source = "registry+https://github.com/rust-lang/crates.io-index"
1553−checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
1497+checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"
15541498dependencies = [
1555− "memchr",
1556− "minimal-lexical",
1499+ "nucleo-matcher",
1500+ "parking_lot",
1501+ "rayon",
15571502]
15581503
15591504[[package]]
1560−name = "nom8"
1505+name = "nucleo-matcher"
15611506version = "0.2.0"
15621507source = "registry+https://github.com/rust-lang/crates.io-index"
1563−checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
1508+checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57"
15641509dependencies = [
1510+ "cov-mark",
15651511 "memchr",
1566−]
1567−
1568−[[package]]
1569−name = "num-integer"
1570−version = "0.1.45"
1571−source = "registry+https://github.com/rust-lang/crates.io-index"
1572−checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
1573−dependencies = [
1574− "autocfg",
1575− "num-traits",
1512+ "unicode-segmentation",
15761513]
15771514
15781515[[package]]
@@ -1586,9 +1523,9 @@ dependencies = [
15861523
15871524[[package]]
15881525name = "num_cpus"
1589−version = "1.14.0"
1526+version = "1.15.0"
15901527source = "registry+https://github.com/rust-lang/crates.io-index"
1591−checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
1528+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
15921529dependencies = [
15931530 "hermit-abi",
15941531 "libc",
@@ -1603,21 +1540,30 @@ dependencies = [
16031540 "libc",
16041541]
16051542
1543+[[package]]
1544+name = "object"
1545+version = "0.31.1"
1546+source = "registry+https://github.com/rust-lang/crates.io-index"
1547+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
1548+dependencies = [
1549+ "memchr",
1550+]
1551+
16061552[[package]]
16071553name = "once_cell"
1608−version = "1.17.1"
1554+version = "1.19.0"
16091555source = "registry+https://github.com/rust-lang/crates.io-index"
1610−checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
1556+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
16111557
16121558[[package]]
1613−name = "parking_lot"
1614−version = "0.11.2"
1559+name = "open"
1560+version = "5.0.1"
16151561source = "registry+https://github.com/rust-lang/crates.io-index"
1616−checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
1562+checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
16171563dependencies = [
1618− "instant",
1619− "lock_api",
1620− "parking_lot_core 0.8.6",
1564+ "is-wsl",
1565+ "libc",
1566+ "pathdiff",
16211567]
16221568
16231569[[package]]
@@ -1627,47 +1573,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
16271573checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
16281574dependencies = [
16291575 "lock_api",
1630− "parking_lot_core 0.9.4",
1576+ "parking_lot_core",
16311577]
16321578
16331579[[package]]
16341580name = "parking_lot_core"
1635−version = "0.8.6"
1581+version = "0.9.7"
16361582source = "registry+https://github.com/rust-lang/crates.io-index"
1637−checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
1583+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
16381584dependencies = [
16391585 "cfg-if",
1640− "instant",
16411586 "libc",
1642− "redox_syscall",
1587+ "redox_syscall 0.2.16",
16431588 "smallvec",
1644− "winapi",
1589+ "windows-sys 0.45.0",
16451590]
16461591
16471592[[package]]
1648−name = "parking_lot_core"
1649−version = "0.9.4"
1593+name = "pathdiff"
1594+version = "0.2.1"
16501595source = "registry+https://github.com/rust-lang/crates.io-index"
1651−checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
1652−dependencies = [
1653− "cfg-if",
1654− "libc",
1655− "redox_syscall",
1656− "smallvec",
1657− "windows-sys",
1658−]
1596+checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
16591597
16601598[[package]]
16611599name = "percent-encoding"
1662−version = "2.2.0"
1600+version = "2.3.1"
16631601source = "registry+https://github.com/rust-lang/crates.io-index"
1664−checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
1602+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
16651603
16661604[[package]]
16671605name = "pin-project-lite"
1668−version = "0.2.9"
1606+version = "0.2.12"
16691607source = "registry+https://github.com/rust-lang/crates.io-index"
1670−checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
1608+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
16711609
16721610[[package]]
16731611name = "pin-utils"
@@ -1677,42 +1615,30 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
16771615
16781616[[package]]
16791617name = "proc-macro2"
1680−version = "1.0.47"
1618+version = "1.0.69"
16811619source = "registry+https://github.com/rust-lang/crates.io-index"
1682−checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
1620+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
16831621dependencies = [
16841622 "unicode-ident",
16851623]
16861624
16871625[[package]]
16881626name = "prodash"
1689−version = "23.0.0"
1627+version = "28.0.0"
16901628source = "registry+https://github.com/rust-lang/crates.io-index"
1691−checksum = "5d8c414345b4a98cbcd0e8d8829c8f54b47a7ed4fb771c45b7c5c6c0ae23dc4c"
1692−dependencies = [
1693− "bytesize",
1694− "dashmap",
1695− "human_format",
1696− "parking_lot 0.11.2",
1697−]
1629+checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
16981630
16991631[[package]]
17001632name = "pulldown-cmark"
1701−version = "0.9.2"
1633+version = "0.9.3"
17021634source = "registry+https://github.com/rust-lang/crates.io-index"
1703−checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
1635+checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
17041636dependencies = [
1705− "bitflags",
1637+ "bitflags 1.3.2",
17061638 "memchr",
17071639 "unicase",
17081640]
17091641
1710−[[package]]
1711−name = "quick-error"
1712−version = "2.0.1"
1713−source = "registry+https://github.com/rust-lang/crates.io-index"
1714−checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
1715−
17161642[[package]]
17171643name = "quickcheck"
17181644version = "1.0.3"
@@ -1724,9 +1650,9 @@ dependencies = [
17241650
17251651[[package]]
17261652name = "quote"
1727−version = "1.0.21"
1653+version = "1.0.29"
17281654source = "registry+https://github.com/rust-lang/crates.io-index"
1729−checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
1655+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
17301656dependencies = [
17311657 "proc-macro2",
17321658]
@@ -1749,79 +1675,109 @@ dependencies = [
17491675 "getrandom",
17501676]
17511677
1678+[[package]]
1679+name = "rayon"
1680+version = "1.7.0"
1681+source = "registry+https://github.com/rust-lang/crates.io-index"
1682+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
1683+dependencies = [
1684+ "either",
1685+ "rayon-core",
1686+]
1687+
1688+[[package]]
1689+name = "rayon-core"
1690+version = "1.11.0"
1691+source = "registry+https://github.com/rust-lang/crates.io-index"
1692+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
1693+dependencies = [
1694+ "crossbeam-channel",
1695+ "crossbeam-deque",
1696+ "crossbeam-utils",
1697+ "num_cpus",
1698+]
1699+
17521700[[package]]
17531701name = "redox_syscall"
17541702version = "0.2.16"
17551703source = "registry+https://github.com/rust-lang/crates.io-index"
17561704checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
17571705dependencies = [
1758− "bitflags",
1706+ "bitflags 1.3.2",
17591707]
17601708
17611709[[package]]
1762−name = "redox_users"
1763−version = "0.4.3"
1710+name = "redox_syscall"
1711+version = "0.4.1"
17641712source = "registry+https://github.com/rust-lang/crates.io-index"
1765−checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
1713+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
17661714dependencies = [
1767− "getrandom",
1768− "redox_syscall",
1769− "thiserror",
1715+ "bitflags 1.3.2",
17701716]
17711717
17721718[[package]]
17731719name = "regex"
1774−version = "1.7.1"
1720+version = "1.10.2"
17751721source = "registry+https://github.com/rust-lang/crates.io-index"
1776−checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
1722+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
17771723dependencies = [
17781724 "aho-corasick",
17791725 "memchr",
1726+ "regex-automata",
17801727 "regex-syntax",
17811728]
17821729
17831730[[package]]
17841731name = "regex-automata"
1785−version = "0.1.10"
1732+version = "0.4.3"
17861733source = "registry+https://github.com/rust-lang/crates.io-index"
1787−checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
1734+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
1735+dependencies = [
1736+ "aho-corasick",
1737+ "memchr",
1738+ "regex-syntax",
1739+]
17881740
17891741[[package]]
17901742name = "regex-syntax"
1791−version = "0.6.28"
1792−source = "registry+https://github.com/rust-lang/crates.io-index"
1793−checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
1794−
1795−[[package]]
1796−name = "remove_dir_all"
1797−version = "0.5.3"
1743+version = "0.8.2"
17981744source = "registry+https://github.com/rust-lang/crates.io-index"
1799−checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
1800−dependencies = [
1801− "winapi",
1802−]
1745+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
18031746
18041747[[package]]
18051748name = "ropey"
1806−version = "1.6.0"
1749+version = "1.6.1"
18071750source = "registry+https://github.com/rust-lang/crates.io-index"
1808−checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
1751+checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
18091752dependencies = [
18101753 "smallvec",
18111754 "str_indices",
18121755]
18131756
18141757[[package]]
1815−name = "rustversion"
1816−version = "1.0.9"
1758+name = "rustc-demangle"
1759+version = "0.1.23"
1760+source = "registry+https://github.com/rust-lang/crates.io-index"
1761+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
1762+
1763+[[package]]
1764+name = "rustix"
1765+version = "0.38.28"
18171766source = "registry+https://github.com/rust-lang/crates.io-index"
1818−checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"
1767+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
1768+dependencies = [
1769+ "bitflags 2.4.1",
1770+ "errno",
1771+ "libc",
1772+ "linux-raw-sys",
1773+ "windows-sys 0.52.0",
1774+]
18191775
18201776[[package]]
18211777name = "ryu"
1822−version = "1.0.11"
1778+version = "1.0.13"
18231779source = "registry+https://github.com/rust-lang/crates.io-index"
1824−checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
1780+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
18251781
18261782[[package]]
18271783name = "same-file"
@@ -1840,35 +1796,35 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
18401796
18411797[[package]]
18421798name = "scratch"
1843−version = "1.0.2"
1799+version = "1.0.5"
18441800source = "registry+https://github.com/rust-lang/crates.io-index"
1845−checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
1801+checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
18461802
18471803[[package]]
18481804name = "serde"
1849−version = "1.0.152"
1805+version = "1.0.193"
18501806source = "registry+https://github.com/rust-lang/crates.io-index"
1851−checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
1807+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
18521808dependencies = [
18531809 "serde_derive",
18541810]
18551811
18561812[[package]]
18571813name = "serde_derive"
1858−version = "1.0.152"
1814+version = "1.0.193"
18591815source = "registry+https://github.com/rust-lang/crates.io-index"
1860−checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
1816+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
18611817dependencies = [
18621818 "proc-macro2",
18631819 "quote",
1864− "syn",
1820+ "syn 2.0.38",
18651821]
18661822
18671823[[package]]
18681824name = "serde_json"
1869−version = "1.0.93"
1825+version = "1.0.108"
18701826source = "registry+https://github.com/rust-lang/crates.io-index"
1871−checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76"
1827+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
18721828dependencies = [
18731829 "itoa",
18741830 "ryu",
@@ -1877,20 +1833,20 @@ dependencies = [
18771833
18781834[[package]]
18791835name = "serde_repr"
1880−version = "0.1.9"
1836+version = "0.1.12"
18811837source = "registry+https://github.com/rust-lang/crates.io-index"
1882−checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
1838+checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
18831839dependencies = [
18841840 "proc-macro2",
18851841 "quote",
1886− "syn",
1842+ "syn 2.0.38",
18871843]
18881844
18891845[[package]]
18901846name = "serde_spanned"
1891−version = "0.6.1"
1847+version = "0.6.3"
18921848source = "registry+https://github.com/rust-lang/crates.io-index"
1893−checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
1849+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
18941850dependencies = [
18951851 "serde",
18961852]
@@ -1903,9 +1859,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
19031859
19041860[[package]]
19051861name = "signal-hook"
1906−version = "0.3.15"
1862+version = "0.3.17"
19071863source = "registry+https://github.com/rust-lang/crates.io-index"
1908−checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
1864+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
19091865dependencies = [
19101866 "libc",
19111867 "signal-hook-registry",
@@ -1924,9 +1880,9 @@ dependencies = [
19241880
19251881[[package]]
19261882name = "signal-hook-registry"
1927−version = "1.4.0"
1883+version = "1.4.1"
19281884source = "registry+https://github.com/rust-lang/crates.io-index"
1929−checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
1885+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
19301886dependencies = [
19311887 "libc",
19321888]
@@ -1945,27 +1901,27 @@ dependencies = [
19451901
19461902[[package]]
19471903name = "slab"
1948−version = "0.4.7"
1904+version = "0.4.8"
19491905source = "registry+https://github.com/rust-lang/crates.io-index"
1950−checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
1906+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
19511907dependencies = [
19521908 "autocfg",
19531909]
19541910
19551911[[package]]
19561912name = "slotmap"
1957−version = "1.0.6"
1913+version = "1.0.7"
19581914source = "registry+https://github.com/rust-lang/crates.io-index"
1959−checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
1915+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
19601916dependencies = [
19611917 "version_check",
19621918]
19631919
19641920[[package]]
19651921name = "smallvec"
1966−version = "1.10.0"
1922+version = "1.11.2"
19671923source = "registry+https://github.com/rust-lang/crates.io-index"
1968−checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
1924+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
19691925
19701926[[package]]
19711927name = "smartstring"
@@ -1986,12 +1942,12 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
19861942
19871943[[package]]
19881944name = "socket2"
1989−version = "0.4.7"
1945+version = "0.5.5"
19901946source = "registry+https://github.com/rust-lang/crates.io-index"
1991−checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
1947+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
19921948dependencies = [
19931949 "libc",
1994− "winapi",
1950+ "windows-sys 0.48.0",
19951951]
19961952
19971953[[package]]
@@ -2001,22 +1957,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
20011957checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
20021958
20031959[[package]]
2004−name = "str-buf"
2005−version = "1.0.6"
1960+name = "str_indices"
1961+version = "0.4.1"
20061962source = "registry+https://github.com/rust-lang/crates.io-index"
2007−checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
1963+checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"
20081964
20091965[[package]]
2010−name = "str_indices"
2011−version = "0.4.0"
1966+name = "syn"
1967+version = "1.0.109"
20121968source = "registry+https://github.com/rust-lang/crates.io-index"
2013−checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0"
1969+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
1970+dependencies = [
1971+ "proc-macro2",
1972+ "quote",
1973+ "unicode-ident",
1974+]
20141975
20151976[[package]]
20161977name = "syn"
2017−version = "1.0.104"
1978+version = "2.0.38"
20181979source = "registry+https://github.com/rust-lang/crates.io-index"
2019−checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce"
1980+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
20201981dependencies = [
20211982 "proc-macro2",
20221983 "quote",
@@ -2025,34 +1986,33 @@ dependencies = [
20251986
20261987[[package]]
20271988name = "tempfile"
2028−version = "3.3.0"
1989+version = "3.8.1"
20291990source = "registry+https://github.com/rust-lang/crates.io-index"
2030−checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
1991+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
20311992dependencies = [
20321993 "cfg-if",
20331994 "fastrand",
2034− "libc",
2035− "redox_syscall",
2036− "remove_dir_all",
2037− "winapi",
1995+ "redox_syscall 0.4.1",
1996+ "rustix",
1997+ "windows-sys 0.48.0",
20381998]
20391999
20402000[[package]]
20412001name = "termcolor"
2042−version = "1.1.3"
2002+version = "1.2.0"
20432003source = "registry+https://github.com/rust-lang/crates.io-index"
2044−checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
2004+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
20452005dependencies = [
20462006 "winapi-util",
20472007]
20482008
20492009[[package]]
20502010name = "termini"
2051−version = "0.1.4"
2011+version = "1.0.0"
20522012source = "registry+https://github.com/rust-lang/crates.io-index"
2053−checksum = "8c0f7ecb9c2a380d2686a747e4fc574043712326e8d39fbd220ab3bd29768a12"
2013+checksum = "2ad441d87dd98bc5eeb31cf2fb7e4839968763006b478efb38668a3bf9da0d59"
20542014dependencies = [
2055− "dirs-next",
2015+ "home",
20562016]
20572017
20582018[[package]]
@@ -2068,31 +2028,22 @@ dependencies = [
20682028
20692029[[package]]
20702030name = "thiserror"
2071−version = "1.0.38"
2031+version = "1.0.52"
20722032source = "registry+https://github.com/rust-lang/crates.io-index"
2073−checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
2033+checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
20742034dependencies = [
20752035 "thiserror-impl",
20762036]
20772037
20782038[[package]]
20792039name = "thiserror-impl"
2080−version = "1.0.38"
2040+version = "1.0.52"
20812041source = "registry+https://github.com/rust-lang/crates.io-index"
2082−checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
2042+checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
20832043dependencies = [
20842044 "proc-macro2",
20852045 "quote",
2086− "syn",
2087−]
2088−
2089−[[package]]
2090−name = "thread_local"
2091−version = "1.1.4"
2092−source = "registry+https://github.com/rust-lang/crates.io-index"
2093−checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
2094−dependencies = [
2095− "once_cell",
2046+ "syn 2.0.38",
20962047]
20972048
20982049[[package]]
@@ -2106,9 +2057,9 @@ dependencies = [
21062057
21072058[[package]]
21082059name = "time"
2109−version = "0.3.17"
2060+version = "0.3.23"
21102061source = "registry+https://github.com/rust-lang/crates.io-index"
2111−checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
2062+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
21122063dependencies = [
21132064 "itoa",
21142065 "libc",
@@ -2120,15 +2071,15 @@ dependencies = [
21202071
21212072[[package]]
21222073name = "time-core"
2123−version = "0.1.0"
2074+version = "0.1.1"
21242075source = "registry+https://github.com/rust-lang/crates.io-index"
2125−checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
2076+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
21262077
21272078[[package]]
21282079name = "time-macros"
2129−version = "0.2.6"
2080+version = "0.2.10"
21302081source = "registry+https://github.com/rust-lang/crates.io-index"
2131−checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
2082+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
21322083dependencies = [
21332084 "time-core",
21342085]
@@ -2144,46 +2095,45 @@ dependencies = [
21442095
21452096[[package]]
21462097name = "tinyvec_macros"
2147−version = "0.1.0"
2098+version = "0.1.1"
21482099source = "registry+https://github.com/rust-lang/crates.io-index"
2149−checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
2100+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
21502101
21512102[[package]]
21522103name = "tokio"
2153−version = "1.25.0"
2104+version = "1.35.1"
21542105source = "registry+https://github.com/rust-lang/crates.io-index"
2155−checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
2106+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
21562107dependencies = [
2157− "autocfg",
2108+ "backtrace",
21582109 "bytes",
21592110 "libc",
2160− "memchr",
21612111 "mio",
21622112 "num_cpus",
2163− "parking_lot 0.12.1",
2113+ "parking_lot",
21642114 "pin-project-lite",
21652115 "signal-hook-registry",
21662116 "socket2",
21672117 "tokio-macros",
2168− "windows-sys",
2118+ "windows-sys 0.48.0",
21692119]
21702120
21712121[[package]]
21722122name = "tokio-macros"
2173−version = "1.8.0"
2123+version = "2.2.0"
21742124source = "registry+https://github.com/rust-lang/crates.io-index"
2175−checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
2125+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
21762126dependencies = [
21772127 "proc-macro2",
21782128 "quote",
2179− "syn",
2129+ "syn 2.0.38",
21802130]
21812131
21822132[[package]]
21832133name = "tokio-stream"
2184−version = "0.1.12"
2134+version = "0.1.14"
21852135source = "registry+https://github.com/rust-lang/crates.io-index"
2186−checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
2136+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
21872137dependencies = [
21882138 "futures-core",
21892139 "pin-project-lite",
@@ -2192,9 +2142,9 @@ dependencies = [
21922142
21932143[[package]]
21942144name = "toml"
2195−version = "0.7.2"
2145+version = "0.7.6"
21962146source = "registry+https://github.com/rust-lang/crates.io-index"
2197−checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
2147+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
21982148dependencies = [
21992149 "serde",
22002150 "serde_spanned",
@@ -2204,31 +2154,30 @@ dependencies = [
22042154
22052155[[package]]
22062156name = "toml_datetime"
2207−version = "0.6.1"
2157+version = "0.6.3"
22082158source = "registry+https://github.com/rust-lang/crates.io-index"
2209−checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
2159+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
22102160dependencies = [
22112161 "serde",
22122162]
22132163
22142164[[package]]
22152165name = "toml_edit"
2216−version = "0.19.3"
2166+version = "0.19.12"
22172167source = "registry+https://github.com/rust-lang/crates.io-index"
2218−checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5"
2168+checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
22192169dependencies = [
22202170 "indexmap",
2221− "nom8",
22222171 "serde",
22232172 "serde_spanned",
22242173 "toml_datetime",
2174+ "winnow 0.4.6",
22252175]
22262176
22272177[[package]]
22282178name = "tree-sitter"
2229−version = "0.20.9"
2230−source = "registry+https://github.com/rust-lang/crates.io-index"
2231−checksum = "d4423c784fe11398ca91e505cdc71356b07b1a924fc8735cfab5333afe3e18bc"
2179+version = "0.20.10"
2180+source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
22322181dependencies = [
22332182 "cc",
22342183 "regex",
@@ -2245,15 +2194,15 @@ dependencies = [
22452194
22462195[[package]]
22472196name = "unicode-bidi"
2248−version = "0.3.8"
2197+version = "0.3.13"
22492198source = "registry+https://github.com/rust-lang/crates.io-index"
2250−checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
2199+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
22512200
22522201[[package]]
22532202name = "unicode-bom"
2254−version = "1.1.4"
2203+version = "2.0.2"
22552204source = "registry+https://github.com/rust-lang/crates.io-index"
2256−checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32"
2205+checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552"
22572206
22582207[[package]]
22592208name = "unicode-general-category"
@@ -2263,19 +2212,15 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
22632212
22642213[[package]]
22652214name = "unicode-ident"
2266−version = "1.0.5"
2215+version = "1.0.8"
22672216source = "registry+https://github.com/rust-lang/crates.io-index"
2268−checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
2217+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
22692218
22702219[[package]]
22712220name = "unicode-linebreak"
2272−version = "0.1.4"
2221+version = "0.1.5"
22732222source = "registry+https://github.com/rust-lang/crates.io-index"
2274−checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
2275−dependencies = [
2276− "hashbrown 0.12.3",
2277− "regex",
2278−]
2223+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
22792224
22802225[[package]]
22812226name = "unicode-normalization"
@@ -2294,15 +2239,15 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
22942239
22952240[[package]]
22962241name = "unicode-width"
2297−version = "0.1.10"
2242+version = "0.1.11"
22982243source = "registry+https://github.com/rust-lang/crates.io-index"
2299−checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
2244+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
23002245
23012246[[package]]
23022247name = "url"
2303−version = "2.3.1"
2248+version = "2.5.0"
23042249source = "registry+https://github.com/rust-lang/crates.io-index"
2305−checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
2250+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
23062251dependencies = [
23072252 "form_urlencoded",
23082253 "idna",
@@ -2318,12 +2263,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
23182263
23192264[[package]]
23202265name = "walkdir"
2321−version = "2.3.2"
2266+version = "2.4.0"
23222267source = "registry+https://github.com/rust-lang/crates.io-index"
2323−checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
2268+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
23242269dependencies = [
23252270 "same-file",
2326− "winapi",
23272271 "winapi-util",
23282272]
23292273
@@ -2335,9 +2279,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
23352279
23362280[[package]]
23372281name = "wasm-bindgen"
2338−version = "0.2.83"
2282+version = "0.2.84"
23392283source = "registry+https://github.com/rust-lang/crates.io-index"
2340−checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
2284+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
23412285dependencies = [
23422286 "cfg-if",
23432287 "wasm-bindgen-macro",
@@ -2345,24 +2289,24 @@ dependencies = [
23452289
23462290[[package]]
23472291name = "wasm-bindgen-backend"
2348−version = "0.2.83"
2292+version = "0.2.84"
23492293source = "registry+https://github.com/rust-lang/crates.io-index"
2350−checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
2294+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
23512295dependencies = [
23522296 "bumpalo",
23532297 "log",
23542298 "once_cell",
23552299 "proc-macro2",
23562300 "quote",
2357− "syn",
2301+ "syn 1.0.109",
23582302 "wasm-bindgen-shared",
23592303]
23602304
23612305[[package]]
23622306name = "wasm-bindgen-macro"
2363−version = "0.2.83"
2307+version = "0.2.84"
23642308source = "registry+https://github.com/rust-lang/crates.io-index"
2365−checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
2309+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
23662310dependencies = [
23672311 "quote",
23682312 "wasm-bindgen-macro-support",
@@ -2370,32 +2314,34 @@ dependencies = [
23702314
23712315[[package]]
23722316name = "wasm-bindgen-macro-support"
2373−version = "0.2.83"
2317+version = "0.2.84"
23742318source = "registry+https://github.com/rust-lang/crates.io-index"
2375−checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
2319+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
23762320dependencies = [
23772321 "proc-macro2",
23782322 "quote",
2379− "syn",
2323+ "syn 1.0.109",
23802324 "wasm-bindgen-backend",
23812325 "wasm-bindgen-shared",
23822326]
23832327
23842328[[package]]
23852329name = "wasm-bindgen-shared"
2386−version = "0.2.83"
2330+version = "0.2.84"
23872331source = "registry+https://github.com/rust-lang/crates.io-index"
2388−checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
2332+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
23892333
23902334[[package]]
23912335name = "which"
2392−version = "4.4.0"
2336+version = "5.0.0"
23932337source = "registry+https://github.com/rust-lang/crates.io-index"
2394−checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
2338+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
23952339dependencies = [
23962340 "either",
2397− "libc",
2341+ "home",
23982342 "once_cell",
2343+ "rustix",
2344+ "windows-sys 0.48.0",
23992345]
24002346
24012347[[package]]
@@ -2431,121 +2377,251 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
24312377
24322378[[package]]
24332379name = "windows"
2434−version = "0.40.0"
2380+version = "0.48.0"
2381+source = "registry+https://github.com/rust-lang/crates.io-index"
2382+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
2383+dependencies = [
2384+ "windows-targets 0.48.0",
2385+]
2386+
2387+[[package]]
2388+name = "windows"
2389+version = "0.52.0"
2390+source = "registry+https://github.com/rust-lang/crates.io-index"
2391+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
2392+dependencies = [
2393+ "windows-core",
2394+ "windows-targets 0.52.0",
2395+]
2396+
2397+[[package]]
2398+name = "windows-core"
2399+version = "0.52.0"
2400+source = "registry+https://github.com/rust-lang/crates.io-index"
2401+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
2402+dependencies = [
2403+ "windows-targets 0.52.0",
2404+]
2405+
2406+[[package]]
2407+name = "windows-sys"
2408+version = "0.45.0"
2409+source = "registry+https://github.com/rust-lang/crates.io-index"
2410+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
2411+dependencies = [
2412+ "windows-targets 0.42.2",
2413+]
2414+
2415+[[package]]
2416+name = "windows-sys"
2417+version = "0.48.0"
24352418source = "registry+https://github.com/rust-lang/crates.io-index"
2436−checksum = "e30acc718a52fb130fec72b1cb5f55ffeeec9253e1b785e94db222178a6acaa1"
2419+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
24372420dependencies = [
2438− "windows_aarch64_gnullvm 0.40.0",
2439− "windows_aarch64_msvc 0.40.0",
2440− "windows_i686_gnu 0.40.0",
2441− "windows_i686_msvc 0.40.0",
2442− "windows_x86_64_gnu 0.40.0",
2443− "windows_x86_64_gnullvm 0.40.0",
2444− "windows_x86_64_msvc 0.40.0",
2421+ "windows-targets 0.48.0",
24452422]
24462423
24472424[[package]]
24482425name = "windows-sys"
2449−version = "0.42.0"
2426+version = "0.52.0"
2427+source = "registry+https://github.com/rust-lang/crates.io-index"
2428+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
2429+dependencies = [
2430+ "windows-targets 0.52.0",
2431+]
2432+
2433+[[package]]
2434+name = "windows-targets"
2435+version = "0.42.2"
2436+source = "registry+https://github.com/rust-lang/crates.io-index"
2437+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
2438+dependencies = [
2439+ "windows_aarch64_gnullvm 0.42.2",
2440+ "windows_aarch64_msvc 0.42.2",
2441+ "windows_i686_gnu 0.42.2",
2442+ "windows_i686_msvc 0.42.2",
2443+ "windows_x86_64_gnu 0.42.2",
2444+ "windows_x86_64_gnullvm 0.42.2",
2445+ "windows_x86_64_msvc 0.42.2",
2446+]
2447+
2448+[[package]]
2449+name = "windows-targets"
2450+version = "0.48.0"
2451+source = "registry+https://github.com/rust-lang/crates.io-index"
2452+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
2453+dependencies = [
2454+ "windows_aarch64_gnullvm 0.48.0",
2455+ "windows_aarch64_msvc 0.48.0",
2456+ "windows_i686_gnu 0.48.0",
2457+ "windows_i686_msvc 0.48.0",
2458+ "windows_x86_64_gnu 0.48.0",
2459+ "windows_x86_64_gnullvm 0.48.0",
2460+ "windows_x86_64_msvc 0.48.0",
2461+]
2462+
2463+[[package]]
2464+name = "windows-targets"
2465+version = "0.52.0"
24502466source = "registry+https://github.com/rust-lang/crates.io-index"
2451−checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
2467+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
24522468dependencies = [
2453− "windows_aarch64_gnullvm 0.42.0",
2454− "windows_aarch64_msvc 0.42.0",
2455− "windows_i686_gnu 0.42.0",
2456− "windows_i686_msvc 0.42.0",
2457− "windows_x86_64_gnu 0.42.0",
2458− "windows_x86_64_gnullvm 0.42.0",
2459− "windows_x86_64_msvc 0.42.0",
2469+ "windows_aarch64_gnullvm 0.52.0",
2470+ "windows_aarch64_msvc 0.52.0",
2471+ "windows_i686_gnu 0.52.0",
2472+ "windows_i686_msvc 0.52.0",
2473+ "windows_x86_64_gnu 0.52.0",
2474+ "windows_x86_64_gnullvm 0.52.0",
2475+ "windows_x86_64_msvc 0.52.0",
24602476]
24612477
24622478[[package]]
24632479name = "windows_aarch64_gnullvm"
2464−version = "0.40.0"
2480+version = "0.42.2"
2481+source = "registry+https://github.com/rust-lang/crates.io-index"
2482+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
2483+
2484+[[package]]
2485+name = "windows_aarch64_gnullvm"
2486+version = "0.48.0"
24652487source = "registry+https://github.com/rust-lang/crates.io-index"
2466−checksum = "f3caa4a1a16561b714323ca6b0817403738583033a6a92e04c5d10d4ba37ca10"
2488+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
24672489
24682490[[package]]
24692491name = "windows_aarch64_gnullvm"
2470−version = "0.42.0"
2492+version = "0.52.0"
24712493source = "registry+https://github.com/rust-lang/crates.io-index"
2472−checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
2494+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
24732495
24742496[[package]]
24752497name = "windows_aarch64_msvc"
2476−version = "0.40.0"
2498+version = "0.42.2"
2499+source = "registry+https://github.com/rust-lang/crates.io-index"
2500+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
2501+
2502+[[package]]
2503+name = "windows_aarch64_msvc"
2504+version = "0.48.0"
24772505source = "registry+https://github.com/rust-lang/crates.io-index"
2478−checksum = "328973c62dfcc50fb1aaa8e7100676e0b642fe56bac6bafff3327902db843ab4"
2506+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
24792507
24802508[[package]]
24812509name = "windows_aarch64_msvc"
2482−version = "0.42.0"
2510+version = "0.52.0"
24832511source = "registry+https://github.com/rust-lang/crates.io-index"
2484−checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
2512+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
24852513
24862514[[package]]
24872515name = "windows_i686_gnu"
2488−version = "0.40.0"
2516+version = "0.42.2"
2517+source = "registry+https://github.com/rust-lang/crates.io-index"
2518+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
2519+
2520+[[package]]
2521+name = "windows_i686_gnu"
2522+version = "0.48.0"
24892523source = "registry+https://github.com/rust-lang/crates.io-index"
2490−checksum = "aa5b09fad70f0df85dea2ac2a525537e415e2bf63ee31cf9b8e263645ee9f3c1"
2524+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
24912525
24922526[[package]]
24932527name = "windows_i686_gnu"
2494−version = "0.42.0"
2528+version = "0.52.0"
24952529source = "registry+https://github.com/rust-lang/crates.io-index"
2496−checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
2530+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
24972531
24982532[[package]]
24992533name = "windows_i686_msvc"
2500−version = "0.40.0"
2534+version = "0.42.2"
2535+source = "registry+https://github.com/rust-lang/crates.io-index"
2536+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
2537+
2538+[[package]]
2539+name = "windows_i686_msvc"
2540+version = "0.48.0"
25012541source = "registry+https://github.com/rust-lang/crates.io-index"
2502−checksum = "2a1ad4031c1a98491fa195d8d43d7489cb749f135f2e5c4eed58da094bd0d876"
2542+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
25032543
25042544[[package]]
25052545name = "windows_i686_msvc"
2506−version = "0.42.0"
2546+version = "0.52.0"
25072547source = "registry+https://github.com/rust-lang/crates.io-index"
2508−checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
2548+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
25092549
25102550[[package]]
25112551name = "windows_x86_64_gnu"
2512−version = "0.40.0"
2552+version = "0.42.2"
2553+source = "registry+https://github.com/rust-lang/crates.io-index"
2554+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
2555+
2556+[[package]]
2557+name = "windows_x86_64_gnu"
2558+version = "0.48.0"
25132559source = "registry+https://github.com/rust-lang/crates.io-index"
2514−checksum = "520ff37edd72da8064b49d2281182898e17f0688ae9f4070bca27e4b5c162ac7"
2560+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
25152561
25162562[[package]]
25172563name = "windows_x86_64_gnu"
2518−version = "0.42.0"
2564+version = "0.52.0"
25192565source = "registry+https://github.com/rust-lang/crates.io-index"
2520−checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
2566+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
25212567
25222568[[package]]
25232569name = "windows_x86_64_gnullvm"
2524−version = "0.40.0"
2570+version = "0.42.2"
2571+source = "registry+https://github.com/rust-lang/crates.io-index"
2572+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
2573+
2574+[[package]]
2575+name = "windows_x86_64_gnullvm"
2576+version = "0.48.0"
25252577source = "registry+https://github.com/rust-lang/crates.io-index"
2526−checksum = "046e5b82215102c44fd75f488f1b9158973d02aa34d06ed85c23d6f5520a2853"
2578+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
25272579
25282580[[package]]
25292581name = "windows_x86_64_gnullvm"
2530−version = "0.42.0"
2582+version = "0.52.0"
25312583source = "registry+https://github.com/rust-lang/crates.io-index"
2532−checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
2584+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
25332585
25342586[[package]]
25352587name = "windows_x86_64_msvc"
2536−version = "0.40.0"
2588+version = "0.42.2"
2589+source = "registry+https://github.com/rust-lang/crates.io-index"
2590+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
2591+
2592+[[package]]
2593+name = "windows_x86_64_msvc"
2594+version = "0.48.0"
25372595source = "registry+https://github.com/rust-lang/crates.io-index"
2538−checksum = "2a0c9c6df55dd1bfa76e131cef44bdd8ec9c819ef3611f04dfe453fd5bfeda28"
2596+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
25392597
25402598[[package]]
25412599name = "windows_x86_64_msvc"
2542−version = "0.42.0"
2600+version = "0.52.0"
2601+source = "registry+https://github.com/rust-lang/crates.io-index"
2602+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
2603+
2604+[[package]]
2605+name = "winnow"
2606+version = "0.4.6"
2607+source = "registry+https://github.com/rust-lang/crates.io-index"
2608+checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
2609+dependencies = [
2610+ "memchr",
2611+]
2612+
2613+[[package]]
2614+name = "winnow"
2615+version = "0.5.28"
25432616source = "registry+https://github.com/rust-lang/crates.io-index"
2544−checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
2617+checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
2618+dependencies = [
2619+ "memchr",
2620+]
25452621
25462622[[package]]
25472623name = "xtask"
2548−version = "0.6.0"
2624+version = "23.10.0"
25492625dependencies = [
25502626 "helix-core",
25512627 "helix-loader",
@@ -2553,3 +2629,23 @@ dependencies = [
25532629 "helix-view",
25542630 "toml",
25552631]
2632+
2633+[[package]]
2634+name = "zerocopy"
2635+version = "0.7.31"
2636+source = "registry+https://github.com/rust-lang/crates.io-index"
2637+checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d"
2638+dependencies = [
2639+ "zerocopy-derive",
2640+]
2641+
2642+[[package]]
2643+name = "zerocopy-derive"
2644+version = "0.7.31"
2645+source = "registry+https://github.com/rust-lang/crates.io-index"
2646+checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
2647+dependencies = [
2648+ "proc-macro2",
2649+ "quote",
2650+ "syn 2.0.38",
2651+]
Cargo.toml+17
@@ -1,13 +1,16 @@
11[workspace]
2+resolver = "2"
23members = [
34 "helix-core",
45 "helix-view",
56 "helix-term",
67 "helix-tui",
78 "helix-lsp",
9+ "helix-event",
810 "helix-dap",
911 "helix-loader",
1012 "helix-vcs",
13+ "helix-parsec",
1114 "xtask",
1215]
1316
@@ -31,3 +34,17 @@ inherits = "test"
3134package.helix-core.opt-level = 2
3235package.helix-tui.opt-level = 2
3336package.helix-term.opt-level = 2
37+
38+[workspace.dependencies]
39+tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
40+nucleo = "0.2.0"
41+
42+[workspace.package]
43+version = "23.10.0"
44+edition = "2021"
45+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
46+categories = ["editor"]
47+repository = "https://github.com/helix-editor/helix"
48+homepage = "https://helix-editor.com"
49+license = "MPL-2.0"
50+rust-version = "1.70"
README.md+3−85
@@ -18,7 +18,7 @@
1818
1919![Screenshot](./screenshot.png)
2020
21−A Kakoune / Neovim inspired editor, written in Rust.
21+A [Kakoune](https://github.com/mawww/kakoune) / [Neovim](https://github.com/neovim/neovim) inspired editor, written in Rust.
2222
2323The editing model is very heavily based on Kakoune; during development I found
2424myself agreeing with most of Kakoune's design decisions.
@@ -45,92 +45,10 @@ Note: Only certain languages have indentation definitions at the moment. Check
4545
4646# Installation
4747
48−Packages are available for various distributions (see [Installation docs](https://docs.helix-editor.com/install.html)).
49−
50−If you would like to build from source:
51−
52−```shell
53−git clone https://github.com/helix-editor/helix
54−cd helix
55−cargo install --locked --path helix-term
56−```
57−
58−This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars in `./runtime/grammars`.
59−
60−Helix needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
61−config directory (for example `~/.config/helix/runtime` on Linux/macOS, or `%AppData%/helix/runtime` on Windows).
62−
63−| OS | Command |
64−| -------------------- | ------------------------------------------------ |
65−| Windows (Cmd) | `xcopy /e /i runtime %AppData%\helix\runtime` |
66−| Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
67−| Linux / macOS | `ln -s $PWD/runtime ~/.config/helix/runtime` |
68−
69−Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
70−elevated privileges - i.e. PowerShell or Cmd must be run as administrator.
71−
72−**PowerShell:**
73−
74−```powershell
75−New-Item -ItemType Junction -Target "runtime" -Path "$Env:AppData\helix\runtime"
76−```
77−Note: "runtime" must be absolute path to the runtime directory.
78−
79−**Cmd:**
80−
81−```cmd
82−cd %appdata%\helix
83−mklink /D runtime "<helix-repo>\runtime"
84−```
85−
86−The runtime location can be overridden via the `HELIX_RUNTIME` environment variable.
87−
88−> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --locked --path helix-term`,
89−> tree-sitter grammars will be built in `$HELIX_RUNTIME/grammars`.
90−
91−If you plan on keeping the repo locally, an alternative to copying/symlinking
92−runtime files is to set `HELIX_RUNTIME=/path/to/helix/runtime`
93−(`HELIX_RUNTIME=$PWD/runtime` if you're in the helix repo directory).
94−
95−Packages already solve this for you by wrapping the `hx` binary with a wrapper
96−that sets the variable to the install dir.
97−
98−> NOTE: running via cargo also doesn't require setting explicit `HELIX_RUNTIME` path, it will automatically
99−> detect the `runtime` directory in the project root.
100−
101−If you want to customize your `languages.toml` config,
102−tree-sitter grammars may be manually fetched and built with `hx --grammar fetch` and `hx --grammar build`.
103−
104−In order to use LSP features like auto-complete, you will need to
105−[install the appropriate Language Server](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers)
106−for a language.
48+[Installation documentation](https://docs.helix-editor.com/install.html).
10749
10850[![Packaging status](https://repology.org/badge/vertical-allrepos/helix.svg)](https://repology.org/project/helix/versions)
10951
110−## Adding Helix to your desktop environment
111−
112−If installing from source, to use Helix in desktop environments that supports [XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html), including Gnome and KDE, copy the provided `.desktop` file to the correct folder:
113−
114−```bash
115−cp contrib/Helix.desktop ~/.local/share/applications
116−cp contrib/helix.png ~/.local/share/icons
117−```
118−
119−To use another terminal than the default, you will need to modify the `.desktop` file. For example, to use `kitty`:
120−
121−```bash
122−sed -i "s|Exec=hx %F|Exec=kitty hx %F|g" ~/.local/share/applications/Helix.desktop
123−sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desktop
124−```
125−
126−## macOS
127−
128−Helix can be installed on macOS through homebrew:
129−
130−```
131−brew install helix
132−```
133−
13452# Contributing
13553
13654Contributing guidelines can be found [here](./docs/CONTRIBUTING.md).
@@ -143,4 +61,4 @@ Discuss the project on the community [Matrix Space](https://matrix.to/#/#helix-c
14361
14462# Credits
14563
146−Thanks to [@JakeHL](https://github.com/JakeHL) for designing the logo!
64+Thanks to [@jakenvac](https://github.com/jakenvac) for designing the logo!
VERSIONdeleted−1
@@ -1 +0,0 @@
1−22.12
book/book.toml+5−1
@@ -3,10 +3,14 @@ authors = ["Blaž Hrastnik"]
33language = "en"
44multilingual = false
55src = "src"
6−edit-url-template = "https://github.com/helix-editor/helix/tree/master/book/{path}?mode=edit"
76
87[output.html]
98cname = "docs.helix-editor.com"
109default-theme = "colibri"
1110preferred-dark-theme = "colibri"
1211git-repository-url = "https://github.com/helix-editor/helix"
12+edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"
13+additional-css = ["custom.css"]
14+
15+[output.html.search]
16+use-boolean-and = true
book/custom.cssnew file+231
@@ -0,0 +1,231 @@
1+html {
2+ font-family: "Inter", sans-serif;
3+}
4+
5+.sidebar .sidebar-scrollbox {
6+ padding: 0;
7+}
8+
9+.chapter {
10+ margin: 0.25rem 0;
11+}
12+
13+.chapter li.chapter-item {
14+ line-height: initial;
15+ margin: 0;
16+ padding: 1rem 1.5rem;
17+}
18+
19+.chapter .section li.chapter-item {
20+ line-height: inherit;
21+ padding: .5rem .5rem 0 .5rem;
22+}
23+
24+.content {
25+ overflow-y: auto;
26+ padding: 0 15px;
27+ padding-bottom: 50px;
28+}
29+
30+/* 2 1.75 1.5 1.25 1 .875 */
31+.content h1 { font-size: 2em }
32+.content h2 { font-size: 1.75em }
33+.content h3 { font-size: 1.5em }
34+.content h4 { font-size: 1.25em }
35+.content h5 { font-size: 1em }
36+.content h6 { font-size: .875em }
37+
38+.content h1,
39+.content h2,
40+.content h3,
41+.content h4 {
42+ font-weight: 500;
43+ margin-top: 1.275em;
44+ margin-bottom: .875em;
45+}
46+
47+.content p,
48+.content ol,
49+.content ul,
50+.content table {
51+ margin-top: 0;
52+ margin-bottom: .875em;
53+}
54+
55+.content ul li {
56+ margin-bottom: .25rem;
57+}
58+
59+.content ul {
60+ list-style-type: square;
61+}
62+
63+.content ul ul,
64+.content ol ul {
65+ margin-bottom: .5rem;
66+}
67+
68+.content li p {
69+ margin-bottom: .5em;
70+}
71+
72+blockquote {
73+ margin: 1.5rem 0;
74+ padding: 1rem 1.5rem;
75+ color: var(--fg);
76+ opacity: .9;
77+ background-color: var(--quote-bg);
78+ border-left: 4px solid var(--quote-border);
79+ border-top: none;
80+ border-bottom: none;
81+}
82+
83+blockquote *:last-child {
84+ margin-bottom: 0;
85+}
86+
87+table {
88+ width: 100%;
89+}
90+
91+table thead th {
92+ padding: .75rem;
93+ text-align: left;
94+ font-weight: 500;
95+ line-height: 1.5;
96+ width: auto;
97+}
98+
99+table td {
100+ padding: .75rem;
101+ border: none;
102+}
103+
104+table thead tr {
105+ border: none;
106+ border-bottom: 2px var(--table-border-color) solid;
107+}
108+
109+table tbody tr {
110+ border-bottom: 1px var(--table-border-line) solid;
111+}
112+
113+table tbody tr:nth-child(2n) {
114+ background: unset;
115+}
116+
117+pre code.hljs {
118+ display: block;
119+ overflow-x: auto;
120+ padding: 1em;
121+}
122+
123+code.hljs {
124+ padding: 3px 5px;
125+}
126+
127+.colibri {
128+ --bg: #3b224c;
129+ --fg: #bcbdd0;
130+ --heading-fg: #fff;
131+
132+ --sidebar-bg: #281733;
133+ --sidebar-fg: #c8c9db;
134+ --sidebar-non-existent: #505274;
135+ --sidebar-active: #a4a0e8;
136+ --sidebar-spacer: #2d334f;
137+
138+ --scrollbar: var(--sidebar-fg);
139+
140+ --icons: #737480;
141+ --icons-hover: #b7b9cc;
142+
143+ /* --links: #a4a0e8; */
144+ --links: #ECCDBA;
145+
146+ --inline-code-color: hsl(48.7, 7.8%, 70%);
147+
148+ --theme-popup-bg: #161923;
149+ --theme-popup-border: #737480;
150+ --theme-hover: rgba(0, 0, 0, .2);
151+
152+ --quote-bg: #281733;
153+ --quote-border: hsl(226, 15%, 22%);
154+
155+ --table-border-color: hsl(226, 23%, 76%);
156+ --table-header-bg: hsla(226, 23%, 31%, 0);
157+ --table-alternate-bg: hsl(226, 23%, 14%);
158+ --table-border-line: hsla(201deg, 20%, 92%, 0.2);
159+
160+ --searchbar-border-color: #aaa;
161+ --searchbar-bg: #aeaec6;
162+ --searchbar-fg: #000;
163+ --searchbar-shadow-color: #aaa;
164+ --searchresults-header-fg: #5f5f71;
165+ --searchresults-border-color: #5c5c68;
166+ --searchresults-li-bg: #242430;
167+ --search-mark-bg: #a2cff5;
168+}
169+
170+.colibri .content .header {
171+ color: #fff;
172+}
173+
174+/* highlight.js theme, :where() is used to avoid increasing specificity */
175+
176+:where(.colibri) .hljs {
177+ background: #2f1e2e;
178+ color: #a39e9b;
179+}
180+
181+:where(.colibri) .hljs-comment,
182+:where(.colibri) .hljs-quote {
183+ color: #8d8687;
184+}
185+
186+:where(.colibri) .hljs-link,
187+:where(.colibri) .hljs-meta,
188+:where(.colibri) .hljs-name,
189+:where(.colibri) .hljs-regexp,
190+:where(.colibri) .hljs-selector-class,
191+:where(.colibri) .hljs-selector-id,
192+:where(.colibri) .hljs-tag,
193+:where(.colibri) .hljs-template-variable,
194+:where(.colibri) .hljs-variable {
195+ color: #ef6155;
196+}
197+
198+:where(.colibri) .hljs-built_in,
199+:where(.colibri) .hljs-deletion,
200+:where(.colibri) .hljs-literal,
201+:where(.colibri) .hljs-number,
202+:where(.colibri) .hljs-params,
203+:where(.colibri) .hljs-type {
204+ color: #f99b15;
205+}
206+
207+:where(.colibri) .hljs-attribute,
208+:where(.colibri) .hljs-section,
209+:where(.colibri) .hljs-title {
210+ color: #fec418;
211+}
212+
213+:where(.colibri) .hljs-addition,
214+:where(.colibri) .hljs-bullet,
215+:where(.colibri) .hljs-string,
216+:where(.colibri) .hljs-symbol {
217+ color: #48b685;
218+}
219+
220+:where(.colibri) .hljs-keyword,
221+:where(.colibri) .hljs-selector-tag {
222+ color: #815ba4;
223+}
224+
225+:where(.colibri) .hljs-emphasis {
226+ font-style: italic;
227+}
228+
229+:where(.colibri) .hljs-strong {
230+ font-weight: 700;
231+}
book/src/SUMMARY.md+6−5
@@ -6,13 +6,14 @@
66- [Usage](./usage.md)
77 - [Keymap](./keymap.md)
88 - [Commands](./commands.md)
9− - [Language Support](./lang-support.md)
9+ - [Language support](./lang-support.md)
1010- [Migrating from Vim](./from-vim.md)
1111- [Configuration](./configuration.md)
1212 - [Themes](./themes.md)
13− - [Key Remapping](./remapping.md)
13+ - [Key remapping](./remapping.md)
1414 - [Languages](./languages.md)
1515- [Guides](./guides/README.md)
16− - [Adding Languages](./guides/adding_languages.md)
17− - [Adding Textobject Queries](./guides/textobject.md)
18− - [Adding Indent Queries](./guides/indent.md)
16+ - [Adding languages](./guides/adding_languages.md)
17+ - [Adding textobject queries](./guides/textobject.md)
18+ - [Adding indent queries](./guides/indent.md)
19+ - [Adding injection queries](./guides/injection.md)
book/src/commands.md+1−1
@@ -1,5 +1,5 @@
11# Commands
22
3−Command mode can be activated by pressing `:`, similar to Vim. Built-in commands:
3+Command mode can be activated by pressing `:`. The built-in commands are:
44
55{{#include ./generated/typable-cmd.md}}
book/src/configuration.md+95−53
@@ -2,10 +2,10 @@
22
33To override global configuration parameters, create a `config.toml` file located in your config directory:
44
5−* Linux and Mac: `~/.config/helix/config.toml`
6−* Windows: `%AppData%\helix\config.toml`
5+- Linux and Mac: `~/.config/helix/config.toml`
6+- Windows: `%AppData%\helix\config.toml`
77
8−> Hint: You can easily open the config file by typing `:config-open` within Helix normal mode.
8+> 💡 You can easily open the config file by typing `:config-open` within Helix normal mode.
99
1010Example config:
1111
@@ -25,12 +25,13 @@ select = "underline"
2525hidden = false
2626```
2727
28−You may also specify a file to use for configuration with the `-c` or
29−`--config` CLI argument: `hx -c path/to/custom-config.toml`.
28+You can use a custom configuration file by specifying it with the `-c` or
29+`--config` command line argument, for example `hx -c path/to/custom-config.toml`.
30+Additionally, you can reload the configuration file by sending the USR1
31+signal to the Helix process on Unix operating systems, such as by using the command `pkill -USR1 hx`.
3032
31−It is also possible to trigger configuration file reloading by sending the `USR1`
32−signal to the helix process, e.g. via `pkill -USR1 hx`. This is only supported
33−on unix operating systems.
33+Finally, you can have a `config.toml` local to a project by putting it under a `.helix` directory in your repository.
34+Its settings will be merged with the configuration directory `config.toml` and the built-in configuration.
3435
3536## Editor
3637
@@ -38,25 +39,34 @@ on unix operating systems.
3839
3940| Key | Description | Default |
4041|--|--|---------|
41−| `scrolloff` | Number of lines of padding around the edge of the screen when scrolling. | `5` |
42−| `mouse` | Enable mouse mode. | `true` |
43−| `middle-click-paste` | Middle click paste support. | `true` |
44−| `scroll-lines` | Number of lines to scroll per scroll wheel step. | `3` |
45−| `shell` | Shell to use when running external commands. | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |
46−| `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers. | `absolute` |
47−| `cursorline` | Highlight all lines with a cursor. | `false` |
48−| `cursorcolumn` | Highlight all columns with a cursor. | `false` |
42+| `scrolloff` | Number of lines of padding around the edge of the screen when scrolling | `5` |
43+| `mouse` | Enable mouse mode | `true` |
44+| `middle-click-paste` | Middle click paste support | `true` |
45+| `scroll-lines` | Number of lines to scroll per scroll wheel step | `3` |
46+| `shell` | Shell to use when running external commands | Unix: `["sh", "-c"]`<br/>Windows: `["cmd", "/C"]` |
47+| `line-number` | Line number display: `absolute` simply shows each line's number, while `relative` shows the distance from the current line. When unfocused or in insert mode, `relative` will still show absolute line numbers | `absolute` |
48+| `cursorline` | Highlight all lines with a cursor | `false` |
49+| `cursorcolumn` | Highlight all columns with a cursor | `false` |
4950| `gutters` | Gutters to display: Available are `diagnostics` and `diff` and `line-numbers` and `spacer`, note that `diagnostics` also includes other features like breakpoints, 1-width padding will be inserted if gutters is non-empty | `["diagnostics", "spacer", "line-numbers", "spacer", "diff"]` |
50−| `auto-completion` | Enable automatic pop up of auto-completion. | `true` |
51−| `auto-format` | Enable automatic formatting on save. | `true` |
52−| `auto-save` | Enable automatic saving on focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal. | `false` |
53−| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant. | `400` |
51+| `auto-completion` | Enable automatic pop up of auto-completion | `true` |
52+| `auto-format` | Enable automatic formatting on save | `true` |
53+| `auto-save` | Enable automatic saving on the focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal | `false` |
54+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `250` |
55+| `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |
5456| `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
55−| `auto-info` | Whether to display infoboxes | `true` |
56−| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative. | `false` |
57−| `rulers` | List of column positions at which to display the rulers. Can be overridden by language specific `rulers` in `languages.toml` file. | `[]` |
57+| `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |
58+| `auto-info` | Whether to display info boxes | `true` |
59+| `true-color` | Set to `true` to override automatic detection of terminal truecolor support in the event of a false negative | `false` |
60+| `undercurl` | Set to `true` to override automatic detection of terminal undercurl support in the event of a false negative | `false` |
61+| `rulers` | List of column positions at which to display the rulers. Can be overridden by language specific `rulers` in `languages.toml` file | `[]` |
5862| `bufferline` | Renders a line at the top of the editor displaying open buffers. Can be `always`, `never` or `multiple` (only shown if more than one buffer is in use) | `never` |
5963| `color-modes` | Whether to color the mode indicator with different colors depending on the mode itself | `false` |
64+| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set | `80` |
65+| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
66+| `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
67+| `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
68+| `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |
69+| `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid`
6070
6171### `[editor.statusline]` Section
6272
@@ -82,9 +92,9 @@ The `[editor.statusline]` key takes the following sub-keys:
8292
8393| Key | Description | Default |
8494| --- | --- | --- |
85−| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
95+| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "file-modification-indicator"]` |
8696| `center` | A list of elements aligned to the middle of the statusline | `[]` |
87−| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
97+| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "register", "position", "file-encoding"]` |
8898| `separator` | The character used to separate elements in the statusline | `"│"` |
8999| `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
90100| `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
@@ -98,8 +108,10 @@ The following statusline elements can be configured:
98108| `spinner` | A progress spinner indicating LSP activity |
99109| `file-name` | The path/name of the opened file |
100110| `file-base-name` | The basename of the opened file |
111+| `file-modification-indicator` | The indicator to show whether the file is modified (a `[+]` appears when there are unsaved changes) |
101112| `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
102113| `file-line-ending` | The file line endings (CRLF or LF) |
114+| `read-only-indicator` | An indicator that shows `[readonly]` when a file cannot be written |
103115| `total-line-numbers` | The total line numbers of the opened file |
104116| `file-type` | The type of the opened file |
105117| `diagnostics` | The number of warnings and/or errors |
@@ -110,6 +122,8 @@ The following statusline elements can be configured:
110122| `position-percentage` | The cursor position as a percentage of the total number of lines |
111123| `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |
112124| `spacer` | Inserts a space between elements (multiple/contiguous spacers may be specified) |
125+| `version-control` | The current branch name or detached commit hash of the opened workspace |
126+| `register` | The current selected register |
113127
114128### `[editor.lsp]` Section
115129
@@ -118,16 +132,23 @@ The following statusline elements can be configured:
118132| `enable` | Enables LSP integration. Setting to false will completely disable language servers regardless of language settings.| `true` |
119133| `display-messages` | Display LSP progress messages below statusline[^1] | `false` |
120134| `auto-signature-help` | Enable automatic popup of signature help (parameter hints) | `true` |
135+| `display-inlay-hints` | Display inlay hints[^2] | `false` |
121136| `display-signature-help-docs` | Display docs under signature help popup | `true` |
137+| `snippets` | Enables snippet completions. Requires a server restart (`:lsp-restart`) to take effect after `:config-reload`/`:set`. | `true` |
138+| `goto-reference-include-declaration` | Include declaration in the goto references popup. | `true` |
122139
123140[^1]: By default, a progress spinner is shown in the statusline beside the file path.
124141
142+[^2]: You may also have to activate them in the LSP config for them to appear, not just in Helix. Inlay hints in Helix are still being improved on and may be a little bit laggy/janky under some circumstances. Please report any bugs you see so we can fix them!
143+
125144### `[editor.cursor-shape]` Section
126145
127−Defines the shape of cursor in each mode. Note that due to limitations
128−of the terminal environment, only the primary cursor can change shape.
146+Defines the shape of cursor in each mode.
129147Valid values for these options are `block`, `bar`, `underline`, or `hidden`.
130148
149+> 💡 Due to limitations of the terminal environment, only the primary cursor can
150+> change shape.
151+
131152| Key | Description | Default |
132153| --- | ----------- | ------- |
133154| `normal` | Cursor shape in [normal mode][normal mode] | `block` |
@@ -140,25 +161,37 @@ Valid values for these options are `block`, `bar`, `underline`, or `hidden`.
140161
141162### `[editor.file-picker]` Section
142163
143−Sets options for file picker and global search. All but the last key listed in
144−the default file-picker configuration below are IgnoreOptions: whether hidden
145−files and files listed within ignore files are ignored by (not visible in) the
146−helix file picker and global search. There is also one other key, `max-depth`
147−available, which is not defined by default.
164+Set options for file picker and global search. Ignoring a file means it is
165+not visible in the Helix file picker and global search.
148166
149167All git related options are only enabled in a git repository.
150168
151169| Key | Description | Default |
152170|--|--|---------|
153−|`hidden` | Enables ignoring hidden files. | true
154−|`follow-links` | Follow symlinks instead of ignoring them | true
155−|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
156−|`parents` | Enables reading ignore files from parent directories. | true
157−|`ignore` | Enables reading `.ignore` files. | true
158−|`git-ignore` | Enables reading `.gitignore` files. | true
159−|`git-global` | Enables reading global .gitignore, whose path is specified in git's config: `core.excludefile` option. | true
160−|`git-exclude` | Enables reading `.git/info/exclude` files. | true
161−|`max-depth` | Set with an integer value for maximum depth to recurse. | Defaults to `None`.
171+|`hidden` | Enables ignoring hidden files | `true`
172+|`follow-symlinks` | Follow symlinks instead of ignoring them | `true`
173+|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | `true`
174+|`parents` | Enables reading ignore files from parent directories | `true`
175+|`ignore` | Enables reading `.ignore` files | `true`
176+|`git-ignore` | Enables reading `.gitignore` files | `true`
177+|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludesfile` option | `true`
178+|`git-exclude` | Enables reading `.git/info/exclude` files | `true`
179+|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
180+
181+Ignore files can be placed locally as `.ignore` or put in your home directory as `~/.ignore`. They support the usual ignore and negative ignore (unignore) rules used in `.gitignore` files.
182+
183+Additionally, you can use Helix-specific ignore files by creating a local `.helix/ignore` file in the current workspace or a global `ignore` file located in your Helix config directory:
184+- Linux and Mac: `~/.config/helix/ignore`
185+- Windows: `%AppData%\helix\ignore`
186+
187+Example:
188+
189+```ini
190+# unignore in file picker and global search
191+!.github/
192+!.gitignore
193+!.gitattributes
194+```
162195
163196### `[editor.auto-pairs]` Section
164197
@@ -210,7 +243,7 @@ Search specific options.
210243
211244| Key | Description | Default |
212245|--|--|---------|
213−| `smart-case` | Enable smart case regex searching (case insensitive unless pattern contains upper case characters) | `true` |
246+| `smart-case` | Enable smart case regex searching (case-insensitive unless pattern contains upper case characters) | `true` |
214247| `wrap-around`| Whether the search should wrap after depleting the matches | `true` |
215248
216249### `[editor.whitespace]` Section
@@ -219,7 +252,7 @@ Options for rendering whitespace with visible characters. Use `:set whitespace.r
219252
220253| Key | Description | Default |
221254|-----|-------------|---------|
222−| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `nbsp`, `tab`, and `newline`. | `"none"` |
255+| `render` | Whether to render whitespace. May either be `"all"` or `"none"`, or a table with sub-keys `space`, `nbsp`, `tab`, and `newline` | `"none"` |
223256| `characters` | Literal characters to use when rendering whitespace. Sub-keys may be any of `tab`, `space`, `nbsp`, `newline` or `tabpad` | See example below |
224257
225258Example
@@ -247,7 +280,7 @@ Options for rendering vertical indent guides.
247280
248281| Key | Description | Default |
249282| --- | --- | --- |
250−| `render` | Whether to render indent guides. | `false` |
283+| `render` | Whether to render indent guides | `false` |
251284| `character` | Literal character to use for rendering the indent guide | `│` |
252285| `skip-levels` | Number of indent levels to skip | `0` |
253286
@@ -272,7 +305,7 @@ gutters = ["diff", "diagnostics", "line-numbers", "spacer"]
272305
273306To customize the behavior of gutters, the `[editor.gutters]` section must
274307be used. This section contains top level settings, as well as settings for
275−specific gutter components as sub-sections.
308+specific gutter components as subsections.
276309
277310| Key | Description | Default |
278311| --- | --- | --- |
@@ -300,7 +333,7 @@ Example:
300333min-width = 1
301334```
302335
303−#### `[editor.gutters.diagnotics]` Section
336+#### `[editor.gutters.diagnostics]` Section
304337
305338Currently unused
306339
@@ -314,14 +347,15 @@ Currently unused
314347
315348### `[editor.soft-wrap]` Section
316349
317−Options for soft wrapping lines that exceed the view width
350+Options for soft wrapping lines that exceed the view width:
318351
319−| Key | Description | Default |
320−| --- | --- | --- |
321−| `enable` | Whether soft wrapping is enabled. | `false` |
322−| `max-wrap` | Maximum free space left at the end of the line. | `20` |
323−| `max-indent-retain` | Maximum indentation to carry over when soft wrapping a line. | `40` |
324−| `wrap-indicator` | Text inserted before soft wrapped lines, highlighted with `ui.virtual.wrap` | `↪ ` |
352+| Key | Description | Default |
353+| --- | --- | --- |
354+| `enable` | Whether soft wrapping is enabled. | `false` |
355+| `max-wrap` | Maximum free space left at the end of the line. | `20` |
356+| `max-indent-retain` | Maximum indentation to carry over when soft wrapping a line. | `40` |
357+| `wrap-indicator` | Text inserted before soft wrapped lines, highlighted with `ui.virtual.wrap` | `↪ ` |
358+| `wrap-at-text-width` | Soft wrap at `text-width` instead of using the full viewport size. | `false` |
325359
326360Example:
327361
@@ -332,3 +366,11 @@ max-wrap = 25 # increase value to reduce forced mid-word wrapping
332366max-indent-retain = 0
333367wrap-indicator = "" # set wrap-indicator to "" to hide it
334368```
369+
370+### `[editor.smart-tab]` Section
371+
372+
373+| Key | Description | Default |
374+|------------|-------------|---------|
375+| `enable` | If set to true, then when the cursor is in a position with non-whitespace to its left, instead of inserting a tab, it will run `move_parent_node_end`. If there is only whitespace to the left, then it inserts a tab as normal. With the default bindings, to explicitly insert a tab character, press Shift-tab. | `true` |
376+| `supersede-menu` | Normally, when a menu is on screen, such as when auto complete is triggered, the tab key is bound to cycling through the items. This means when menus are on screen, one cannot use the tab key to trigger the `smart-tab` command. If this option is set to true, the `smart-tab` command always takes precedence, which means one cannot use the tab key to cycle through menu items. One of the other bindings must be used instead, such as arrow keys or `C-n`/`C-p`. | `false` |
book/src/from-vim.md+3−3
@@ -2,9 +2,9 @@
22
33Helix's editing model is strongly inspired from Vim and Kakoune, and a notable
44difference from Vim (and the most striking similarity to Kakoune) is that Helix
5−follows the `selection → action` model. This means that the whatever you are
6−going to act on (a word, a paragraph, a line, etc) is selected first and the
7−action itself (delete, change, yank, etc) comes second. A cursor is simply a
5+follows the `selection → action` model. This means that whatever you are
6+going to act on (a word, a paragraph, a line, etc.) is selected first and the
7+action itself (delete, change, yank, etc.) comes second. A cursor is simply a
88single width selection.
99
1010See also Kakoune's [Migrating from Vim](https://github.com/mawww/kakoune/wiki/Migrating-from-Vim) and Helix's [Migrating from Vim](https://github.com/helix-editor/helix/wiki/Migrating-from-Vim).
book/src/generated/lang-support.md+64−23
@@ -1,74 +1,91 @@
11| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
22| --- | --- | --- | --- | --- |
3+| agda | ✓ | | | |
34| astro | ✓ | | | |
45| awk | ✓ | ✓ | | `awk-language-server` |
5−| bash | ✓ | | ✓ | `bash-language-server` |
6+| bash | ✓ | ✓ | ✓ | `bash-language-server` |
67| bass | ✓ | | | `bass` |
78| beancount | ✓ | | | |
89| bibtex | ✓ | | | `texlab` |
910| bicep | ✓ | | | `bicep-langserver` |
11+| blueprint | ✓ | | | `blueprint-compiler` |
1012| c | ✓ | ✓ | ✓ | `clangd` |
1113| c-sharp | ✓ | ✓ | | `OmniSharp` |
12−| cairo | ✓ | | | |
14+| cabal | | | | `haskell-language-server-wrapper` |
15+| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
16+| capnp | ✓ | | ✓ | |
1317| clojure | ✓ | | | `clojure-lsp` |
1418| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
1519| comment | ✓ | | | |
16−| common-lisp | ✓ | | | `cl-lsp` |
20+| common-lisp | ✓ | | ✓ | `cl-lsp` |
1721| cpon | ✓ | | ✓ | |
1822| cpp | ✓ | ✓ | ✓ | `clangd` |
19−| crystal | ✓ | ✓ | | |
23+| crystal | ✓ | ✓ | | `crystalline` |
2024| css | ✓ | | | `vscode-css-language-server` |
2125| cue | ✓ | | | `cuelsp` |
2226| d | ✓ | ✓ | ✓ | `serve-d` |
2327| dart | ✓ | | ✓ | `dart` |
28+| dbml | ✓ | | | |
2429| devicetree | ✓ | | | |
2530| dhall | ✓ | ✓ | | `dhall-lsp-server` |
2631| diff | ✓ | | | |
2732| dockerfile | ✓ | | | `docker-langserver` |
2833| dot | ✓ | | | `dot-language-server` |
34+| dtd | ✓ | | | |
2935| edoc | ✓ | | | |
3036| eex | ✓ | | | |
3137| ejs | ✓ | | | |
3238| elixir | ✓ | ✓ | ✓ | `elixir-ls` |
33−| elm | ✓ | | | `elm-language-server` |
39+| elm | ✓ | ✓ | | `elm-language-server` |
3440| elvish | ✓ | | | `elvish` |
3541| env | ✓ | | | |
3642| erb | ✓ | | | |
3743| erlang | ✓ | ✓ | | `erlang_ls` |
3844| esdl | ✓ | | | |
3945| fish | ✓ | ✓ | ✓ | |
46+| forth | ✓ | | | `forth-lsp` |
4047| fortran | ✓ | | ✓ | `fortls` |
48+| fsharp | ✓ | | | `fsautocomplete` |
49+| gas | ✓ | ✓ | | |
4150| gdscript | ✓ | ✓ | ✓ | |
51+| gemini | ✓ | | | |
4252| git-attributes | ✓ | | | |
43−| git-commit | ✓ | | | |
53+| git-commit | ✓ | ✓ | | |
4454| git-config | ✓ | | | |
4555| git-ignore | ✓ | | | |
4656| git-rebase | ✓ | | | |
4757| gleam | ✓ | ✓ | | `gleam` |
4858| glsl | ✓ | ✓ | ✓ | |
49−| go | ✓ | ✓ | ✓ | `gopls` |
59+| gn | ✓ | | | |
60+| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
5061| godot-resource | ✓ | | | |
5162| gomod | ✓ | | | `gopls` |
5263| gotmpl | ✓ | | | `gopls` |
5364| gowork | ✓ | | | `gopls` |
54−| graphql | ✓ | | | |
65+| graphql | ✓ | | | `graphql-lsp` |
5566| hare | ✓ | | | |
5667| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
68+| haskell-persistent | ✓ | | | |
5769| hcl | ✓ | | ✓ | `terraform-ls` |
5870| heex | ✓ | ✓ | | `elixir-ls` |
5971| hosts | ✓ | | | |
6072| html | ✓ | | | `vscode-html-language-server` |
73+| hurl | ✓ | | ✓ | |
6174| idris | | | | `idris2-lsp` |
6275| iex | ✓ | | | |
6376| ini | ✓ | | | |
64−| java | ✓ | ✓ | | `jdtls` |
77+| janet | ✓ | | | |
78+| java | ✓ | ✓ | ✓ | `jdtls` |
6579| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
80+| jinja | ✓ | | | |
6681| jsdoc | ✓ | | | |
6782| json | ✓ | | ✓ | `vscode-json-language-server` |
83+| json5 | ✓ | | | |
6884| jsonnet | ✓ | | | `jsonnet-language-server` |
6985| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
70−| julia | ✓ | | | `julia` |
71−| kdl | ✓ | | | |
86+| julia | ✓ | ✓ | ✓ | `julia` |
87+| just | ✓ | ✓ | ✓ | |
88+| kdl | ✓ | ✓ | ✓ | |
7289| kotlin | ✓ | | | `kotlin-language-server` |
7390| latex | ✓ | ✓ | | `texlab` |
7491| lean | ✓ | | | `lean` |
@@ -76,77 +93,101 @@
7693| llvm | ✓ | ✓ | ✓ | |
7794| llvm-mir | ✓ | ✓ | ✓ | |
7895| llvm-mir-yaml | ✓ | | ✓ | |
96+| log | ✓ | | | |
97+| lpf | ✓ | | | |
7998| lua | ✓ | ✓ | ✓ | `lua-language-server` |
8099| make | ✓ | | | |
100+| markdoc | ✓ | | | `markdoc-ls` |
81101| markdown | ✓ | | | `marksman` |
82102| markdown.inline | ✓ | | | |
83−| matlab | ✓ | | | |
103+| matlab | ✓ | ✓ | ✓ | |
84104| mermaid | ✓ | | | |
85105| meson | ✓ | | ✓ | |
86106| mint | | | | `mint` |
87107| msbuild | ✓ | | ✓ | |
108+| nasm | ✓ | ✓ | | |
88109| nickel | ✓ | | ✓ | `nls` |
110+| nim | ✓ | ✓ | ✓ | `nimlangserver` |
89111| nix | ✓ | | | `nil` |
90−| nu | ✓ | | | |
112+| nu | ✓ | | | `nu` |
113+| nunjucks | ✓ | | | |
91114| ocaml | ✓ | | ✓ | `ocamllsp` |
92115| ocaml-interface | ✓ | | | `ocamllsp` |
93−| odin | ✓ | | | `ols` |
116+| odin | ✓ | | ✓ | `ols` |
117+| opencl | ✓ | ✓ | ✓ | `clangd` |
94118| openscad | ✓ | | | `openscad-lsp` |
95119| org | ✓ | | | |
96120| pascal | ✓ | ✓ | | `pasls` |
97121| passwd | ✓ | | | |
98122| pem | ✓ | | | |
99−| perl | ✓ | ✓ | ✓ | |
123+| perl | ✓ | ✓ | ✓ | `perlnavigator` |
100124| php | ✓ | ✓ | ✓ | `intelephense` |
101125| po | ✓ | ✓ | | |
126+| pod | ✓ | | | |
102127| ponylang | ✓ | ✓ | ✓ | |
103128| prisma | ✓ | | | `prisma-language-server` |
104129| prolog | | | | `swipl` |
105−| protobuf | ✓ | | ✓ | |
106−| purescript | ✓ | | | `purescript-language-server` |
130+| protobuf | ✓ | | ✓ | `bufls`, `pb` |
131+| prql | ✓ | | | |
132+| purescript | ✓ | ✓ | | `purescript-language-server` |
107133| python | ✓ | ✓ | ✓ | `pylsp` |
108134| qml | ✓ | | ✓ | `qmlls` |
109135| r | ✓ | | | `R` |
110−| racket | ✓ | | | `racket` |
136+| racket | ✓ | | ✓ | `racket` |
111137| regex | ✓ | | | |
138+| rego | ✓ | | | `regols` |
112139| rescript | ✓ | ✓ | | `rescript-language-server` |
113140| rmarkdown | ✓ | | ✓ | `R` |
141+| robot | ✓ | | | `robotframework_ls` |
114142| ron | ✓ | | ✓ | |
143+| rst | ✓ | | | |
115144| ruby | ✓ | ✓ | ✓ | `solargraph` |
116145| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
117146| sage | ✓ | ✓ | | |
118147| scala | ✓ | | ✓ | `metals` |
119−| scheme | ✓ | | | |
148+| scheme | ✓ | | ✓ | |
120149| scss | ✓ | | | `vscode-css-language-server` |
121150| slint | ✓ | | ✓ | `slint-lsp` |
151+| smali | ✓ | | ✓ | |
152+| smithy | ✓ | | | `cs` |
122153| sml | ✓ | | | |
123154| solidity | ✓ | | | `solc` |
124155| sql | ✓ | | | |
125156| sshclientconfig | ✓ | | | |
126157| starlark | ✓ | ✓ | | |
127−| svelte | ✓ | | | `svelteserver` |
158+| strace | ✓ | | | |
159+| svelte | ✓ | | ✓ | `svelteserver` |
160+| sway | ✓ | ✓ | ✓ | `forc` |
128161| swift | ✓ | | | `sourcekit-lsp` |
162+| t32 | ✓ | | | |
129163| tablegen | ✓ | ✓ | ✓ | |
130164| task | ✓ | | | |
165+| templ | ✓ | | | `templ` |
131166| tfvars | ✓ | | ✓ | `terraform-ls` |
167+| todotxt | ✓ | | | |
132168| toml | ✓ | | | `taplo` |
133169| tsq | ✓ | | | |
134170| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
135171| twig | ✓ | | | |
136172| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
173+| typst | ✓ | | | `typst-lsp` |
137174| ungrammar | ✓ | | | |
175+| unison | ✓ | | | |
138176| uxntal | ✓ | | | |
139−| v | ✓ | | | `v` |
177+| v | ✓ | ✓ | ✓ | `v-analyzer` |
140178| vala | ✓ | | | `vala-language-server` |
141179| verilog | ✓ | ✓ | | `svlangserver` |
180+| vhdl | ✓ | | | `vhdl_ls` |
142181| vhs | ✓ | | | |
143−| vue | ✓ | | | `vls` |
182+| vue | ✓ | | | `vue-language-server` |
144183| wast | ✓ | | | |
145184| wat | ✓ | | | |
185+| webc | ✓ | | | |
146186| wgsl | ✓ | | | `wgsl_analyzer` |
147187| wit | ✓ | | ✓ | |
188+| wren | ✓ | ✓ | ✓ | |
148189| xit | ✓ | | | |
149190| xml | ✓ | | ✓ | |
150−| yaml | ✓ | | ✓ | `yaml-language-server` |
191+| yaml | ✓ | | ✓ | `yaml-language-server`, `ansible-language-server` |
151192| yuck | ✓ | | | |
152193| zig | ✓ | ✓ | ✓ | `zls` |
book/src/generated/typable-cmd.md+17−6
@@ -12,16 +12,19 @@
1212| `:buffer-next`, `:bn`, `:bnext` | Goto next buffer. |
1313| `:buffer-previous`, `:bp`, `:bprev` | Goto previous buffer. |
1414| `:write`, `:w` | Write changes to disk. Accepts an optional path (:write some/path.txt) |
15−| `:write!`, `:w!` | Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write some/path.txt) |
15+| `:write!`, `:w!` | Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt) |
16+| `:write-buffer-close`, `:wbc` | Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt) |
17+| `:write-buffer-close!`, `:wbc!` | Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt) |
1618| `:new`, `:n` | Create a new scratch buffer. |
1719| `:format`, `:fmt` | Format the file using the LSP formatter. |
18−| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.) |
20+| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.) |
1921| `:line-ending` | Set the document's default line ending. Options: crlf, lf. |
2022| `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. |
2123| `:later`, `:lat` | Jump to a later point in edit history. Accepts a number of steps or a time span. |
2224| `:write-quit`, `:wq`, `:x` | Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt) |
2325| `:write-quit!`, `:wq!`, `:x!` | Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt) |
2426| `:write-all`, `:wa` | Write changes from all buffers to disk. |
27+| `:write-all!`, `:wa!` | Forcefully write changes from all buffers to disk creating necessary subdirectories. |
2528| `:write-quit-all`, `:wqa`, `:xa` | Write changes from all buffers to disk and close all views. |
2629| `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes). |
2730| `:quit-all`, `:qa` | Close all views. |
@@ -29,6 +32,7 @@
2932| `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |
3033| `:cquit!`, `:cq!` | Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2). |
3134| `:theme` | Change the editor theme (show current theme if no name specified). |
35+| `:yank-join` | Yank joined selections. A separator can be provided as first argument. Default value is newline. |
3236| `:clipboard-yank` | Yank main selection into system clipboard. |
3337| `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |
3438| `:primary-clipboard-yank` | Yank main selection into system primary clipboard. |
@@ -44,12 +48,14 @@
4448| `:show-directory`, `:pwd` | Show the current working directory. |
4549| `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
4650| `:character-info`, `:char` | Get info about the character under the primary cursor. |
47−| `:reload` | Discard changes and reload from the source file. |
48−| `:reload-all` | Discard changes and reload all documents from the source files. |
49−| `:update` | Write changes only if the file has been modified. |
51+| `:reload`, `:rl` | Discard changes and reload from the source file. |
52+| `:reload-all`, `:rla` | Discard changes and reload all documents from the source files. |
53+| `:update`, `:u` | Write changes only if the file has been modified. |
5054| `:lsp-workspace-command` | Open workspace command picker |
51−| `:lsp-restart` | Restarts the Language Server that is in use by the current doc |
55+| `:lsp-restart` | Restarts the language servers used by the current doc |
56+| `:lsp-stop` | Stops the language servers that are used by the current doc |
5257| `:tree-sitter-scopes` | Display tree sitter scopes, primarily for theming and development. |
58+| `:tree-sitter-highlight-name` | Display name of tree-sitter highlight scope under the cursor. |
5359| `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
5460| `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
5561| `:debug-eval` | Evaluate expression in current debug context. |
@@ -69,9 +75,14 @@
6975| `:tree-sitter-subtree`, `:ts-subtree` | Display tree sitter subtree under cursor, primarily for debugging queries. |
7076| `:config-reload` | Refresh user config. |
7177| `:config-open` | Open the user config.toml file. |
78+| `:config-open-workspace` | Open the workspace config.toml file. |
7279| `:log-open` | Open the helix log file. |
7380| `:insert-output` | Run shell command, inserting output before each selection. |
7481| `:append-output` | Run shell command, appending output after each selection. |
7582| `:pipe` | Pipe each selection to the shell command. |
7683| `:pipe-to` | Pipe each selection to the shell command, ignoring output. |
7784| `:run-shell-command`, `:sh` | Run a shell command |
85+| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
86+| `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
87+| `:redraw` | Clear and re-render the whole UI |
88+| `:move` | Move the current buffer and its corresponding file to a different path |
book/src/guides/README.md+1−1
@@ -1,4 +1,4 @@
11# Guides
22
33This section contains guides for adding new language server configurations,
4−tree-sitter grammars, textobject queries, etc.
4+tree-sitter grammars, textobject queries, and other similar items.
book/src/guides/adding_languages.md+45−35
@@ -1,45 +1,55 @@
1−# Adding languages
1+# Adding new languages to Helix
2+
3+In order to add a new language to Helix, you will need to follow the steps
4+below.
25
36## Language configuration
47
5−To add a new language, you need to add a `[[language]]` entry to the
6−`languages.toml` (see the [language configuration section]).
8+1. Add a new `[[language]]` entry in the `languages.toml` file and provide the
9+ necessary configuration for the new language. For more information on
10+ language configuration, refer to the
11+ [language configuration section](../languages.md) of the documentation.
12+ A new language server can be added by extending the `[language-server]` table in the same file.
13+2. If you are adding a new language or updating an existing language server
14+ configuration, run the command `cargo xtask docgen` to update the
15+ [Language Support](../lang-support.md) documentation.
716
8−When adding a new language or Language Server configuration for an existing
9−language, run `cargo xtask docgen` to add the new configuration to the
10−[Language Support][lang-support] docs before creating a pull request.
11−When adding a Language Server configuration, be sure to update the
12−[Language Server Wiki][install-lsp-wiki] with installation notes.
17+> 💡 If you are adding a new Language Server configuration, make sure to update
18+> the
19+> [Language Server Wiki](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers)
20+> with the installation instructions.
1321
1422## Grammar configuration
1523
16−If a tree-sitter grammar is available for the language, add a new `[[grammar]]`
17−entry to `languages.toml`.
18−
19−You may use the `source.path` key rather than `source.git` with an absolute path
20−to a locally available grammar for testing, but switch to `source.git` before
21−submitting a pull request.
24+1. If a tree-sitter grammar is available for the new language, add a new
25+ `[[grammar]]` entry to the `languages.toml` file.
26+2. If you are testing the grammar locally, you can use the `source.path` key
27+ with an absolute path to the grammar. However, before submitting a pull
28+ request, make sure to switch to using `source.git`.
2229
2330## Queries
2431
25−For a language to have syntax-highlighting and indentation among
26−other things, you have to add queries. Add a directory for your
27−language with the path `runtime/queries/<name>/`. The tree-sitter
28−[website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)
29−gives more info on how to write queries.
30−
31−> NOTE: When evaluating queries, the first matching query takes
32−precedence, which is different from other editors like Neovim where
33−the last matching query supersedes the ones before it. See
34−[this issue][neovim-query-precedence] for an example.
35−
36−## Common Issues
37−
38−- If you get errors when running after switching branches, you may have to update the tree-sitter grammars. Run `hx --grammar fetch` to fetch the grammars and `hx --grammar build` to build any out-of-date grammars.
39−
40−- If a parser is segfaulting or you want to remove the parser, make sure to remove the compiled parser in `runtime/grammar/<name>.so`
41−
42−[language configuration section]: ../languages.md
43−[neovim-query-precedence]: https://github.com/helix-editor/helix/pull/1170#issuecomment-997294090
44−[install-lsp-wiki]: https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers
45−[lang-support]: ../lang-support.md
32+1. In order to provide syntax highlighting and indentation for the new language,
33+ you will need to add queries.
34+2. Create a new directory for the language with the path
35+ `runtime/queries/<name>/`.
36+3. Refer to the
37+ [tree-sitter website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)
38+ for more information on writing queries.
39+4. A list of highlight captures can be found [on the themes page](https://docs.helix-editor.com/themes.html#scopes).
40+
41+> 💡 In Helix, the first matching query takes precedence when evaluating
42+> queries, which is different from other editors such as Neovim where the last
43+> matching query supersedes the ones before it. See
44+> [this issue](https://github.com/helix-editor/helix/pull/1170#issuecomment-997294090)
45+> for an example.
46+
47+## Common issues
48+
49+- If you encounter errors when running Helix after switching branches, you may
50+ need to update the tree-sitter grammars. Run the command `hx --grammar fetch`
51+ to fetch the grammars and `hx --grammar build` to build any out-of-date
52+ grammars.
53+- If a parser is causing a segfault, or you want to remove it, make sure to
54+ remove the compiled parser located at `runtime/grammars/<name>.so`.
55+- If you are attempting to add queries and Helix is unable to locate them, ensure that the environment variable `HELIX_RUNTIME` is set to the location of the `runtime` folder you're developing in.
book/src/guides/indent.md+320−44
@@ -1,76 +1,308 @@
1−# Adding Indent Queries
1+# Adding indent queries
22
3−Helix uses tree-sitter to correctly indent new lines. This requires
4−a tree-sitter grammar and an `indent.scm` query file placed in
5−`runtime/queries/{language}/indents.scm`. The indentation for a line
6−is calculated by traversing the syntax tree from the lowest node at the
7−beginning of the new line. Each of these nodes contributes to the total
8−indent when it is captured by the query (in what way depends on the name
9−of the capture).
3+Helix uses tree-sitter to correctly indent new lines. This requires a tree-
4+sitter grammar and an `indent.scm` query file placed in `runtime/queries/
5+{language}/indents.scm`. The indentation for a line is calculated by traversing
6+the syntax tree from the lowest node at the beginning of the new line (see
7+[Indent queries](#indent-queries)). Each of these nodes contributes to the total
8+indent when it is captured by the query (in what way depends on the name of
9+the capture.
1010
1111Note that it matters where these added indents begin. For example,
1212multiple indent level increases that start on the same line only increase
13−the total indent level by 1.
13+the total indent level by 1. See [Capture types](#capture-types).
1414
15−## Scopes
15+By default, Helix uses the `hybrid` indentation heuristic. This means that
16+indent queries are not used to compute the expected absolute indentation of a
17+line but rather the expected difference in indentation between the new and an
18+already existing line. This difference is then added to the actual indentation
19+of the already existing line. Since this makes errors in the indent queries
20+harder to find, it is recommended to disable it when testing via
21+`:set indent-heuristic tree-sitter`. The rest of this guide assumes that
22+the `tree-sitter` heuristic is used.
1623
17−Added indents don't always apply to the whole node. For example, in most
18−cases when a node should be indented, we actually only want everything
19−except for its first line to be indented. For this, there are several
20−scopes (more scopes may be added in the future if required):
24+## Indent queries
2125
22−- `all`:
23−This scope applies to the whole captured node. This is only different from
24−`tail` when the captured node is the first node on its line.
26+When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine
27+the indent level for the new line, the query in `indents.scm` is run on the
28+document. The starting position of the query is the end of the line above where
29+a new line will be inserted.
2530
26−- `tail`:
27−This scope applies to everything except for the first line of the
28−captured node.
31+For `o`, the inserted line is the line below the cursor, so that starting
32+position of the query is the end of the current line.
2933
30−Every capture type has a default scope which should do the right thing
31−in most situations. When a different scope is required, this can be
32−changed by using a `#set!` declaration anywhere in the pattern:
33−```scm
34−(assignment_expression
35− right: (_) @indent
36− (#set! "scope" "all"))
34+```rust
35+fn need_hero(some_hero: Hero, life: Life) -> {
36+ matches!(some_hero, Hero { // ←─────────────────╮
37+ strong: true,//←╮ ↑ ↑ │
38+ fast: true, // │ │ ╰── query start │
39+ sure: true, // │ ╰───── cursor ├─ traversal
40+ soon: true, // ╰──────── new line inserted │ start node
41+ }) && // │
42+// ↑ │
43+// ╰───────────────────────────────────────────────╯
44+ some_hero > life
45+}
3746```
3847
39−## Capture Types
48+For `O`, the newly inserted line is the *current* line, so the starting position
49+of the query is the end of the line above the cursor.
4050
41−- `@indent` (default scope `tail`):
42−Increase the indent level by 1. Multiple occurrences in the same line
43−don't stack. If there is at least one `@indent` and one `@outdent`
44−capture on the same line, the indent level isn't changed at all.
51+```rust
52+fn need_hero(some_hero: Hero, life: Life) -> { // ←─╮
53+ matches!(some_hero, Hero { // ←╮ ↑ │
54+ strong: true,// ↑ ╭───╯ │ │
55+ fast: true, // │ │ query start ─╯ │
56+ sure: true, // ╰───┼ cursor ├─ traversal
57+ soon: true, // ╰ new line inserted │ start node
58+ }) && // │
59+ some_hero > life // │
60+} // ←──────────────────────────────────────────────╯
61+```
4562
46−- `@outdent` (default scope `all`):
47−Decrease the indent level by 1. The same rules as for `@indent` apply.
63+From this starting node, the syntax tree is traversed up until the root node.
64+Each indent capture is collected along the way, and then combined according to
65+their [capture types](#capture-types) and [scopes](#scopes) to a final indent
66+level for the line.
4867
49−- `@extend`:
50−Extend the range of this node to the end of the line and to lines that
51−are indented more than the line that this node starts on. This is useful
52−for languages like Python, where for the purpose of indentation some nodes
53−(like functions or classes) should also contain indented lines that follow them.
68+### Capture types
5469
70+- `@indent` (default scope `tail`):
71+ Increase the indent level by 1. Multiple occurrences in the same line *do not*
72+ stack. If there is at least one `@indent` and one `@outdent` capture on the
73+ same line, the indent level isn't changed at all.
74+- `@outdent` (default scope `all`):
75+ Decrease the indent level by 1. The same rules as for `@indent` apply.
76+- `@indent.always` (default scope `tail`):
77+ Increase the indent level by 1. Multiple occurrences on the same line *do*
78+ stack. The final indent level is `@indent.always` – `@outdent.always`. If
79+ an `@indent` and an `@indent.always` are on the same line, the `@indent` is
80+ ignored.
81+- `@outdent.always` (default scope `all`):
82+ Decrease the indent level by 1. The same rules as for `@indent.always` apply.
83+- `@align` (default scope `all`):
84+ Align everything inside this node to some anchor. The anchor is given
85+ by the start of the node captured by `@anchor` in the same pattern.
86+ Every pattern with an `@align` should contain exactly one `@anchor`.
87+ Indent (and outdent) for nodes below (in terms of their starting line)
88+ the `@align` node is added to the indentation required for alignment.
89+- `@extend`:
90+ Extend the range of this node to the end of the line and to lines that are
91+ indented more than the line that this node starts on. This is useful for
92+ languages like Python, where for the purpose of indentation some nodes (like
93+ functions or classes) should also contain indented lines that follow them.
5594- `@extend.prevent-once`:
56−Prevents the first extension of an ancestor of this node. For example, in Python
57−a return expression always ends the block that it is in. Note that this only stops the
58−extension of the next `@extend` capture. If multiple ancestors are captured,
59−only the extension of the innermost one is prevented. All other ancestors are unaffected
60−(regardless of whether the innermost ancestor would actually have been extended).
95+ Prevents the first extension of an ancestor of this node. For example, in Python
96+ a return expression always ends the block that it is in. Note that this only
97+ stops the extension of the next `@extend` capture. If multiple ancestors are
98+ captured, only the extension of the innermost one is prevented. All other
99+ ancestors are unaffected (regardless of whether the innermost ancestor would
100+ actually have been extended).
101+
102+#### `@indent` / `@outdent`
103+
104+Consider this example:
105+
106+```rust
107+fn shout(things: Vec<Thing>) {
108+ // ↑
109+ // ├───────────────────────╮ indent level
110+ // @indent ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
111+ // │
112+ let it_all = |out| { things.filter(|thing| { // │ 1
113+ // ↑ ↑ │
114+ // ├───────────────────────┼─────┼┄┄┄┄┄┄┄┄┄┄┄┄┄┄
115+ // @indent @indent │
116+ // │ 2
117+ thing.can_do_with(out) // │
118+ })}; // ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
119+ //↑↑↑ │ 1
120+} //╰┼┴──────────────────────────────────────────────┴┄┄┄┄┄┄┄┄┄┄┄┄┄┄
121+// 3x @outdent
122+```
123+
124+```scm
125+((block) @indent)
126+["}" ")"] @outdent
127+```
128+
129+Note how on the second line, we have two blocks begin on the same line. In this
130+case, since both captures occur on the same line, they are combined and only
131+result in a net increase of 1. Also note that the closing `}`s are part of the
132+`@indent` captures, but the 3 `@outdent`s also combine into 1 and result in that
133+line losing one indent level.
134+
135+#### `@extend` / `@extend.prevent-once`
136+
137+For an example of where `@extend` can be useful, consider Python, which is
138+whitespace-sensitive.
139+
140+```scm
141+]
142+ (parenthesized_expression)
143+ (function_definition)
144+ (class_definition)
145+] @indent
146+
147+```
148+
149+```python
150+class Hero:
151+ def __init__(self, strong, fast, sure, soon):# ←─╮
152+ self.is_strong = strong # │
153+ self.is_fast = fast # ╭─── query start │
154+ self.is_sure = sure # │ ╭─ cursor │
155+ self.is_soon = soon # │ │ │
156+ # ↑ ↑ │ │ │
157+ # │ ╰──────╯ │ │
158+ # ╰─────────────────────╯ │
159+ # ├─ traversal
160+ def need_hero(self, life): # │ start node
161+ return ( # │
162+ self.is_strong # │
163+ and self.is_fast # │
164+ and self.is_sure # │
165+ and self.is_soon # │
166+ and self > life # │
167+ ) # ←─────────────────────────────────────────╯
168+```
169+
170+Without braces to catch the scope of the function, the smallest descendant of
171+the cursor on a line feed ends up being the entire inside of the class. Because
172+of this, it will miss the entire function node and its indent capture, leading
173+to an indent level one too small.
174+
175+To address this case, `@extend` tells helix to "extend" the captured node's span
176+to the line feed and every consecutive line that has a greater indent level than
177+the line of the node.
178+
179+```scm
180+(parenthesized_expression) @indent
181+
182+]
183+ (function_definition)
184+ (class_definition)
185+] @indent @extend
186+
187+```
188+
189+```python
190+class Hero:
191+ def __init__(self, strong, fast, sure, soon):# ←─╮
192+ self.is_strong = strong # │
193+ self.is_fast = fast # ╭─── query start ├─ traversal
194+ self.is_sure = sure # │ ╭─ cursor │ start node
195+ self.is_soon = soon # │ │ ←───────────────╯
196+ # ↑ ↑ │ │
197+ # │ ╰──────╯ │
198+ # ╰─────────────────────╯
199+ def need_hero(self, life):
200+ return (
201+ self.is_strong
202+ and self.is_fast
203+ and self.is_sure
204+ and self.is_soon
205+ and self > life
206+ )
207+```
61208
209+Furthermore, there are some cases where extending to everything with a greater
210+indent level may not be desirable. Consider the `need_hero` function above. If
211+our cursor is on the last line of the returned expression.
212+
213+```python
214+class Hero:
215+ def __init__(self, strong, fast, sure, soon):
216+ self.is_strong = strong
217+ self.is_fast = fast
218+ self.is_sure = sure
219+ self.is_soon = soon
220+
221+ def need_hero(self, life):
222+ return (
223+ self.is_strong
224+ and self.is_fast
225+ and self.is_sure
226+ and self.is_soon
227+ and self > life
228+ ) # ←─── cursor
229+ #←────────── where cursor should go on new line
230+```
231+
232+In Python, the are a few tokens that will always end a scope, such as a return
233+statement. Since the scope ends, so should the indent level. But because the
234+function span is extended to every line with a greater indent level, a new line
235+would just continue on the same level. And an `@outdent` would not help us here
236+either, since it would cause everything in the parentheses to become outdented
237+as well.
238+
239+To help, we need to signal an end to the extension. We can do this with
240+`@extend.prevent-once`.
241+
242+```scm
243+(parenthesized_expression) @indent
244+
245+]
246+ (function_definition)
247+ (class_definition)
248+] @indent @extend
249+
250+(return_statement) @extend.prevent-once
251+```
252+
253+#### `@indent.always` / `@outdent.always`
254+
255+As mentioned before, normally if there is more than one `@indent` or `@outdent`
256+capture on the same line, they are combined.
257+
258+Sometimes, there are cases when you may want to ensure that every indent capture
259+is additive, regardless of how many occur on the same line. Consider this
260+example in YAML.
261+
262+```yaml
263+ - foo: bar
264+# ↑ ↑
265+# │ ╰─────────────── start of map
266+# ╰───────────────── start of list element
267+ baz: quux # ←─── cursor
268+ # ←───────────── where the cursor should go on a new line
269+ garply: waldo
270+ - quux:
271+ bar: baz
272+ xyzzy: thud
273+ fred: plugh
274+```
275+
276+In YAML, you often have lists of maps. In these cases, the syntax is such that
277+the list element and the map both start on the same line. But we really do want
278+to start an indentation for each of these so that subsequent keys in the map
279+hang over the list and align properly. This is where `@indent.always` helps.
280+
281+```scm
282+((block_sequence_item) @item @indent.always @extend
283+ (#not-one-line? @item))
284+
285+((block_mapping_pair
286+ key: (_) @key
287+ value: (_) @val
288+ (#not-same-line? @key @val)
289+ ) @indent.always @extend
290+)
291+```
62292
63293## Predicates
64294
65295In some cases, an S-expression cannot express exactly what pattern should be matched.
66296For that, tree-sitter allows for predicates to appear anywhere within a pattern,
67297similar to how `#set!` declarations work:
298+
68299```scm
69300(some_kind
70301 (child_kind) @indent
71302 (#predicate? arg1 arg2 ...)
72303)
73304```
305+
74306The number of arguments depends on the predicate that's used.
75307Each argument is either a capture (`@name`) or a string (`"some string"`).
76308The following predicates are supported by tree-sitter:
@@ -91,3 +323,47 @@ argument (a string).
91323
92324- `#same-line?`/`#not-same-line?`:
93325The captures given by the 2 arguments must/must not start on the same line.
326+
327+- `#one-line?`/`#not-one-line?`:
328+The captures given by the fist argument must/must span a total of one line.
329+
330+### Scopes
331+
332+Added indents don't always apply to the whole node. For example, in most
333+cases when a node should be indented, we actually only want everything
334+except for its first line to be indented. For this, there are several
335+scopes (more scopes may be added in the future if required):
336+
337+- `tail`:
338+This scope applies to everything except for the first line of the
339+captured node.
340+- `all`:
341+This scope applies to the whole captured node. This is only different from
342+`tail` when the captured node is the first node on its line.
343+
344+For example, imagine we have the following function
345+
346+```rust
347+fn aha() { // ←─────────────────────────────────────╮
348+ let take = "on me"; // ←──────────────╮ scope: │
349+ let take = "me on"; // ├─ "tail" ├─ (block) @indent
350+ let ill = be_gone_days(1 || 2); // │ │
351+} // ←───────────────────────────────────┴──────────┴─ "}" @outdent
352+ // scope: "all"
353+```
354+
355+We can write the following query with the `#set!` declaration:
356+
357+ ```scm
358+ ((block) @indent
359+ (#set! "scope" "tail"))
360+ ("}" @outdent
361+ (#set! "scope" "all"))
362+ ```
363+
364+As we can see, the "tail" scope covers the node, except for the first line.
365+Everything up to and including the closing brace gets an indent level of 1.
366+Then, on the closing brace, we encounter an outdent with a scope of "all", which
367+means the first line is included, and the indent level is cancelled out on this
368+line. (Note these scopes are the defaults for `@indent` and `@outdent`—they are
369+written explicitly for demonstration.)
book/src/guides/injection.mdnew file+57
@@ -0,0 +1,57 @@
1+# Adding Injection Queries
2+
3+Writing language injection queries allows one to highlight a specific node as a different language.
4+In addition to the [standard][upstream-docs] language injection options used by tree-sitter, there
5+are a few Helix specific extensions that allow for more control.
6+
7+And example of a simple query that would highlight all strings as bash in Nix:
8+```scm
9+((string_expression (string_fragment) @injection.content)
10+ (#set! injection.language "bash"))
11+```
12+
13+## Capture Types
14+
15+- `@injection.language` (standard):
16+The captured node may contain the language name used to highlight the node captured by
17+`@injection.content`.
18+
19+- `@injection.content` (standard):
20+Marks the content to be highlighted as the language captured with `@injection.language` _et al_.
21+
22+- `@injection.filename` (extension):
23+The captured node may contain a filename with a file-extension known to Helix,
24+highlighting `@injection.content` as that language. This uses the language extensions defined in
25+both the default languages.toml distributed with Helix, as well as user defined languages.
26+
27+- `@injection.shebang` (extension):
28+The captured node may contain a shebang used to choose a language to highlight as. This also uses
29+the shebangs defined in the default and user `languages.toml`.
30+
31+## Settings
32+
33+- `injection.combined` (standard):
34+Indicates that all the matching nodes in the tree should have their content parsed as one
35+nested document.
36+
37+- `injection.language` (standard):
38+Forces the captured content to be highlighted as the given language
39+
40+- `injection.include-children` (standard):
41+Indicates that the content node’s entire text should be re-parsed, including the text of its child
42+nodes. By default, child nodes’ text will be excluded from the injected document.
43+
44+- `injection.include-unnamed-children` (extension):
45+Same as `injection.include-children` but only for unnamed child nodes.
46+
47+## Predicates
48+
49+- `#eq?` (standard):
50+The first argument (a capture) must be equal to the second argument
51+(a capture or a string).
52+
53+- `#match?` (standard):
54+The first argument (a capture) must match the regex given in the
55+second argument (a string).
56+
57+[upstream-docs]: http://tree-sitter.github.io/tree-sitter/syntax-highlighting#language-injection
book/src/guides/textobject.md+7−9
@@ -1,14 +1,14 @@
1−# Adding Textobject Queries
1+# Adding textobject queries
22
3−Textobjects that are language specific ([like functions, classes, etc][textobjects])
4−require an accompanying tree-sitter grammar and a `textobjects.scm` query file
3+Helix supports textobjects that are language specific, such as functions, classes, etc.
4+These textobjects require an accompanying tree-sitter grammar and a `textobjects.scm` query file
55to work properly. Tree-sitter allows us to query the source code syntax tree
66and capture specific parts of it. The queries are written in a lisp dialect.
77More information on how to write queries can be found in the [official tree-sitter
88documentation][tree-sitter-queries].
99
1010Query files should be placed in `runtime/queries/{language}/textobjects.scm`
11−when contributing. Note that to test the query files locally you should put
11+when contributing to Helix. Note that to test the query files locally you should put
1212them under your local runtime directory (`~/.config/helix/runtime` on Linux
1313for example).
1414
@@ -28,9 +28,9 @@ The following [captures][tree-sitter-captures] are recognized:
2828
2929[Example query files][textobject-examples] can be found in the helix GitHub repository.
3030
31−## Queries for Textobject Based Navigation
31+## Queries for textobject based navigation
3232
33−[Tree-sitter based navigation][textobjects-nav] is done using captures in the
33+Tree-sitter based navigation in Helix is done using captures in the
3434following order:
3535
3636- `object.movement`
@@ -38,12 +38,10 @@ following order:
3838- `object.inside`
3939
4040For example if a `function.around` capture has been already defined for a language
41−in it's `textobjects.scm` file, function navigation should also work automatically.
41+in its `textobjects.scm` file, function navigation should also work automatically.
4242`function.movement` should be defined only if the node captured by `function.around`
4343doesn't make sense in a navigation context.
4444
45−[textobjects]: ../usage.md#textobjects
46−[textobjects-nav]: ../usage.md#tree-sitter-textobject-based-navigation
4745[tree-sitter-queries]: https://tree-sitter.github.io/tree-sitter/using-parsers#query-syntax
4846[tree-sitter-captures]: https://tree-sitter.github.io/tree-sitter/using-parsers#capturing-nodes
4947[textobject-examples]: https://github.com/search?q=repo%3Ahelix-editor%2Fhelix+filename%3Atextobjects.scm&type=Code&ref=advsearch&l=&l=
book/src/install.md+240−100
@@ -1,180 +1,320 @@
1−# Installation
2−
3−We provide pre-built binaries on the [GitHub Releases page](https://github.com/helix-editor/helix/releases).
1+# Installing Helix
2+
3+<!--toc:start-->
4+- [Pre-built binaries](#pre-built-binaries)
5+- [Linux, macOS, Windows and OpenBSD packaging status](#linux-macos-windows-and-openbsd-packaging-status)
6+- [Linux](#linux)
7+ - [Ubuntu](#ubuntu)
8+ - [Fedora/RHEL](#fedorarhel)
9+ - [Arch Linux extra](#arch-linux-extra)
10+ - [NixOS](#nixos)
11+ - [Flatpak](#flatpak)
12+ - [Snap](#snap)
13+ - [AppImage](#appimage)
14+- [macOS](#macos)
15+ - [Homebrew Core](#homebrew-core)
16+ - [MacPorts](#macports)
17+- [Windows](#windows)
18+ - [Winget](#winget)
19+ - [Scoop](#scoop)
20+ - [Chocolatey](#chocolatey)
21+ - [MSYS2](#msys2)
22+- [Building from source](#building-from-source)
23+ - [Configuring Helix's runtime files](#configuring-helixs-runtime-files)
24+ - [Linux and macOS](#linux-and-macos)
25+ - [Windows](#windows)
26+ - [Multiple runtime directories](#multiple-runtime-directories)
27+ - [Validating the installation](#validating-the-installation)
28+ - [Configure the desktop shortcut](#configure-the-desktop-shortcut)
29+<!--toc:end-->
30+
31+To install Helix, follow the instructions specific to your operating system.
32+Note that:
33+
34+- To get the latest nightly version of Helix, you need to
35+ [build from source](#building-from-source).
36+
37+- To take full advantage of Helix, install the language servers for your
38+ preferred programming languages. See the
39+ [wiki](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers)
40+ for instructions.
41+
42+## Pre-built binaries
43+
44+Download pre-built binaries from the
45+[GitHub Releases page](https://github.com/helix-editor/helix/releases). Add the binary to your system's `$PATH` to use it from the command
46+line.
47+
48+## Linux, macOS, Windows and OpenBSD packaging status
449
550[![Packaging status](https://repology.org/badge/vertical-allrepos/helix.svg)](https://repology.org/project/helix/versions)
651
7−## OSX
52+## Linux
53+
54+The following third party repositories are available:
55+
56+### Ubuntu
857
9−Helix is available in homebrew-core:
58+Add the `PPA` for Helix:
1059
60+```sh
61+sudo add-apt-repository ppa:maveonair/helix-editor
62+sudo apt update
63+sudo apt install helix
1164```
12−brew install helix
65+
66+### Fedora/RHEL
67+
68+```sh
69+sudo dnf install helix
1370```
1471
15−## Linux
72+### Arch Linux extra
73+
74+Releases are available in the `extra` repository:
75+
76+```sh
77+sudo pacman -S helix
78+```
79+Additionally, a [helix-git](https://aur.archlinux.org/packages/helix-git/) package is available
80+in the AUR, which builds the master branch.
1681
1782### NixOS
1883
19−A [flake](https://nixos.wiki/wiki/Flakes) containing the package is available in
20−the project root. The flake can also be used to spin up a reproducible development
21−shell for working on Helix with `nix develop`.
84+Helix is available in [nixpkgs](https://github.com/nixos/nixpkgs) through the `helix` attribute,
85+the unstable channel usually carries the latest release.
2286
23−Flake outputs are cached for each push to master using
24−[Cachix](https://www.cachix.org/). The flake is configured to
25−automatically make use of this cache assuming the user accepts
26−the new settings on first use.
87+Helix is also available as a [flake](https://nixos.wiki/wiki/Flakes) in the project
88+root. Use `nix develop` to spin up a reproducible development shell. Outputs are
89+cached for each push to master using [Cachix](https://www.cachix.org/). The
90+flake is configured to automatically make use of this cache assuming the user
91+accepts the new settings on first use.
2792
28−If you are using a version of Nix without flakes enabled you can
29−[install Cachix cli](https://docs.cachix.org/installation); `cachix use helix` will
30−configure Nix to use cached outputs when possible.
93+If you are using a version of Nix without flakes enabled,
94+[install Cachix CLI](https://docs.cachix.org/installation) and use
95+`cachix use helix` to configure Nix to use cached outputs when possible.
3196
32−### Arch Linux
97+### Flatpak
3398
34−Releases are available in the `community` repository.
99+Helix is available on [Flathub](https://flathub.org/en-GB/apps/com.helix_editor.Helix):
35100
36−A [helix-git](https://aur.archlinux.org/packages/helix-git/) package is also available on the AUR, which builds the master branch.
101+```sh
102+flatpak install flathub com.helix_editor.Helix
103+flatpak run com.helix_editor.Helix
104+```
37105
38−### Fedora Linux
106+### Snap
39107
40−You can install the COPR package for Helix via
108+Helix is available on [Snapcraft](https://snapcraft.io/helix) and can be installed with:
41109
110+```sh
111+snap install --classic helix
42112```
43−sudo dnf copr enable varlad/helix
44−sudo dnf install helix
113+
114+This will install Helix as both `/snap/bin/helix` and `/snap/bin/hx`, so make sure `/snap/bin` is in your `PATH`.
115+
116+### AppImage
117+
118+Install Helix using the Linux [AppImage](https://appimage.org/) format.
119+Download the official Helix AppImage from the [latest releases](https://github.com/helix-editor/helix/releases/latest) page.
120+
121+```sh
122+chmod +x helix-*.AppImage # change permission for executable mode
123+./helix-*.AppImage # run helix
45124```
125+
126+## macOS
46127
47−### Void Linux
128+### Homebrew Core
48129
130+```sh
131+brew install helix
49132```
50−sudo xbps-install helix
133+
134+### MacPorts
135+
136+```sh
137+port install helix
51138```
52139
53140## Windows
54141
55−Helix can be installed using [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
142+Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
56143or [MSYS2](https://msys2.org/).
57144
58−**Scoop:**
145+### Winget
146+Windows Package Manager winget command-line tool is by default available on Windows 11 and modern versions of Windows 10 as a part of the App Installer.
147+You can get [App Installer from the Microsoft Store](https://www.microsoft.com/p/app-installer/9nblggh4nns1#activetab=pivot:overviewtab). If it's already installed, make sure it is updated with the latest version.
59148
149+```sh
150+winget install Helix.Helix
60151```
152+
153+### Scoop
154+
155+```sh
61156scoop install helix
62157```
63158
64−**Chocolatey:**
159+### Chocolatey
65160
66−```
161+```sh
67162choco install helix
68163```
69164
70−**MSYS2:**
71−
72−Choose the [proper command](https://www.msys2.org/docs/package-naming/) for your system from below:
165+### MSYS2
73166
74− - For 32 bit Windows 7 or above:
167+For 64-bit Windows 8.1 or above:
75168
76−```
77−pacman -S mingw-w64-i686-helix
169+```sh
170+pacman -S mingw-w64-ucrt-x86_64-helix
78171```
79172
80− - For 64 bit Windows 7 or above:
173+## Building from source
81174
82−```
83−pacman -S mingw-w64-x86_64-helix
84−```
175+Requirements:
85176
86− - For 64 bit Windows 8.1 or above:
177+Clone the Helix GitHub repository into a directory of your choice. The
178+examples in this documentation assume installation into either `~/src/` on
179+Linux and macOS, or `%userprofile%\src\` on Windows.
87180
88−```
89−pacman -S mingw-w64-ucrt-x86_64-helix
90−```
181+- The [Rust toolchain](https://www.rust-lang.org/tools/install)
182+- The [Git version control system](https://git-scm.com/)
183+- A C++14 compatible compiler to build the tree-sitter grammars, for example GCC or Clang
91184
92−## Build from source
185+If you are using the `musl-libc` standard library instead of `glibc` the following environment variable must be set during the build to ensure tree-sitter grammars can be loaded correctly:
93186
94−```
95−git clone https://github.com/helix-editor/helix
96−cd helix
97−cargo install --path helix-term --locked
187+```sh
188+RUSTFLAGS="-C target-feature=-crt-static"
98189```
99190
100−This will install the `hx` binary to `$HOME/.cargo/bin` and build tree-sitter grammars in `./runtime/grammars`.
191+1. Clone the repository:
101192
102−If you are using the musl-libc instead of glibc the following environment variable must be set during the build
103−to ensure tree sitter grammars can be loaded correctly:
193+ ```sh
194+ git clone https://github.com/helix-editor/helix
195+ cd helix
196+ ```
104197
105−```
106−RUSTFLAGS="-C target-feature=-crt-static"
107−```
198+2. Compile from source:
199+
200+ ```sh
201+ cargo install --path helix-term --locked
202+ ```
108203
204+ This command will create the `hx` executable and construct the tree-sitter
205+ grammars in the local `runtime` folder.
109206
110−Helix also needs its runtime files so make sure to copy/symlink the `runtime/` directory into the
111−config directory (for example `~/.config/helix/runtime` on Linux/macOS). This location can be overridden
112−via the `HELIX_RUNTIME` environment variable.
207+> 💡 Tree-sitter grammars can be fetched and compiled if not pre-packaged. Fetch
208+> grammars with `hx --grammar fetch` and compile them with
209+> `hx --grammar build`. This will install them in
210+> the `runtime` directory within the user's helix config directory (more
211+> [details below](#multiple-runtime-directories)).
113212
114−| OS | Command |
115−| -------------------- | ------------------------------------------------ |
116−| Windows (Cmd) | `xcopy /e /i runtime %AppData%\helix\runtime` |
117−| Windows (PowerShell) | `xcopy /e /i runtime $Env:AppData\helix\runtime` |
118−| Linux / macOS | `ln -s $PWD/runtime ~/.config/helix/runtime` |
213+### Configuring Helix's runtime files
119214
120−Starting with Windows Vista you can also create symbolic links on Windows. Note that this requires
121−elevated privileges - i.e. PowerShell or Cmd must be run as administrator.
215+#### Linux and macOS
122216
123−**PowerShell:**
217+The **runtime** directory is one below the Helix source, so either set a
218+`HELIX_RUNTIME` environment variable to point to that directory and add it to
219+your `~/.bashrc` or equivalent:
124220
125−```powershell
126−New-Item -ItemType Junction -Target "runtime" -Path "$Env:AppData\helix\runtime"
221+```sh
222+HELIX_RUNTIME=~/src/helix/runtime
127223```
128−Note: "runtime" must be the absolute path to the runtime directory.
129224
130−**Cmd:**
225+Or, create a symbolic link:
131226
132−```cmd
133−cd %appdata%\helix
134−mklink /D runtime "<helix-repo>\runtime"
227+```sh
228+ln -Ts $PWD/runtime ~/.config/helix/runtime
135229```
136230
137−The runtime location can be overridden via the `HELIX_RUNTIME` environment variable.
231+If the above command fails to create a symbolic link because the file exists either move `~/.config/helix/runtime` to a new location or delete it, then run the symlink command above again.
138232
139−> NOTE: if `HELIX_RUNTIME` is set prior to calling `cargo install --path helix-term --locked`,
140−> tree-sitter grammars will be built in `$HELIX_RUNTIME/grammars`.
233+#### Windows
141234
142−If you plan on keeping the repo locally, an alternative to copying/symlinking
143−runtime files is to set `HELIX_RUNTIME=/path/to/helix/runtime`
144−(`HELIX_RUNTIME=$PWD/runtime` if you're in the helix repo directory).
235+Either set the `HELIX_RUNTIME` environment variable to point to the runtime files using the Windows setting (search for
236+`Edit environment variables for your account`) or use the `setx` command in
237+Cmd:
145238
146−To use Helix in desktop environments that supports [XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html), including Gnome and KDE, copy the provided `.desktop` file to the correct folder:
147−
148−```bash
149−cp contrib/Helix.desktop ~/.local/share/applications
239+```sh
240+setx HELIX_RUNTIME "%userprofile%\source\repos\helix\runtime"
150241```
151242
152−To use another terminal than the default, you will need to modify the `.desktop` file. For example, to use `kitty`:
243+> 💡 `%userprofile%` resolves to your user directory like
244+> `C:\Users\Your-Name\` for example.
153245
154−```bash
155−sed -i "s|Exec=hx %F|Exec=kitty hx %F|g" ~/.local/share/applications/Helix.desktop
156−sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desktop
157−```
246+Or, create a symlink in `%appdata%\helix\` that links to the source code directory:
158247
159−Please note: there is no icon for Helix yet, so the system default will be used.
248+| Method | Command |
249+| ---------- | -------------------------------------------------------------------------------------- |
250+| PowerShell | `New-Item -ItemType Junction -Target "runtime" -Path "$Env:AppData\helix\runtime"` |
251+| Cmd | `cd %appdata%\helix` <br/> `mklink /D runtime "%userprofile%\src\helix\runtime"` |
160252
161−## Finishing up the installation
253+> 💡 On Windows, creating a symbolic link may require running PowerShell or
254+> Cmd as an administrator.
162255
163−To make sure everything is set up as expected you should finally run the helix healthcheck via
256+#### Multiple runtime directories
164257
165−```
258+When Helix finds multiple runtime directories it will search through them for files in the
259+following order:
260+
261+1. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
262+ developing and testing helix only).
263+2. `runtime/` subdirectory of OS-dependent helix user config directory.
264+3. `$HELIX_RUNTIME`
265+4. Distribution-specific fallback directory (set at compile time—not run time—
266+ with the `HELIX_DEFAULT_RUNTIME` environment variable)
267+5. `runtime/` subdirectory of path to Helix executable.
268+
269+This order also sets the priority for selecting which file will be used if multiple runtime
270+directories have files with the same name.
271+
272+#### Note to packagers
273+
274+If you are making a package of Helix for end users, to provide a good out of
275+the box experience, you should set the `HELIX_DEFAULT_RUNTIME` environment
276+variable at build time (before invoking `cargo build`) to a directory which
277+will store the final runtime files after installation. For example, say you want
278+to package the runtime into `/usr/lib/helix/runtime`. The rough steps a build
279+script could follow are:
280+
281+1. `export HELIX_DEFAULT_RUNTIME=/usr/lib/helix/runtime`
282+1. `cargo build --profile opt --locked --path helix-term`
283+1. `cp -r runtime $BUILD_DIR/usr/lib/helix/`
284+1. `cp target/opt/hx $BUILD_DIR/usr/bin/hx`
285+
286+This way the resulting `hx` binary will always look for its runtime directory in
287+`/usr/lib/helix/runtime` if the user has no custom runtime in `~/.config/helix`
288+or `HELIX_RUNTIME`.
289+
290+### Validating the installation
291+
292+To make sure everything is set up as expected you should run the Helix health
293+check:
294+
295+```sh
166296hx --health
167297```
168298
169−For more information on the information displayed in the health check results refer to [Healthcheck](https://github.com/helix-editor/helix/wiki/Healthcheck).
299+For more information on the health check results refer to
300+[Health check](https://github.com/helix-editor/helix/wiki/Healthcheck).
301+
302+### Configure the desktop shortcut
170303
171−### Building tree-sitter grammars
304+If your desktop environment supports the
305+[XDG desktop menu](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html)
306+you can configure Helix to show up in the application menu by copying the
307+provided `.desktop` and icon files to their correct folders:
172308
173−Tree-sitter grammars must be fetched and compiled if not pre-packaged.
174−Fetch grammars with `hx --grammar fetch` (requires `git`) and compile them
175−with `hx --grammar build` (requires a C++ compiler).
309+```sh
310+cp contrib/Helix.desktop ~/.local/share/applications
311+cp contrib/helix.png ~/.icons # or ~/.local/share/icons
312+```
176313
177−### Installing language servers
314+To use another terminal than the system default, you can modify the `.desktop`
315+file. For example, to use `kitty`:
178316
179−Language servers can optionally be installed if you want their features (auto-complete, diagnostics etc.).
180−Follow the [instructions on the wiki page](https://github.com/helix-editor/helix/wiki/How-to-install-the-default-language-servers) to add your language servers of choice.
317+```sh
318+sed -i "s|Exec=hx %F|Exec=kitty hx %F|g" ~/.local/share/applications/Helix.desktop
319+sed -i "s|Terminal=true|Terminal=false|g" ~/.local/share/applications/Helix.desktop
320+```
book/src/keymap.md+73−61
@@ -14,17 +14,19 @@
1414 - [Space mode](#space-mode)
1515 - [Popup](#popup)
1616 - [Unimpaired](#unimpaired)
17−- [Insert Mode](#insert-mode)
17+- [Insert mode](#insert-mode)
1818- [Select / extend mode](#select--extend-mode)
1919- [Picker](#picker)
2020- [Prompt](#prompt)
2121
2222> 💡 Mappings marked (**LSP**) require an active language server for the file.
2323
24−> 💡 Mappings marked (**TS**) require a tree-sitter grammar for the filetype.
24+> 💡 Mappings marked (**TS**) require a tree-sitter grammar for the file type.
2525
2626## Normal mode
2727
28+Normal mode is the default mode when you launch helix. You can return to it from other modes by pressing the `Escape` key.
29+
2830### Movement
2931
3032> NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line.
@@ -32,8 +34,8 @@
3234| Key | Description | Command |
3335| ----- | ----------- | ------- |
3436| `h`, `Left` | Move left | `move_char_left` |
35−| `j`, `Down` | Move down | `move_line_down` |
36−| `k`, `Up` | Move up | `move_line_up` |
37+| `j`, `Down` | Move down | `move_visual_line_down` |
38+| `k`, `Up` | Move up | `move_visual_line_up` |
3739| `l`, `Right` | Move right | `move_char_right` |
3840| `w` | Move next word start | `move_next_word_start` |
3941| `b` | Move previous word start | `move_prev_word_start` |
@@ -109,9 +111,10 @@
109111| Key | Description | Command |
110112| ----- | ----------- | ------- |
111113| `s` | Select all regex matches inside selections | `select_regex` |
112−| `S` | Split selection into subselections on regex matches | `split_selection` |
114+| `S` | Split selection into sub selections on regex matches | `split_selection` |
113115| `Alt-s` | Split selection on newlines | `split_selection_on_newline` |
114−| `Alt-_ ` | Merge consecutive selections | `merge_consecutive_selections` |
116+| `Alt-minus` | Merge selections | `merge_selections` |
117+| `Alt-_` | Merge consecutive selections | `merge_consecutive_selections` |
115118| `&` | Align selection in columns | `align_selections` |
116119| `_` | Trim whitespace from the selection | `trim_selections` |
117120| `;` | Collapse selection onto a single cursor | `collapse_selection` |
@@ -141,7 +144,7 @@
141144
142145### Search
143146
144−Search commands all operate on the `/` register by default. Use `"<char>` to operate on a different one.
147+Search commands all operate on the `/` register by default. To use a different register, use `"<char>`.
145148
146149| Key | Description | Command |
147150| ----- | ----------- | ------- |
@@ -175,9 +178,8 @@ Accessed by typing `z` in [normal mode](#normal-mode).
175178
176179View mode is intended for scrolling and manipulating the view without changing
177180the selection. The "sticky" variant of this mode (accessed by typing `Z` in
178−normal mode) is persistent; use the Escape key to return to normal mode after
179−usage (useful when you're simply looking over text and not actively editing
180−it).
181+normal mode) is persistent and can be exited using the escape key. This is
182+useful when you're simply looking over text and not actively editing it.
181183
182184
183185| Key | Description | Command |
@@ -219,13 +221,15 @@ Jumps to various locations.
219221| `n` | Go to next buffer | `goto_next_buffer` |
220222| `p` | Go to previous buffer | `goto_previous_buffer` |
221223| `.` | Go to last modification in current file | `goto_last_modification` |
224+| `j` | Move down textual (instead of visual) line | `move_line_down` |
225+| `k` | Move up textual (instead of visual) line | `move_line_up` |
222226
223227#### Match mode
224228
225229Accessed by typing `m` in [normal mode](#normal-mode).
226230
227231See the relevant section in [Usage](./usage.md) for an explanation about
228−[surround](./usage.md#surround) and [textobject](./usage.md#textobjects) usage.
232+[surround](./usage.md#surround) and [textobject](./usage.md#navigating-using-tree-sitter-textobjects) usage.
229233
230234| Key | Description | Command |
231235| ----- | ----------- | ------- |
@@ -242,7 +246,7 @@ TODO: Mappings for selecting syntax nodes (a superset of `[`).
242246
243247Accessed by typing `Ctrl-w` in [normal mode](#normal-mode).
244248
245−This layer is similar to Vim keybindings as Kakoune does not support window.
249+This layer is similar to Vim keybindings as Kakoune does not support windows.
246250
247251| Key | Description | Command |
248252| ----- | ------------- | ------- |
@@ -268,30 +272,32 @@ Accessed by typing `Space` in [normal mode](#normal-mode).
268272
269273This layer is a kludge of mappings, mostly pickers.
270274
271−| Key | Description | Command |
272−| ----- | ----------- | ------- |
273−| `f` | Open file picker | `file_picker` |
274−| `F` | Open file picker at current working directory | `file_picker_in_current_directory` |
275−| `b` | Open buffer picker | `buffer_picker` |
276−| `j` | Open jumplist picker | `jumplist_picker` |
277−| `k` | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover` |
278−| `s` | Open document symbol picker (**LSP**) | `symbol_picker` |
279−| `S` | Open workspace symbol picker (**LSP**) | `workspace_symbol_picker` |
280−| `d` | Open document diagnostics picker (**LSP**) | `diagnostics_picker` |
281−| `D` | Open workspace diagnostics picker (**LSP**) | `workspace_diagnostics_picker` |
282−| `r` | Rename symbol (**LSP**) | `rename_symbol` |
283−| `a` | Apply code action (**LSP**) | `code_action` |
284−| `'` | Open last fuzzy picker | `last_picker` |
285−| `w` | Enter [window mode](#window-mode) | N/A |
286−| `p` | Paste system clipboard after selections | `paste_clipboard_after` |
287−| `P` | Paste system clipboard before selections | `paste_clipboard_before` |
288−| `y` | Join and yank selections to clipboard | `yank_joined_to_clipboard` |
289−| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |
290−| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |
291−| `/` | Global search in workspace folder | `global_search` |
292−| `?` | Open command palette | `command_palette` |
293−
294−> TIP: Global search displays results in a fuzzy picker, use `Space + '` to bring it back up after opening a file.
275+| Key | Description | Command |
276+| ----- | ----------- | ------- |
277+| `f` | Open file picker | `file_picker` |
278+| `F` | Open file picker at current working directory | `file_picker_in_current_directory` |
279+| `b` | Open buffer picker | `buffer_picker` |
280+| `j` | Open jumplist picker | `jumplist_picker` |
281+| `g` | Debug (experimental) | N/A |
282+| `k` | Show documentation for item under cursor in a [popup](#popup) (**LSP**) | `hover` |
283+| `s` | Open document symbol picker (**LSP**) | `symbol_picker` |
284+| `S` | Open workspace symbol picker (**LSP**) | `workspace_symbol_picker` |
285+| `d` | Open document diagnostics picker (**LSP**) | `diagnostics_picker` |
286+| `D` | Open workspace diagnostics picker (**LSP**) | `workspace_diagnostics_picker` |
287+| `r` | Rename symbol (**LSP**) | `rename_symbol` |
288+| `a` | Apply code action (**LSP**) | `code_action` |
289+| `h` | Select symbol references (**LSP**) | `select_references_to_symbol_under_cursor` |
290+| `'` | Open last fuzzy picker | `last_picker` |
291+| `w` | Enter [window mode](#window-mode) | N/A |
292+| `p` | Paste system clipboard after selections | `paste_clipboard_after` |
293+| `P` | Paste system clipboard before selections | `paste_clipboard_before` |
294+| `y` | Yank selections to clipboard | `yank_to_clipboard` |
295+| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |
296+| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |
297+| `/` | Global search in workspace folder | `global_search` |
298+| `?` | Open command palette | `command_palette` |
299+
300+> 💡 Global search displays results in a fuzzy picker, use `Space + '` to bring it back up after opening a file.
295301
296302##### Popup
297303
@@ -304,7 +310,7 @@ Displays documentation for item under cursor.
304310
305311#### Unimpaired
306312
307−Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired).
313+These mappings are in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired).
308314
309315| Key | Description | Command |
310316| ----- | ----------- | ------- |
@@ -333,12 +339,15 @@ Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaire
333339
334340## Insert mode
335341
336−Insert mode bindings are somewhat minimal by default. Helix is designed to
342+Accessed by typing `i` in [normal mode](#normal-mode).
343+
344+Insert mode bindings are minimal by default. Helix is designed to
337345be a modal editor, and this is reflected in the user experience and internal
338−mechanics. For example, changes to the text are only saved for undos when
339−escaping from insert mode to normal mode. For this reason, new users are
340−strongly encouraged to learn the modal editing paradigm to get the smoothest
341−experience.
346+mechanics. Changes to the text are only saved for undos when
347+escaping from insert mode to normal mode.
348+
349+> 💡 New users are strongly encouraged to learn the modal editing paradigm
350+> to get the smoothest experience.
342351
343352| Key | Description | Command |
344353| ----- | ----------- | ------- |
@@ -350,7 +359,7 @@ experience.
350359| `Alt-d`, `Alt-Delete` | Delete next word | `delete_word_forward` |
351360| `Ctrl-u` | Delete to start of line | `kill_to_line_start` |
352361| `Ctrl-k` | Delete to end of line | `kill_to_line_end` |
353−| `Ctrl-h`, `Backspace` | Delete previous char | `delete_char_backward` |
362+| `Ctrl-h`, `Backspace`, `Shift-Backspace` | Delete previous char | `delete_char_backward` |
354363| `Ctrl-d`, `Delete` | Delete next char | `delete_char_forward` |
355364| `Ctrl-j`, `Enter` | Insert new line | `insert_newline` |
356365
@@ -368,8 +377,8 @@ with modal editors.
368377| `Home` | Move to line start | `goto_line_start` |
369378| `End` | Move to line end | `goto_line_end_newline` |
370379
371−If you want to disable them in insert mode as you become more comfortable with modal editing, you can use
372−the following in your `config.toml`:
380+As you become more comfortable with modal editing, you may want to disable some
381+insert mode bindings. You can do this by editing your `config.toml` file.
373382
374383```toml
375384[keys.insert]
@@ -385,9 +394,11 @@ end = "no_op"
385394
386395## Select / extend mode
387396
388−This mode echoes Normal mode, but changes any movements to extend
397+Accessed by typing `v` in [normal mode](#normal-mode).
398+
399+Select mode echoes Normal mode, but changes any movements to extend
389400selections rather than replace them. Goto motions are also changed to
390−extend, so that `vgl` for example extends the selection to the end of
401+extend, so that `vgl`, for example, extends the selection to the end of
391402the line.
392403
393404Search is also affected. By default, `n` and `N` will remove the current
@@ -400,19 +411,20 @@ you to selectively add search terms to your selections.
400411
401412Keys to use within picker. Remapping currently not supported.
402413
403−| Key | Description |
404−| ----- | ------------- |
405−| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
406−| `Tab`, `Down`, `Ctrl-n` | Next entry |
407−| `PageUp`, `Ctrl-u` | Page up |
408−| `PageDown`, `Ctrl-d` | Page down |
409−| `Home` | Go to first entry |
410−| `End` | Go to last entry |
411−| `Enter` | Open selected |
412−| `Ctrl-s` | Open horizontally |
413−| `Ctrl-v` | Open vertically |
414−| `Ctrl-t` | Toggle preview |
415−| `Escape`, `Ctrl-c` | Close picker |
414+| Key | Description |
415+| ----- | ------------- |
416+| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
417+| `Tab`, `Down`, `Ctrl-n` | Next entry |
418+| `PageUp`, `Ctrl-u` | Page up |
419+| `PageDown`, `Ctrl-d` | Page down |
420+| `Home` | Go to first entry |
421+| `End` | Go to last entry |
422+| `Enter` | Open selected |
423+| `Alt-Enter` | Open selected in the background without closing the picker |
424+| `Ctrl-s` | Open horizontally |
425+| `Ctrl-v` | Open vertically |
426+| `Ctrl-t` | Toggle preview |
427+| `Escape`, `Ctrl-c` | Close picker |
416428
417429## Prompt
418430
@@ -431,7 +443,7 @@ Keys to use within prompt, Remapping currently not supported.
431443| `Alt-d`, `Alt-Delete`, `Ctrl-Delete` | Delete next word |
432444| `Ctrl-u` | Delete to start of line |
433445| `Ctrl-k` | Delete to end of line |
434−| `Backspace`, `Ctrl-h` | Delete previous char |
446+| `Backspace`, `Ctrl-h`, `Shift-Backspace` | Delete previous char |
435447| `Delete`, `Ctrl-d` | Delete next char |
436448| `Ctrl-s` | Insert a word under doc cursor, may be changed to Ctrl-r Ctrl-w later |
437449| `Ctrl-p`, `Up` | Select previous history |
book/src/lang-support.md+2−2
@@ -1,10 +1,10 @@
11# Language Support
22
3−The following languages and Language Servers are supported. In order to use
3+The following languages and Language Servers are supported. To use
44Language Server features, you must first [install][lsp-install-wiki] the
55appropriate Language Server.
66
7−Check the language support in your installed helix version with `hx --health`.
7+You can check the language support in your installed helix version with `hx --health`.
88
99Also see the [Language Configuration][lang-config] docs and the [Adding
1010Languages][adding-languages] guide for more language configuration information.
book/src/languages.md+117−38
@@ -5,26 +5,31 @@ in `languages.toml` files.
55
66## `languages.toml` files
77
8−There are three possible `languages.toml` files. The first is compiled into
9−Helix and lives in the [Helix repository](https://github.com/helix-editor/helix/blob/master/languages.toml).
10−This provides the default configurations for languages and language servers.
8+There are three possible locations for a `languages.toml` file:
119
12−You may define a `languages.toml` in your [configuration directory](./configuration.md)
13−which overrides values from the built-in language configuration. For example
14−to disable auto-LSP-formatting in Rust:
10+1. In the Helix source code, which lives in the
11+ [Helix repository](https://github.com/helix-editor/helix/blob/master/languages.toml).
12+ It provides the default configurations for languages and language servers.
1513
16−```toml
17−# in <config_dir>/helix/languages.toml
14+2. In your [configuration directory](./configuration.md). This overrides values
15+ from the built-in language configuration. For example, to disable
16+ auto-LSP-formatting in Rust:
1817
19−[[language]]
20−name = "rust"
21−auto-format = false
22−```
18+ ```toml
19+ # in <config_dir>/helix/languages.toml
20+
21+ [language-server.mylang-lsp]
22+ command = "mylang-lsp"
2323
24−Language configuration may also be overridden local to a project by creating
25−a `languages.toml` file under a `.helix` directory. Its settings will be merged
26−with the language configuration in the configuration directory and the built-in
27−configuration.
24+ [[language]]
25+ name = "rust"
26+ auto-format = false
27+ ```
28+
29+3. In a `.helix` folder in your project. Language configuration may also be
30+ overridden local to a project by creating a `languages.toml` file in a
31+ `.helix` folder. Its settings will be merged with the language configuration
32+ in the configuration directory and the built-in configuration.
2833
2934## Language configuration
3035
@@ -39,8 +44,8 @@ injection-regex = "mylang"
3944file-types = ["mylang", "myl"]
4045comment-token = "#"
4146indent = { tab-width = 2, unit = " " }
42−language-server = { command = "mylang-lsp", args = ["--stdio"], environment = { "ENV1" = "value1", "ENV2" = "value2" } }
4347formatter = { command = "mylang-formatter" , args = ["--stdin"] }
48+language-servers = [ "mylang-lsp" ]
4449```
4550
4651These configuration keys are available:
@@ -48,6 +53,7 @@ These configuration keys are available:
4853| Key | Description |
4954| ---- | ----------- |
5055| `name` | The name of the language |
56+| `language-id` | The language-id for language servers, checkout the table at [TextDocumentItem](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem) for the right id |
5157| `scope` | A string like `source.js` that identifies the language. Currently, we strive to match the scope names used by popular TextMate grammars and by the Linguist library. Usually `source.<name>` or `text.<name>` in case of markup languages |
5258| `injection-regex` | regex pattern that will be tested against a language name in order to determine whether this language should be used for a potential [language injection][treesitter-language-injection] site. |
5359| `file-types` | The filetypes of the language, for example `["yml", "yaml"]`. See the file-type detection section below. |
@@ -56,16 +62,18 @@ These configuration keys are available:
5662| `auto-format` | Whether to autoformat this language when saving |
5763| `diagnostic-severity` | Minimal severity of diagnostic for it to be displayed. (Allowed values: `Error`, `Warning`, `Info`, `Hint`) |
5864| `comment-token` | The token to use as a comment-token |
59−| `indent` | The indent to use. Has sub keys `tab-width` and `unit` |
60−| `language-server` | The Language Server to run. See the Language Server configuration section below. |
61−| `config` | Language Server configuration |
65+| `indent` | The indent to use. Has sub keys `unit` (the text inserted into the document when indenting; usually set to N spaces or `"\t"` for tabs) and `tab-width` (the number of spaces rendered for a tab) |
66+| `language-servers` | The Language Servers used for this language. See below for more information in the section [Configuring Language Servers for a language](#configuring-language-servers-for-a-language) |
6267| `grammar` | The tree-sitter grammar to use (defaults to the value of `name`) |
6368| `formatter` | The formatter for the language, it will take precedence over the lsp when defined. The formatter must be able to take the original file as input from stdin and write the formatted file to stdout |
64−| `max-line-length` | Maximum line length. Used for the `:reflow` command and soft-wrapping |
69+| `soft-wrap` | [editor.softwrap](./configuration.md#editorsoft-wrap-section)
70+| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set, defaults to `editor.text-width` |
71+| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml`. Overwrites the setting of the same name in `config.toml` if set. |
72+| `persistent-diagnostic-sources` | An array of LSP diagnostic sources assumed unchanged when the language server resends the same set of diagnostics. Helix can track the position for these diagnostics internally instead. Useful for diagnostics that are recomputed on save.
6573
6674### File-type detection and the `file-types` key
6775
68−Helix determines which language configuration to use with the `file-types` key
76+Helix determines which language configuration to use based on the `file-types` key
6977from the above section. `file-types` is a list of strings or tables, for
7078example:
7179
@@ -89,31 +97,102 @@ with the following priorities:
8997 replaced at runtime with the appropriate path separator for the operating
9098 system, so this rule would match against `.git\config` files on Windows.
9199
92−### Language Server configuration
100+## Language Server configuration
101+
102+Language servers are configured separately in the table `language-server` in the same file as the languages `languages.toml`
93103
94−The `language-server` field takes the following keys:
104+For example:
95105
96−| Key | Description |
97−| --- | ----------- |
98−| `command` | The name of the language server binary to execute. Binaries must be in `$PATH` |
99−| `args` | A list of arguments to pass to the language server binary |
100−| `timeout` | The maximum time a request to the language server may take, in seconds. Defaults to `20` |
101−| `language-id` | The language name to pass to the language server. Some language servers support multiple languages and use this field to determine which one is being served in a buffer |
102−| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
106+```toml
107+[language-server.mylang-lsp]
108+command = "mylang-lsp"
109+args = ["--stdio"]
110+config = { provideFormatter = true }
111+environment = { "ENV1" = "value1", "ENV2" = "value2" }
112+
113+[language-server.efm-lsp-prettier]
114+command = "efm-langserver"
115+
116+[language-server.efm-lsp-prettier.config]
117+documentFormatting = true
118+languages = { typescript = [ { formatCommand ="prettier --stdin-filepath ${INPUT}", formatStdin = true } ] }
119+```
103120
104−The top-level `config` field is used to configure the LSP initialization options. A `format`
105−sub-table within `config` can be used to pass extra formatting options to
106−[Document Formatting Requests](https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-16.md#document-formatting-request--leftwards_arrow_with_hook).
107−For example with typescript:
121+These are the available options for a language server.
122+
123+| Key | Description |
124+| ---- | ----------- |
125+| `command` | The name or path of the language server binary to execute. Binaries must be in `$PATH` |
126+| `args` | A list of arguments to pass to the language server binary |
127+| `config` | LSP initialization options |
128+| `timeout` | The maximum time a request to the language server may take, in seconds. Defaults to `20` |
129+| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
130+
131+A `format` sub-table within `config` can be used to pass extra formatting options to
132+[Document Formatting Requests](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting).
133+For example, with typescript:
108134
109135```toml
110−[[language]]
111−name = "typescript"
112−auto-format = true
136+[language-server.typescript-language-server]
113137# pass format options according to https://github.com/typescript-language-server/typescript-language-server#workspacedidchangeconfiguration omitting the "[language].format." prefix.
114138config = { format = { "semicolons" = "insert", "insertSpaceBeforeFunctionParenthesis" = true } }
115139```
116140
141+### Configuring Language Servers for a language
142+
143+The `language-servers` attribute in a language tells helix which language servers are used for this language.
144+
145+They have to be defined in the `[language-server]` table as described in the previous section.
146+
147+Different languages can use the same language server instance, e.g. `typescript-language-server` is used for javascript, jsx, tsx and typescript by default.
148+
149+In case multiple language servers are specified in the `language-servers` attribute of a `language`,
150+it's often useful to only enable/disable certain language-server features for these language servers.
151+
152+As an example, `efm-lsp-prettier` of the previous example is used only with a formatting command `prettier`,
153+so everything else should be handled by the `typescript-language-server` (which is configured by default).
154+The language configuration for typescript could look like this:
155+
156+```toml
157+[[language]]
158+name = "typescript"
159+language-servers = [ { name = "efm-lsp-prettier", only-features = [ "format" ] }, "typescript-language-server" ]
160+```
161+
162+or equivalent:
163+
164+```toml
165+[[language]]
166+name = "typescript"
167+language-servers = [ { name = "typescript-language-server", except-features = [ "format" ] }, "efm-lsp-prettier" ]
168+```
169+
170+Each requested LSP feature is prioritized in the order of the `language-servers` array.
171+For example, the first `goto-definition` supported language server (in this case `typescript-language-server`) will be taken for the relevant LSP request (command `goto_definition`).
172+The features `diagnostics`, `code-action`, `completion`, `document-symbols` and `workspace-symbols` are an exception to that rule, as they are working for all language servers at the same time and are merged together, if enabled for the language.
173+If no `except-features` or `only-features` is given, all features for the language server are enabled.
174+If a language server itself doesn't support a feature, the next language server array entry will be tried (and so on).
175+
176+The list of supported features is:
177+
178+- `format`
179+- `goto-definition`
180+- `goto-declaration`
181+- `goto-type-definition`
182+- `goto-reference`
183+- `goto-implementation`
184+- `signature-help`
185+- `hover`
186+- `document-highlight`
187+- `completion`
188+- `code-action`
189+- `workspace-command`
190+- `document-symbols`
191+- `workspace-symbols`
192+- `diagnostics`
193+- `rename-symbol`
194+- `inlay-hints`
195+
117196## Tree-sitter grammar configuration
118197
119198The source for a language's tree-sitter grammar is specified in a `[[grammar]]`
book/src/remapping.md+9−10
@@ -1,18 +1,18 @@
1−# Key Remapping
1+# Key remapping
22
3−One-way key remapping is temporarily supported via a simple TOML configuration
3+Helix currently supports one-way key remapping through a simple TOML configuration
44file. (More powerful solutions such as rebinding via commands will be
55available in the future).
66
7−To remap keys, write a `config.toml` file in your `helix` configuration
8−directory (default `~/.config/helix` in Linux systems) with a structure like
7+To remap keys, create a `config.toml` file in your `helix` configuration
8+directory (default `~/.config/helix` on Linux systems) with a structure like
99this:
1010
1111```toml
1212# At most one section each of 'keys.normal', 'keys.insert' and 'keys.select'
1313[keys.normal]
14−C-s = ":w" # Maps the Ctrl-s to the typable command :w which is an alias for :write (save file)
15−C-o = ":open ~/.config/helix/config.toml" # Maps the Ctrl-o to opening of the helix config file
14+C-s = ":w" # Maps Ctrl-s to the typable command :w which is an alias for :write (save file)
15+C-o = ":open ~/.config/helix/config.toml" # Maps Ctrl-o to opening of the helix config file
1616a = "move_char_left" # Maps the 'a' key to the move_char_left command
1717w = "move_line_up" # Maps the 'w' key move_line_up
1818"C-S-esc" = "extend_line" # Maps Ctrl-Shift-Escape to extend_line
@@ -20,10 +20,9 @@ g = { a = "code_action" } # Maps `ga` to show possible code actions
2020"ret" = ["open_below", "normal_mode"] # Maps the enter key to open_below then re-enter normal mode
2121
2222[keys.insert]
23−"A-x" = "normal_mode" # Maps Alt-X to enter normal mode
23+"A-x" = "normal_mode" # Maps Alt-X to enter normal mode
2424j = { k = "normal_mode" } # Maps `jk` to exit insert mode
2525```
26−> NOTE: Typable commands can also be remapped, remember to keep the `:` prefix to indicate it's a typable command.
2726
2827## Minor modes
2928
@@ -76,5 +75,5 @@ Ctrl, Shift and Alt modifiers are encoded respectively with the prefixes
7675
7776Keys can be disabled by binding them to the `no_op` command.
7877
79−Commands can be found at [Keymap](https://docs.helix-editor.com/keymap.html) Commands.
80−> Commands can also be found in the source code at [`helix-term/src/commands.rs`](https://github.com/helix-editor/helix/blob/master/helix-term/src/commands.rs) at the invocation of `static_commands!` macro and the `TypableCommandList`.
78+A list of commands is available in the [Keymap](https://docs.helix-editor.com/keymap.html) documentation
79+ and in the source code at [`helix-term/src/commands.rs`](https://github.com/helix-editor/helix/blob/master/helix-term/src/commands.rs) at the invocation of `static_commands!` macro and the `TypableCommandList`.
book/src/themes.md+125−98
@@ -1,14 +1,15 @@
11# Themes
22
3−To use a theme add `theme = "<name>"` to your [`config.toml`](./configuration.md) at the very top of the file before the first section or select it during runtime using `:theme <name>`.
3+To use a theme add `theme = "<name>"` to the top of your [`config.toml`](./configuration.md) file, or select it during runtime using `:theme <name>`.
44
55## Creating a theme
66
7−Create a file with the name of your theme as file name (i.e `mytheme.toml`) and place it in your `themes` directory (i.e `~/.config/helix/themes`). The directory might have to be created beforehand.
7+Create a file with the name of your theme as the file name (i.e `mytheme.toml`) and place it in your `themes` directory (i.e `~/.config/helix/themes` or `%AppData%\helix\themes` on Windows). The directory might have to be created beforehand.
88
9−The names "default" and "base16_default" are reserved for the builtin themes and cannot be overridden by user defined themes.
9+> 💡 The names "default" and "base16_default" are reserved for built-in themes
10+> and cannot be overridden by user-defined themes.
1011
11−The default theme.toml can be found [here](https://github.com/helix-editor/helix/blob/master/theme.toml), and user submitted themes [here](https://github.com/helix-editor/helix/blob/master/runtime/themes).
12+### Overview
1213
1314Each line in the theme file is specified as below:
1415
@@ -16,7 +17,7 @@ Each line in the theme file is specified as below:
1617key = { fg = "#ffffff", bg = "#000000", underline = { color = "#ff0000", style = "curl"}, modifiers = ["bold", "italic"] }
1718```
1819
19−where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline` the underline `style`/`color`, and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
20+Where `key` represents what you want to style, `fg` specifies the foreground color, `bg` the background color, `underline` the underline `style`/`color`, and `modifiers` is a list of style modifiers. `bg`, `underline` and `modifiers` can be omitted to defer to the defaults.
2021
2122To specify only the foreground color:
2223
@@ -24,15 +25,30 @@ To specify only the foreground color:
2425key = "#ffffff"
2526```
2627
27−if the key contains a dot `'.'`, it must be quoted to prevent it being parsed as a [dotted key](https://toml.io/en/v1.0.0#keys).
28+If the key contains a dot `'.'`, it must be quoted to prevent it being parsed as a [dotted key](https://toml.io/en/v1.0.0#keys).
2829
2930```toml
3031"key.key" = "#ffffff"
3132```
3233
34+For inspiration, you can find the default `theme.toml`
35+[here](https://github.com/helix-editor/helix/blob/master/theme.toml) and
36+user-submitted themes
37+[here](https://github.com/helix-editor/helix/blob/master/runtime/themes).
38+
39+### Using the linter
40+
41+Use the supplied linting tool to check for errors and missing scopes:
42+
43+```sh
44+cargo xtask themelint onedark # replace onedark with <name>
45+```
46+
47+## The details of theme creation
48+
3349### Color palettes
3450
35−It's recommended define a palette of named colors, and refer to them from the
51+It's recommended to define a palette of named colors, and refer to them in the
3652configuration values in your theme. To do this, add a table called
3753`palette` to your theme file:
3854
@@ -45,8 +61,8 @@ white = "#ffffff"
4561black = "#000000"
4662```
4763
48−Remember that the `[palette]` table includes all keys after its header,
49−so you should define the palette after normal theme options.
64+Keep in mind that the `[palette]` table includes all keys after its header,
65+so it should be defined after the normal theme options.
5066
5167The default palette uses the terminal's default 16 colors, and the colors names
5268are listed below. The `[palette]` section in the config file takes precedence
@@ -54,6 +70,7 @@ over it and is merged into the default palette.
5470
5571| Color Name |
5672| --- |
73+| `default` |
5774| `black` |
5875| `red` |
5976| `green` |
@@ -73,9 +90,8 @@ over it and is merged into the default palette.
7390
7491### Modifiers
7592
76−The following values may be used as modifiers.
77−
78−Less common modifiers might not be supported by your terminal emulator.
93+The following values may be used as modifier, provided they are supported by
94+your terminal emulator.
7995
8096| Modifier |
8197| --- |
@@ -89,14 +105,13 @@ Less common modifiers might not be supported by your terminal emulator.
89105| `hidden` |
90106| `crossed_out` |
91107
92−> Note: The `underlined` modifier is deprecated and only available for backwards compatibility.
108+> 💡 The `underlined` modifier is deprecated and only available for backwards compatibility.
93109> Its behavior is equivalent to setting `underline.style="line"`.
94110
95−### Underline Style
96−
97−One of the following values may be used as a value for `underline.style`.
111+### Underline style
98112
99−Some styles might not be supported by your terminal emulator.
113+One of the following values may be used as a value for `underline.style`, providing it is
114+supported by your terminal emulator.
100115
101116| Modifier |
102117| --- |
@@ -109,7 +124,7 @@ Some styles might not be supported by your terminal emulator.
109124
110125### Inheritance
111126
112−Extend upon other themes by setting the `inherits` property to an existing theme.
127+Extend other themes by setting the `inherits` property to an existing theme.
113128
114129```toml
115130inherits = "boo_berry"
@@ -124,27 +139,28 @@ berry = "#2A2A4D"
124139
125140### Scopes
126141
127−The following is a list of scopes available to use for styling.
142+The following is a list of scopes available to use for styling:
128143
129144#### Syntax highlighting
130145
131146These keys match [tree-sitter scopes](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#theme).
132147
133−For a given highlight produced, styling will be determined based on the longest matching theme key. For example, the highlight `function.builtin.static` would match the key `function.builtin` rather than `function`.
148+When determining styling for a highlight, the longest matching theme key will be used. For example, if the highlight is `function.builtin.static`, the key `function.builtin` will be used instead of `function`.
134149
135150We use a similar set of scopes as
136−[SublimeText](https://www.sublimetext.com/docs/scope_naming.html). See also
151+[Sublime Text](https://www.sublimetext.com/docs/scope_naming.html). See also
137152[TextMate](https://macromates.com/manual/en/language_grammars) scopes.
138153
139−- `attribute` - Class attributes, html tag attributes
154+- `attribute` - Class attributes, HTML tag attributes
140155
141156- `type` - Types
142157 - `builtin` - Primitive types provided by the language (`int`, `usize`)
158+ - `parameter` - Generic type parameters (`T`)
143159 - `enum`
144160 - `variant`
145161- `constructor`
146162
147−- `constant` (TODO: constant.other.placeholder for %v)
163+- `constant` (TODO: constant.other.placeholder for `%v`)
148164 - `builtin` Special constants provided by the language (`true`, `false`, `nil` etc)
149165 - `boolean`
150166 - `character`
@@ -162,11 +178,11 @@ We use a similar set of scopes as
162178
163179- `comment` - Code comments
164180 - `line` - Single line comments (`//`)
165− - `block` - Block comments (e.g. (`/* */`)
181+ - `block` - Block comments (e.g. (`/* */`)
166182 - `documentation` - Documentation comments (e.g. `///` in Rust)
167183
168184- `variable` - Variables
169− - `builtin` - Reserved language variables (`self`, `this`, `super`, etc)
185+ - `builtin` - Reserved language variables (`self`, `this`, `super`, etc.)
170186 - `parameter` - Function parameters
171187 - `other`
172188 - `member` - Fields of composite data types (e.g. structs, unions)
@@ -186,10 +202,10 @@ We use a similar set of scopes as
186202 - `return`
187203 - `exception`
188204 - `operator` - `or`, `in`
189− - `directive` - Preprocessor directives (`#if` in C)
205+ - `directive` - Preprocessor directives (`#if` in C)
190206 - `function` - `fn`, `func`
191207 - `storage` - Keywords describing how things are stored
192− - `type` - The type of something, `class`, `function`, `var`, `let`, etc.
208+ - `type` - The type of something, `class`, `function`, `var`, `let`, etc.
193209 - `modifier` - Storage modifiers like `static`, `mut`, `const`, `ref`, etc.
194210
195211- `operator` - `||`, `+=`, `>`
@@ -201,6 +217,7 @@ We use a similar set of scopes as
201217 - `special` (preprocessor in C)
202218
203219- `tag` - Tags (e.g. `<body>` in HTML)
220+ - `builtin`
204221
205222- `namespace`
206223
@@ -213,12 +230,15 @@ We use a similar set of scopes as
213230 - `list`
214231 - `unnumbered`
215232 - `numbered`
233+ - `checked`
234+ - `unchecked`
216235 - `bold`
217236 - `italic`
237+ - `strikethrough`
218238 - `link`
219− - `url` - urls pointed to by links
220− - `label` - non-url link references
221− - `text` - url and image descriptions in links
239+ - `url` - URLs pointed to by links
240+ - `label` - non-URL link references
241+ - `text` - URL and image descriptions in links
222242 - `quote`
223243 - `raw`
224244 - `inline`
@@ -226,85 +246,92 @@ We use a similar set of scopes as
226246
227247- `diff` - version control changes
228248 - `plus` - additions
249+ - `gutter` - gutter indicator
229250 - `minus` - deletions
251+ - `gutter` - gutter indicator
230252 - `delta` - modifications
231253 - `moved` - renamed or moved files/changes
254+ - `gutter` - gutter indicator
232255
233256#### Interface
234257
235−These scopes are used for theming the editor interface.
258+These scopes are used for theming the editor interface:
236259
237260- `markup`
238261 - `normal`
239− - `completion` - for completion doc popup ui
240− - `hover` - for hover popup ui
262+ - `completion` - for completion doc popup UI
263+ - `hover` - for hover popup UI
241264 - `heading`
242− - `completion` - for completion doc popup ui
243− - `hover` - for hover popup ui
265+ - `completion` - for completion doc popup UI
266+ - `hover` - for hover popup UI
244267 - `raw`
245268 - `inline`
246− - `completion` - for completion doc popup ui
247− - `hover` - for hover popup ui
248−
249−
250−| Key | Notes |
251−| --- | --- |
252−| `ui.background` | |
253−| `ui.background.separator` | Picker separator below input line |
254−| `ui.cursor` | |
255−| `ui.cursor.normal` | |
256−| `ui.cursor.insert` | |
257−| `ui.cursor.select` | |
258−| `ui.cursor.match` | Matching bracket etc. |
259−| `ui.cursor.primary` | Cursor with primary selection |
260−| `ui.cursor.primary.normal` | |
261−| `ui.cursor.primary.insert` | |
262−| `ui.cursor.primary.select` | |
263−| `ui.gutter` | Gutter |
264−| `ui.gutter.selected` | Gutter for the line the cursor is on |
265−| `ui.linenr` | Line numbers |
266−| `ui.linenr.selected` | Line number for the line the cursor is on |
267−| `ui.statusline` | Statusline |
268−| `ui.statusline.inactive` | Statusline (unfocused document) |
269−| `ui.statusline.normal` | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |
270−| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
271−| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
272−| `ui.statusline.separator` | Separator character in statusline |
273−| `ui.popup` | Documentation popups (e.g Space + k) |
274−| `ui.popup.info` | Prompt for multiple key options |
275−| `ui.window` | Border lines separating splits |
276−| `ui.help` | Description box for commands |
277−| `ui.text` | Command prompts, popup text, etc. |
278−| `ui.text.focus` | |
279−| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
280−| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
281−| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) |
282−| `ui.virtual.whitespace` | Visible whitespace characters |
283−| `ui.virtual.indent-guide` | Vertical indent width guides |
284−| `ui.virtual.wrap` | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section]) |
285−| `ui.menu` | Code and command completion menus |
286−| `ui.menu.selected` | Selected autocomplete item |
287−| `ui.menu.scroll` | `fg` sets thumb color, `bg` sets track color of scrollbar |
288−| `ui.selection` | For selections in the editing area |
289−| `ui.selection.primary` | |
290−| `ui.cursorline.primary` | The line of the primary cursor ([if cursorline is enabled][editor-section]) |
291−| `ui.cursorline.secondary` | The lines of any other cursors ([if cursorline is enabled][editor-section]) |
292−| `ui.cursorcolumn.primary` | The column of the primary cursor ([if cursorcolumn is enabled][editor-section]) |
293−| `ui.cursorcolumn.secondary` | The columns of any other cursors ([if cursorcolumn is enabled][editor-section]) |
294−| `warning` | Diagnostics warning (gutter) |
295−| `error` | Diagnostics error (gutter) |
296−| `info` | Diagnostics info (gutter) |
297−| `hint` | Diagnostics hint (gutter) |
298−| `diagnostic` | Diagnostics fallback style (editing area) |
299−| `diagnostic.hint` | Diagnostics hint (editing area) |
300−| `diagnostic.info` | Diagnostics info (editing area) |
301−| `diagnostic.warning` | Diagnostics warning (editing area) |
302−| `diagnostic.error` | Diagnostics error (editing area) |
303−
304−You can check compliance to spec with
305−
306−```shell
307−cargo xtask themelint onedark # replace onedark with <name>
308−```
269+ - `completion` - for completion doc popup UI
270+ - `hover` - for hover popup UI
271+
272+
273+| Key | Notes |
274+| --- | --- |
275+| `ui.background` | |
276+| `ui.background.separator` | Picker separator below input line |
277+| `ui.cursor` | |
278+| `ui.cursor.normal` | |
279+| `ui.cursor.insert` | |
280+| `ui.cursor.select` | |
281+| `ui.cursor.match` | Matching bracket etc. |
282+| `ui.cursor.primary` | Cursor with primary selection |
283+| `ui.cursor.primary.normal` | |
284+| `ui.cursor.primary.insert` | |
285+| `ui.cursor.primary.select` | |
286+| `ui.debug.breakpoint` | Breakpoint indicator, found in the gutter |
287+| `ui.debug.active` | Indicator for the line at which debugging execution is paused at, found in the gutter |
288+| `ui.gutter` | Gutter |
289+| `ui.gutter.selected` | Gutter for the line the cursor is on |
290+| `ui.highlight.frameline` | Line at which debugging execution is paused at |
291+| `ui.linenr` | Line numbers |
292+| `ui.linenr.selected` | Line number for the line the cursor is on |
293+| `ui.statusline` | Statusline |
294+| `ui.statusline.inactive` | Statusline (unfocused document) |
295+| `ui.statusline.normal` | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |
296+| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
297+| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
298+| `ui.statusline.separator` | Separator character in statusline |
299+| `ui.bufferline` | Style for the buffer line |
300+| `ui.bufferline.active` | Style for the active buffer in buffer line |
301+| `ui.bufferline.background` | Style for bufferline background |
302+| `ui.popup` | Documentation popups (e.g. Space + k) |
303+| `ui.popup.info` | Prompt for multiple key options |
304+| `ui.window` | Borderlines separating splits |
305+| `ui.help` | Description box for commands |
306+| `ui.text` | Default text style, command prompts, popup text, etc. |
307+| `ui.text.focus` | The currently selected line in the picker |
308+| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
309+| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
310+| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) |
311+| `ui.virtual.whitespace` | Visible whitespace characters |
312+| `ui.virtual.indent-guide` | Vertical indent width guides |
313+| `ui.virtual.inlay-hint` | Default style for inlay hints of all kinds |
314+| `ui.virtual.inlay-hint.parameter` | Style for inlay hints of kind `parameter` (LSPs are not required to set a kind) |
315+| `ui.virtual.inlay-hint.type` | Style for inlay hints of kind `type` (LSPs are not required to set a kind) |
316+| `ui.virtual.wrap` | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section]) |
317+| `ui.menu` | Code and command completion menus |
318+| `ui.menu.selected` | Selected autocomplete item |
319+| `ui.menu.scroll` | `fg` sets thumb color, `bg` sets track color of scrollbar |
320+| `ui.selection` | For selections in the editing area |
321+| `ui.selection.primary` | |
322+| `ui.highlight` | Highlighted lines in the picker preview |
323+| `ui.cursorline.primary` | The line of the primary cursor ([if cursorline is enabled][editor-section]) |
324+| `ui.cursorline.secondary` | The lines of any other cursors ([if cursorline is enabled][editor-section]) |
325+| `ui.cursorcolumn.primary` | The column of the primary cursor ([if cursorcolumn is enabled][editor-section]) |
326+| `ui.cursorcolumn.secondary` | The columns of any other cursors ([if cursorcolumn is enabled][editor-section]) |
327+| `warning` | Diagnostics warning (gutter) |
328+| `error` | Diagnostics error (gutter) |
329+| `info` | Diagnostics info (gutter) |
330+| `hint` | Diagnostics hint (gutter) |
331+| `diagnostic` | Diagnostics fallback style (editing area) |
332+| `diagnostic.hint` | Diagnostics hint (editing area) |
333+| `diagnostic.info` | Diagnostics info (editing area) |
334+| `diagnostic.warning` | Diagnostics warning (editing area) |
335+| `diagnostic.error` | Diagnostics error (editing area) |
309336
310337[editor-section]: ./configuration.md#editor-section
book/src/usage.md+131−93
@@ -1,65 +1,151 @@
1−# Usage
1+# Using Helix
22
3−(Currently not fully documented, see the [keymappings](./keymap.md) list for more.)
3+<!--toc:start-->
4+- [Registers](#registers)
5+ - [User-defined registers](#user-defined-registers)
6+ - [Special registers](#special-registers)
7+- [Surround](#surround)
8+- [Selecting and manipulating text with textobjects](#selecting-and-manipulating-text-with-textobjects)
9+- [Navigating using tree-sitter textobjects](#navigating-using-tree-sitter-textobjects)
10+- [Moving the selection with syntax-aware motions](#moving-the-selection-with-syntax-aware-motions)
11+<!--toc:end-->
412
5−See [tutor](https://github.com/helix-editor/helix/blob/master/runtime/tutor) (accessible via `hx --tutor` or `:tutor`) for a vimtutor-like introduction.
13+For a full interactive introduction to Helix, refer to the
14+[tutor](https://github.com/helix-editor/helix/blob/master/runtime/tutor) which
15+can be accessed via the command `hx --tutor` or `:tutor`.
16+
17+> 💡 Currently, not all functionality is fully documented, please refer to the
18+> [key mappings](./keymap.md) list.
619
720## Registers
821
9−Vim-like registers can be used to yank and store text to be pasted later. Usage is similar, with `"` being used to select a register:
22+In Helix, registers are storage locations for text and other data, such as the
23+result of a search. Registers can be used to cut, copy, and paste text, similar
24+to the clipboard in other text editors. Usage is similar to Vim, with `"` being
25+used to select a register.
26+
27+### User-defined registers
28+
29+Helix allows you to create your own named registers for storing text, for
30+example:
1031
1132- `"ay` - Yank the current selection to register `a`.
1233- `"op` - Paste the text in register `o` after the selection.
1334
14−If there is a selected register before invoking a change or delete command, the selection will be stored in the register and the action will be carried out:
35+If a register is selected before invoking a change or delete command, the selection will be stored in the register and the action will be carried out:
1536
1637- `"hc` - Store the selection in register `h` and then change it (delete and enter insert mode).
1738- `"md` - Store the selection in register `m` and delete it.
1839
19−### Special Registers
40+### Default registers
41+
42+Commands that use registers, like yank (`y`), use a default register if none is specified.
43+These registers are used as defaults:
2044
2145| Register character | Contains |
2246| --- | --- |
2347| `/` | Last search |
2448| `:` | Last executed command |
2549| `"` | Last yanked text |
26−| `_` | Black hole |
50+| `@` | Last recorded macro |
51+
52+### Special registers
2753
28−> There is no special register for copying to system clipboard, instead special commands and keybindings are provided. See the [keymap](keymap.md#space-mode) for the specifics.
29−> The black hole register works as a no-op register, meaning no data will be written to / read from it.
54+Some registers have special behavior when read from and written to.
55+
56+| Register character | When read | When written |
57+| --- | --- | --- |
58+| `_` | No values are returned | All values are discarded |
59+| `#` | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
60+| `.` | Contents of the current selections | This register is not writable |
61+| `%` | Name of the current file | This register is not writable |
62+| `+` | Reads from the system clipboard | Joins and yanks to the system clipboard |
63+| `*` | Reads from the primary clipboard | Joins and yanks to the primary clipboard |
64+
65+When yanking multiple selections to the clipboard registers, the selections
66+are joined with newlines. Pasting from these registers will paste multiple
67+selections if the clipboard was last yanked to by the Helix session. Otherwise
68+the clipboard contents are pasted as one selection.
3069
3170## Surround
3271
33−Functionality similar to [vim-surround](https://github.com/tpope/vim-surround) is built into
34−helix. The keymappings have been inspired from [vim-sandwich](https://github.com/machakann/vim-sandwich):
72+Helix includes built-in functionality similar to [vim-surround](https://github.com/tpope/vim-surround).
73+The keymappings have been inspired from [vim-sandwich](https://github.com/machakann/vim-sandwich):
3574
36−![surround demo](https://user-images.githubusercontent.com/23398472/122865801-97073180-d344-11eb-8142-8f43809982c6.gif)
75+![Surround demo](https://user-images.githubusercontent.com/23398472/122865801-97073180-d344-11eb-8142-8f43809982c6.gif)
3776
38−- `ms` - Add surround characters
39−- `mr` - Replace surround characters
40−- `md` - Delete surround characters
77+| Key Sequence | Action |
78+| --------------------------------- | --------------------------------------- |
79+| `ms<char>` (after selecting text) | Add surround characters to selection |
80+| `mr<char_to_replace><new_char>` | Replace the closest surround characters |
81+| `md<char_to_delete>` | Delete the closest surround characters |
4182
42−`ms` acts on a selection, so select the text first and use `ms<char>`. `mr` and `md` work
43−on the closest pairs found and selections are not required; use counts to act in outer pairs.
83+You can use counts to act on outer pairs.
4484
45−It can also act on multiple selections (yay!). For example, to change every occurrence of `(use)` to `[use]`:
85+Surround can also act on multiple selections. For example, to change every occurrence of `(use)` to `[use]`:
4686
47−- `%` to select the whole file
48−- `s` to split the selections on a search term
49−- Input `use` and hit Enter
50−- `mr([` to replace the parens with square brackets
87+1. `%` to select the whole file
88+2. `s` to split the selections on a search term
89+3. Input `use` and hit Enter
90+4. `mr([` to replace the parentheses with square brackets
5191
52−Multiple characters are currently not supported, but planned.
92+Multiple characters are currently not supported, but planned for future release.
5393
54−## Syntax-tree Motions
94+## Selecting and manipulating text with textobjects
5595
56−`Alt-p`, `Alt-o`, `Alt-i`, and `Alt-n` (or `Alt` and arrow keys) move the primary
57−selection according to the selection's place in the syntax tree. Let's walk
58−through an example to get familiar with them. Many languages have a syntax like
59−so for function calls:
96+In Helix, textobjects are a way to select, manipulate and operate on a piece of
97+text in a structured way. They allow you to refer to blocks of text based on
98+their structure or purpose, such as a word, sentence, paragraph, or even a
99+function or block of code.
60100
61−```
62−func(arg1, arg2, arg3)
101+![Textobject demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)
102+![Textobject tree-sitter demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)
103+
104+- `ma` - Select around the object (`va` in Vim, `<alt-a>` in Kakoune)
105+- `mi` - Select inside the object (`vi` in Vim, `<alt-i>` in Kakoune)
106+
107+| Key after `mi` or `ma` | Textobject selected |
108+| --- | --- |
109+| `w` | Word |
110+| `W` | WORD |
111+| `p` | Paragraph |
112+| `(`, `[`, `'`, etc. | Specified surround pairs |
113+| `m` | The closest surround pair |
114+| `f` | Function |
115+| `t` | Type (or Class) |
116+| `a` | Argument/parameter |
117+| `c` | Comment |
118+| `T` | Test |
119+| `g` | Change |
120+
121+> 💡 `f`, `t`, etc. need a tree-sitter grammar active for the current
122+document and a special tree-sitter query file to work properly. [Only
123+some grammars][lang-support] currently have the query file implemented.
124+Contributions are welcome!
125+
126+## Navigating using tree-sitter textobjects
127+
128+Navigating between functions, classes, parameters, and other elements is
129+possible using tree-sitter and textobject queries. For
130+example to move to the next function use `]f`, to move to previous
131+type use `[t`, and so on.
132+
133+![Tree-sitter-nav-demo][tree-sitter-nav-demo]
134+
135+For the full reference see the [unimpaired][unimpaired-keybinds] section of the key bind
136+documentation.
137+
138+> 💡 This feature relies on tree-sitter textobjects
139+> and requires the corresponding query file to work properly.
140+
141+## Moving the selection with syntax-aware motions
142+
143+`Alt-p`, `Alt-o`, `Alt-i`, and `Alt-n` (or `Alt` and arrow keys) allow you to move the
144+selection according to its location in the syntax tree. For example, many languages have the
145+following syntax for function calls:
146+
147+```js
148+func(arg1, arg2, arg3);
63149```
64150
65151A function call might be parsed by tree-sitter into a tree like the following.
@@ -93,77 +179,29 @@ a more intuitive tree format:
93179 └──────────┘ └──────────┘ └──────────┘
94180```
95181
96−Say we have a selection that wraps `arg1`. The selection is on the `arg1` leaf
97−in the tree above.
182+If you have a selection that wraps `arg1` (see the tree above), and you use
183+`Alt-n`, it will select the next sibling in the syntax tree: `arg2`.
98184
99−```
185+```js
186+// before
100187func([arg1], arg2, arg3)
188+// after
189+func(arg1, [arg2], arg3);
101190```
102191
103−Using `Alt-n` would select the next sibling in the syntax tree: `arg2`.
192+Similarly, `Alt-o` will expand the selection to the parent node, in this case, the
193+arguments node.
104194
105−```
106−func(arg1, [arg2], arg3)
107−```
108−
109−While `Alt-o` would expand the selection to the parent node. In the tree above we
110−can see that we would select the `arguments` node.
111−
112−```
113−func[(arg1, arg2, arg3)]
195+```js
196+func[(arg1, arg2, arg3)];
114197```
115198
116199There is also some nuanced behavior that prevents you from getting stuck on a
117−node with no sibling. If we have a selection on `arg1`, `Alt-p` would bring us
118−to the previous child node. Since `arg1` doesn't have a sibling to its left,
119−though, we climb the syntax tree and then take the previous selection. So
120−`Alt-p` will move the selection over to the "func" `identifier`.
121−
122−```
123−[func](arg1, arg2, arg3)
124−```
125−
126−## Textobjects
127−
128−![textobject-demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)
129−![textobject-treesitter-demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)
130−
131−- `ma` - Select around the object (`va` in Vim, `<alt-a>` in Kakoune)
132−- `mi` - Select inside the object (`vi` in Vim, `<alt-i>` in Kakoune)
133−
134−| Key after `mi` or `ma` | Textobject selected |
135−| --- | --- |
136−| `w` | Word |
137−| `W` | WORD |
138−| `p` | Paragraph |
139−| `(`, `[`, `'`, etc | Specified surround pairs |
140−| `m` | Closest surround pair |
141−| `f` | Function |
142−| `c` | Class |
143−| `a` | Argument/parameter |
144−| `o` | Comment |
145−| `t` | Test |
146−| `g` | Change |
147−
148−> NOTE: `f`, `c`, etc need a tree-sitter grammar active for the current
149−document and a special tree-sitter query file to work properly. [Only
150−some grammars][lang-support] currently have the query file implemented.
151−Contributions are welcome!
152−
153−## Tree-sitter Textobject Based Navigation
154−
155−Navigating between functions, classes, parameters, etc is made
156−possible by leveraging tree-sitter and textobjects queries. For
157−example to move to the next function use `]f`, to move to previous
158−class use `[c`, and so on.
159−
160−![tree-sitter-nav-demo][tree-sitter-nav-demo]
161−
162−See the [unimpaired][unimpaired-keybinds] section of the keybind
163−documentation for the full reference.
164−
165−> NOTE: This feature is dependent on tree-sitter based textobjects
166−and therefore requires the corresponding query file to work properly.
200+node with no sibling. When using `Alt-p` with a selection on `arg1`, the previous
201+child node will be selected. In the event that `arg1` does not have a previous
202+sibling, the selection will move up the syntax tree and select the previous
203+element. As a result, using `Alt-p` with a selection on `arg1` will move the
204+selection to the "func" `identifier`.
167205
168206[lang-support]: ./lang-support.md
169207[unimpaired-keybinds]: ./keymap.md#unimpaired
book/theme/book.jsdeleted−660
@@ -1,660 +0,0 @@
1−"use strict";
2−
3−// Fix back button cache problem
4−window.onunload = function () { };
5−
6−// Global variable, shared between modules
7−function playground_text(playground) {
8− let code_block = playground.querySelector("code");
9−
10− if (window.ace && code_block.classList.contains("editable")) {
11− let editor = window.ace.edit(code_block);
12− return editor.getValue();
13− } else {
14− return code_block.textContent;
15− }
16−}
17−
18−(function codeSnippets() {
19− function fetch_with_timeout(url, options, timeout = 6000) {
20− return Promise.race([
21− fetch(url, options),
22− new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout))
23− ]);
24− }
25−
26− var playgrounds = Array.from(document.querySelectorAll(".playground"));
27− if (playgrounds.length > 0) {
28− fetch_with_timeout("https://play.rust-lang.org/meta/crates", {
29− headers: {
30− 'Content-Type': "application/json",
31− },
32− method: 'POST',
33− mode: 'cors',
34− })
35− .then(response => response.json())
36− .then(response => {
37− // get list of crates available in the rust playground
38− let playground_crates = response.crates.map(item => item["id"]);
39− playgrounds.forEach(block => handle_crate_list_update(block, playground_crates));
40− });
41− }
42−
43− function handle_crate_list_update(playground_block, playground_crates) {
44− // update the play buttons after receiving the response
45− update_play_button(playground_block, playground_crates);
46−
47− // and install on change listener to dynamically update ACE editors
48− if (window.ace) {
49− let code_block = playground_block.querySelector("code");
50− if (code_block.classList.contains("editable")) {
51− let editor = window.ace.edit(code_block);
52− editor.addEventListener("change", function (e) {
53− update_play_button(playground_block, playground_crates);
54− });
55− // add Ctrl-Enter command to execute rust code
56− editor.commands.addCommand({
57− name: "run",
58− bindKey: {
59− win: "Ctrl-Enter",
60− mac: "Ctrl-Enter"
61− },
62− exec: _editor => run_rust_code(playground_block)
63− });
64− }
65− }
66− }
67−
68− // updates the visibility of play button based on `no_run` class and
69− // used crates vs ones available on http://play.rust-lang.org
70− function update_play_button(pre_block, playground_crates) {
71− var play_button = pre_block.querySelector(".play-button");
72−
73− // skip if code is `no_run`
74− if (pre_block.querySelector('code').classList.contains("no_run")) {
75− play_button.classList.add("hidden");
76− return;
77− }
78−
79− // get list of `extern crate`'s from snippet
80− var txt = playground_text(pre_block);
81− var re = /extern\s+crate\s+([a-zA-Z_0-9]+)\s*;/g;
82− var snippet_crates = [];
83− var item;
84− while (item = re.exec(txt)) {
85− snippet_crates.push(item[1]);
86− }
87−
88− // check if all used crates are available on play.rust-lang.org
89− var all_available = snippet_crates.every(function (elem) {
90− return playground_crates.indexOf(elem) > -1;
91− });
92−
93− if (all_available) {
94− play_button.classList.remove("hidden");
95− } else {
96− play_button.classList.add("hidden");
97− }
98− }
99−
100− function run_rust_code(code_block) {
101− var result_block = code_block.querySelector(".result");
102− if (!result_block) {
103− result_block = document.createElement('code');
104− result_block.className = 'result hljs language-bash';
105−
106− code_block.append(result_block);
107− }
108−
109− let text = playground_text(code_block);
110− let classes = code_block.querySelector('code').classList;
111− let has_2018 = classes.contains("edition2018");
112− let edition = has_2018 ? "2018" : "2015";
113−
114− var params = {
115− version: "stable",
116− optimize: "0",
117− code: text,
118− edition: edition
119− };
120−
121− if (text.indexOf("#![feature") !== -1) {
122− params.version = "nightly";
123− }
124−
125− result_block.innerText = "Running...";
126−
127− fetch_with_timeout("https://play.rust-lang.org/evaluate.json", {
128− headers: {
129− 'Content-Type': "application/json",
130− },
131− method: 'POST',
132− mode: 'cors',
133− body: JSON.stringify(params)
134− })
135− .then(response => response.json())
136− .then(response => result_block.innerText = response.result)
137− .catch(error => result_block.innerText = "Playground Communication: " + error.message);
138− }
139−
140− // Syntax highlighting Configuration
141− hljs.configure({
142− tabReplace: ' ', // 4 spaces
143− languages: [], // Languages used for auto-detection
144− });
145−
146− let code_nodes = Array
147− .from(document.querySelectorAll('code'))
148− // Don't highlight `inline code` blocks in headers.
149− .filter(function (node) {return !node.parentElement.classList.contains("header"); });
150−
151− if (window.ace) {
152− // language-rust class needs to be removed for editable
153− // blocks or highlightjs will capture events
154− Array
155− .from(document.querySelectorAll('code.editable'))
156− .forEach(function (block) { block.classList.remove('language-rust'); });
157−
158− Array
159− .from(document.querySelectorAll('code:not(.editable)'))
160− .forEach(function (block) { hljs.highlightBlock(block); });
161− } else {
162− code_nodes.forEach(function (block) { hljs.highlightBlock(block); });
163− }
164−
165− // Adding the hljs class gives code blocks the color css
166− // even if highlighting doesn't apply
167− code_nodes.forEach(function (block) { block.classList.add('hljs'); });
168−
169− Array.from(document.querySelectorAll("code.language-rust")).forEach(function (block) {
170−
171− var lines = Array.from(block.querySelectorAll('.boring'));
172− // If no lines were hidden, return
173− if (!lines.length) { return; }
174− block.classList.add("hide-boring");
175−
176− var buttons = document.createElement('div');
177− buttons.className = 'buttons';
178− buttons.innerHTML = "<button class=\"fa fa-eye\" title=\"Show hidden lines\" aria-label=\"Show hidden lines\"></button>";
179−
180− // add expand button
181− var pre_block = block.parentNode;
182− pre_block.insertBefore(buttons, pre_block.firstChild);
183−
184− pre_block.querySelector('.buttons').addEventListener('click', function (e) {
185− if (e.target.classList.contains('fa-eye')) {
186− e.target.classList.remove('fa-eye');
187− e.target.classList.add('fa-eye-slash');
188− e.target.title = 'Hide lines';
189− e.target.setAttribute('aria-label', e.target.title);
190−
191− block.classList.remove('hide-boring');
192− } else if (e.target.classList.contains('fa-eye-slash')) {
193− e.target.classList.remove('fa-eye-slash');
194− e.target.classList.add('fa-eye');
195− e.target.title = 'Show hidden lines';
196− e.target.setAttribute('aria-label', e.target.title);
197−
198− block.classList.add('hide-boring');
199− }
200− });
201− });
202−
203− if (window.playground_copyable) {
204− Array.from(document.querySelectorAll('pre code')).forEach(function (block) {
205− var pre_block = block.parentNode;
206− if (!pre_block.classList.contains('playground')) {
207− var buttons = pre_block.querySelector(".buttons");
208− if (!buttons) {
209− buttons = document.createElement('div');
210− buttons.className = 'buttons';
211− pre_block.insertBefore(buttons, pre_block.firstChild);
212− }
213−
214− var clipButton = document.createElement('button');
215− clipButton.className = 'fa fa-copy clip-button';
216− clipButton.title = 'Copy to clipboard';
217− clipButton.setAttribute('aria-label', clipButton.title);
218− clipButton.innerHTML = '<i class=\"tooltiptext\"></i>';
219−
220− buttons.insertBefore(clipButton, buttons.firstChild);
221− }
222− });
223− }
224−
225− // Process playground code blocks
226− Array.from(document.querySelectorAll(".playground")).forEach(function (pre_block) {
227− // Add play button
228− var buttons = pre_block.querySelector(".buttons");
229− if (!buttons) {
230− buttons = document.createElement('div');
231− buttons.className = 'buttons';
232− pre_block.insertBefore(buttons, pre_block.firstChild);
233− }
234−
235− var runCodeButton = document.createElement('button');
236− runCodeButton.className = 'fa fa-play play-button';
237− runCodeButton.hidden = true;
238− runCodeButton.title = 'Run this code';
239− runCodeButton.setAttribute('aria-label', runCodeButton.title);
240−
241− buttons.insertBefore(runCodeButton, buttons.firstChild);
242− runCodeButton.addEventListener('click', function (e) {
243− run_rust_code(pre_block);
244− });
245−
246− if (window.playground_copyable) {
247− var copyCodeClipboardButton = document.createElement('button');
248− copyCodeClipboardButton.className = 'fa fa-copy clip-button';
249− copyCodeClipboardButton.innerHTML = '<i class="tooltiptext"></i>';
250− copyCodeClipboardButton.title = 'Copy to clipboard';
251− copyCodeClipboardButton.setAttribute('aria-label', copyCodeClipboardButton.title);
252−
253− buttons.insertBefore(copyCodeClipboardButton, buttons.firstChild);
254− }
255−
256− let code_block = pre_block.querySelector("code");
257− if (window.ace && code_block.classList.contains("editable")) {
258− var undoChangesButton = document.createElement('button');
259− undoChangesButton.className = 'fa fa-history reset-button';
260− undoChangesButton.title = 'Undo changes';
261− undoChangesButton.setAttribute('aria-label', undoChangesButton.title);
262−
263− buttons.insertBefore(undoChangesButton, buttons.firstChild);
264−
265− undoChangesButton.addEventListener('click', function () {
266− let editor = window.ace.edit(code_block);
267− editor.setValue(editor.originalCode);
268− editor.clearSelection();
269− });
270− }
271− });
272−})();
273−
274−(function themes() {
275− var html = document.querySelector('html');
276− var themeToggleButton = document.getElementById('theme-toggle');
277− var themePopup = document.getElementById('theme-list');
278− var themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
279− var stylesheets = {
280− ayuHighlight: document.querySelector("[href$='ayu-highlight.css']"),
281− tomorrowNight: document.querySelector("[href$='tomorrow-night.css']"),
282− highlight: document.querySelector("[href$='highlight.css']"),
283− };
284−
285− function showThemes() {
286− themePopup.style.display = 'block';
287− themeToggleButton.setAttribute('aria-expanded', true);
288− themePopup.querySelector("button#" + get_theme()).focus();
289− }
290−
291− function hideThemes() {
292− themePopup.style.display = 'none';
293− themeToggleButton.setAttribute('aria-expanded', false);
294− themeToggleButton.focus();
295− }
296−
297− function get_theme() {
298− var theme;
299− try { theme = localStorage.getItem('mdbook-theme'); } catch (e) { }
300− if (theme === null || theme === undefined) {
301− return default_theme;
302− } else {
303− return theme;
304− }
305− }
306−
307− function set_theme(theme, store = true) {
308− let ace_theme;
309−
310− if (theme == 'coal' || theme == 'navy') {
311− stylesheets.ayuHighlight.disabled = true;
312− stylesheets.tomorrowNight.disabled = false;
313− stylesheets.highlight.disabled = true;
314−
315− ace_theme = "ace/theme/tomorrow_night";
316− } else if (theme == 'ayu') {
317− stylesheets.ayuHighlight.disabled = false;
318− stylesheets.tomorrowNight.disabled = true;
319− stylesheets.highlight.disabled = true;
320− ace_theme = "ace/theme/tomorrow_night";
321− } else {
322− stylesheets.ayuHighlight.disabled = true;
323− stylesheets.tomorrowNight.disabled = true;
324− stylesheets.highlight.disabled = false;
325− ace_theme = "ace/theme/dawn";
326− }
327−
328− setTimeout(function () {
329− themeColorMetaTag.content = getComputedStyle(document.body).backgroundColor;
330− }, 1);
331−
332− if (window.ace && window.editors) {
333− window.editors.forEach(function (editor) {
334− editor.setTheme(ace_theme);
335− });
336− }
337−
338− var previousTheme = get_theme();
339−
340− if (store) {
341− try { localStorage.setItem('mdbook-theme', theme); } catch (e) { }
342− }
343−
344− html.classList.remove(previousTheme);
345− html.classList.add(theme);
346− }
347−
348− // Set theme
349− var theme = get_theme();
350−
351− set_theme(theme, false);
352−
353− themeToggleButton.addEventListener('click', function () {
354− if (themePopup.style.display === 'block') {
355− hideThemes();
356− } else {
357− showThemes();
358− }
359− });
360−
361− themePopup.addEventListener('click', function (e) {
362− var theme = e.target.id || e.target.parentElement.id;
363− set_theme(theme);
364− });
365−
366− themePopup.addEventListener('focusout', function(e) {
367− // e.relatedTarget is null in Safari and Firefox on macOS (see workaround below)
368− if (!!e.relatedTarget && !themeToggleButton.contains(e.relatedTarget) && !themePopup.contains(e.relatedTarget)) {
369− hideThemes();
370− }
371− });
372−
373− // Should not be needed, but it works around an issue on macOS & iOS: https://github.com/rust-lang/mdBook/issues/628
374− document.addEventListener('click', function(e) {
375− if (themePopup.style.display === 'block' && !themeToggleButton.contains(e.target) && !themePopup.contains(e.target)) {
376− hideThemes();
377− }
378− });
379−
380− document.addEventListener('keydown', function (e) {
381− if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
382− if (!themePopup.contains(e.target)) { return; }
383−
384− switch (e.key) {
385− case 'Escape':
386− e.preventDefault();
387− hideThemes();
388− break;
389− case 'ArrowUp':
390− e.preventDefault();
391− var li = document.activeElement.parentElement;
392− if (li && li.previousElementSibling) {
393− li.previousElementSibling.querySelector('button').focus();
394− }
395− break;
396− case 'ArrowDown':
397− e.preventDefault();
398− var li = document.activeElement.parentElement;
399− if (li && li.nextElementSibling) {
400− li.nextElementSibling.querySelector('button').focus();
401− }
402− break;
403− case 'Home':
404− e.preventDefault();
405− themePopup.querySelector('li:first-child button').focus();
406− break;
407− case 'End':
408− e.preventDefault();
409− themePopup.querySelector('li:last-child button').focus();
410− break;
411− }
412− });
413−})();
414−
415−(function sidebar() {
416− var html = document.querySelector("html");
417− var sidebar = document.getElementById("sidebar");
418− var sidebarLinks = document.querySelectorAll('#sidebar a');
419− var sidebarToggleButton = document.getElementById("sidebar-toggle");
420− var sidebarResizeHandle = document.getElementById("sidebar-resize-handle");
421− var firstContact = null;
422−
423− function showSidebar() {
424− html.classList.remove('sidebar-hidden')
425− html.classList.add('sidebar-visible');
426− Array.from(sidebarLinks).forEach(function (link) {
427− link.setAttribute('tabIndex', 0);
428− });
429− sidebarToggleButton.setAttribute('aria-expanded', true);
430− sidebar.setAttribute('aria-hidden', false);
431− try { localStorage.setItem('mdbook-sidebar', 'visible'); } catch (e) { }
432− }
433−
434−
435− var sidebarAnchorToggles = document.querySelectorAll('#sidebar a.toggle');
436−
437− function toggleSection(ev) {
438− ev.currentTarget.parentElement.classList.toggle('expanded');
439− }
440−
441− Array.from(sidebarAnchorToggles).forEach(function (el) {
442− el.addEventListener('click', toggleSection);
443− });
444−
445− function hideSidebar() {
446− html.classList.remove('sidebar-visible')
447− html.classList.add('sidebar-hidden');
448− Array.from(sidebarLinks).forEach(function (link) {
449− link.setAttribute('tabIndex', -1);
450− });
451− sidebarToggleButton.setAttribute('aria-expanded', false);
452− sidebar.setAttribute('aria-hidden', true);
453− try { localStorage.setItem('mdbook-sidebar', 'hidden'); } catch (e) { }
454− }
455−
456− // Toggle sidebar
457− sidebarToggleButton.addEventListener('click', function sidebarToggle() {
458− if (html.classList.contains("sidebar-hidden")) {
459− var current_width = parseInt(
460− document.documentElement.style.getPropertyValue('--sidebar-width'), 10);
461− if (current_width < 150) {
462− document.documentElement.style.setProperty('--sidebar-width', '150px');
463− }
464− showSidebar();
465− } else if (html.classList.contains("sidebar-visible")) {
466− hideSidebar();
467− } else {
468− if (getComputedStyle(sidebar)['transform'] === 'none') {
469− hideSidebar();
470− } else {
471− showSidebar();
472− }
473− }
474− });
475−
476− sidebarResizeHandle.addEventListener('mousedown', initResize, false);
477−
478− function initResize(e) {
479− window.addEventListener('mousemove', resize, false);
480− window.addEventListener('mouseup', stopResize, false);
481− html.classList.add('sidebar-resizing');
482− }
483− function resize(e) {
484− var pos = (e.clientX - sidebar.offsetLeft);
485− if (pos < 20) {
486− hideSidebar();
487− } else {
488− if (html.classList.contains("sidebar-hidden")) {
489− showSidebar();
490− }
491− pos = Math.min(pos, window.innerWidth - 100);
492− document.documentElement.style.setProperty('--sidebar-width', pos + 'px');
493− }
494− }
495− //on mouseup remove windows functions mousemove & mouseup
496− function stopResize(e) {
497− html.classList.remove('sidebar-resizing');
498− window.removeEventListener('mousemove', resize, false);
499− window.removeEventListener('mouseup', stopResize, false);
500− }
501−
502− document.addEventListener('touchstart', function (e) {
503− firstContact = {
504− x: e.touches[0].clientX,
505− time: Date.now()
506− };
507− }, { passive: true });
508−
509− document.addEventListener('touchmove', function (e) {
510− if (!firstContact)
511− return;
512−
513− var curX = e.touches[0].clientX;
514− var xDiff = curX - firstContact.x,
515− tDiff = Date.now() - firstContact.time;
516−
517− if (tDiff < 250 && Math.abs(xDiff) >= 150) {
518− if (xDiff >= 0 && firstContact.x < Math.min(document.body.clientWidth * 0.25, 300))
519− showSidebar();
520− else if (xDiff < 0 && curX < 300)
521− hideSidebar();
522−
523− firstContact = null;
524− }
525− }, { passive: true });
526−
527− // Scroll sidebar to current active section
528− var activeSection = document.getElementById("sidebar").querySelector(".active");
529− if (activeSection) {
530− // https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView
531− activeSection.scrollIntoView({ block: 'center' });
532− }
533−})();
534−
535−(function chapterNavigation() {
536− document.addEventListener('keydown', function (e) {
537− if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
538− if (window.search && window.search.hasFocus()) { return; }
539−
540− switch (e.key) {
541− case 'ArrowRight':
542− e.preventDefault();
543− var nextButton = document.querySelector('.nav-chapters.next');
544− if (nextButton) {
545− window.location.href = nextButton.href;
546− }
547− break;
548− case 'ArrowLeft':
549− e.preventDefault();
550− var previousButton = document.querySelector('.nav-chapters.previous');
551− if (previousButton) {
552− window.location.href = previousButton.href;
553− }
554− break;
555− }
556− });
557−})();
558−
559−(function clipboard() {
560− var clipButtons = document.querySelectorAll('.clip-button');
561−
562− function hideTooltip(elem) {
563− elem.firstChild.innerText = "";
564− elem.className = 'fa fa-copy clip-button';
565− }
566−
567− function showTooltip(elem, msg) {
568− elem.firstChild.innerText = msg;
569− elem.className = 'fa fa-copy tooltipped';
570− }
571−
572− var clipboardSnippets = new ClipboardJS('.clip-button', {
573− text: function (trigger) {
574− hideTooltip(trigger);
575− let playground = trigger.closest("pre");
576− return playground_text(playground);
577− }
578− });
579−
580− Array.from(clipButtons).forEach(function (clipButton) {
581− clipButton.addEventListener('mouseout', function (e) {
582− hideTooltip(e.currentTarget);
583− });
584− });
585−
586− clipboardSnippets.on('success', function (e) {
587− e.clearSelection();
588− showTooltip(e.trigger, "Copied!");
589− });
590−
591− clipboardSnippets.on('error', function (e) {
592− showTooltip(e.trigger, "Clipboard error!");
593− });
594−})();
595−
596−(function scrollToTop () {
597− var menuTitle = document.querySelector('.menu-title');
598−
599− menuTitle.addEventListener('click', function () {
600− document.scrollingElement.scrollTo({ top: 0, behavior: 'smooth' });
601− });
602−})();
603−
604−(function controlMenu() {
605− var menu = document.getElementById('menu-bar');
606−
607− (function controlPosition() {
608− var scrollTop = document.scrollingElement.scrollTop;
609− var prevScrollTop = scrollTop;
610− var minMenuY = -menu.clientHeight - 50;
611− // When the script loads, the page can be at any scroll (e.g. if you reforesh it).
612− menu.style.top = scrollTop + 'px';
613− // Same as parseInt(menu.style.top.slice(0, -2), but faster
614− var topCache = menu.style.top.slice(0, -2);
615− menu.classList.remove('sticky');
616− var stickyCache = false; // Same as menu.classList.contains('sticky'), but faster
617− document.addEventListener('scroll', function () {
618− scrollTop = Math.max(document.scrollingElement.scrollTop, 0);
619− // `null` means that it doesn't need to be updated
620− var nextSticky = null;
621− var nextTop = null;
622− var scrollDown = scrollTop > prevScrollTop;
623− var menuPosAbsoluteY = topCache - scrollTop;
624− if (scrollDown) {
625− nextSticky = false;
626− if (menuPosAbsoluteY > 0) {
627− nextTop = prevScrollTop;
628− }
629− } else {
630− if (menuPosAbsoluteY > 0) {
631− nextSticky = true;
632− } else if (menuPosAbsoluteY < minMenuY) {
633− nextTop = prevScrollTop + minMenuY;
634− }
635− }
636− if (nextSticky === true && stickyCache === false) {
637− menu.classList.add('sticky');
638− stickyCache = true;
639− } else if (nextSticky === false && stickyCache === true) {
640− menu.classList.remove('sticky');
641− stickyCache = false;
642− }
643− if (nextTop !== null) {
644− menu.style.top = nextTop + 'px';
645− topCache = nextTop;
646− }
647− prevScrollTop = scrollTop;
648− }, { passive: true });
649− })();
650− (function controlBorder() {
651− menu.classList.remove('bordered');
652− document.addEventListener('scroll', function () {
653− if (menu.offsetTop === 0) {
654− menu.classList.remove('bordered');
655− } else {
656− menu.classList.add('bordered');
657− }
658− }, { passive: true });
659− })();
660−})();
book/theme/css/chrome.cssdeleted−499
@@ -1,499 +0,0 @@
1−/* CSS for UI elements (a.k.a. chrome) */
2−
3−@import 'variables.css';
4−
5−::-webkit-scrollbar {
6− background: var(--bg);
7−}
8−::-webkit-scrollbar-thumb {
9− background: var(--scrollbar);
10−}
11−html {
12− scrollbar-color: var(--scrollbar) var(--bg);
13−}
14−#searchresults a,
15−.content a:link,
16−a:visited,
17−a > .hljs {
18− color: var(--links);
19−}
20−.content a:hover {
21− text-decoration: underline;
22−}
23−
24−/* Menu Bar */
25−
26−#menu-bar,
27−#menu-bar-hover-placeholder {
28− z-index: 101;
29− margin: auto calc(0px - var(--page-padding));
30−}
31−#menu-bar {
32− position: relative;
33− display: flex;
34− flex-wrap: wrap;
35− background-color: var(--bg);
36− border-bottom-color: var(--bg);
37− border-bottom-width: 1px;
38− border-bottom-style: solid;
39−}
40−#menu-bar.sticky,
41−.js #menu-bar-hover-placeholder:hover + #menu-bar,
42−.js #menu-bar:hover,
43−.js.sidebar-visible #menu-bar {
44− position: -webkit-sticky;
45− position: sticky;
46− top: 0 !important;
47−}
48−#menu-bar-hover-placeholder {
49− position: sticky;
50− position: -webkit-sticky;
51− top: 0;
52− height: var(--menu-bar-height);
53−}
54−#menu-bar.bordered {
55− border-bottom-color: var(--table-border-color);
56−}
57−#menu-bar i, #menu-bar .icon-button {
58− position: relative;
59− padding: 0 8px;
60− z-index: 10;
61− line-height: var(--menu-bar-height);
62− cursor: pointer;
63− transition: color 0.5s;
64−}
65−@media only screen and (max-width: 420px) {
66− #menu-bar i, #menu-bar .icon-button {
67− padding: 0 5px;
68− }
69−}
70−
71−.icon-button {
72− border: none;
73− background: none;
74− padding: 0;
75− color: inherit;
76−}
77−.icon-button i {
78− margin: 0;
79−}
80−
81−.right-buttons {
82− margin: 0 15px;
83−}
84−.right-buttons a {
85− text-decoration: none;
86−}
87−
88−.left-buttons {
89− display: flex;
90− margin: 0 5px;
91−}
92−.no-js .left-buttons {
93− display: none;
94−}
95−
96−.menu-title {
97− display: inline-block;
98− font-weight: 200;
99− font-size: 2.4rem;
100− line-height: var(--menu-bar-height);
101− text-align: center;
102− margin: 0;
103− flex: 1;
104− white-space: nowrap;
105− overflow: hidden;
106− text-overflow: ellipsis;
107−}
108−.js .menu-title {
109− cursor: pointer;
110−}
111−
112−.menu-bar,
113−.menu-bar:visited,
114−.nav-chapters,
115−.nav-chapters:visited,
116−.mobile-nav-chapters,
117−.mobile-nav-chapters:visited,
118−.menu-bar .icon-button,
119−.menu-bar a i {
120− color: var(--icons);
121−}
122−
123−.menu-bar i:hover,
124−.menu-bar .icon-button:hover,
125−.nav-chapters:hover,
126−.mobile-nav-chapters i:hover {
127− color: var(--icons-hover);
128−}
129−
130−/* Nav Icons */
131−
132−.nav-chapters {
133− font-size: 2.5em;
134− text-align: center;
135− text-decoration: none;
136−
137− position: fixed;
138− top: 0;
139− bottom: 0;
140− margin: 0;
141− max-width: 150px;
142− min-width: 90px;
143−
144− display: flex;
145− justify-content: center;
146− align-content: center;
147− flex-direction: column;
148−
149− transition: color 0.5s, background-color 0.5s;
150−}
151−
152−.nav-chapters:hover {
153− text-decoration: none;
154− background-color: var(--theme-hover);
155− transition: background-color 0.15s, color 0.15s;
156−}
157−
158−.nav-wrapper {
159− margin-top: 50px;
160− display: none;
161−}
162−
163−.mobile-nav-chapters {
164− font-size: 2.5em;
165− text-align: center;
166− text-decoration: none;
167− width: 90px;
168− border-radius: 5px;
169− background-color: var(--sidebar-bg);
170−}
171−
172−.previous {
173− float: left;
174−}
175−
176−.next {
177− float: right;
178− right: var(--page-padding);
179−}
180−
181−@media only screen and (max-width: 1080px) {
182− .nav-wide-wrapper { display: none; }
183− .nav-wrapper { display: block; }
184−}
185−
186−@media only screen and (max-width: 1380px) {
187− .sidebar-visible .nav-wide-wrapper { display: none; }
188− .sidebar-visible .nav-wrapper { display: block; }
189−}
190−
191−/* Inline code */
192−
193−:not(pre) > .hljs {
194− display: inline;
195− padding: 0.1em 0.3em;
196− border-radius: 3px;
197−}
198−
199−:not(pre):not(a):not(td):not(p) > .hljs {
200− color: var(--inline-code-color);
201− overflow-x: initial;
202−}
203−
204−a:hover > .hljs {
205− text-decoration: underline;
206−}
207−
208−pre {
209− position: relative;
210−}
211−pre > .buttons {
212− position: absolute;
213− z-index: 100;
214− right: 5px;
215− top: 5px;
216−
217− color: var(--sidebar-fg);
218− cursor: pointer;
219−}
220−pre > .buttons :hover {
221− color: var(--sidebar-active);
222−}
223−pre > .buttons i {
224− margin-left: 8px;
225−}
226−pre > .buttons button {
227− color: inherit;
228− background: transparent;
229− border: none;
230− cursor: inherit;
231−}
232−pre > .result {
233− margin-top: 10px;
234−}
235−
236−/* Search */
237−
238−#searchresults a {
239− text-decoration: none;
240−}
241−
242−mark {
243− border-radius: 2px;
244− padding: 0 3px 1px 3px;
245− margin: 0 -3px -1px -3px;
246− background-color: var(--search-mark-bg);
247− transition: background-color 300ms linear;
248− cursor: pointer;
249−}
250−
251−mark.fade-out {
252− background-color: rgba(0,0,0,0) !important;
253− cursor: auto;
254−}
255−
256−.searchbar-outer {
257− margin-left: auto;
258− margin-right: auto;
259− max-width: var(--content-max-width);
260−}
261−
262−#searchbar {
263− width: 100%;
264− margin: 5px auto 0px auto;
265− padding: 10px 16px;
266− transition: box-shadow 300ms ease-in-out;
267− border: 1px solid var(--searchbar-border-color);
268− border-radius: 3px;
269− background-color: var(--searchbar-bg);
270− color: var(--searchbar-fg);
271−}
272−#searchbar:focus,
273−#searchbar.active {
274− box-shadow: 0 0 3px var(--searchbar-shadow-color);
275−}
276−
277−.searchresults-header {
278− font-weight: bold;
279− font-size: 1em;
280− padding: 18px 0 0 5px;
281− color: var(--searchresults-header-fg);
282−}
283−
284−.searchresults-outer {
285− margin-left: auto;
286− margin-right: auto;
287− max-width: var(--content-max-width);
288− border-bottom: 1px dashed var(--searchresults-border-color);
289−}
290−
291−ul#searchresults {
292− list-style: none;
293− padding-left: 20px;
294−}
295−ul#searchresults li {
296− margin: 10px 0px;
297− padding: 2px;
298− border-radius: 2px;
299−}
300−ul#searchresults li.focus {
301− background-color: var(--searchresults-li-bg);
302−}
303−ul#searchresults span.teaser {
304− display: block;
305− clear: both;
306− margin: 5px 0 0 20px;
307− font-size: 0.8em;
308−}
309−ul#searchresults span.teaser em {
310− font-weight: bold;
311− font-style: normal;
312−}
313−
314−/* Sidebar */
315−
316−.sidebar {
317− position: fixed;
318− left: 0;
319− top: 0;
320− bottom: 0;
321− width: var(--sidebar-width);
322− font-size: 0.875em;
323− box-sizing: border-box;
324− -webkit-overflow-scrolling: touch;
325− overscroll-behavior-y: contain;
326− background-color: var(--sidebar-bg);
327− color: var(--sidebar-fg);
328−}
329−.sidebar-resizing {
330− -moz-user-select: none;
331− -webkit-user-select: none;
332− -ms-user-select: none;
333− user-select: none;
334−}
335−.js:not(.sidebar-resizing) .sidebar {
336− transition: transform 0.3s; /* Animation: slide away */
337−}
338−.sidebar code {
339− line-height: 2em;
340−}
341−.sidebar .sidebar-scrollbox {
342− overflow-y: auto;
343− position: absolute;
344− top: 0;
345− bottom: 0;
346− left: 0;
347− right: 0;
348−}
349−.sidebar .sidebar-resize-handle {
350− position: absolute;
351− cursor: col-resize;
352− width: 0;
353− right: 0;
354− top: 0;
355− bottom: 0;
356−}
357−.js .sidebar .sidebar-resize-handle {
358− cursor: col-resize;
359− width: 5px;
360−}
361−.sidebar-hidden .sidebar {
362− transform: translateX(calc(0px - var(--sidebar-width)));
363−}
364−.sidebar::-webkit-scrollbar {
365− background: var(--sidebar-bg);
366−}
367−.sidebar::-webkit-scrollbar-thumb {
368− background: var(--scrollbar);
369−}
370−
371−.sidebar-visible .page-wrapper {
372− transform: translateX(var(--sidebar-width));
373−}
374−@media only screen and (min-width: 620px) {
375− .sidebar-visible .page-wrapper {
376− transform: none;
377− margin-left: var(--sidebar-width);
378− }
379−}
380−
381−.chapter {
382− list-style: none outside none;
383− padding-left: 0;
384− margin: .25rem 0;
385−}
386−
387−.chapter ol {
388− width: 100%;
389−}
390−
391−.chapter li {
392− display: flex;
393− color: var(--sidebar-non-existent);
394−}
395−.chapter li a {
396− display: block;
397− text-decoration: none;
398− color: var(--sidebar-fg);
399−}
400−
401−.chapter li a:hover {
402− color: var(--sidebar-active);
403−}
404−
405−.chapter li a.active {
406− color: var(--sidebar-active);
407−}
408−
409−.chapter li > a.toggle {
410− cursor: pointer;
411− display: block;
412− margin-left: auto;
413− padding: 0 10px;
414− user-select: none;
415− opacity: 0.68;
416−}
417−
418−.chapter li > a.toggle div {
419− transition: transform 0.5s;
420−}
421−
422−/* collapse the section */
423−.chapter li:not(.expanded) + li > ol {
424− display: none;
425−}
426−
427−.chapter li.chapter-item {
428− padding: 1rem 1.5rem;
429−}
430−
431−.chapter .section li.chapter-item {
432− padding: .5rem .5rem 0 .5rem;
433−}
434−
435−.chapter li.expanded > a.toggle div {
436− transform: rotate(90deg);
437−}
438−
439−.spacer {
440− width: 100%;
441− height: 3px;
442− margin: 5px 0px;
443−}
444−.chapter .spacer {
445− background-color: var(--sidebar-spacer);
446−}
447−
448−@media (-moz-touch-enabled: 1), (pointer: coarse) {
449− .chapter li a { padding: 5px 0; }
450− .spacer { margin: 10px 0; }
451−}
452−
453−.section {
454− list-style: none outside none;
455− padding-left: 2rem;
456− line-height: 1.9em;
457−}
458−
459−/* Theme Menu Popup */
460−
461−.theme-popup {
462− position: absolute;
463− left: 10px;
464− top: var(--menu-bar-height);
465− z-index: 1000;
466− border-radius: 4px;
467− font-size: 0.7em;
468− color: var(--fg);
469− background: var(--theme-popup-bg);
470− border: 1px solid var(--theme-popup-border);
471− margin: 0;
472− padding: 0;
473− list-style: none;
474− display: none;
475−}
476−.theme-popup .default {
477− color: var(--icons);
478−}
479−.theme-popup .theme {
480− width: 100%;
481− border: 0;
482− margin: 0;
483− padding: 2px 10px;
484− line-height: 25px;
485− white-space: nowrap;
486− text-align: left;
487− cursor: pointer;
488− color: inherit;
489− background: inherit;
490− font-size: inherit;
491−}
492−.theme-popup .theme:hover {
493− background-color: var(--theme-hover);
494−}
495−.theme-popup .theme:hover:first-child,
496−.theme-popup .theme:hover:last-child {
497− border-top-left-radius: inherit;
498− border-top-right-radius: inherit;
499−}
book/theme/css/general.cssdeleted−233
@@ -1,233 +0,0 @@
1−/* Base styles and content styles */
2−
3−@import 'variables.css';
4−
5−:root {
6− /* Browser default font-size is 16px, this way 1 rem = 10px */
7− font-size: 62.5%;
8−}
9−
10−/* TODO: replace with self hosted fonts */
11−
12−html {
13− font-family: "Inter", sans-serif;
14− color: var(--fg);
15− background-color: var(--bg);
16− text-size-adjust: none;
17−}
18−
19−/* @supports (font-variation-settings: normal) { */
20−/* html { font-family: 'Inter var', sans-serif; } */
21−/* } */
22−
23−body {
24− margin: 0;
25− font-size: 1.6rem;
26− overflow-x: hidden;
27−}
28−
29−code {
30− font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace !important;
31− font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */
32−}
33−
34−/* Don't change font size in headers. */
35−h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
36− font-size: unset;
37−}
38−
39−.left { float: left; }
40−.right { float: right; }
41−.boring { opacity: 0.6; }
42−.hide-boring .boring { display: none; }
43−.hidden { display: none !important; }
44−
45−h2, h3 { margin-top: 2.5em; }
46−h4, h5 { margin-top: 2em; }
47−
48−.header + .header h3,
49−.header + .header h4,
50−.header + .header h5 {
51− margin-top: 1em;
52−}
53−
54−h1:target::before,
55−h2:target::before,
56−h3:target::before,
57−h4:target::before,
58−h5:target::before,
59−h6:target::before {
60− display: inline-block;
61− content: "»";
62− margin-left: -30px;
63− width: 30px;
64−}
65−
66−/* This is broken on Safari as of version 14, but is fixed
67− in Safari Technology Preview 117 which I think will be Safari 14.2.
68− https://bugs.webkit.org/show_bug.cgi?id=218076
69−*/
70−:target {
71− scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
72−}
73−
74−.page {
75− outline: 0;
76− padding: 0 var(--page-padding);
77− margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
78−}
79−.page-wrapper {
80− box-sizing: border-box;
81−}
82−.js:not(.sidebar-resizing) .page-wrapper {
83− transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
84−}
85−
86−.content {
87− overflow-y: auto;
88− padding: 0 15px;
89− padding-bottom: 50px;
90−}
91−.content main {
92− margin-left: auto;
93− margin-right: auto;
94− max-width: var(--content-max-width);
95−}
96−
97−
98−/* 2 1.75 1.5 1.25 1 .875 */
99−
100−.content h1 { font-size: 2em }
101−.content h2 { font-size: 1.75em }
102−.content h3 { font-size: 1.5em }
103−.content h4 { font-size: 1.25em }
104−.content h5 { font-size: 1em }
105−.content h6 { font-size: .875em }
106−
107−.content h1, .content h2, .content h3, .content h4 {
108− font-weight: 500;
109− margin-top: 1.275em;
110− margin-bottom: .875em;
111−}
112−.content p, .content ol, .content ul, .content table {
113− margin-top: 0;
114− margin-bottom: .875em;
115−}
116−
117−.content ul li {
118−margin-bottom: .25rem;
119−}
120−.content ul {
121− list-style-type: square;
122−}
123−.content ul ul, .content ol ul {
124− margin-bottom: .5rem;
125−}
126−.content li p {
127− margin-bottom: .5em;
128−}
129−
130−.content p { line-height: 1.45em; }
131−.content ol { line-height: 1.45em; }
132−.content ul { line-height: 1.45em; }
133−.content a { text-decoration: none; }
134−.content a:hover { text-decoration: underline; }
135−.content img { max-width: 100%; }
136−.content .header:link,
137−.content .header:visited {
138− color: var(--fg);
139− color: var(--heading-fg);
140−}
141−.content .header:link,
142−.content .header:visited:hover {
143− text-decoration: none;
144−}
145−
146−table {
147− margin: 0 auto;
148− border-collapse: collapse;
149− width: 100%;
150−}
151−table td {
152− padding: .75rem;
153− width: auto;
154−}
155−table thead {
156− background: var(--table-header-bg);
157−}
158−table thead td {
159− font-weight: 700;
160− border: none;
161−}
162−table thead th {
163− padding: .75rem;
164− text-align: left;
165− font-weight: 500;
166− line-height: 1.5;
167− width: auto;
168−}
169−table thead tr {
170− border-bottom: 2px var(--table-border-color) solid;
171−}
172−table tbody tr {
173− border-bottom: 1px var(--table-border-line) solid;
174−}
175−/* Alternate background colors for rows */
176−table tbody tr:nth-child(2n) {
177− /* background: var(--table-alternate-bg); */
178−}
179−
180−
181−blockquote {
182− margin: 1.5rem 0;
183− padding: 1rem 1.5rem;
184− color: var(--fg);
185− opacity: .9;
186− background-color: var(--quote-bg);
187− border-left: 4px solid var(--quote-border);
188−}
189−blockquote *:last-child {
190− margin-bottom: 0;
191−}
192−
193−
194−:not(.footnote-definition) + .footnote-definition,
195−.footnote-definition + :not(.footnote-definition) {
196− margin-top: 2em;
197−}
198−.footnote-definition {
199− font-size: 0.9em;
200− margin: 0.5em 0;
201−}
202−.footnote-definition p {
203− display: inline;
204−}
205−
206−.tooltiptext {
207− position: absolute;
208− visibility: hidden;
209− color: #fff;
210− background-color: #333;
211− transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */
212− left: -8px; /* Half of the width of the icon */
213− top: -35px;
214− font-size: 0.8em;
215− text-align: center;
216− border-radius: 6px;
217− padding: 5px 8px;
218− margin: 5px;
219− z-index: 1000;
220−}
221−.tooltipped .tooltiptext {
222− visibility: visible;
223−}
224−
225−.chapter li.part-title {
226− color: var(--sidebar-fg);
227− margin: 5px 0px;
228− font-weight: bold;
229−}
230−
231−.result-no-output {
232− font-style: italic;
233−}
book/theme/css/print.cssdeleted−54
@@ -1,54 +0,0 @@
1−
2−#sidebar,
3−#menu-bar,
4−.nav-chapters,
5−.mobile-nav-chapters {
6− display: none;
7−}
8−
9−#page-wrapper.page-wrapper {
10− transform: none;
11− margin-left: 0px;
12− overflow-y: initial;
13−}
14−
15−#content {
16− max-width: none;
17− margin: 0;
18− padding: 0;
19−}
20−
21−.page {
22− overflow-y: initial;
23−}
24−
25−code {
26− background-color: #666666;
27− border-radius: 5px;
28−
29− /* Force background to be printed in Chrome */
30− -webkit-print-color-adjust: exact;
31−}
32−
33−pre > .buttons {
34− z-index: 2;
35−}
36−
37−a, a:visited, a:active, a:hover {
38− color: #4183c4;
39− text-decoration: none;
40−}
41−
42−h1, h2, h3, h4, h5, h6 {
43− page-break-inside: avoid;
44− page-break-after: avoid;
45−}
46−
47−pre, code {
48− page-break-inside: avoid;
49− white-space: pre-wrap;
50−}
51−
52−.fa {
53− display: none !important;
54−}
book/theme/css/variables.cssdeleted−411
@@ -1,411 +0,0 @@
1−
2−/* Globals */
3−
4−:root {
5− --sidebar-width: 300px;
6− --page-padding: 15px;
7− --content-max-width: 750px;
8− --menu-bar-height: 50px;
9−}
10−
11−/* Themes */
12−
13−.ayu {
14− --bg: hsl(210, 25%, 8%);
15− --fg: #c5c5c5;
16−
17− --sidebar-bg: #14191f;
18− --sidebar-fg: #c8c9db;
19− --sidebar-non-existent: #5c6773;
20− --sidebar-active: #ffb454;
21− --sidebar-spacer: #2d334f;
22−
23− --scrollbar: var(--sidebar-fg);
24−
25− --icons: #737480;
26− --icons-hover: #b7b9cc;
27−
28− --links: #0096cf;
29−
30− --inline-code-color: #ffb454;
31−
32− --theme-popup-bg: #14191f;
33− --theme-popup-border: #5c6773;
34− --theme-hover: #191f26;
35−
36− --quote-bg: hsl(226, 15%, 17%);
37− --quote-border: hsl(226, 15%, 22%);
38−
39− --table-border-color: hsl(210, 25%, 13%);
40− --table-header-bg: hsl(210, 25%, 28%);
41− --table-alternate-bg: hsl(210, 25%, 11%);
42−
43− --searchbar-border-color: #848484;
44− --searchbar-bg: #424242;
45− --searchbar-fg: #fff;
46− --searchbar-shadow-color: #d4c89f;
47− --searchresults-header-fg: #666;
48− --searchresults-border-color: #888;
49− --searchresults-li-bg: #252932;
50− --search-mark-bg: #e3b171;
51− --hljs-background: #191f26;
52− --hljs-color: #e6e1cf;
53− --hljs-quote: #5c6773;
54− --hljs-variable: #ff7733;
55− --hljs-type: #ffee99;
56− --hljs-title: #b8cc52;
57− --hljs-symbol: #ffb454;
58− --hljs-selector-tag: #ff7733;
59− --hljs-selector-tag: #36a3d9;
60− --hljs-selector-tag: #00568d;
61− --hljs-selector-tag: #91b362;
62− --hljs-selector-tag: #d96c75;
63−}
64−
65−.coal {
66− --bg: hsl(200, 7%, 8%);
67− --fg: #98a3ad;
68−
69− --sidebar-bg: #292c2f;
70− --sidebar-fg: #a1adb8;
71− --sidebar-non-existent: #505254;
72− --sidebar-active: #3473ad;
73− --sidebar-spacer: #393939;
74−
75− --scrollbar: var(--sidebar-fg);
76−
77− --icons: #43484d;
78− --icons-hover: #b3c0cc;
79−
80− --links: #2b79a2;
81−
82− --inline-code-color: #c5c8c6;
83−
84− --theme-popup-bg: #141617;
85− --theme-popup-border: #43484d;
86− --theme-hover: #1f2124;
87−
88− --quote-bg: hsl(234, 21%, 18%);
89− --quote-border: hsl(234, 21%, 23%);
90−
91− --table-border-color: hsl(200, 7%, 13%);
92− --table-header-bg: hsl(200, 7%, 28%);
93− --table-alternate-bg: hsl(200, 7%, 11%);
94−
95− --searchbar-border-color: #aaa;
96− --searchbar-bg: #b7b7b7;
97− --searchbar-fg: #000;
98− --searchbar-shadow-color: #aaa;
99− --searchresults-header-fg: #666;
100− --searchresults-border-color: #98a3ad;
101− --searchresults-li-bg: #2b2b2f;
102− --search-mark-bg: #355c7d;
103− --hljs-background: #969896;
104− --hljs-color: #cc6666;
105− --hljs-quote: #de935f;
106− --hljs-variable: #f0c674;
107− --hljs-type: #b5bd68;
108− --hljs-title: #8abeb7;
109− --hljs-symbol: #81a2be;
110− --hljs-selector-tag: #b294bb;
111− --hljs-selector-tag: #1d1f21;
112− --hljs-selector-tag: #c5c8c6;
113− --hljs-selector-tag: #718c00;
114− --hljs-selector-tag: #c82829;
115−}
116−
117−.light {
118− --bg: hsl(0, 0%, 100%);
119− --fg: hsl(0, 0%, 0%);
120−
121− --sidebar-bg: #fafafa;
122− --sidebar-fg: hsl(0, 0%, 0%);
123− --sidebar-non-existent: #aaaaaa;
124− --sidebar-active: #1f1fff;
125− --sidebar-spacer: #f4f4f4;
126−
127− --scrollbar: #8F8F8F;
128−
129− --icons: #747474;
130− --icons-hover: #000000;
131−
132− --links: #20609f;
133−
134− --inline-code-color: #301900;
135−
136− --theme-popup-bg: #fafafa;
137− --theme-popup-border: #cccccc;
138− --theme-hover: #e6e6e6;
139−
140− --quote-bg: hsl(197, 37%, 96%);
141− --quote-border: hsl(197, 37%, 91%);
142−
143− --table-border-color: hsl(0, 0%, 95%);
144− --table-header-bg: hsl(0, 0%, 80%);
145− --table-alternate-bg: hsl(0, 0%, 97%);
146−
147− --searchbar-border-color: #aaa;
148− --searchbar-bg: #fafafa;
149− --searchbar-fg: #000;
150− --searchbar-shadow-color: #aaa;
151− --searchresults-header-fg: #666;
152− --searchresults-border-color: #888;
153− --searchresults-li-bg: #e4f2fe;
154− --search-mark-bg: #a2cff5;
155− --hljs-background: #f6f7f6;
156− --hljs-color: #000;
157− --hljs-quote: #575757;
158− --hljs-variable: #d70025;
159− --hljs-type: #b21e00;
160− --hljs-title: #0030f2;
161− --hljs-symbol: #008200;
162− --hljs-selector-tag: #9d00ec;
163−}
164−
165−.navy {
166− --bg: hsl(226, 23%, 11%);
167− --fg: #bcbdd0;
168−
169− --sidebar-bg: #282d3f;
170− --sidebar-fg: #c8c9db;
171− --sidebar-non-existent: #505274;
172− --sidebar-active: #2b79a2;
173− --sidebar-spacer: #2d334f;
174−
175− --scrollbar: var(--sidebar-fg);
176−
177− --icons: #737480;
178− --icons-hover: #b7b9cc;
179−
180− --links: #2b79a2;
181−
182− --inline-code-color: #c5c8c6;
183−
184− --theme-popup-bg: #161923;
185− --theme-popup-border: #737480;
186− --theme-hover: #282e40;
187−
188− --quote-bg: hsl(226, 15%, 17%);
189− --quote-border: hsl(226, 15%, 22%);
190−
191− --table-border-color: hsl(226, 23%, 16%);
192− --table-header-bg: hsl(226, 23%, 31%);
193− --table-alternate-bg: hsl(226, 23%, 14%);
194−
195− --searchbar-border-color: #aaa;
196− --searchbar-bg: #aeaec6;
197− --searchbar-fg: #000;
198− --searchbar-shadow-color: #aaa;
199− --searchresults-header-fg: #5f5f71;
200− --searchresults-border-color: #5c5c68;
201− --searchresults-li-bg: #242430;
202− --search-mark-bg: #a2cff5;
203−
204− --hljs-background: #969896;
205− --hljs-color: #cc6666;
206− --hljs-quote: #de935f;
207− --hljs-variable: #f0c674;
208− --hljs-type: #b5bd68;
209− --hljs-title: #8abeb7;
210− --hljs-symbol: #81a2be;
211− --hljs-selector-tag: #b294bb;
212− --hljs-selector-tag: #1d1f21;
213− --hljs-selector-tag: #c5c8c6;
214− --hljs-selector-tag: #718c00;
215− --hljs-selector-tag: #c82829;
216−}
217−
218−.rust {
219− --bg: hsl(60, 9%, 87%);
220− --fg: #262625;
221−
222− --sidebar-bg: #3b2e2a;
223− --sidebar-fg: #c8c9db;
224− --sidebar-non-existent: #505254;
225− --sidebar-active: #e69f67;
226− --sidebar-spacer: #45373a;
227−
228− --scrollbar: var(--sidebar-fg);
229−
230− --icons: #737480;
231− --icons-hover: #262625;
232−
233− --links: #2b79a2;
234−
235− --inline-code-color: #6e6b5e;
236−
237− --theme-popup-bg: #e1e1db;
238− --theme-popup-border: #b38f6b;
239− --theme-hover: #99908a;
240−
241− --quote-bg: hsl(60, 5%, 75%);
242− --quote-border: hsl(60, 5%, 70%);
243−
244− --table-border-color: hsl(60, 9%, 82%);
245− --table-header-bg: #b3a497;
246− --table-alternate-bg: hsl(60, 9%, 84%);
247−
248− --searchbar-border-color: #aaa;
249− --searchbar-bg: #fafafa;
250− --searchbar-fg: #000;
251− --searchbar-shadow-color: #aaa;
252− --searchresults-header-fg: #666;
253− --searchresults-border-color: #888;
254− --searchresults-li-bg: #dec2a2;
255− --search-mark-bg: #e69f67;
256− --hljs-background: #f6f7f6;
257− --hljs-color: #000;
258− --hljs-quote: #575757;
259− --hljs-variable: #d70025;
260− --hljs-type: #b21e00;
261− --hljs-title: #0030f2;
262− --hljs-symbol: #008200;
263− --hljs-selector-tag: #9d00ec;
264−}
265−
266−@media (prefers-color-scheme: dark) {
267− .light.no-js {
268− --bg: hsl(200, 7%, 8%);
269− --fg: #98a3ad;
270−
271− --sidebar-bg: #292c2f;
272− --sidebar-fg: #a1adb8;
273− --sidebar-non-existent: #505254;
274− --sidebar-active: #3473ad;
275− --sidebar-spacer: #393939;
276−
277− --scrollbar: var(--sidebar-fg);
278−
279− --icons: #43484d;
280− --icons-hover: #b3c0cc;
281−
282− --links: #2b79a2;
283−
284− --inline-code-color: #c5c8c6;
285−
286− --theme-popup-bg: #141617;
287− --theme-popup-border: #43484d;
288− --theme-hover: #1f2124;
289−
290− --quote-bg: hsl(234, 21%, 18%);
291− --quote-border: hsl(234, 21%, 23%);
292−
293− --table-border-color: hsl(200, 7%, 13%);
294− --table-header-bg: hsl(200, 7%, 28%);
295− --table-alternate-bg: hsl(200, 7%, 11%);
296−
297− --searchbar-border-color: #aaa;
298− --searchbar-bg: #b7b7b7;
299− --searchbar-fg: #000;
300− --searchbar-shadow-color: #aaa;
301− --searchresults-header-fg: #666;
302− --searchresults-border-color: #98a3ad;
303− --searchresults-li-bg: #2b2b2f;
304− --search-mark-bg: #355c7d;
305− }
306−}
307−
308−.colibri {
309− --bg: #3b224c;
310− --fg: #bcbdd0;
311− --heading-fg: #fff;
312−
313− --sidebar-bg: #281733;
314− --sidebar-fg: #c8c9db;
315− --sidebar-non-existent: #505274;
316− --sidebar-active: #a4a0e8;
317− --sidebar-spacer: #2d334f;
318−
319− --scrollbar: var(--sidebar-fg);
320−
321− --icons: #737480;
322− --icons-hover: #b7b9cc;
323−
324− /* --links: #a4a0e8; */
325− --links: #ECCDBA;
326−
327− --inline-code-color: hsl(48.7, 7.8%, 70%);
328−
329− --theme-popup-bg: #161923;
330− --theme-popup-border: #737480;
331− --theme-hover: rgba(0,0,0, .2);
332−
333− --quote-bg: #281733;
334− --quote-border: hsl(226, 15%, 22%);
335−
336− --table-border-color: hsl(226, 23%, 76%);
337− --table-header-bg: hsla(226, 23%, 31%, 0);
338− --table-alternate-bg: hsl(226, 23%, 14%);
339− --table-border-line: hsla(201deg, 20%, 92%, 0.2);
340−
341− --searchbar-border-color: #aaa;
342− --searchbar-bg: #aeaec6;
343− --searchbar-fg: #000;
344− --searchbar-shadow-color: #aaa;
345− --searchresults-header-fg: #5f5f71;
346− --searchresults-border-color: #5c5c68;
347− --searchresults-li-bg: #242430;
348− --search-mark-bg: #acff5;
349− --hljs-background: #2f1e2e;
350− --hljs-color: #a39e9b;
351− --hljs-quote: #8d8687;
352− --hljs-variable: #ef6155;
353− --hljs-type: #f99b15;
354− --hljs-title: #fec418;
355− --hljs-symbol: #48b685;
356− --hljs-selector-tag: #815ba4;
357−}
358−
359−.colibri {
360−/*
361− --bg: #ffffff;
362− --fg: #452859;
363− --fg: #5a5977;
364− --heading-fg: #281733;
365−
366− --sidebar-bg: #281733;
367− --sidebar-fg: #c8c9db;
368− --sidebar-non-existent: #505274;
369− --sidebar-active: #a4a0e8;
370− --sidebar-spacer: #2d334f;
371−
372− --scrollbar: var(--sidebar-fg);
373−
374− --icons: #737480;
375− --icons-hover: #b7b9cc;
376−
377− --links: #6F44F0;
378−
379− --inline-code-color: #a39e9b;
380−
381− --theme-popup-bg: #161923;
382− --theme-popup-border: #737480;
383− --theme-hover: rgba(0,0,0, .2);
384−
385− --quote-bg: rgba(0, 0, 0, 0);
386− --quote-border: hsl(226, 15%, 75%);
387−
388− --table-border-color: #5a5977;
389− --table-border-color: hsl(201deg 10% 67%);
390− --table-header-bg: hsl(0, 0%, 100%);
391− --table-alternate-bg: hsl(0, 0%, 97%);
392− --table-border-line: hsl(201deg, 20%, 92%);
393−
394− --searchbar-border-color: #aaa;
395− --searchbar-bg: #aeaec6;
396− --searchbar-fg: #000;
397− --searchbar-shadow-color: #aaa;
398− --searchresults-header-fg: #5f5f71;
399− --searchresults-border-color: #5c5c68;
400− --searchresults-li-bg: #242430;
401− --search-mark-bg: #a2cff5;
402− --hljs-background: #TODO;
403− --hljs-color: #TODO;
404− --hljs-quote: #TODO;
405− --hljs-variable: #TODO;
406− --hljs-type: #TODO;
407− --hljs-title: #TODO;
408− --hljs-symbol: #TODO;
409− --hljs-selector-tag: #TODO;
410−*/
411−}
book/theme/highlight.cssdeleted−56
@@ -1,56 +0,0 @@
1−pre code.hljs {
2− display:block;
3− overflow-x:auto;
4− padding:1em
5−}
6−code.hljs {
7− padding:3px 5px
8−}
9−.hljs {
10− background: var(--hljs-background);
11− color: var(--hljs-color);
12−}
13−.hljs-comment,
14−.hljs-quote {
15− color: var(--hljs-quote)
16−}
17−.hljs-link,
18−.hljs-meta,
19−.hljs-name,
20−.hljs-regexp,
21−.hljs-selector-class,
22−.hljs-selector-id,
23−.hljs-tag,
24−.hljs-template-variable,
25−.hljs-variable {
26− color: var(--hljs-variable)
27−}
28−.hljs-built_in,
29−.hljs-deletion,
30−.hljs-literal,
31−.hljs-number,
32−.hljs-params,
33−.hljs-type {
34− color: var(--hljs-type)
35−}
36−.hljs-attribute,
37−.hljs-section,
38−.hljs-title {
39− color: var(--hljs-title)
40−}
41−.hljs-addition,
42−.hljs-bullet,
43−.hljs-string,
44−.hljs-symbol {
45− color: var(--hljs-symbol)
46−}
47−.hljs-keyword,
48−.hljs-selector-tag {
49− color: var(--hljs-selector-tag)
50−}
51−.hljs-emphasis {
52− font-style:italic
53−}
54−.hljs-strong {
55− font-weight:700
56−}
book/theme/highlight.jsdeleted−6
@@ -1,6 +0,0 @@
1−/*
2− Highlight.js 10.1.1 (93fd0d73)
3− License: BSD-3-Clause
4− Copyright (c) 2006-2020, Ivan Sagalaev
5−*/
6−var hljs=function(){"use strict";function e(n){Object.freeze(n);var t="function"==typeof n;return Object.getOwnPropertyNames(n).forEach((function(r){!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r])})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}ignoreMatch(){this.ignore=!0}}function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function d(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var g=l();if(s+=t(r.substring(i,g[0].offset)),i=g[0].offset,g===e){o.reverse().forEach(u);do{d(g.splice(0,1)[0]),g=l()}while(g===e&&g.length&&g[0].offset===i);o.reverse().forEach(c)}else"start"===g[0].event?o.push(g[0].node):o.pop(),d(g.splice(0,1)[0])}return s+t(r.substr(i))}});const s="</span>",o=e=>!!e.kind;class l{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!o(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){o(e)&&(this.buffer+=s)}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class c{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{c._collapse(e)}))}}class u extends c{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new l(this,this.options).value()}finalize(){return!0}}function d(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",h={begin:"\\\\[\\s\\S]",relevance:0},f={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[h]},p={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[h]},b={begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},m=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(b),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},v=m("//","$"),x=m("/\\*","\\*/"),E=m("#","$");var _=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>d(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:h,APOS_STRING_MODE:f,QUOTE_STRING_MODE:p,PHRASAL_WORDS_MODE:b,COMMENT:m,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:x,HASH_COMMENT_MODE:E,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[h,{begin:/\[/,end:/\]/,relevance:0,contains:[h]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),N="of and for in not or if then".split(" ");function w(e,n){return n?+n:function(e){return N.includes(e.toLowerCase())}(e)?0:1}const R=t,y=r,{nodeStream:k,mergeStreams:O}=i,M=Symbol("nomatch");return function(t){var a=[],i={},s={},o=[],l=!0,c=/(^(<[^>]+>|\t|)+|\n)/gm,g="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:u};function p(e){return f.noHighlightRe.test(e)}function b(e,n,t,r){var a={code:n,language:e};S("before:highlight",a);var i=a.result?a.result:m(a.language,a.code,t,r);return i.code=a.code,S("after:highlight",i),i}function m(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function u(){null!=y.subLanguage?function(){if(""!==A){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void O.addText(A);e=m(y.subLanguage,A,!0,k[y.subLanguage]),k[y.subLanguage]=e.top}else e=v(A,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(I+=e.relevance),O.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void O.addText(A);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(A),t="";for(;n;){t+=A.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;O.addText(t),t="",I+=a,O.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(A)}t+=A.substr(e),O.addText(t)}(),A=""}function h(e){return e.className&&O.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(A+=e[0],1):(L=!0,0)}var b={};function x(t,r){var i=r&&r[0];if(A+=t,null==i)return u(),0;if("begin"===b.type&&"end"===r.type&&b.index===r.index&&""===i){if(A+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=b.rule,n}return 1}if(b=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?A+=t:(r.excludeBegin&&(A+=t),u(),r.returnBegin||r.excludeBegin||(A=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return M;var i=y;i.skip?A+=t:(i.returnEnd||i.excludeEnd||(A+=t),u(),i.excludeEnd&&(A=t));do{y.className&&O.closeNode(),y.skip||y.subLanguage||(I+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==M)return s}if("illegal"===r.type&&""===i)return 1;if(B>1e5&&B>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return A+=i,i.length}var E=T(e);if(!E)throw console.error(g.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=d(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(+l[1]+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;const t=n.exec(e);return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&(this.regexIndex=0)),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language. See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,w(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=d(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),N="",y=s||_,k={},O=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>O.openNode(e))}();var A="",I=0,S=0,B=0,L=!1;try{for(y.matcher.considerAll();;){B++,L?L=!1:(y.matcher.lastIndex=S,y.matcher.considerAll());const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(S,e.index),e);S=e.index+n}return x(o.substr(S)),O.closeAllNodes(),O.finalize(),N=O.toHTML(),{relevance:I,value:N,language:e,illegal:!1,emitter:O,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(S-100,S+100),mode:n.mode},sofar:N,relevance:0,value:R(o),emitter:O};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:O,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(T).filter(I).forEach((function(n){var a=m(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(c,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function E(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=T(t[1]);return r||(console.warn(g.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||T(e))}(e);if(p(t))return;S("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"):n=e;const r=n.textContent,a=t?b(t,r,!0):v(r),i=k(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=O(i,k(e),r)}a.value=x(a.value),S("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const N=()=>{if(!N.called){N.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,E)}};function T(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function A(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function I(e){var n=T(e);return n&&!n.disableAutodetect}function S(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:b,highlightAuto:v,fixMarkup:x,highlightBlock:E,configure:function(e){f=y(f,e)},initHighlighting:N,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",N,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&A(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:T,registerAliases:A,requireLanguage:function(e){var n=T(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:I,inherit:y,addPlugin:function(e){o.push(e)}}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.1.1";for(const n in _)"object"==typeof _[n]&&e(_[n]);return Object.assign(t,_),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);hljs.registerLanguage("php",function(){"use strict";return function(e){var r={begin:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},t={className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:'b"',end:'"'},{begin:"b'",end:"'"},e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i={keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield",literal:"false null true",built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass"};return{aliases:["php","php3","php4","php5","php6","php7"],case_insensitive:!0,keywords:i,contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t]}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0,keywords:"__halt_compiler"}),{className:"string",begin:/<<<['"]?\w+['"]?$/,end:/^\w+;?$/,contains:[e.BACKSLASH_ESCAPE,{className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]}]},t,{className:"keyword",begin:/\$this\b/},r,{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:i,contains:["self",r,e.C_BLOCK_COMMENT_MODE,a,n]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";",contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},a,n]}}}());hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{$pattern:"[a-z/_]+",literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n]},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^",end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number",begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}],illegal:"[^\\s\\}]"}}}());hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i=e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},t=e.inherit(s,{illegal:/\n/}),l={className:"subst",begin:"{",end:"}",keywords:n},r=e.inherit(l,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,r]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]},g=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]});l.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],r.contains=[g,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var d={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},i]},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"],keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0,contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{begin:"\x3c!--|--\x3e"},{begin:"</?",end:">"}]}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},d,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta",begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{className:"meta-string",begin:/"/,end:/"/}]},{beginKeywords:"new return throw await else",relevance:0},{className:"function",begin:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{begin:e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[d,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}}());hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst",begin:/\\\(/,end:"\\)",keywords:i,contains:[]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/,end:/"/}]},r={className:"number",begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return t.contains=[r],{name:"Swift",keywords:i,contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},r,{className:"function",beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin:/</,end:/>/},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:i,contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}],illegal:/\[|%/},{className:"class",beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta",begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b"},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("makefile",function(){"use strict";return function(e){var i={className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},a={className:"variable",begin:/\$\([\w-]+\s/,end:/\)/,keywords:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},contains:[i]},r={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},s={className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{name:"Makefile",aliases:["mk","mak"],keywords:{$pattern:/[\w-]+/,keyword:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath"},contains:[e.HASH_COMMENT_MODE,i,n,a,r,{className:"meta",begin:/^\.PHONY:/,end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},s]}}}());hljs.registerLanguage("css",function(){"use strict";return function(e){var n={begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";",endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":",excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{begin:/[\w-]+\(/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/},{begin:/\(/,end:/\)/,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}]}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/,contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",illegal:/:/,returnBegin:!0,contains:[{className:"keyword",begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/,className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\\(",end:"\\)"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$\(\(/,end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());hljs.registerLanguage("c-like",function(){"use strict";return function(e){function t(e){return"(?:"+e+")?"}var n="(decltype\\(auto\\)|"+t("[a-zA-Z_]\\w*::")+"[a-zA-Z_]\\w*"+t("<.*?>")+")",r={className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},a={className:"string",variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",end:"'",illegal:"."},e.END_SAME_AS_BEGIN({begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},i={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(a,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},o={className:"title",begin:t("[a-zA-Z_]\\w*::")+e.IDENT_RE,relevance:0},c=t("[a-zA-Z_]\\w*::")+e.IDENT_RE+"\\s*\\(",l={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},d=[r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,a],_={variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],keywords:l,contains:d.concat([{begin:/\(/,end:/\)/,keywords:l,contains:d.concat(["self"]),relevance:0}]),relevance:0},u={className:"function",begin:"("+n+"[\\*&\\s]+)+"+c,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:l,illegal:/[^\w\s\*&:<>]/,contains:[{begin:"decltype\\(auto\\)",keywords:l,relevance:0},{begin:c,returnBegin:!0,contains:[o],relevance:0},{className:"params",begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:["self",e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r]}]},r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:l,disableAutodetect:!0,illegal:"</",contains:[].concat(_,u,d,[s,{begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",end:">",keywords:l,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:l},{className:"class",beginKeywords:"class struct",end:/[{;:]/,contains:[{begin:/</,end:/>/,contains:["self"]},e.TITLE_MODE]}]),exports:{preprocessor:s,strings:a,keywords:l}}}}());hljs.registerLanguage("coffeescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((e=>n=>!e.includes(n))(["var","const","let","function","static"])).join(" "),literal:n.concat(["yes","no","on","off"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},i="[A-Za-z$_][0-9A-Za-z$_]*",s={className:"subst",begin:/#\{/,end:/}/,keywords:t},o=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,s]},{begin:/"/,end:/"/,contains:[r.BACKSLASH_ESCAPE,s]}]},{className:"regexp",variants:[{begin:"///",end:"///",contains:[s,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)",relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+i},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{begin:"```",end:"```"},{begin:"`",end:"`"}]}];s.contains=o;var c=r.inherit(r.TITLE_MODE,{begin:i}),l={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:t,contains:["self"].concat(o)}]};return{name:"CoffeeScript",aliases:["coffee","cson","iced"],keywords:t,illegal:/\/\*/,contains:o.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{className:"function",begin:"^\\s*"+i+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[c,l]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[l]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[c]},c]},{begin:i+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(",end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());hljs.registerLanguage("d",function(){"use strict";return function(e){var a={$pattern:e.UNDERSCORE_IDENT_RE,keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={className:"number",begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",begin:"#(line)",end:"$",relevance:5},{className:"keyword",begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}}());hljs.registerLanguage("properties",function(){"use strict";return function(e){var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",s={end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+"+t,returnBegin:!0,contains:[{className:"attr",begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",endsParent:!0,relevance:0}],starts:s},{begin:a+t,returnBegin:!0,relevance:0,contains:[{className:"meta",begin:a,endsParent:!0,relevance:0}],starts:s},{className:"attr",relevance:0,begin:a+n+"$"}]}}}());hljs.registerLanguage("http",function(){"use strict";return function(e){var n="HTTP/[0-9\\.]+";return{name:"HTTP",aliases:["https"],illegal:"\\S",contains:[{begin:"^"+n,end:"$",contains:[{className:"number",begin:"\\b\\d{3}\\b"}]},{begin:"^[A-Z]+ (.*?) "+n+"$",returnBegin:!0,end:"$",contains:[{className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{begin:n},{className:"keyword",begin:"[A-Z]+"}]},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,illegal:"\\n|\\s|=",starts:{end:"$",relevance:0}},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}]}}}());hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",end:"\\)",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());hljs.registerLanguage("handlebars",function(){"use strict";function e(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}}());hljs.registerLanguage("rust",function(){"use strict";return function(e){var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?",keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:t},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),e.inherit(e.QUOTE_STRING_MODE,{begin:/b?"/,illegal:null}),{className:"string",variants:[{begin:/r(#*)"(.|\n)*?"\1(?!#)/},{begin:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{className:"symbol",begin:/'[a-zA-Z_][a-zA-Z0-9_]*/},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+n}],relevance:0},{className:"function",beginKeywords:"fn",end:"(\\(|<)",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"#\\!?\\[",end:"\\]",contains:[{className:"meta-string",begin:/"/,end:/"/}]},{className:"class",beginKeywords:"type",end:";",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"\\S"},{className:"class",beginKeywords:"trait enum struct union",end:"{",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"[\\w\\d]"},{begin:e.IDENT_RE+"::",keywords:{built_in:t}},{begin:"->"}]}}}());hljs.registerLanguage("cpp",function(){"use strict";return function(e){var t=e.getLanguage("c-like").rawDefinition();return t.disableAutodetect=!1,t.name="C++",t.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],t}}());hljs.registerLanguage("ini",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(...n){return n.map(n=>e(n)).join("")}return function(a){var s={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}]},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"],relevance:0},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map(n=>e(n)).join("|")+")";return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}());hljs.registerLanguage("objectivec",function(){"use strict";return function(e){var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,keyword:"@interface @class @protocol @implementation"};return{name:"Objective-C",aliases:["mm","objc","obj-c"],keywords:{$pattern:n,keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},illegal:"</",contains:[{className:"built_in",begin:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",variants:[{begin:'@"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]}]},{className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)",excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}());hljs.registerLanguage("apache",function(){"use strict";return function(e){var n={className:"number",begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"</?",end:">",contains:[n,{className:"number",begin:":\\d{1,5}"},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute",begin:/\w+/,relevance:0,keywords:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"},contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable",begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number",begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]}}],illegal:/\S/}}}());hljs.registerLanguage("java",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(e){return a("(",e,")?")}function a(...n){return n.map(n=>e(n)).join("")}function s(...n){return"("+n.map(n=>e(n)).join("|")+")"}return function(e){var t="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",i={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/\(/,end:/\)/,contains:["self"]}]},r=e=>a("[",e,"]+([",e,"_]*[",e,"]+)?"),c={className:"number",variants:[{begin:`\\b(0[bB]${r("01")})[lL]?`},{begin:`\\b(0${r("0-7")})[dDfFlL]?`},{begin:a(/\b0[xX]/,s(a(r("a-fA-F0-9"),/\./,r("a-fA-F0-9")),a(r("a-fA-F0-9"),/\.?/),a(/\./,r("a-fA-F0-9"))),/([pP][+-]?(\d+))?/,/[fFdDlL]?/)},{begin:a(/\b/,s(a(/\d*\./,r("\\d")),r("\\d")),/[eE][+-]?[\d]+[dDfF]?/)},{begin:a(/\b/,r(/\d/),n(/\.?/),n(r(/\d/)),/[dDfFlL]?/)}],relevance:0};return{name:"Java",aliases:["jsp"],keywords:t,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"function",begin:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:t,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:t,relevance:0,contains:[i,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},c,i]}}}());hljs.registerLanguage("x86asm",function(){"use strict";return function(s){return{name:"Intel x86 Assembly",case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0 xmm1 xmm2 xmm3 xmm4 xmm5 xmm6 xmm7 xmm8 xmm9 xmm10 xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0 ymm1 ymm2 ymm3 ymm4 ymm5 ymm6 ymm7 ymm8 ymm9 ymm10 ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0 zmm1 zmm2 zmm3 zmm4 zmm5 zmm6 zmm7 zmm8 zmm9 zmm10 zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__ __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__ __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},contains:[s.COMMENT(";","$",{relevance:0}),{className:"number",variants:[{begin:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{begin:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{begin:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{begin:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QUOTE_STRING_MODE,{className:"string",variants:[{begin:"'",end:"[^\\\\]'"},{begin:"`",end:"[^\\\\]`"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{begin:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{className:"subst",begin:"%[0-9]+",relevance:0},{className:"subst",begin:"%!S+",relevance:0},{className:"meta",begin:/^\s*\.[\w_-]+/}]}}}());hljs.registerLanguage("kotlin",function(){"use strict";return function(e){var n={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string",variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'",illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta",begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,end:/\)/,contains:[e.inherit(t,{className:"meta-string"})]}]},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,contains:[]}]},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,c,{className:"keyword",begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$",returnBegin:!0,excludeEnd:!0,keywords:n,illegal:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/,endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class",beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0,illegal:"extends implements",contains:[{beginKeywords:"public protected internal private constructor"},e.UNDERSCORE_TITLE_MODE,{className:"type",begin:/</,end:/>/,excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/,excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env",end:"$",illegal:"\n"},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0}]}}}());hljs.registerLanguage("armasm",function(){"use strict";return function(s){const e={variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0}),s.COMMENT("[;@]","$",{relevance:0}),s.C_LINE_COMMENT_MODE,s.C_BLOCK_COMMENT_MODE]};return{name:"ARM Assembly",case_insensitive:!0,aliases:["arm"],keywords:{$pattern:"\\.?"+s.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},contains:[{className:"keyword",begin:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?(?=\\s)"},e,s.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"[#$=]?0x[0-9a-f]+"},{begin:"[#$=]?0b[01]+"},{begin:"[#$=]\\d+"},{begin:"\\b\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{begin:"[=#]\\w+"}],relevance:0}]}}}());hljs.registerLanguage("go",function(){"use strict";return function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{name:"Go",aliases:["golang"],keywords:n,illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",variants:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{begin:"`",end:"`"}]},{className:"number",variants:[{begin:e.C_NUMBER_RE+"[i]",relevance:1},e.C_NUMBER_MODE]},{begin:/:=/},{className:"function",beginKeywords:"func",end:"\\s*(\\{|$)",excludeEnd:!0,contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,illegal:/["']/}]}]}}}());hljs.registerLanguage("diff",function(){"use strict";return function(e){return{name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!",end:"$"}]}}}());hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());hljs.registerLanguage("scala",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:"\\${",end:"}"}]},a={className:"string",variants:[{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:'"""',end:'"""',relevance:10},{begin:'[a-z]+"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n]},{className:"string",begin:'[a-z]+"""',end:'"""',contains:[n],relevance:10}]},s={className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},t={className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},i={className:"class",beginKeywords:"class object trait type",end:/[:={\[\n;]/,excludeEnd:!0,contains:[{beginKeywords:"extends with",relevance:10},{begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},t]},l={className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[t]};return{name:"Scala",keywords:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"symbol",begin:"'\\w[\\w\\d_]*(?!')"},s,l,i,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());hljs.registerLanguage("julia",function(){"use strict";return function(e){var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},a={keywords:t,illegal:/<\//},n={className:"subst",begin:/\$\(/,end:/\)/,keywords:t},o={className:"variable",begin:"\\$"+r},i={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],variants:[{begin:/\w*"""/,end:/"""\w*/,relevance:10},{begin:/\w*"/,end:/"\w*/}]},l={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],begin:"`",end:"`"},s={className:"meta",begin:"@"+r};return a.name="Julia",a.contains=[{className:"number",begin:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,s,{className:"comment",variants:[{begin:"#=",end:"=#",relevance:10},{begin:"#",end:"$"}]},e.HASH_COMMENT_MODE,{className:"keyword",begin:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{begin:/<:/}],n.contains=a.contains,a}}());hljs.registerLanguage("php-template",function(){"use strict";return function(n){return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0})]}]}}}());hljs.registerLanguage("scss",function(){"use strict";return function(e){var t={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={className:"number",begin:"#[0-9A-Fa-f]+"};return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0,illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{className:"selector-tag",begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{className:"selector-pseudo",begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{className:"selector-pseudo",begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},t,{className:"attribute",begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",illegal:"[^\\s]"},{begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{begin:":",end:";",contains:[t,i,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0,keywords:"and or not only",contains:[{begin:"@[a-z-]+",className:"keyword"},t,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,i,e.CSS_NUMBER_MODE]}]}}}());hljs.registerLanguage("r",function(){"use strict";return function(e){var n="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{name:"R",contains:[e.HASH_COMMENT_MODE,{begin:n,keywords:{$pattern:n,keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{className:"number",begin:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{className:"number",begin:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{className:"number",begin:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{className:"number",begin:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{className:"number",begin:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{begin:"`",end:"`",relevance:0},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]}]}}}());hljs.registerLanguage("sql",function(){"use strict";return function(e){var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0,illegal:/[<>{}*]/,contains:[{beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/,keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:"`",end:"`"},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}());hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.getLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());hljs.registerLanguage("python-repl",function(){"use strict";return function(n){return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]}}}());hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());hljs.registerLanguage("javascript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);function s(e){return r("(?=",e,")")}function r(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(t){var i="[A-Za-z$_][0-9A-Za-z$_]*",c={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/},o={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.join(" "),literal:n.join(" "),built_in:a.join(" ")},l={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:t.C_NUMBER_RE+"n?"}],relevance:0},E={className:"subst",begin:"\\$\\{",end:"\\}",keywords:o,contains:[]},d={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},g={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"css"}},u={className:"string",begin:"`",end:"`",contains:[t.BACKSLASH_ESCAPE,E]};E.contains=[t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,l,t.REGEXP_MODE];var b=E.contains.concat([{begin:/\(/,end:/\)/,contains:["self"].concat(E.contains,[t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE])},t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE]),_={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:b};return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:o,contains:[t.SHEBANG({binary:"node",relevance:5}),{className:"meta",relevance:10,begin:/^\s*['"]use (strict|asm)['"]/},t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,t.C_LINE_COMMENT_MODE,t.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",end:"\\}",relevance:0},{className:"variable",begin:i+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]}),t.C_BLOCK_COMMENT_MODE,l,{begin:r(/[{,\n]\s*/,s(r(/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,i+"\\s*:"))),relevance:0,contains:[{className:"attr",begin:i+s("\\s*:"),relevance:0}]},{begin:"("+t.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[t.C_LINE_COMMENT_MODE,t.C_BLOCK_COMMENT_MODE,t.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+t.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:t.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:o,contains:b}]}]},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{begin:"<>",end:"</>"},{begin:c.begin,end:c.end}],subLanguage:"xml",contains:[{begin:c.begin,end:c.end,skip:!0,contains:["self"]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[t.inherit(t.TITLE_MODE,{begin:i}),_],illegal:/\[|%/},{begin:/\$[(.]/},t.METHOD_GUARD,{className:"class",beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends"},t.UNDERSCORE_TITLE_MODE]},{beginKeywords:"constructor",end:/\{/,excludeEnd:!0},{begin:"(get|set)\\s+(?="+i+"\\()",end:/{/,keywords:"get set",contains:[t.inherit(t.TITLE_MODE,{begin:i}),{begin:/\(\)/},_]}],illegal:/#(?!!)/}}}());hljs.registerLanguage("typescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "),literal:n.join(" "),built_in:a.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ")},s={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},i={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:r.C_NUMBER_RE+"n?"}],relevance:0},o={className:"subst",begin:"\\$\\{",end:"\\}",keywords:t,contains:[]},c={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"xml"}},l={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"css"}},E={className:"string",begin:"`",end:"`",contains:[r.BACKSLASH_ESCAPE,o]};o.contains=[r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,i,r.REGEXP_MODE];var d={begin:"\\(",end:/\)/,keywords:t,contains:["self",r.QUOTE_STRING_MODE,r.APOS_STRING_MODE,r.NUMBER_MODE]},u={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,s,d]};return{name:"TypeScript",aliases:["ts"],keywords:t,contains:[r.SHEBANG(),{className:"meta",begin:/^\s*['"]use strict['"]/},r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,i,{begin:"("+r.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,r.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+r.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:r.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:d.contains}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/[\{;]/,excludeEnd:!0,keywords:t,contains:["self",r.inherit(r.TITLE_MODE,{begin:"[A-Za-z$_][0-9A-Za-z$_]*"}),u],illegal:/%/,relevance:0},{beginKeywords:"constructor",end:/[\{;]/,excludeEnd:!0,contains:["self",u]},{begin:/module\./,keywords:{built_in:"module"},relevance:0},{beginKeywords:"module",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",end:/\{/,excludeEnd:!0,keywords:"interface extends"},{begin:/\$[(.]/},{begin:"\\."+r.IDENT_RE,relevance:0},s,d]}}}());hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());hljs.registerLanguage("less",function(){"use strict";return function(e){var n="([\\w-]+|@{[\\w-]+})",a=[],s=[],t=function(e){return{className:"string",begin:"~?"+e+".*?"+e}},r=function(e,n,a){return{className:e,begin:n,relevance:a}},i={begin:"\\(",end:"\\)",contains:s,relevance:0};s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t("'"),t('"'),e.CSS_NUMBER_MODE,{begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",excludeEnd:!0}},r("number","#[0-9A-Fa-f]+\\b"),i,r("variable","@@?[\\w-]+",10),r("variable","@{[\\w-]+}"),r("built_in","~?`[^`]*?`"),{className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0},{className:"meta",begin:"!important"});var c=s.concat({begin:"{",end:"}",contains:a}),l={beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"}].concat(s)},o={begin:n+"\\s*:",returnBegin:!0,end:"[;}]",relevance:0,contains:[{className:"attribute",begin:n,end:":",excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s}}]},g={className:"keyword",begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{end:"[;{}]",returnEnd:!0,contains:s,relevance:0}},d={className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:c}},b={variants:[{begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:n,end:"{"}],returnBegin:!0,returnEnd:!0,illegal:"[<='$\"]",relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,l,r("keyword","all\\b"),r("variable","@{[\\w-]+}"),r("selector-tag",n+"%?",0),r("selector-id","#"+n),r("selector-class","\\."+n,0),r("selector-tag","&",0),{className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"\\(",end:"\\)",contains:c},{begin:"!important"}]};return a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,d,o,b),{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:a}}}());hljs.registerLanguage("lua",function(){"use strict";return function(e){var t={begin:"\\[=*\\[",end:"\\]=*\\]",contains:["self"]},a=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[","\\]=*\\]",{contains:[t],relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},contains:a.concat([{className:"function",beginKeywords:"function",end:"\\)",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params",begin:"\\(",endsWithParent:!0,contains:a}].concat(a)},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\[=*\\[",end:"\\]=*\\]",contains:[t],relevance:5}])}}}());
book/theme/index.hbs+87−51
@@ -1,11 +1,11 @@
11<!DOCTYPE HTML>
2−<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
2+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
33 <head>
44 <!-- Book generated using mdBook -->
55 <meta charset="UTF-8">
66 <title>{{ title }}</title>
77 {{#if is_print }}
8− <meta name="robots" content="noindex" />
8+ <meta name="robots" content="noindex">
99 {{/if}}
1010 {{#if base_url}}
1111 <base href="{{ base_url }}">
@@ -15,10 +15,9 @@
1515 <!-- Custom HTML head -->
1616 {{> head}}
1717
18− <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
1918 <meta name="description" content="{{ description }}">
2019 <meta name="viewport" content="width=device-width, initial-scale=1">
21− <meta name="theme-color" content="#ffffff" />
20+ <meta name="theme-color" content="#ffffff">
2221
2322 {{#if favicon_svg}}
2423 <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -35,8 +34,6 @@
3534
3635 <!-- Fonts -->
3736 <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
38− <link rel="preconnect" href="https://fonts.gstatic.com">
39− <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;400;500;700&display=swap" rel="stylesheet">
4037 {{#if copy_fonts}}
4138 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
4239 {{/if}}
@@ -53,18 +50,19 @@
5350
5451 {{#if mathjax_support}}
5552 <!-- MathJax -->
56− <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
53+ <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
5754 {{/if}}
5855 </head>
59− <body>
56+ <body class="sidebar-visible no-js">
57+ <div id="body-container">
6058 <!-- Provide site root to javascript -->
61− <script type="text/javascript">
59+ <script>
6260 var path_to_root = "{{ path_to_root }}";
6361 var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
6462 </script>
6563
6664 <!-- Work around some values being stored in localStorage wrapped in quotes -->
67− <script type="text/javascript">
65+ <script>
6866 try {
6967 var theme = localStorage.getItem('mdbook-theme');
7068 var sidebar = localStorage.getItem('mdbook-sidebar');
@@ -80,27 +78,34 @@
8078 </script>
8179
8280 <!-- Set the theme before any content is loaded, prevents flash -->
83− <script type="text/javascript">
81+ <script>
8482 var theme;
8583 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
8684 if (theme === null || theme === undefined) { theme = default_theme; }
8785 var html = document.querySelector('html');
88− html.classList.remove('no-js')
8986 html.classList.remove('{{ default_theme }}')
9087 html.classList.add(theme);
91− html.classList.add('js');
88+ var body = document.querySelector('body');
89+ body.classList.remove('no-js')
90+ body.classList.add('js');
9291 </script>
9392
93+ <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
94+
9495 <!-- Hide / unhide sidebar before it is displayed -->
95− <script type="text/javascript">
96− var html = document.querySelector('html');
97− var sidebar = 'hidden';
96+ <script>
97+ var body = document.querySelector('body');
98+ var sidebar = null;
99+ var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
98100 if (document.body.clientWidth >= 1080) {
99101 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
100102 sidebar = sidebar || 'visible';
103+ } else {
104+ sidebar = 'hidden';
101105 }
102− html.classList.remove('sidebar-visible');
103− html.classList.add("sidebar-" + sidebar);
106+ sidebar_toggle.checked = sidebar === 'visible';
107+ body.classList.remove('sidebar-visible');
108+ body.classList.add("sidebar-" + sidebar);
104109 </script>
105110
106111 <nav id="sidebar" class="sidebar" aria-label="Table of contents">
@@ -110,26 +115,48 @@
110115 <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
111116 </nav>
112117
118+ <!-- Track and set sidebar scroll position -->
119+ <script>
120+ var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
121+ sidebarScrollbox.addEventListener('click', function(e) {
122+ if (e.target.tagName === 'A') {
123+ sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
124+ }
125+ }, { passive: true });
126+ var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
127+ sessionStorage.removeItem('sidebar-scroll');
128+ if (sidebarScrollTop) {
129+ // preserve sidebar scroll position when navigating via links within sidebar
130+ sidebarScrollbox.scrollTop = sidebarScrollTop;
131+ } else {
132+ // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
133+ var activeSection = document.querySelector('#sidebar .active');
134+ if (activeSection) {
135+ activeSection.scrollIntoView({ block: 'center' });
136+ }
137+ }
138+ </script>
139+
113140 <div id="page-wrapper" class="page-wrapper">
114141
115142 <div class="page">
116143 {{> header}}
117144 <div id="menu-bar-hover-placeholder"></div>
118− <div id="menu-bar" class="menu-bar sticky bordered">
145+ <div id="menu-bar" class="menu-bar sticky">
119146 <div class="left-buttons">
120− <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
147+ <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
121148 <i class="fa fa-bars"></i>
122− </button>
149+ </label>
123150 <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
124151 <i class="fa fa-paint-brush"></i>
125152 </button>
126153 <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
127− <li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>
128− <li role="none"><button role="menuitem" class="theme" id="rust">{{ theme_option "Rust" }}</button></li>
129− <li role="none"><button role="menuitem" class="theme" id="coal">{{ theme_option "Coal" }}</button></li>
130− <li role="none"><button role="menuitem" class="theme" id="navy">{{ theme_option "Navy" }}</button></li>
131− <li role="none"><button role="menuitem" class="theme" id="ayu">{{ theme_option "Ayu" }}</button></li>
132− <li role="none"><button role="menuitem" class="theme" id="colibri">{{ theme_option "Colibri" }}</button></li>
154+ <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
155+ <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
156+ <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
157+ <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
158+ <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
159+ <li role="none"><button role="menuitem" class="theme" id="colibri">Colibri</button></li>
133160 </ul>
134161 {{#if search_enabled}}
135162 <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
@@ -151,13 +178,19 @@
151178 <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
152179 </a>
153180 {{/if}}
181+ {{#if git_repository_edit_url}}
182+ <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
183+ <i id="git-edit-button" class="fa fa-edit"></i>
184+ </a>
185+ {{/if}}
186+
154187 </div>
155188 </div>
156189
157190 {{#if search_enabled}}
158191 <div id="search-wrapper" class="hidden">
159192 <form id="searchbar-outer" class="searchbar-outer">
160− <input type="search" name="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
193+ <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
161194 </form>
162195 <div id="searchresults-outer" class="searchresults-outer hidden">
163196 <div id="searchresults-header" class="searchresults-header"></div>
@@ -168,7 +201,7 @@
168201 {{/if}}
169202
170203 <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
171− <script type="text/javascript">
204+ <script>
172205 document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
173206 document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
174207 Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
@@ -190,7 +223,7 @@
190223 {{/previous}}
191224
192225 {{#next}}
193− <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
226+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
194227 <i class="fa fa-angle-right"></i>
195228 </a>
196229 {{/next}}
@@ -208,7 +241,7 @@
208241 {{/previous}}
209242
210243 {{#next}}
211− <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
244+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
212245 <i class="fa fa-angle-right"></i>
213246 </a>
214247 {{/next}}
@@ -216,10 +249,12 @@
216249
217250 </div>
218251
219− {{#if livereload}}
252+ {{#if live_reload_endpoint}}
220253 <!-- Livereload script (if served using the cli tool) -->
221− <script type="text/javascript">
222− var socket = new WebSocket("{{{livereload}}}");
254+ <script>
255+ const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
256+ const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
257+ const socket = new WebSocket(wsAddress);
223258 socket.onmessage = function (event) {
224259 if (event.data === "reload") {
225260 socket.close();
@@ -235,7 +270,7 @@
235270
236271 {{#if google_analytics}}
237272 <!-- Google Analytics Tag -->
238− <script type="text/javascript">
273+ <script>
239274 var localAddrs = ["localhost", "127.0.0.1", ""];
240275
241276 // make sure we don't activate google analytics if the developer is
@@ -253,43 +288,43 @@
253288 {{/if}}
254289
255290 {{#if playground_line_numbers}}
256− <script type="text/javascript">
291+ <script>
257292 window.playground_line_numbers = true;
258293 </script>
259294 {{/if}}
260295
261296 {{#if playground_copyable}}
262− <script type="text/javascript">
297+ <script>
263298 window.playground_copyable = true;
264299 </script>
265300 {{/if}}
266301
267302 {{#if playground_js}}
268− <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>
269− <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>
270− <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>
271− <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>
272− <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
303+ <script src="{{ path_to_root }}ace.js"></script>
304+ <script src="{{ path_to_root }}editor.js"></script>
305+ <script src="{{ path_to_root }}mode-rust.js"></script>
306+ <script src="{{ path_to_root }}theme-dawn.js"></script>
307+ <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
273308 {{/if}}
274309
275310 {{#if search_js}}
276− <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
277− <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>
278− <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
311+ <script src="{{ path_to_root }}elasticlunr.min.js"></script>
312+ <script src="{{ path_to_root }}mark.min.js"></script>
313+ <script src="{{ path_to_root }}searcher.js"></script>
279314 {{/if}}
280315
281− <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
282− <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
283− <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
316+ <script src="{{ path_to_root }}clipboard.min.js"></script>
317+ <script src="{{ path_to_root }}highlight.js"></script>
318+ <script src="{{ path_to_root }}book.js"></script>
284319
285320 <!-- Custom JS scripts -->
286321 {{#each additional_js}}
287− <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>
322+ <script src="{{ ../path_to_root }}{{this}}"></script>
288323 {{/each}}
289324
290325 {{#if is_print}}
291326 {{#if mathjax_support}}
292− <script type="text/javascript">
327+ <script>
293328 window.addEventListener('load', function() {
294329 MathJax.Hub.Register.StartupHook('End', function() {
295330 window.setTimeout(window.print, 100);
@@ -297,7 +332,7 @@
297332 });
298333 </script>
299334 {{else}}
300− <script type="text/javascript">
335+ <script>
301336 window.addEventListener('load', function() {
302337 window.setTimeout(window.print, 100);
303338 });
@@ -305,5 +340,6 @@
305340 {{/if}}
306341 {{/if}}
307342
343+ </div>
308344 </body>
309345</html>
contrib/Helix.appdata.xml+21
@@ -5,6 +5,7 @@
55 <project_license>MPL-2.0</project_license>
66 <name>Helix</name>
77 <summary>A post-modern text editor</summary>
8+ <summary xml:lang="ar">مُحَرِّرُ نُصُوصٍ سَابِقٌ لِعَهدِه</summary>
89
910 <description>
1011 <p>
@@ -17,6 +18,17 @@
1718 <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
1819 </ul>
1920 </description>
21+ <description xml:lang="ar">
22+ <p>
23+ مُحَرِّرُ نُصُوصٍ يَعمَلُ فِي الطَّرَفِيَّة، مُستَلهَمٌ مِن Kakoune وَ Neovim وَمَكتُوبٌ بِلُغَةِ رَست البَرمَجِيَّة.
24+ </p>
25+ <ul>
26+ <li>تَحرِيرٌ وَضعِيٌّ شَبيهٌ بِـVim</li>
27+ <li>تَحدِيدَاتٌ لِلنَّصِ مُتَعَدِّدَة</li>
28+ <li>دَعْمٌ مُدمَجٌ لِخَوادِمِ اللُّغَات</li>
29+ <li>تَحرِيرُ التَّعلِيمَاتِ البَّرمَجِيَّةِ مَعَ تَمييزٍ لِلتَّركِيبِ النَّحُويِّ بِواسِطَةِ tree-sitter</li>
30+ </ul>
31+ </description>
2032
2133 <launchable type="desktop-id">Helix.desktop</launchable>
2234
@@ -36,6 +48,15 @@
3648 <content_rating type="oars-1.1" />
3749
3850 <releases>
51+ <release version="23.10" date="2023-10-24">
52+ <url>https://helix-editor.com/news/release-23-10-highlights/</url>
53+ </release>
54+ <release version="23.05" date="2023-05-18">
55+ <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
56+ </release>
57+ <release version="23.03" date="2023-03-31">
58+ <url>https://helix-editor.com/news/release-23-03-highlights/</url>
59+ </release>
3960 <release version="22.12" date="2022-12-6">
4061 <url>https://helix-editor.com/news/release-22-12-highlights/</url>
4162 </release>
contrib/Helix.desktop+3−1
@@ -1,6 +1,7 @@
11[Desktop Entry]
22Name=Helix
33GenericName=Text Editor
4+GenericName[ar]=مُحَرِّرُ نُصُوص
45GenericName[de]=Texteditor
56GenericName[fr]=Éditeur de texte
67GenericName[ru]=Текстовый редактор
@@ -9,7 +10,7 @@ GenericName[tr]=Metin Düzenleyici
910Comment=Edit text files
1011Comment[af]=Redigeer tekslêers
1112Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
12−Comment[ar]=حرّر ملفات نصية
13+Comment[ar]=مُحَرِّرُ مِلَفَّاتٍ نَصِّيَّة
1314Comment[az]=Mətn fayllarını redaktə edin
1415Comment[be]=Рэдагаваньне тэкставых файлаў
1516Comment[bg]=Редактиране на текстови файлове
@@ -79,6 +80,7 @@ Exec=hx %F
7980Terminal=true
8081Type=Application
8182Keywords=Text;editor;
83+Keywords[ar]=نص;نصوص;محرر;
8284Keywords[fr]=Texte;éditeur;
8385Keywords[ru]=текст;текстовый редактор;
8486Keywords[sr]=Текст;едитор;
docs/CONTRIBUTING.md+17−4
@@ -29,11 +29,23 @@ files, run
2929cargo xtask docgen
3030```
3131
32−inside the project. We use [xtask][xtask] as an ad-hoc task runner and
33−thus do not require any dependencies other than `cargo` (You don't have
34−to `cargo install` anything either).
32+inside the project. We use [xtask][xtask] as an ad-hoc task runner.
3533
36−# Integration tests
34+To preview the book itself, install [mdbook][mdbook]. Then, run
35+
36+```shell
37+mdbook serve book
38+```
39+
40+and visit [http://localhost:3000](http://localhost:3000).
41+
42+# Testing
43+
44+## Unit tests/Documentation tests
45+
46+Run `cargo test --workspace` to run unit tests and documentation tests in all packages.
47+
48+## Integration tests
3749
3850Integration tests for helix-term can be run with `cargo integration-test`. Code
3951contributors are strongly encouraged to write integration tests for their code.
@@ -52,4 +64,5 @@ The current MSRV and future changes to the MSRV are listed in the [Firefox docum
5264[architecture.md]: ./architecture.md
5365[docs]: https://docs.helix-editor.com/
5466[xtask]: https://github.com/matklad/cargo-xtask
67+[mdbook]: https://rust-lang.github.io/mdBook/guide/installation.html
5568[helpers.rs]: ../helix-term/tests/test/helpers.rs
docs/releases.md+13−6
@@ -1,16 +1,23 @@
11## Checklist
22
33Helix releases are versioned in the Calendar Versioning scheme:
4−`YY.0M(.MICRO)`, for example `22.05` for May of 2022. In these instructions
5−we'll use `<tag>` as a placeholder for the tag being published.
4+`YY.0M(.MICRO)`, for example, `22.05` for May of 2022, or in a patch release,
5+`22.05.1`. In these instructions we'll use `<tag>` as a placeholder for the tag
6+being published.
67
78* Merge the changelog PR
89* Add new `<release>` entry in `contrib/Helix.appdata.xml` with release information according to the [AppStream spec](https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Releases.html)
910* Tag and push
1011 * `git tag -s -m "<tag>" -a <tag> && git push`
1112 * Make sure to switch to master and pull first
12−* Edit the `VERSION` file and change the date to the next planned release
13− * Releases are planned to happen every two months, so `22.05` would change to `22.07`
13+* Edit the `Cargo.toml` file and change the date in the `version` field to the next planned release
14+ * Due to Cargo having a strict requirement on SemVer with 3 or more version
15+ numbers, a `0` is required in the micro version; however, unless we are
16+ publishing a patch release after a major release, the `.0` is dropped in
17+ the user facing version.
18+ * Releases are planned to happen every two months, so `22.05.0` would change to `22.07.0`
19+ * If we are pushing a patch/bugfix release in the same month as the previous
20+ release, bump the micro version, e.g. `22.07.0` to `22.07.1`
1421* Wait for the Release CI to finish
1522 * It will automatically turn the git tag into a GitHub release when it uploads artifacts
1623* Edit the new release
@@ -30,7 +37,7 @@ we'll use `<tag>` as a placeholder for the tag being published.
3037
3138The changelog is currently created manually by reading through commits in the
3239log since the last release. GitHub's compare view is a nice way to approach
33−this. For example when creating the 22.07 release notes, this compare link
40+this. For example, when creating the 22.07 release notes, this compare link
3441may be used
3542
3643```
@@ -57,4 +64,4 @@ versions for convenience:
5764> release. For the full log, check out the git log.
5865
5966Typically, small changes like dependencies or documentation updates, refactors,
60−or meta changes like GitHub Actions work are left out.
67+or meta changes like GitHub Actions work are left out.
docs/vision.md+1−1
@@ -20,5 +20,5 @@ Vision statements are all well and good, but are also vague and subjective. Her
2020* **Built-in tools** for working with code bases efficiently. Most projects aren't a single file, and an editor should handle that as a first-class use case. In Helix's case, this means (among other things) a fuzzy-search file navigator and LSP support.
2121* **Edit anything** that comes up when coding, within reason. Whether it's a 200 MB XML file, a megabyte of minified javascript on a single line, or Japanese text encoded in ShiftJIS, you should be able to open it and edit it without problems. (Note: this doesn't mean handle every esoteric use case. Sometimes you do just need a specialized tool, and Helix isn't that.)
2222* **Configurable**, within reason. Although the defaults should be good, not everyone will agree on what "good" is. Within the bounds of Helix's core interaction models, it should be reasonably configurable so that it can be "good" for more people. This means, for example, custom key maps among other things.
23−* **Extensible**, within reason. Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor. The basics should be built-in, but you should be able to extend it with additional functionality as needed. Right now we're thinking Wasm-based plugins.
23+* **Extensible**, within reason. Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor. The basics should be built-in, but you should be able to extend it with additional functionality as needed.
2424* **Clean code base.** Sometimes other factors (e.g. significant performance gains, important features, correctness, etc.) will trump strict readability, but we nevertheless want to keep the code base straightforward and easy to understand to the extent we can.
flake.lock+39−173
@@ -1,87 +1,35 @@
11{
22 "nodes": {
33 "crane": {
4− "flake": false,
5− "locked": {
6− "lastModified": 1670900067,
7− "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
8− "owner": "ipetkov",
9− "repo": "crane",
10− "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
11− "type": "github"
12− },
13− "original": {
14− "owner": "ipetkov",
15− "repo": "crane",
16− "type": "github"
17− }
18− },
19− "dream2nix": {
204 "inputs": {
21− "alejandra": [
22− "nci"
23− ],
24− "all-cabal-json": [
25− "nci"
26− ],
27− "crane": "crane",
28− "devshell": [
29− "nci"
30− ],
31− "flake-parts": [
32− "nci",
33− "parts"
34− ],
35− "flake-utils-pre-commit": [
36− "nci"
37− ],
38− "ghc-utils": [
39− "nci"
40− ],
41− "gomod2nix": [
42− "nci"
43− ],
44− "mach-nix": [
45− "nci"
46− ],
47− "nix-pypi-fetcher": [
48− "nci"
49− ],
505 "nixpkgs": [
51− "nci",
526 "nixpkgs"
53− ],
54− "poetry2nix": [
55− "nci"
56− ],
57− "pre-commit-hooks": [
58− "nci"
59− ],
60− "pruned-racket-catalog": [
61− "nci"
627 ]
638 },
649 "locked": {
65− "lastModified": 1677289985,
66− "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=",
67− "owner": "nix-community",
68− "repo": "dream2nix",
69− "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889",
10+ "lastModified": 1701025348,
11+ "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
12+ "owner": "ipetkov",
13+ "repo": "crane",
14+ "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
7015 "type": "github"
7116 },
7217 "original": {
73− "owner": "nix-community",
74− "repo": "dream2nix",
18+ "owner": "ipetkov",
19+ "repo": "crane",
7520 "type": "github"
7621 }
7722 },
7823 "flake-utils": {
24+ "inputs": {
25+ "systems": "systems"
26+ },
7927 "locked": {
80− "lastModified": 1659877975,
81− "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
28+ "lastModified": 1694529238,
29+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
8230 "owner": "numtide",
8331 "repo": "flake-utils",
84− "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
32+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
8533 "type": "github"
8634 },
8735 "original": {
@@ -90,55 +38,13 @@
9038 "type": "github"
9139 }
9240 },
93− "mk-naked-shell": {
94− "flake": false,
95− "locked": {
96− "lastModified": 1676572903,
97− "narHash": "sha256-oQoDHHUTxNVSURfkFcYLuAK+btjs30T4rbEUtCUyKy8=",
98− "owner": "yusdacra",
99− "repo": "mk-naked-shell",
100− "rev": "aeca9f8aa592f5e8f71f407d081cb26fd30c5a57",
101− "type": "github"
102− },
103− "original": {
104− "owner": "yusdacra",
105− "repo": "mk-naked-shell",
106− "type": "github"
107− }
108− },
109− "nci": {
110− "inputs": {
111− "dream2nix": "dream2nix",
112− "mk-naked-shell": "mk-naked-shell",
113− "nixpkgs": [
114− "nixpkgs"
115− ],
116− "parts": "parts",
117− "rust-overlay": [
118− "rust-overlay"
119− ]
120− },
121− "locked": {
122− "lastModified": 1677297103,
123− "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=",
124− "owner": "yusdacra",
125− "repo": "nix-cargo-integration",
126− "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2",
127− "type": "github"
128− },
129− "original": {
130− "owner": "yusdacra",
131− "repo": "nix-cargo-integration",
132− "type": "github"
133− }
134− },
13541 "nixpkgs": {
13642 "locked": {
137− "lastModified": 1677063315,
138− "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
43+ "lastModified": 1700794826,
44+ "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
13945 "owner": "nixos",
14046 "repo": "nixpkgs",
141− "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
47+ "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
14248 "type": "github"
14349 },
14450 "original": {
@@ -148,84 +54,29 @@
14854 "type": "github"
14955 }
15056 },
151− "nixpkgs-lib": {
152− "locked": {
153− "dir": "lib",
154− "lastModified": 1675183161,
155− "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=",
156− "owner": "NixOS",
157− "repo": "nixpkgs",
158− "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e",
159− "type": "github"
160− },
161− "original": {
162− "dir": "lib",
163− "owner": "NixOS",
164− "ref": "nixos-unstable",
165− "repo": "nixpkgs",
166− "type": "github"
167− }
168− },
169− "parts": {
170− "inputs": {
171− "nixpkgs-lib": [
172− "nci",
173− "nixpkgs"
174− ]
175− },
176− "locked": {
177− "lastModified": 1675933616,
178− "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
179− "owner": "hercules-ci",
180− "repo": "flake-parts",
181− "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
182− "type": "github"
183− },
184− "original": {
185− "owner": "hercules-ci",
186− "repo": "flake-parts",
187− "type": "github"
188− }
189− },
190− "parts_2": {
191− "inputs": {
192− "nixpkgs-lib": "nixpkgs-lib"
193− },
194− "locked": {
195− "lastModified": 1675933616,
196− "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
197− "owner": "hercules-ci",
198− "repo": "flake-parts",
199− "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
200− "type": "github"
201− },
202− "original": {
203− "owner": "hercules-ci",
204− "repo": "flake-parts",
205− "type": "github"
206− }
207− },
20857 "root": {
20958 "inputs": {
210− "nci": "nci",
59+ "crane": "crane",
60+ "flake-utils": "flake-utils",
21161 "nixpkgs": "nixpkgs",
212− "parts": "parts_2",
21362 "rust-overlay": "rust-overlay"
21463 }
21564 },
21665 "rust-overlay": {
21766 "inputs": {
218− "flake-utils": "flake-utils",
67+ "flake-utils": [
68+ "flake-utils"
69+ ],
21970 "nixpkgs": [
22071 "nixpkgs"
22172 ]
22273 },
22374 "locked": {
224− "lastModified": 1677292251,
225− "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=",
75+ "lastModified": 1701137803,
76+ "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
22677 "owner": "oxalica",
22778 "repo": "rust-overlay",
228− "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc",
79+ "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
22980 "type": "github"
23081 },
23182 "original": {
@@ -233,6 +84,21 @@
23384 "repo": "rust-overlay",
23485 "type": "github"
23586 }
87+ },
88+ "systems": {
89+ "locked": {
90+ "lastModified": 1681028828,
91+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
92+ "owner": "nix-systems",
93+ "repo": "default",
94+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
95+ "type": "github"
96+ },
97+ "original": {
98+ "owner": "nix-systems",
99+ "repo": "default",
100+ "type": "github"
101+ }
236102 }
237103 },
238104 "root": "root",
flake.nix+171−142
@@ -3,164 +3,193 @@
33
44 inputs = {
55 nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
6+ flake-utils.url = "github:numtide/flake-utils";
67 rust-overlay = {
78 url = "github:oxalica/rust-overlay";
8− inputs.nixpkgs.follows = "nixpkgs";
9+ inputs = {
10+ nixpkgs.follows = "nixpkgs";
11+ flake-utils.follows = "flake-utils";
12+ };
913 };
10− nci = {
11− url = "github:yusdacra/nix-cargo-integration";
14+ crane = {
15+ url = "github:ipetkov/crane";
1216 inputs.nixpkgs.follows = "nixpkgs";
13− inputs.rust-overlay.follows = "rust-overlay";
1417 };
15− parts.url = "github:hercules-ci/flake-parts";
1618 };
1719
18− outputs = inp: let
19− mkRootPath = rel:
20− builtins.path {
21− path = "${toString ./.}/${rel}";
22− name = rel;
23− };
24− filteredSource = let
25− pathsToIgnore = [
26− ".envrc"
27− ".ignore"
28− ".github"
29− ".gitignore"
30− "logo.svg"
31− "logo_dark.svg"
32− "logo_light.svg"
33− "rust-toolchain.toml"
34− "rustfmt.toml"
35− "runtime"
36− "screenshot.png"
37− "book"
38− "contrib"
39− "docs"
40− "README.md"
41− "CHANGELOG.md"
42− "shell.nix"
43− "default.nix"
44− "grammars.nix"
45− "flake.nix"
46− "flake.lock"
47− ];
48− ignorePaths = path: type: let
49− inherit (inp.nixpkgs) lib;
50− # split the nix store path into its components
51− components = lib.splitString "/" path;
52− # drop off the `/nix/hash-source` section from the path
53− relPathComponents = lib.drop 4 components;
54− # reassemble the path components
55− relPath = lib.concatStringsSep "/" relPathComponents;
56− in
57− lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
58− in
59− builtins.path {
60− name = "helix-source";
61− path = toString ./.;
62− # filter out unnecessary paths
63− filter = ignorePaths;
20+ outputs = {
21+ self,
22+ nixpkgs,
23+ crane,
24+ flake-utils,
25+ rust-overlay,
26+ ...
27+ }:
28+ flake-utils.lib.eachDefaultSystem (system: let
29+ pkgs = import nixpkgs {
30+ inherit system;
31+ overlays = [(import rust-overlay)];
6432 };
65− in
66− inp.parts.lib.mkFlake {inputs = inp;} {
67− imports = [inp.nci.flakeModule];
68− systems = [
69− "x86_64-linux"
70− "x86_64-darwin"
71− "aarch64-linux"
72− "aarch64-darwin"
73− "i686-linux"
74− ];
75− perSystem = {
76− config,
77− pkgs,
78− lib,
79− ...
80− }: let
81− makeOverridableHelix = old: config: let
82− grammars = pkgs.callPackage ./grammars.nix config;
83− runtimeDir = pkgs.runCommand "helix-runtime" {} ''
84− mkdir -p $out
85− ln -s ${mkRootPath "runtime"}/* $out
86− rm -r $out/grammars
87− ln -s ${grammars} $out/grammars
88− '';
89− helix-wrapped =
90− pkgs.runCommand
91− old.name
92− {
93− inherit (old) pname version;
94− meta = old.meta or {};
95− passthru =
96− (old.passthru or {})
97− // {
98− unwrapped = old;
99− };
100− nativeBuildInputs = [pkgs.makeWrapper];
101− makeWrapperArgs = config.makeWrapperArgs or [];
102− }
103− ''
104− cp -rs --no-preserve=mode,ownership ${old} $out
105− wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
106− '';
33+ mkRootPath = rel:
34+ builtins.path {
35+ path = "${toString ./.}/${rel}";
36+ name = rel;
37+ };
38+ filteredSource = let
39+ pathsToIgnore = [
40+ ".envrc"
41+ ".ignore"
42+ ".github"
43+ ".gitignore"
44+ "logo_dark.svg"
45+ "logo_light.svg"
46+ "rust-toolchain.toml"
47+ "rustfmt.toml"
48+ "runtime"
49+ "screenshot.png"
50+ "book"
51+ "docs"
52+ "README.md"
53+ "CHANGELOG.md"
54+ "shell.nix"
55+ "default.nix"
56+ "grammars.nix"
57+ "flake.nix"
58+ "flake.lock"
59+ ];
60+ ignorePaths = path: type: let
61+ inherit (nixpkgs) lib;
62+ # split the nix store path into its components
63+ components = lib.splitString "/" path;
64+ # drop off the `/nix/hash-source` section from the path
65+ relPathComponents = lib.drop 4 components;
66+ # reassemble the path components
67+ relPath = lib.concatStringsSep "/" relPathComponents;
10768 in
108− helix-wrapped
109− // {
110− override = makeOverridableHelix old;
69+ lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
70+ in
71+ builtins.path {
72+ name = "helix-source";
73+ path = toString ./.;
74+ # filter out unnecessary paths
75+ filter = ignorePaths;
76+ };
77+ makeOverridableHelix = old: config: let
78+ grammars = pkgs.callPackage ./grammars.nix config;
79+ runtimeDir = pkgs.runCommand "helix-runtime" {} ''
80+ mkdir -p $out
81+ ln -s ${mkRootPath "runtime"}/* $out
82+ rm -r $out/grammars
83+ ln -s ${grammars} $out/grammars
84+ '';
85+ helix-wrapped =
86+ pkgs.runCommand
87+ old.name
88+ {
89+ inherit (old) pname version;
90+ meta = old.meta or {};
11191 passthru =
112− helix-wrapped.passthru
92+ (old.passthru or {})
11393 // {
114− wrapper = old: makeOverridableHelix old config;
94+ unwrapped = old;
11595 };
116− };
117− stdenv =
118− if pkgs.stdenv.isLinux
119− then pkgs.stdenv
120− else pkgs.clangStdenv;
121− rustFlagsEnv =
122− if stdenv.isLinux
123− then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
124− else "$RUSTFLAGS";
125− in {
126− # by default NCI adds rust-analyzer component, but helix toolchain doesn't have rust-analyzer
127− nci.toolchains.shell.components = ["rust-src" "rustfmt" "clippy"];
128− nci.projects."helix-project".relPath = "";
129− nci.crates."helix-term" = {
130− overrides = {
131− add-meta.override = _: {meta.mainProgram = "hx";};
132− add-inputs.overrideAttrs = prev: {
133− buildInputs = (prev.buildInputs or []) ++ [stdenv.cc.cc.lib];
134− };
135− disable-grammar-builds = {
136− # disable fetching and building of tree-sitter grammars in the helix-term build.rs
137− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
96+ nativeBuildInputs = [pkgs.makeWrapper];
97+ makeWrapperArgs = config.makeWrapperArgs or [];
98+ }
99+ ''
100+ cp -rs --no-preserve=mode,ownership ${old} $out
101+ wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
102+ '';
103+ in
104+ helix-wrapped
105+ // {
106+ override = makeOverridableHelix old;
107+ passthru =
108+ helix-wrapped.passthru
109+ // {
110+ wrapper = old: makeOverridableHelix old config;
138111 };
139− disable-tests = {checkPhase = ":";};
140− set-stdenv.override = _: {inherit stdenv;};
141− set-filtered-src.override = _: {src = filteredSource;};
142− };
143112 };
113+ stdenv =
114+ if pkgs.stdenv.isLinux
115+ then pkgs.stdenv
116+ else pkgs.clangStdenv;
117+ rustFlagsEnv =
118+ if stdenv.isLinux
119+ then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
120+ else "$RUSTFLAGS";
121+ rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
122+ craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
123+ craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
124+ commonArgs = {
125+ inherit stdenv;
126+ inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
127+ inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
128+ src = filteredSource;
129+ # disable fetching and building of tree-sitter grammars in the helix-term build.rs
130+ HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
131+ buildInputs = [stdenv.cc.cc.lib];
132+ # disable tests
133+ doCheck = false;
134+ meta.mainProgram = "hx";
135+ };
136+ cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
137+ in {
138+ packages = {
139+ helix-unwrapped = craneLibStable.buildPackage (commonArgs
140+ // {
141+ cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
142+ postInstall = ''
143+ mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
144+ cp contrib/Helix.desktop $out/share/applications
145+ cp logo.svg $out/share/icons/hicolor/scalable/apps/helix.svg
146+ cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
147+ '';
148+ });
149+ helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
150+ default = self.packages.${system}.helix;
151+ };
144152
145− packages.helix-unwrapped = config.nci.outputs."helix-term".packages.release;
146− packages.helix-unwrapped-dev = config.nci.outputs."helix-term".packages.dev;
147− packages.helix = makeOverridableHelix config.packages.helix-unwrapped {};
148− packages.helix-dev = makeOverridableHelix config.packages.helix-unwrapped-dev {};
149− packages.default = config.packages.helix;
153+ checks = {
154+ # Build the crate itself
155+ inherit (self.packages.${system}) helix;
150156
151− devShells.default = config.nci.outputs."helix-project".devShell.overrideAttrs (old: {
152− nativeBuildInputs =
153− (old.nativeBuildInputs or [])
154− ++ (with pkgs; [lld_13 cargo-flamegraph rust-analyzer])
155− ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
156− ++ (lib.optional stdenv.isLinux pkgs.lldb)
157− ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
158− shellHook = ''
159− export HELIX_RUNTIME="$PWD/runtime"
160− export RUST_BACKTRACE="1"
161− export RUSTFLAGS="${rustFlagsEnv}"
162− '';
163− });
157+ clippy = craneLibMSRV.cargoClippy (commonArgs
158+ // {
159+ inherit cargoArtifacts;
160+ cargoClippyExtraArgs = "--all-targets -- --deny warnings";
161+ });
162+
163+ fmt = craneLibMSRV.cargoFmt commonArgs;
164+
165+ doc = craneLibMSRV.cargoDoc (commonArgs
166+ // {
167+ inherit cargoArtifacts;
168+ });
169+
170+ test = craneLibMSRV.cargoTest (commonArgs
171+ // {
172+ inherit cargoArtifacts;
173+ });
174+ };
175+
176+ devShells.default = pkgs.mkShell {
177+ inputsFrom = builtins.attrValues self.checks.${system};
178+ nativeBuildInputs = with pkgs;
179+ [lld_13 cargo-flamegraph rust-analyzer]
180+ ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
181+ ++ (lib.optional stdenv.isLinux pkgs.lldb)
182+ ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
183+ shellHook = ''
184+ export HELIX_RUNTIME="$PWD/runtime"
185+ export RUST_BACKTRACE="1"
186+ export RUSTFLAGS="${rustFlagsEnv}"
187+ '';
188+ };
189+ })
190+ // {
191+ overlays.default = final: prev: {
192+ inherit (self.packages.${final.system}) helix;
164193 };
165194 };
166195
grammars.nix+24−21
@@ -5,6 +5,7 @@
55 runCommand,
66 yj,
77 includeGrammarIf ? _: true,
8+ grammarOverlays ? [],
89 ...
910}: let
1011 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
@@ -48,22 +49,22 @@
4849 then sourceGitHub
4950 else sourceGit;
5051 in
51− stdenv.mkDerivation rec {
52+ stdenv.mkDerivation {
5253 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
5354
5455 pname = "helix-tree-sitter-${grammar.name}";
5556 version = grammar.source.rev;
5657
57− src =
58− if builtins.hasAttr "subpath" grammar.source
59− then "${source}/${grammar.source.subpath}"
60− else source;
58+ src = source;
59+ sourceRoot = if builtins.hasAttr "subpath" grammar.source then
60+ "source/${grammar.source.subpath}"
61+ else
62+ "source";
6163
62− dontUnpack = true;
6364 dontConfigure = true;
6465
6566 FLAGS = [
66− "-I${src}/src"
67+ "-Isrc"
6768 "-g"
6869 "-O3"
6970 "-fPIC"
@@ -76,13 +77,13 @@
7677 buildPhase = ''
7778 runHook preBuild
7879
79− if [[ -e "$src/src/scanner.cc" ]]; then
80− $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS
81− elif [[ -e "$src/src/scanner.c" ]]; then
82− $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS
80+ if [[ -e src/scanner.cc ]]; then
81+ $CXX -c src/scanner.cc -o scanner.o $FLAGS
82+ elif [[ -e src/scanner.c ]]; then
83+ $CC -c src/scanner.c -o scanner.o $FLAGS
8384 fi
8485
85− $CC -c "$src/src/parser.c" -o parser.o $FLAGS
86+ $CC -c src/parser.c -o parser.o $FLAGS
8687 $CXX -shared -o $NAME.so *.o
8788
8889 ls -al
@@ -105,15 +106,17 @@
105106 '';
106107 };
107108 grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
108− builtGrammars =
109− builtins.map (grammar: {
110− inherit (grammar) name;
111− artifact = buildGrammar grammar;
112− })
113− grammarsToBuild;
114− grammarLinks =
115− builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
116− builtGrammars;
109+ builtGrammars = builtins.map (grammar: {
110+ inherit (grammar) name;
111+ value = buildGrammar grammar;
112+ }) grammarsToBuild;
113+ extensibleGrammars =
114+ lib.makeExtensible (self: builtins.listToAttrs builtGrammars);
115+ overlayedGrammars = lib.pipe extensibleGrammars
116+ (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);
117+ grammarLinks = lib.mapAttrsToList
118+ (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")
119+ (lib.filterAttrs (n: v: lib.isDerivation v) overlayedGrammars);
117120in
118121 runCommand "consolidated-helix-grammars" {} ''
119122 mkdir -p $out
helix-core/Cargo.toml+22−16
@@ -1,37 +1,39 @@
11[package]
22name = "helix-core"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
73description = "Helix editor core editing primitives"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
114include = ["src/**/*", "README.md"]
5+version.workspace = true
6+authors.workspace = true
7+edition.workspace = true
8+license.workspace = true
9+rust-version.workspace = true
10+categories.workspace = true
11+repository.workspace = true
12+homepage.workspace = true
1213
1314[features]
1415unicode-lines = ["ropey/unicode_lines"]
1516integration = []
1617
1718[dependencies]
18−helix-loader = { version = "0.6", path = "../helix-loader" }
19+helix-loader = { path = "../helix-loader" }
1920
20−ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
21−smallvec = "1.10"
21+ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
22+smallvec = "1.11"
2223smartstring = "1.0.1"
2324unicode-segmentation = "1.10"
2425unicode-width = "0.1"
2526unicode-general-category = "0.6"
2627# slab = "0.4.2"
2728slotmap = "1.0"
28−tree-sitter = "0.20"
29−once_cell = "1.17"
29+tree-sitter.workspace = true
30+once_cell = "1.19"
3031arc-swap = "1"
3132regex = "1"
32−bitflags = "1.3"
33−ahash = "0.8.3"
34−hashbrown = { version = "0.13.2", features = ["raw"] }
33+bitflags = "2.4"
34+ahash = "0.8.6"
35+hashbrown = { version = "0.14.3", features = ["raw"] }
36+dunce = "1.0"
3537
3638log = "0.4"
3739serde = { version = "1.0", features = ["derive"] }
@@ -44,8 +46,12 @@ encoding_rs = "0.8"
4446
4547chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
4648
47−etcetera = "0.4"
49+etcetera = "0.8"
4850textwrap = "0.16.0"
4951
52+nucleo.workspace = true
53+parking_lot = "0.12"
54+
5055[dev-dependencies]
5156quickcheck = { version = "1", default-features = false }
57+indoc = "2.0.4"
helix-core/src/diagnostic.rs+6−1
@@ -35,14 +35,19 @@ pub enum DiagnosticTag {
3535 Deprecated,
3636}
3737
38−/// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.91.0/lsp_types/struct.Diagnostic.html)
38+/// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.94.0/lsp_types/struct.Diagnostic.html)
3939#[derive(Debug, Clone)]
4040pub struct Diagnostic {
4141 pub range: Range,
42+ // whether this diagnostic ends at the end of(or inside) a word
43+ pub ends_at_word: bool,
44+ pub starts_at_word: bool,
45+ pub zero_width: bool,
4246 pub line: usize,
4347 pub message: String,
4448 pub severity: Option<Severity>,
4549 pub code: Option<NumberOrString>,
50+ pub language_server_id: usize,
4651 pub tags: Vec<DiagnosticTag>,
4752 pub source: Option<String>,
4853 pub data: Option<serde_json::Value>,
helix-core/src/doc_formatter/test.rs+8−48
@@ -119,16 +119,7 @@ fn overlay() {
119119 "foobar",
120120 0,
121121 false,
122− &[
123− Overlay {
124− char_idx: 0,
125− grapheme: "X".into(),
126− },
127− Overlay {
128− char_idx: 2,
129− grapheme: "\t".into(),
130− },
131− ]
122+ &[Overlay::new(0, "X"), Overlay::new(2, "\t")],
132123 ),
133124 "Xo bar "
134125 );
@@ -138,18 +129,9 @@ fn overlay() {
138129 0,
139130 true,
140131 &[
141− Overlay {
142− char_idx: 2,
143− grapheme: "\t".into(),
144− },
145− Overlay {
146− char_idx: 5,
147− grapheme: "\t".into(),
148− },
149− Overlay {
150− char_idx: 16,
151− grapheme: "X".into(),
152− },
132+ Overlay::new(2, "\t"),
133+ Overlay::new(5, "\t"),
134+ Overlay::new(16, "X"),
153135 ]
154136 ),
155137 "fo f o foo \n.foo Xoo foo foo \n.foo foo foo "
@@ -170,24 +152,14 @@ fn annotate_text(text: &str, softwrap: bool, annotations: &[InlineAnnotation]) -
170152#[test]
171153fn annotation() {
172154 assert_eq!(
173− annotate_text(
174− "bar",
175− false,
176− &[InlineAnnotation {
177− char_idx: 0,
178− text: "foo".into(),
179− }]
180− ),
155+ annotate_text("bar", false, &[InlineAnnotation::new(0, "foo")]),
181156 "foobar "
182157 );
183158 assert_eq!(
184159 annotate_text(
185160 &"foo ".repeat(10),
186161 true,
187− &[InlineAnnotation {
188− char_idx: 0,
189− text: "foo ".into(),
190− }]
162+ &[InlineAnnotation::new(0, "foo ")]
191163 ),
192164 "foo foo foo foo \n.foo foo foo foo \n.foo foo foo "
193165 );
@@ -199,20 +171,8 @@ fn annotation_and_overlay() {
199171 "bbar".into(),
200172 &TextFormat::new_test(false),
201173 TextAnnotations::default()
202− .add_inline_annotations(
203− Rc::new([InlineAnnotation {
204− char_idx: 0,
205− text: "fooo".into(),
206− }]),
207− None
208− )
209− .add_overlay(
210− Rc::new([Overlay {
211− char_idx: 0,
212− grapheme: "\t".into(),
213− }]),
214− None
215− ),
174+ .add_inline_annotations(Rc::new([InlineAnnotation::new(0, "fooo")]), None)
175+ .add_overlay(Rc::new([Overlay::new(0, "\t")]), None),
216176 0,
217177 )
218178 .0
helix-core/src/fuzzy.rsnew file+43
@@ -0,0 +1,43 @@
1+use std::ops::DerefMut;
2+
3+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
4+use nucleo::Config;
5+use parking_lot::Mutex;
6+
7+pub struct LazyMutex<T> {
8+ inner: Mutex<Option<T>>,
9+ init: fn() -> T,
10+}
11+
12+impl<T> LazyMutex<T> {
13+ pub const fn new(init: fn() -> T) -> Self {
14+ Self {
15+ inner: Mutex::new(None),
16+ init,
17+ }
18+ }
19+
20+ pub fn lock(&self) -> impl DerefMut<Target = T> + '_ {
21+ parking_lot::MutexGuard::map(self.inner.lock(), |val| val.get_or_insert_with(self.init))
22+ }
23+}
24+
25+pub static MATCHER: LazyMutex<nucleo::Matcher> = LazyMutex::new(nucleo::Matcher::default);
26+
27+/// convenience function to easily fuzzy match
28+/// on a (relatively small list of inputs). This is not recommended for building a full tui
29+/// application that can match large numbers of matches as all matching is done on the current
30+/// thread, effectively blocking the UI
31+pub fn fuzzy_match<T: AsRef<str>>(
32+ pattern: &str,
33+ items: impl IntoIterator<Item = T>,
34+ path: bool,
35+) -> Vec<(T, u16)> {
36+ let mut matcher = MATCHER.lock();
37+ matcher.config = Config::DEFAULT;
38+ if path {
39+ matcher.config.set_match_paths();
40+ }
41+ let pattern = Atom::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy, false);
42+ pattern.match_list(items, &mut matcher)
43+}
helix-core/src/graphemes.rs+1−1
@@ -481,7 +481,7 @@ impl<'a> From<String> for GraphemeStr<'a> {
481481 let ptr = Box::into_raw(g.into_bytes().into_boxed_slice()) as *mut u8;
482482 GraphemeStr {
483483 ptr: unsafe { NonNull::new_unchecked(ptr) },
484− len: i32::try_from(len).unwrap() as u32,
484+ len: (i32::try_from(len).unwrap() as u32) | Self::MASK_OWNED,
485485 phantom: PhantomData,
486486 }
487487 }
helix-core/src/history.rs+2−2
@@ -72,8 +72,8 @@ impl Default for History {
7272 revisions: vec![Revision {
7373 parent: 0,
7474 last_child: None,
75− transaction: Transaction::from(ChangeSet::new(&Rope::new())),
76− inversion: Transaction::from(ChangeSet::new(&Rope::new())),
75+ transaction: Transaction::from(ChangeSet::new("".into())),
76+ inversion: Transaction::from(ChangeSet::new("".into())),
7777 timestamp: Instant::now(),
7878 }],
7979 current: 0,
helix-core/src/indent.rs+618−145
@@ -1,12 +1,14 @@
1−use std::collections::HashMap;
1+use std::{borrow::Cow, collections::HashMap};
22
33use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
44
55use crate::{
66 chars::{char_is_line_ending, char_is_whitespace},
7− syntax::{LanguageConfiguration, RopeProvider, Syntax},
7+ find_first_non_whitespace_char,
8+ graphemes::{grapheme_width, tab_width_at},
9+ syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
810 tree_sitter::Node,
9− Rope, RopeSlice,
11+ Position, Rope, RopeGraphemes, RopeSlice,
1012};
1113
1214/// Enum representing indentation style.
@@ -18,6 +20,10 @@ pub enum IndentStyle {
1820 Spaces(u8),
1921}
2022
23+// 16 spaces
24+const INDENTS: &str = " ";
25+pub const MAX_INDENT: u8 = 16;
26+
2127impl IndentStyle {
2228 /// Creates an `IndentStyle` from an indentation string.
2329 ///
@@ -26,10 +32,10 @@ impl IndentStyle {
2632 #[inline]
2733 pub fn from_str(indent: &str) -> Self {
2834 // XXX: do we care about validating the input more than this? Probably not...?
29− debug_assert!(!indent.is_empty() && indent.len() <= 8);
35+ debug_assert!(!indent.is_empty() && indent.len() <= MAX_INDENT as usize);
3036
3137 if indent.starts_with(' ') {
32− IndentStyle::Spaces(indent.len() as u8)
38+ IndentStyle::Spaces(indent.len().clamp(1, MAX_INDENT as usize) as u8)
3339 } else {
3440 IndentStyle::Tabs
3541 }
@@ -39,20 +45,13 @@ impl IndentStyle {
3945 pub fn as_str(&self) -> &'static str {
4046 match *self {
4147 IndentStyle::Tabs => "\t",
42− IndentStyle::Spaces(1) => " ",
43− IndentStyle::Spaces(2) => " ",
44− IndentStyle::Spaces(3) => " ",
45− IndentStyle::Spaces(4) => " ",
46− IndentStyle::Spaces(5) => " ",
47− IndentStyle::Spaces(6) => " ",
48− IndentStyle::Spaces(7) => " ",
49− IndentStyle::Spaces(8) => " ",
50−
51− // Unsupported indentation style. This should never happen,
52− // but just in case fall back to two spaces.
5348 IndentStyle::Spaces(n) => {
54− debug_assert!(n > 0 && n <= 8); // Always triggers. `debug_panic!()` wanted.
55− " "
49+ // Unsupported indentation style. This should never happen,
50+ debug_assert!(n > 0 && n <= MAX_INDENT);
51+
52+ // Either way, clamp to the nearest supported value
53+ let closest_n = n.clamp(1, MAX_INDENT) as usize;
54+ &INDENTS[0..closest_n]
5655 }
5756 }
5857 }
@@ -74,9 +73,9 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
7473 // Build a histogram of the indentation *increases* between
7574 // subsequent lines, ignoring lines that are all whitespace.
7675 //
77− // Index 0 is for tabs, the rest are 1-8 spaces.
78− let histogram: [usize; 9] = {
79− let mut histogram = [0; 9];
76+ // Index 0 is for tabs, the rest are 1-MAX_INDENT spaces.
77+ let histogram: [usize; MAX_INDENT as usize + 1] = {
78+ let mut histogram = [0; MAX_INDENT as usize + 1];
8079 let mut prev_line_is_tabs = false;
8180 let mut prev_line_leading_count = 0usize;
8281
@@ -135,7 +134,7 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
135134 histogram[0] += 1;
136135 } else {
137136 let amount = leading_count - prev_line_leading_count;
138− if amount <= 8 {
137+ if amount <= MAX_INDENT as usize {
139138 histogram[amount] += 1;
140139 }
141140 }
@@ -189,7 +188,7 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
189188 let mut len = 0;
190189 for ch in line.chars() {
191190 match ch {
192− '\t' => len += tab_width,
191+ '\t' => len += tab_width_at(len, tab_width as u16),
193192 ' ' => len += 1,
194193 _ => break,
195194 }
@@ -198,6 +197,56 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
198197 len / indent_width
199198}
200199
200+/// Create a string of tabs & spaces that has the same visual width as the given RopeSlice (independent of the tab width).
201+fn whitespace_with_same_width(text: RopeSlice) -> String {
202+ let mut s = String::new();
203+ for grapheme in RopeGraphemes::new(text) {
204+ if grapheme == "\t" {
205+ s.push('\t');
206+ } else {
207+ s.extend(std::iter::repeat(' ').take(grapheme_width(&Cow::from(grapheme))));
208+ }
209+ }
210+ s
211+}
212+
213+fn add_indent_level(
214+ mut base_indent: String,
215+ added_indent_level: isize,
216+ indent_style: &IndentStyle,
217+ tab_width: usize,
218+) -> String {
219+ if added_indent_level >= 0 {
220+ // Adding a non-negative indent is easy, we can simply append the indent string
221+ base_indent.push_str(&indent_style.as_str().repeat(added_indent_level as usize));
222+ base_indent
223+ } else {
224+ // In this case, we want to return a prefix of `base_indent`.
225+ // Since the width of a tab depends on its offset, we cannot simply iterate over
226+ // the chars of `base_indent` in reverse until we have the desired indent reduction,
227+ // instead we iterate over them twice in forward direction.
228+ let base_indent_rope = RopeSlice::from(base_indent.as_str());
229+ #[allow(deprecated)]
230+ let base_indent_width =
231+ crate::visual_coords_at_pos(base_indent_rope, base_indent_rope.len_chars(), tab_width)
232+ .col;
233+ let target_indent_width = base_indent_width
234+ .saturating_sub((-added_indent_level) as usize * indent_style.indent_width(tab_width));
235+ #[allow(deprecated)]
236+ let char_end_idx = crate::pos_at_visual_coords(
237+ base_indent_rope,
238+ Position {
239+ row: 0,
240+ col: target_indent_width,
241+ },
242+ tab_width,
243+ );
244+ let byte_end_idx = base_indent_rope.char_to_byte(char_end_idx);
245+ base_indent.truncate(byte_end_idx);
246+ base_indent
247+ }
248+}
249+
201250/// Computes for node and all ancestors whether they are the first node on their line.
202251/// The first entry in the return value represents the root node, the last one the node itself
203252fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
@@ -239,68 +288,140 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
239288/// This is usually constructed in one of 2 ways:
240289/// - Successively add indent captures to get the (added) indent from a single line
241290/// - Successively add the indent results for each line
242−#[derive(Default)]
243−pub struct Indentation {
244− /// The total indent (the number of indent levels) is defined as max(0, indent-outdent).
245− /// The string that this results in depends on the indent style (spaces or tabs, etc.)
291+/// The string that this indentation defines starts with the string contained in the align field (unless it is None), followed by:
292+/// - max(0, indent - outdent) tabs, if tabs are used for indentation
293+/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
294+#[derive(Default, Debug, PartialEq, Eq, Clone)]
295+pub struct Indentation<'a> {
246296 indent: usize,
297+ indent_always: usize,
247298 outdent: usize,
299+ outdent_always: usize,
300+ /// The alignment, as a string containing only tabs & spaces. Storing this as a string instead of e.g.
301+ /// the (visual) width ensures that the alignment is preserved even if the tab width changes.
302+ align: Option<RopeSlice<'a>>,
248303}
249−impl Indentation {
304+
305+impl<'a> Indentation<'a> {
250306 /// Add some other [Indentation] to this.
251− /// The added indent should be the total added indent from one line
252− fn add_line(&mut self, added: &Indentation) {
253− if added.indent > 0 && added.outdent == 0 {
254− self.indent += 1;
255− } else if added.outdent > 0 && added.indent == 0 {
256− self.outdent += 1;
307+ /// The added indent should be the total added indent from one line.
308+ /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).
309+ fn add_line(&mut self, added: Indentation<'a>) {
310+ // Align overrides the indent from outer scopes.
311+ if self.align.is_some() {
312+ return;
257313 }
314+ if added.align.is_some() {
315+ self.align = added.align;
316+ return;
317+ }
318+ self.indent += added.indent;
319+ self.indent_always += added.indent_always;
320+ self.outdent += added.outdent;
321+ self.outdent_always += added.outdent_always;
258322 }
323+
259324 /// Add an indent capture to this indent.
260− /// All the captures that are added in this way should be on the same line.
261− fn add_capture(&mut self, added: IndentCaptureType) {
325+ /// Only captures that apply to the same line should be added together in this way (otherwise use `add_line`)
326+ /// and the captures should be added starting from the innermost tree-sitter node (currently this only matters
327+ /// if multiple `@align` patterns occur on the same line).
328+ fn add_capture(&mut self, added: IndentCaptureType<'a>) {
262329 match added {
263330 IndentCaptureType::Indent => {
264− self.indent = 1;
331+ if self.indent_always == 0 {
332+ self.indent = 1;
333+ }
334+ }
335+ IndentCaptureType::IndentAlways => {
336+ // any time we encounter an `indent.always` on the same line, we
337+ // want to cancel out all regular indents
338+ self.indent_always += 1;
339+ self.indent = 0;
265340 }
266341 IndentCaptureType::Outdent => {
267− self.outdent = 1;
342+ if self.outdent_always == 0 {
343+ self.outdent = 1;
344+ }
345+ }
346+ IndentCaptureType::OutdentAlways => {
347+ self.outdent_always += 1;
348+ self.outdent = 0;
349+ }
350+ IndentCaptureType::Align(align) => {
351+ if self.align.is_none() {
352+ self.align = Some(align);
353+ }
268354 }
269355 }
270356 }
271− fn as_string(&self, indent_style: &IndentStyle) -> String {
272− let indent_level = if self.indent >= self.outdent {
273− self.indent - self.outdent
357+ fn net_indent(&self) -> isize {
358+ (self.indent + self.indent_always) as isize
359+ - ((self.outdent + self.outdent_always) as isize)
360+ }
361+ /// Convert `self` into a string, taking into account the computed and actual indentation of some other line.
362+ fn relative_indent(
363+ &self,
364+ other_computed_indent: &Self,
365+ other_leading_whitespace: RopeSlice,
366+ indent_style: &IndentStyle,
367+ tab_width: usize,
368+ ) -> Option<String> {
369+ if self.align == other_computed_indent.align {
370+ // If self and baseline are either not aligned to anything or both aligned the same way,
371+ // we can simply take `other_leading_whitespace` and add some indent / outdent to it (in the second
372+ // case, the alignment should already be accounted for in `other_leading_whitespace`).
373+ let indent_diff = self.net_indent() - other_computed_indent.net_indent();
374+ Some(add_indent_level(
375+ String::from(other_leading_whitespace),
376+ indent_diff,
377+ indent_style,
378+ tab_width,
379+ ))
274380 } else {
275− log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
276− 0
277− };
278− indent_style.as_str().repeat(indent_level)
381+ // If the alignment of both lines is different, we cannot compare their indentation in any meaningful way
382+ None
383+ }
384+ }
385+ pub fn to_string(&self, indent_style: &IndentStyle, tab_width: usize) -> String {
386+ add_indent_level(
387+ self.align
388+ .map_or_else(String::new, whitespace_with_same_width),
389+ self.net_indent(),
390+ indent_style,
391+ tab_width,
392+ )
279393 }
280394}
281395
282396/// An indent definition which corresponds to a capture from the indent query
283−struct IndentCapture {
284− capture_type: IndentCaptureType,
397+#[derive(Debug)]
398+struct IndentCapture<'a> {
399+ capture_type: IndentCaptureType<'a>,
285400 scope: IndentScope,
286401}
287−#[derive(Clone, Copy)]
288−enum IndentCaptureType {
402+#[derive(Debug, Clone, PartialEq)]
403+enum IndentCaptureType<'a> {
289404 Indent,
405+ IndentAlways,
290406 Outdent,
407+ OutdentAlways,
408+ /// Alignment given as a string of whitespace
409+ Align(RopeSlice<'a>),
291410}
292−impl IndentCaptureType {
411+
412+impl<'a> IndentCaptureType<'a> {
293413 fn default_scope(&self) -> IndentScope {
294414 match self {
295− IndentCaptureType::Indent => IndentScope::Tail,
296− IndentCaptureType::Outdent => IndentScope::All,
415+ IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
416+ IndentCaptureType::Outdent | IndentCaptureType::OutdentAlways => IndentScope::All,
417+ IndentCaptureType::Align(_) => IndentScope::All,
297418 }
298419 }
299420}
300421/// This defines which part of a node an [IndentCapture] applies to.
301422/// Each [IndentCaptureType] has a default scope, but the scope can be changed
302423/// with `#set!` property declarations.
303−#[derive(Clone, Copy)]
424+#[derive(Debug, Clone, Copy)]
304425enum IndentScope {
305426 /// The indent applies to the whole node
306427 All,
@@ -310,6 +431,7 @@ enum IndentScope {
310431
311432/// A capture from the indent query which does not define an indent but extends
312433/// the range of a node. This is used before the indent is calculated.
434+#[derive(Debug)]
313435enum ExtendCapture {
314436 Extend,
315437 PreventOnce,
@@ -318,24 +440,41 @@ enum ExtendCapture {
318440/// The result of running a tree-sitter indent query. This stores for
319441/// each node (identified by its ID) the relevant captures (already filtered
320442/// by predicates).
321−struct IndentQueryResult {
322− indent_captures: HashMap<usize, Vec<IndentCapture>>,
443+#[derive(Debug)]
444+struct IndentQueryResult<'a> {
445+ indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,
323446 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
324447}
325448
326−fn query_indents(
449+fn get_node_start_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
450+ let mut node_line = node.start_position().row;
451+ // Adjust for the new line that will be inserted
452+ if new_line_byte_pos.map_or(false, |pos| node.start_byte() >= pos) {
453+ node_line += 1;
454+ }
455+ node_line
456+}
457+fn get_node_end_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
458+ let mut node_line = node.end_position().row;
459+ // Adjust for the new line that will be inserted (with a strict inequality since end_byte is exclusive)
460+ if new_line_byte_pos.map_or(false, |pos| node.end_byte() > pos) {
461+ node_line += 1;
462+ }
463+ node_line
464+}
465+
466+fn query_indents<'a>(
327467 query: &Query,
328468 syntax: &Syntax,
329469 cursor: &mut QueryCursor,
330− text: RopeSlice,
470+ text: RopeSlice<'a>,
331471 range: std::ops::Range<usize>,
332− // Position of the (optional) newly inserted line break.
333− // Given as (line, byte_pos)
334− new_line_break: Option<(usize, usize)>,
335−) -> IndentQueryResult {
472+ new_line_byte_pos: Option<usize>,
473+) -> IndentQueryResult<'a> {
336474 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
337475 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
338476 cursor.set_byte_range(range);
477+
339478 // Iterate over all captures from the query
340479 for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
341480 // Skip matches where not all custom predicates are fulfilled
@@ -362,21 +501,13 @@ fn query_indents(
362501 Some(QueryPredicateArg::Capture(capt1)),
363502 Some(QueryPredicateArg::Capture(capt2))
364503 ) => {
365− let get_line_num = |node: Node| {
366− let mut node_line = node.start_position().row;
367− // Adjust for the new line that will be inserted
368− if let Some((line, byte)) = new_line_break {
369− if node_line==line && node.start_byte()>=byte {
370− node_line += 1;
371− }
372− }
373− node_line
374− };
375504 let n1 = m.nodes_for_capture_index(*capt1).next();
376505 let n2 = m.nodes_for_capture_index(*capt2).next();
377506 match (n1, n2) {
378507 (Some(n1), Some(n2)) => {
379− let same_line = get_line_num(n1)==get_line_num(n2);
508+ let n1_line = get_node_start_line(n1, new_line_byte_pos);
509+ let n2_line = get_node_start_line(n2, new_line_byte_pos);
510+ let same_line = n1_line == n2_line;
380511 same_line==(pred.operator.as_ref()=="same-line?")
381512 }
382513 _ => true,
@@ -387,6 +518,23 @@ fn query_indents(
387518 }
388519 }
389520 }
521+ "one-line?" | "not-one-line?" => match pred.args.get(0) {
522+ Some(QueryPredicateArg::Capture(capture_idx)) => {
523+ let node = m.nodes_for_capture_index(*capture_idx).next();
524+
525+ match node {
526+ Some(node) => {
527+ let (start_line, end_line) = (get_node_start_line(node,new_line_byte_pos), get_node_end_line(node, new_line_byte_pos));
528+ let one_line = end_line == start_line;
529+ one_line != (pred.operator.as_ref() == "not-one-line?")
530+ },
531+ _ => true,
532+ }
533+ }
534+ _ => {
535+ panic!("Invalid indent query: Arguments to \"not-kind-eq?\" must be a capture and a string");
536+ }
537+ },
390538 _ => {
391539 panic!(
392540 "Invalid indent query: Unknown predicate (\"{}\")",
@@ -397,11 +545,28 @@ fn query_indents(
397545 }) {
398546 continue;
399547 }
548+ // A list of pairs (node_id, indent_capture) that are added by this match.
549+ // They cannot be added to indent_captures immediately since they may depend on other captures (such as an @anchor).
550+ let mut added_indent_captures: Vec<(usize, IndentCapture)> = Vec::new();
551+ // The row/column position of the optional anchor in this query
552+ let mut anchor: Option<tree_sitter::Node> = None;
400553 for capture in m.captures {
401554 let capture_name = query.capture_names()[capture.index as usize].as_str();
402555 let capture_type = match capture_name {
403556 "indent" => IndentCaptureType::Indent,
557+ "indent.always" => IndentCaptureType::IndentAlways,
404558 "outdent" => IndentCaptureType::Outdent,
559+ "outdent.always" => IndentCaptureType::OutdentAlways,
560+ // The alignment will be updated to the correct value at the end, when the anchor is known.
561+ "align" => IndentCaptureType::Align(RopeSlice::from("")),
562+ "anchor" => {
563+ if anchor.is_some() {
564+ log::error!("Invalid indent query: Encountered more than one @anchor in the same match.")
565+ } else {
566+ anchor = Some(capture.node);
567+ }
568+ continue;
569+ }
405570 "extend" => {
406571 extend_captures
407572 .entry(capture.node.id())
@@ -451,17 +616,40 @@ fn query_indents(
451616 }
452617 }
453618 }
619+ added_indent_captures.push((capture.node.id(), indent_capture))
620+ }
621+ for (node_id, mut capture) in added_indent_captures {
622+ // Set the anchor for all align queries.
623+ if let IndentCaptureType::Align(_) = capture.capture_type {
624+ let anchor = match anchor {
625+ None => {
626+ log::error!(
627+ "Invalid indent query: @align requires an accompanying @anchor."
628+ );
629+ continue;
630+ }
631+ Some(anchor) => anchor,
632+ };
633+ capture.capture_type = IndentCaptureType::Align(
634+ text.line(anchor.start_position().row)
635+ .byte_slice(0..anchor.start_position().column),
636+ );
637+ }
454638 indent_captures
455− .entry(capture.node.id())
456− // Most entries only need to contain a single IndentCapture
639+ .entry(node_id)
457640 .or_insert_with(|| Vec::with_capacity(1))
458− .push(indent_capture);
641+ .push(capture);
459642 }
460643 }
461− IndentQueryResult {
644+
645+ let result = IndentQueryResult {
462646 indent_captures,
463647 extend_captures,
464− }
648+ };
649+
650+ log::trace!("indent result = {:?}", result);
651+
652+ result
465653}
466654
467655/// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.
@@ -531,61 +719,27 @@ fn extend_nodes<'a>(
531719 }
532720}
533721
534−/// Use the syntax tree to determine the indentation for a given position.
535−/// This can be used in 2 ways:
536−///
537−/// - To get the correct indentation for an existing line (new_line=false), not necessarily equal to the current indentation.
538−/// - In this case, pos should be inside the first tree-sitter node on that line.
539−/// In most cases, this can just be the first non-whitespace on that line.
540−/// - To get the indentation for a new line (new_line=true). This behaves like the first usecase if the part of the current line
541−/// after pos were moved to a new line.
542−///
543−/// The indentation is determined by traversing all the tree-sitter nodes containing the position.
544−/// Each of these nodes produces some [Indentation] for:
545−///
546−/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
547−/// - The line after the node. This is defined by:
548−/// - The scope `tail`.
549−/// - The scope `all` if this node is not the first node on its line.
550−/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
551−/// The indents from different nodes for the same line are then combined.
552−/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
553−///
554−/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
555−/// ```ignore
556−/// some_function(|| {
557−/// // Both the function parameters as well as the contained block should be indented.
558−/// // Because they are on the same line, this only yields one indent level
559−/// });
560−/// ```
561−///
562−/// ```ignore
563−/// some_function(
564−/// param1,
565−/// || {
566−/// // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines
567−/// },
568−/// );
569−/// ```
722+/// Prepare an indent query by computing:
723+/// - The node from which to start the query (this is non-trivial due to `@extend` captures)
724+/// - The indent captures for all relevant nodes.
570725#[allow(clippy::too_many_arguments)]
571−pub fn treesitter_indent_for_pos(
726+fn init_indent_query<'a, 'b>(
572727 query: &Query,
573− syntax: &Syntax,
574− indent_style: &IndentStyle,
728+ syntax: &'a Syntax,
729+ text: RopeSlice<'b>,
575730 tab_width: usize,
576731 indent_width: usize,
577− text: RopeSlice,
578732 line: usize,
579− pos: usize,
580− new_line: bool,
581−) -> Option<String> {
582− let byte_pos = text.char_to_byte(pos);
733+ byte_pos: usize,
734+ new_line_byte_pos: Option<usize>,
735+) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {
583736 // The innermost tree-sitter node which is considered for the indent
584737 // computation. It may change if some predeceding node is extended
585738 let mut node = syntax
586739 .tree()
587740 .root_node()
588741 .descendant_for_byte_range(byte_pos, byte_pos)?;
742+
589743 let (query_result, deepest_preceding) = {
590744 // The query range should intersect with all nodes directly preceding
591745 // the position of the indent query in case one of them is extended.
@@ -616,13 +770,12 @@ pub fn treesitter_indent_for_pos(
616770 &mut cursor,
617771 text,
618772 query_range,
619− new_line.then_some((line, byte_pos)),
773+ new_line_byte_pos,
620774 );
621775 ts_parser.cursors.push(cursor);
622776 (query_result, deepest_preceding)
623777 })
624778 };
625− let indent_captures = query_result.indent_captures;
626779 let extend_captures = query_result.extend_captures;
627780
628781 // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -637,6 +790,68 @@ pub fn treesitter_indent_for_pos(
637790 indent_width,
638791 );
639792 }
793+ Some((node, query_result.indent_captures))
794+}
795+
796+/// Use the syntax tree to determine the indentation for a given position.
797+/// This can be used in 2 ways:
798+///
799+/// - To get the correct indentation for an existing line (new_line=false), not necessarily equal to the current indentation.
800+/// - In this case, pos should be inside the first tree-sitter node on that line.
801+/// In most cases, this can just be the first non-whitespace on that line.
802+/// - To get the indentation for a new line (new_line=true). This behaves like the first usecase if the part of the current line
803+/// after pos were moved to a new line.
804+///
805+/// The indentation is determined by traversing all the tree-sitter nodes containing the position.
806+/// Each of these nodes produces some [Indentation] for:
807+///
808+/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
809+/// - The line after the node. This is defined by:
810+/// - The scope `tail`.
811+/// - The scope `all` if this node is not the first node on its line.
812+/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
813+/// The indents from different nodes for the same line are then combined.
814+/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
815+///
816+/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
817+/// ```ignore
818+/// some_function(|| {
819+/// // Both the function parameters as well as the contained block should be indented.
820+/// // Because they are on the same line, this only yields one indent level
821+/// });
822+/// ```
823+///
824+/// ```ignore
825+/// some_function(
826+/// param1,
827+/// || {
828+/// // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines
829+/// },
830+/// );
831+/// ```
832+#[allow(clippy::too_many_arguments)]
833+pub fn treesitter_indent_for_pos<'a>(
834+ query: &Query,
835+ syntax: &Syntax,
836+ tab_width: usize,
837+ indent_width: usize,
838+ text: RopeSlice<'a>,
839+ line: usize,
840+ pos: usize,
841+ new_line: bool,
842+) -> Option<Indentation<'a>> {
843+ let byte_pos = text.char_to_byte(pos);
844+ let new_line_byte_pos = new_line.then_some(byte_pos);
845+ let (mut node, mut indent_captures) = init_indent_query(
846+ query,
847+ syntax,
848+ text,
849+ tab_width,
850+ indent_width,
851+ line,
852+ byte_pos,
853+ new_line_byte_pos,
854+ )?;
640855 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
641856
642857 let mut result = Indentation::default();
@@ -644,12 +859,16 @@ pub fn treesitter_indent_for_pos(
644859 // even if there are multiple "indent" nodes on the same line
645860 let mut indent_for_line = Indentation::default();
646861 let mut indent_for_line_below = Indentation::default();
862+
647863 loop {
648864 // This can safely be unwrapped because `first_in_line` contains
649865 // one entry for each ancestor of the node (which is what we iterate over)
650866 let is_first = *first_in_line.last().unwrap();
651− // Apply all indent definitions for this node
652− if let Some(definitions) = indent_captures.get(&node.id()) {
867+
868+ // Apply all indent definitions for this node.
869+ // Since we only iterate over each node once, we can remove the
870+ // corresponding captures from the HashMap to avoid cloning them.
871+ if let Some(definitions) = indent_captures.remove(&node.id()) {
653872 for definition in definitions {
654873 match definition.scope {
655874 IndentScope::All => {
@@ -667,28 +886,22 @@ pub fn treesitter_indent_for_pos(
667886 }
668887
669888 if let Some(parent) = node.parent() {
670− let mut node_line = node.start_position().row;
671− let mut parent_line = parent.start_position().row;
672− if node_line == line && new_line {
673− // Also consider the line that will be inserted
674− if node.start_byte() >= byte_pos {
675− node_line += 1;
676− }
677− if parent.start_byte() >= byte_pos {
678− parent_line += 1;
679− }
680− };
889+ let node_line = get_node_start_line(node, new_line_byte_pos);
890+ let parent_line = get_node_start_line(parent, new_line_byte_pos);
891+
681892 if node_line != parent_line {
893+ // Don't add indent for the line below the line of the query
682894 if node_line < line + (new_line as usize) {
683− // Don't add indent for the line below the line of the query
684− result.add_line(&indent_for_line_below);
895+ result.add_line(indent_for_line_below);
685896 }
897+
686898 if node_line == parent_line + 1 {
687899 indent_for_line_below = indent_for_line;
688900 } else {
689− result.add_line(&indent_for_line);
901+ result.add_line(indent_for_line);
690902 indent_for_line_below = Indentation::default();
691903 }
904+
692905 indent_for_line = Indentation::default();
693906 }
694907
@@ -700,13 +913,13 @@ pub fn treesitter_indent_for_pos(
700913 if (node.start_position().row < line)
701914 || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)
702915 {
703− result.add_line(&indent_for_line_below);
916+ result.add_line(indent_for_line_below);
704917 }
705− result.add_line(&indent_for_line);
918+ result.add_line(indent_for_line);
706919 break;
707920 }
708921 }
709− Some(result.as_string(indent_style))
922+ Some(result)
710923}
711924
712925/// Returns the indentation for a new line.
@@ -715,6 +928,7 @@ pub fn treesitter_indent_for_pos(
715928pub fn indent_for_newline(
716929 language_config: Option<&LanguageConfiguration>,
717930 syntax: Option<&Syntax>,
931+ indent_heuristic: &IndentationHeuristic,
718932 indent_style: &IndentStyle,
719933 tab_width: usize,
720934 text: RopeSlice,
@@ -723,14 +937,18 @@ pub fn indent_for_newline(
723937 current_line: usize,
724938) -> String {
725939 let indent_width = indent_style.indent_width(tab_width);
726− if let (Some(query), Some(syntax)) = (
940+ if let (
941+ IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,
942+ Some(query),
943+ Some(syntax),
944+ ) = (
945+ indent_heuristic,
727946 language_config.and_then(|config| config.indent_query()),
728947 syntax,
729948 ) {
730949 if let Some(indent) = treesitter_indent_for_pos(
731950 query,
732951 syntax,
733− indent_style,
734952 tab_width,
735953 indent_width,
736954 text,
@@ -738,9 +956,57 @@ pub fn indent_for_newline(
738956 line_before_end_pos,
739957 true,
740958 ) {
741− return indent;
959+ if *indent_heuristic == IndentationHeuristic::Hybrid {
960+ // We want to compute the indentation not only based on the
961+ // syntax tree but also on the actual indentation of a previous
962+ // line. This makes indentation computation more resilient to
963+ // incomplete queries, incomplete source code & differing indentation
964+ // styles for the same language.
965+ // However, using the indent of a previous line as a baseline may not
966+ // make sense, e.g. if it has a different alignment than the new line.
967+ // In order to prevent edge cases with long running times, we only try
968+ // a constant number of (non-empty) lines.
969+ const MAX_ATTEMPTS: usize = 4;
970+ let mut num_attempts = 0;
971+ for line_idx in (0..=line_before).rev() {
972+ let line = text.line(line_idx);
973+ let first_non_whitespace_char = match find_first_non_whitespace_char(line) {
974+ Some(i) => i,
975+ None => {
976+ continue;
977+ }
978+ };
979+ if let Some(indent) = (|| {
980+ let computed_indent = treesitter_indent_for_pos(
981+ query,
982+ syntax,
983+ tab_width,
984+ indent_width,
985+ text,
986+ line_idx,
987+ text.line_to_char(line_idx) + first_non_whitespace_char,
988+ false,
989+ )?;
990+ let leading_whitespace = line.slice(0..first_non_whitespace_char);
991+ indent.relative_indent(
992+ &computed_indent,
993+ leading_whitespace,
994+ indent_style,
995+ tab_width,
996+ )
997+ })() {
998+ return indent;
999+ }
1000+ num_attempts += 1;
1001+ if num_attempts == MAX_ATTEMPTS {
1002+ break;
1003+ }
1004+ }
1005+ }
1006+ return indent.to_string(indent_style, tab_width);
7421007 };
7431008 }
1009+ // Fallback in case we either don't have indent queries or they failed for some reason
7441010 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
7451011 indent_style.as_str().repeat(indent_level)
7461012}
@@ -796,4 +1062,211 @@ mod test {
7961062 3
7971063 );
7981064 }
1065+
1066+ #[test]
1067+ fn test_large_indent_level() {
1068+ let tab_width = 16;
1069+ let indent_width = 16;
1070+ let line = Rope::from(" fn new"); // 16 spaces
1071+ assert_eq!(
1072+ indent_level_for_line(line.slice(..), tab_width, indent_width),
1073+ 1
1074+ );
1075+ let line = Rope::from(" fn new"); // 32 spaces
1076+ assert_eq!(
1077+ indent_level_for_line(line.slice(..), tab_width, indent_width),
1078+ 2
1079+ );
1080+ }
1081+
1082+ #[test]
1083+ fn add_capture() {
1084+ let indent = || Indentation {
1085+ indent: 1,
1086+ ..Default::default()
1087+ };
1088+ let indent_always = || Indentation {
1089+ indent_always: 1,
1090+ ..Default::default()
1091+ };
1092+ let outdent = || Indentation {
1093+ outdent: 1,
1094+ ..Default::default()
1095+ };
1096+ let outdent_always = || Indentation {
1097+ outdent_always: 1,
1098+ ..Default::default()
1099+ };
1100+
1101+ fn add_capture<'a>(
1102+ mut indent: Indentation<'a>,
1103+ capture: IndentCaptureType<'a>,
1104+ ) -> Indentation<'a> {
1105+ indent.add_capture(capture);
1106+ indent
1107+ }
1108+
1109+ // adding an indent to no indent makes an indent
1110+ assert_eq!(
1111+ indent(),
1112+ add_capture(Indentation::default(), IndentCaptureType::Indent)
1113+ );
1114+ assert_eq!(
1115+ indent_always(),
1116+ add_capture(Indentation::default(), IndentCaptureType::IndentAlways)
1117+ );
1118+ assert_eq!(
1119+ outdent(),
1120+ add_capture(Indentation::default(), IndentCaptureType::Outdent)
1121+ );
1122+ assert_eq!(
1123+ outdent_always(),
1124+ add_capture(Indentation::default(), IndentCaptureType::OutdentAlways)
1125+ );
1126+
1127+ // adding an indent to an already indented has no effect
1128+ assert_eq!(indent(), add_capture(indent(), IndentCaptureType::Indent));
1129+ assert_eq!(
1130+ outdent(),
1131+ add_capture(outdent(), IndentCaptureType::Outdent)
1132+ );
1133+
1134+ // adding an always to a regular makes it always
1135+ assert_eq!(
1136+ indent_always(),
1137+ add_capture(indent(), IndentCaptureType::IndentAlways)
1138+ );
1139+ assert_eq!(
1140+ outdent_always(),
1141+ add_capture(outdent(), IndentCaptureType::OutdentAlways)
1142+ );
1143+
1144+ // adding an always to an always is additive
1145+ assert_eq!(
1146+ Indentation {
1147+ indent_always: 2,
1148+ ..Default::default()
1149+ },
1150+ add_capture(indent_always(), IndentCaptureType::IndentAlways)
1151+ );
1152+ assert_eq!(
1153+ Indentation {
1154+ outdent_always: 2,
1155+ ..Default::default()
1156+ },
1157+ add_capture(outdent_always(), IndentCaptureType::OutdentAlways)
1158+ );
1159+
1160+ // adding regular to always should be associative
1161+ assert_eq!(
1162+ Indentation {
1163+ indent_always: 1,
1164+ ..Default::default()
1165+ },
1166+ add_capture(
1167+ add_capture(indent(), IndentCaptureType::Indent),
1168+ IndentCaptureType::IndentAlways
1169+ )
1170+ );
1171+ assert_eq!(
1172+ Indentation {
1173+ indent_always: 1,
1174+ ..Default::default()
1175+ },
1176+ add_capture(
1177+ add_capture(indent(), IndentCaptureType::IndentAlways),
1178+ IndentCaptureType::Indent
1179+ )
1180+ );
1181+ assert_eq!(
1182+ Indentation {
1183+ outdent_always: 1,
1184+ ..Default::default()
1185+ },
1186+ add_capture(
1187+ add_capture(outdent(), IndentCaptureType::Outdent),
1188+ IndentCaptureType::OutdentAlways
1189+ )
1190+ );
1191+ assert_eq!(
1192+ Indentation {
1193+ outdent_always: 1,
1194+ ..Default::default()
1195+ },
1196+ add_capture(
1197+ add_capture(outdent(), IndentCaptureType::OutdentAlways),
1198+ IndentCaptureType::Outdent
1199+ )
1200+ );
1201+ }
1202+
1203+ #[test]
1204+ fn test_relative_indent() {
1205+ let indent_style = IndentStyle::Spaces(4);
1206+ let tab_width: usize = 4;
1207+ let no_align = [
1208+ Indentation::default(),
1209+ Indentation {
1210+ indent: 1,
1211+ ..Default::default()
1212+ },
1213+ Indentation {
1214+ indent: 5,
1215+ outdent: 1,
1216+ ..Default::default()
1217+ },
1218+ ];
1219+ let align = no_align.clone().map(|indent| Indentation {
1220+ align: Some(RopeSlice::from("12345")),
1221+ ..indent
1222+ });
1223+ let different_align = Indentation {
1224+ align: Some(RopeSlice::from("123456")),
1225+ ..Default::default()
1226+ };
1227+
1228+ // Check that relative and absolute indentation computation are the same when the line we compare to is
1229+ // indented as we expect.
1230+ let check_consistency = |indent: &Indentation, other: &Indentation| {
1231+ assert_eq!(
1232+ indent.relative_indent(
1233+ other,
1234+ RopeSlice::from(other.to_string(&indent_style, tab_width).as_str()),
1235+ &indent_style,
1236+ tab_width
1237+ ),
1238+ Some(indent.to_string(&indent_style, tab_width))
1239+ );
1240+ };
1241+ for a in &no_align {
1242+ for b in &no_align {
1243+ check_consistency(a, b);
1244+ }
1245+ }
1246+ for a in &align {
1247+ for b in &align {
1248+ check_consistency(a, b);
1249+ }
1250+ }
1251+
1252+ // Relative indent computation makes no sense if the alignment differs
1253+ assert_eq!(
1254+ align[0].relative_indent(
1255+ &no_align[0],
1256+ RopeSlice::from(" "),
1257+ &indent_style,
1258+ tab_width
1259+ ),
1260+ None
1261+ );
1262+ assert_eq!(
1263+ align[0].relative_indent(
1264+ &different_align,
1265+ RopeSlice::from(" "),
1266+ &indent_style,
1267+ tab_width
1268+ ),
1269+ None
1270+ );
1271+ }
7991272}
helix-core/src/lib.rs+8−49
@@ -7,6 +7,7 @@ pub mod config;
77pub mod diagnostic;
88pub mod diff;
99pub mod doc_formatter;
10+pub mod fuzzy;
1011pub mod graphemes;
1112pub mod history;
1213pub mod increment;
@@ -18,7 +19,6 @@ pub mod movement;
1819pub mod object;
1920pub mod path;
2021mod position;
21−pub mod register;
2222pub mod search;
2323pub mod selection;
2424pub mod shellwords;
@@ -36,55 +36,14 @@ pub mod unicode {
3636 pub use unicode_width as width;
3737}
3838
39+pub use helix_loader::find_workspace;
40+
3941pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
4042 line.chars().position(|ch| !ch.is_whitespace())
4143}
44+mod rope_reader;
4245
43−/// Find project root.
44−///
45−/// Order of detection:
46−/// * Top-most folder containing a root marker in current git repository
47−/// * Git repository root if no marker detected
48−/// * Top-most folder containing a root marker if not git repository detected
49−/// * Current working directory as fallback
50−pub fn find_root(root: Option<&str>, root_markers: &[String]) -> std::path::PathBuf {
51− let current_dir = std::env::current_dir().expect("unable to determine current directory");
52−
53− let root = match root {
54− Some(root) => {
55− let root = std::path::Path::new(root);
56− if root.is_absolute() {
57− root.to_path_buf()
58− } else {
59− current_dir.join(root)
60− }
61− }
62− None => current_dir.clone(),
63− };
64−
65− let mut top_marker = None;
66− for ancestor in root.ancestors() {
67− if root_markers
68− .iter()
69− .any(|marker| ancestor.join(marker).exists())
70− {
71− top_marker = Some(ancestor);
72− }
73−
74− if ancestor.join(".git").exists() {
75− // Top marker is repo root if not root marker was detected yet
76− if top_marker.is_none() {
77− top_marker = Some(ancestor);
78− }
79− // Don't go higher than repo if we're in one
80− break;
81− }
82− }
83−
84− // Return the found top marker or the current_dir as fallback
85− top_marker.map_or(current_dir, |a| a.to_path_buf())
86−}
87−
46+pub use rope_reader::RopeReader;
8847pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
8948
9049// pub use tendril::StrTendril as Tendril;
@@ -98,7 +57,7 @@ pub use {regex, tree_sitter};
9857pub use graphemes::RopeGraphemes;
9958pub use position::{
10059 char_idx_at_visual_offset, coords_at_pos, pos_at_coords, visual_offset_from_anchor,
101− visual_offset_from_block, Position,
60+ visual_offset_from_block, Position, VisualOffsetError,
10261};
10362#[allow(deprecated)]
10463pub use position::{pos_at_visual_coords, visual_coords_at_pos};
@@ -109,5 +68,5 @@ pub use syntax::Syntax;
10968
11069pub use diagnostic::Diagnostic;
11170
112−pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};
113−pub use transaction::{Assoc, Change, ChangeSet, Operation, Transaction};
71+pub use line_ending::{LineEnding, NATIVE_LINE_ENDING};
72+pub use transaction::{Assoc, Change, ChangeSet, Deletion, Operation, Transaction};
helix-core/src/line_ending.rs+2−2
@@ -1,9 +1,9 @@
11use crate::{Rope, RopeSlice};
22
33#[cfg(target_os = "windows")]
4−pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;
4+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::Crlf;
55#[cfg(not(target_os = "windows"))]
6−pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::LF;
6+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::LF;
77
88/// Represents one of the valid Unicode line endings.
99#[derive(PartialEq, Eq, Copy, Clone, Debug)]
helix-core/src/match_brackets.rs+232−29
@@ -1,7 +1,15 @@
1+use std::iter;
2+
3+use ropey::RopeSlice;
14use tree_sitter::Node;
25
3−use crate::{Rope, Syntax};
6+use crate::movement::Direction::{self, Backward, Forward};
7+use crate::Syntax;
8+
9+const MAX_PLAINTEXT_SCAN: usize = 10000;
10+const MATCH_LIMIT: usize = 16;
411
12+// Limit matching pairs to only ( ) { } [ ] < > ' ' " "
513const PAIRS: &[(char, char)] = &[
614 ('(', ')'),
715 ('{', '}'),
@@ -11,17 +19,17 @@ const PAIRS: &[(char, char)] = &[
1119 ('\"', '\"'),
1220];
1321
14−// limit matching pairs to only ( ) { } [ ] < > ' ' " "
15−
16−// Returns the position of the matching bracket under cursor.
17−//
18−// If the cursor is one the opening bracket, the position of
19−// the closing bracket is returned. If the cursor in the closing
20−// bracket, the position of the opening bracket is returned.
21−//
22−// If the cursor is not on a bracket, `None` is returned.
22+/// Returns the position of the matching bracket under cursor.
23+///
24+/// If the cursor is on the opening bracket, the position of
25+/// the closing bracket is returned. If the cursor on the closing
26+/// bracket, the position of the opening bracket is returned.
27+///
28+/// If the cursor is not on a bracket, `None` is returned.
29+///
30+/// If no matching bracket is found, `None` is returned.
2331#[must_use]
24−pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
32+pub fn find_matching_bracket(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
2533 if pos >= doc.len_chars() || !is_valid_bracket(doc.char(pos)) {
2634 return None;
2735 }
@@ -39,46 +47,159 @@ pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<
3947//
4048// If no surrounding scope is found, the function returns `None`.
4149#[must_use]
42−pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
50+pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
4351 find_pair(syntax, doc, pos, true)
4452}
4553
46−fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) -> Option<usize> {
54+fn find_pair(
55+ syntax: &Syntax,
56+ doc: RopeSlice,
57+ pos_: usize,
58+ traverse_parents: bool,
59+) -> Option<usize> {
4760 let tree = syntax.tree();
48− let pos = doc.char_to_byte(pos);
61+ let pos = doc.char_to_byte(pos_);
4962
50− let mut node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
63+ let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;
5164
5265 loop {
53− let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;
54− let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));
66+ if node.is_named() {
67+ let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;
68+ let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));
69+
70+ if is_valid_pair(doc, start_char, end_char) {
71+ if end_byte == pos {
72+ return Some(start_char);
73+ }
5574
56− if is_valid_pair(doc, start_char, end_char) {
57− if end_byte == pos {
58− return Some(start_char);
75+ // We return the end char if the cursor is either on the start char
76+ // or at some arbitrary position between start and end char.
77+ if traverse_parents || start_byte == pos {
78+ return Some(end_char);
79+ }
5980 }
60− // We return the end char if the cursor is either on the start char
61− // or at some arbitrary position between start and end char.
62− return Some(end_char);
6381 }
82+ // this node itselt wasn't a pair but maybe its siblings are
6483
65− if traverse_parents {
66− node = node.parent()?;
67− } else {
68− return None;
84+ // check if we are *on* the pair (special cased so we don't look
85+ // at the current node twice and to jump to the start on that case)
86+ if let Some(open) = as_close_pair(doc, &node) {
87+ if let Some(pair_start) = find_pair_end(doc, node.prev_sibling(), open, Backward) {
88+ return Some(pair_start);
89+ }
6990 }
91+
92+ if !traverse_parents {
93+ // check if we are *on* the opening pair (special cased here as
94+ // an opptimization since we only care about bracket on the cursor
95+ // here)
96+ if let Some(close) = as_open_pair(doc, &node) {
97+ if let Some(pair_end) = find_pair_end(doc, node.next_sibling(), close, Forward) {
98+ return Some(pair_end);
99+ }
100+ }
101+ if node.is_named() {
102+ break;
103+ }
104+ }
105+
106+ for close in
107+ iter::successors(node.next_sibling(), |node| node.next_sibling()).take(MATCH_LIMIT)
108+ {
109+ let Some(open) = as_close_pair(doc, &close) else {
110+ continue;
111+ };
112+ if find_pair_end(doc, Some(node), open, Backward).is_some() {
113+ return doc.try_byte_to_char(close.start_byte()).ok();
114+ }
115+ }
116+ let Some(parent) = node.parent() else {
117+ break;
118+ };
119+ node = parent;
120+ }
121+ let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
122+ if node.child_count() != 0 {
123+ return None;
70124 }
125+ let node_start = doc.byte_to_char(node.start_byte());
126+ find_matching_bracket_plaintext(doc.byte_slice(node.byte_range()), pos_ - node_start)
127+ .map(|pos| pos + node_start)
128+}
129+
130+/// Returns the position of the matching bracket under cursor.
131+/// This function works on plain text and ignores tree-sitter grammar.
132+/// The search is limited to `MAX_PLAINTEXT_SCAN` characters
133+///
134+/// If the cursor is on the opening bracket, the position of
135+/// the closing bracket is returned. If the cursor on the closing
136+/// bracket, the position of the opening bracket is returned.
137+///
138+/// If the cursor is not on a bracket, `None` is returned.
139+///
140+/// If no matching bracket is found, `None` is returned.
141+#[must_use]
142+pub fn find_matching_bracket_plaintext(doc: RopeSlice, cursor_pos: usize) -> Option<usize> {
143+ // Don't do anything when the cursor is not on top of a bracket.
144+ let bracket = doc.char(cursor_pos);
145+ if !is_valid_bracket(bracket) {
146+ return None;
147+ }
148+
149+ // Determine the direction of the matching.
150+ let is_fwd = is_forward_bracket(bracket);
151+ let chars_iter = if is_fwd {
152+ doc.chars_at(cursor_pos + 1)
153+ } else {
154+ doc.chars_at(cursor_pos).reversed()
155+ };
156+
157+ let mut open_cnt = 1;
158+
159+ for (i, candidate) in chars_iter.take(MAX_PLAINTEXT_SCAN).enumerate() {
160+ if candidate == bracket {
161+ open_cnt += 1;
162+ } else if is_valid_pair(
163+ doc,
164+ if is_fwd {
165+ cursor_pos
166+ } else {
167+ cursor_pos - i - 1
168+ },
169+ if is_fwd {
170+ cursor_pos + i + 1
171+ } else {
172+ cursor_pos
173+ },
174+ ) {
175+ // Return when all pending brackets have been closed.
176+ if open_cnt == 1 {
177+ return Some(if is_fwd {
178+ cursor_pos + i + 1
179+ } else {
180+ cursor_pos - i - 1
181+ });
182+ }
183+ open_cnt -= 1;
184+ }
185+ }
186+
187+ None
71188}
72189
73190fn is_valid_bracket(c: char) -> bool {
74191 PAIRS.iter().any(|(l, r)| *l == c || *r == c)
75192}
76193
77−fn is_valid_pair(doc: &Rope, start_char: usize, end_char: usize) -> bool {
194+fn is_forward_bracket(c: char) -> bool {
195+ PAIRS.iter().any(|(l, _)| *l == c)
196+}
197+
198+fn is_valid_pair(doc: RopeSlice, start_char: usize, end_char: usize) -> bool {
78199 PAIRS.contains(&(doc.char(start_char), doc.char(end_char)))
79200}
80201
81−fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
202+fn surrounding_bytes(doc: RopeSlice, node: &Node) -> Option<(usize, usize)> {
82203 let len = doc.len_bytes();
83204
84205 let start_byte = node.start_byte();
@@ -90,3 +211,85 @@ fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
90211
91212 Some((start_byte, end_byte))
92213}
214+
215+/// Tests if this node is a pair close char and returns the expected open char
216+fn as_close_pair(doc: RopeSlice, node: &Node) -> Option<char> {
217+ let close = as_char(doc, node)?.1;
218+ PAIRS
219+ .iter()
220+ .find_map(|&(open, close_)| (close_ == close).then_some(open))
221+}
222+
223+/// Checks if `node` or its siblings (at most MATCH_LIMIT nodes) is the specified closing char
224+///
225+/// # Returns
226+///
227+/// The position of the found node or `None` otherwise
228+fn find_pair_end(
229+ doc: RopeSlice,
230+ node: Option<Node>,
231+ end_char: char,
232+ direction: Direction,
233+) -> Option<usize> {
234+ let advance = match direction {
235+ Forward => Node::next_sibling,
236+ Backward => Node::prev_sibling,
237+ };
238+ iter::successors(node, advance)
239+ .take(MATCH_LIMIT)
240+ .find_map(|node| {
241+ let (pos, c) = as_char(doc, &node)?;
242+ (end_char == c).then_some(pos)
243+ })
244+}
245+
246+/// Tests if this node is a pair close char and returns the expected open char
247+fn as_open_pair(doc: RopeSlice, node: &Node) -> Option<char> {
248+ let open = as_char(doc, node)?.1;
249+ PAIRS
250+ .iter()
251+ .find_map(|&(open_, close)| (open_ == open).then_some(close))
252+}
253+
254+/// If node is a single char return it (and its char position)
255+fn as_char(doc: RopeSlice, node: &Node) -> Option<(usize, char)> {
256+ // TODO: multi char/non ASCII pairs
257+ if node.byte_range().len() != 1 {
258+ return None;
259+ }
260+ let pos = doc.try_byte_to_char(node.start_byte()).ok()?;
261+ Some((pos, doc.char(pos)))
262+}
263+
264+#[cfg(test)]
265+mod tests {
266+ use super::*;
267+
268+ #[test]
269+ fn test_find_matching_bracket_current_line_plaintext() {
270+ let assert = |input: &str, pos, expected| {
271+ let input = RopeSlice::from(input);
272+ let actual = find_matching_bracket_plaintext(input, pos);
273+ assert_eq!(expected, actual.unwrap());
274+
275+ let actual = find_matching_bracket_plaintext(input, expected);
276+ assert_eq!(pos, actual.unwrap(), "expected symmetrical behaviour");
277+ };
278+
279+ assert("(hello)", 0, 6);
280+ assert("((hello))", 0, 8);
281+ assert("((hello))", 1, 7);
282+ assert("(((hello)))", 2, 8);
283+
284+ assert("key: ${value}", 6, 12);
285+ assert("key: ${value} # (some comment)", 16, 29);
286+
287+ assert("(paren (paren {bracket}))", 0, 24);
288+ assert("(paren (paren {bracket}))", 7, 23);
289+ assert("(paren (paren {bracket}))", 14, 22);
290+
291+ assert("(prev line\n ) (middle) ( \n next line)", 0, 12);
292+ assert("(prev line\n ) (middle) ( \n next line)", 14, 21);
293+ assert("(prev line\n ) (middle) ( \n next line)", 23, 36);
294+ }
295+}
helix-core/src/movement.rs+195−15
@@ -1,4 +1,4 @@
1−use std::iter;
1+use std::{cmp::Reverse, iter};
22
33use ropey::iter::Chars;
44use tree_sitter::{Node, QueryCursor};
@@ -16,7 +16,7 @@ use crate::{
1616 syntax::LanguageConfiguration,
1717 text_annotations::TextAnnotations,
1818 textobject::TextObject,
19− visual_offset_from_block, Range, RopeSlice,
19+ visual_offset_from_block, Range, RopeSlice, Selection, Syntax,
2020};
2121
2222#[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -62,7 +62,7 @@ pub fn move_vertically_visual(
6262 annotations: &mut TextAnnotations,
6363) -> Range {
6464 if !text_fmt.soft_wrap {
65− move_vertically(slice, range, dir, count, behaviour, text_fmt, annotations);
65+ return move_vertically(slice, range, dir, count, behaviour, text_fmt, annotations);
6666 }
6767 annotations.clear_line_annotations();
6868 let pos = range.cursor(slice);
@@ -177,6 +177,10 @@ pub fn move_prev_word_start(slice: RopeSlice, range: Range, count: usize) -> Ran
177177 word_move(slice, range, count, WordMotionTarget::PrevWordStart)
178178}
179179
180+pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
181+ word_move(slice, range, count, WordMotionTarget::PrevWordEnd)
182+}
183+
180184pub fn move_next_long_word_start(slice: RopeSlice, range: Range, count: usize) -> Range {
181185 word_move(slice, range, count, WordMotionTarget::NextLongWordStart)
182186}
@@ -189,8 +193,8 @@ pub fn move_prev_long_word_start(slice: RopeSlice, range: Range, count: usize) -
189193 word_move(slice, range, count, WordMotionTarget::PrevLongWordStart)
190194}
191195
192−pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
193− word_move(slice, range, count, WordMotionTarget::PrevWordEnd)
196+pub fn move_prev_long_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
197+ word_move(slice, range, count, WordMotionTarget::PrevLongWordEnd)
194198}
195199
196200fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {
@@ -199,6 +203,7 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar
199203 WordMotionTarget::PrevWordStart
200204 | WordMotionTarget::PrevLongWordStart
201205 | WordMotionTarget::PrevWordEnd
206+ | WordMotionTarget::PrevLongWordEnd
202207 );
203208
204209 // Special-case early-out.
@@ -377,6 +382,7 @@ pub enum WordMotionTarget {
377382 NextLongWordStart,
378383 NextLongWordEnd,
379384 PrevLongWordStart,
385+ PrevLongWordEnd,
380386}
381387
382388pub trait CharHelpers {
@@ -393,6 +399,7 @@ impl CharHelpers for Chars<'_> {
393399 WordMotionTarget::PrevWordStart
394400 | WordMotionTarget::PrevLongWordStart
395401 | WordMotionTarget::PrevWordEnd
402+ | WordMotionTarget::PrevLongWordEnd
396403 );
397404
398405 // Reverse the iterator if needed for the motion direction.
@@ -479,7 +486,7 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo
479486 is_word_boundary(prev_ch, next_ch)
480487 && (!prev_ch.is_whitespace() || char_is_line_ending(next_ch))
481488 }
482− WordMotionTarget::NextLongWordStart => {
489+ WordMotionTarget::NextLongWordStart | WordMotionTarget::PrevLongWordEnd => {
483490 is_long_word_boundary(prev_ch, next_ch)
484491 && (char_is_line_ending(next_ch) || !next_ch.is_whitespace())
485492 }
@@ -520,10 +527,10 @@ pub fn goto_treesitter_object(
520527 let node = match dir {
521528 Direction::Forward => nodes
522529 .filter(|n| n.start_byte() > byte_pos)
523− .min_by_key(|n| n.start_byte())?,
530+ .min_by_key(|n| (n.start_byte(), Reverse(n.end_byte())))?,
524531 Direction::Backward => nodes
525532 .filter(|n| n.end_byte() < byte_pos)
526− .max_by_key(|n| n.end_byte())?,
533+ .max_by_key(|n| (n.end_byte(), Reverse(n.start_byte())))?,
527534 };
528535
529536 let len = slice.len_bytes();
@@ -549,6 +556,85 @@ pub fn goto_treesitter_object(
549556 last_range
550557}
551558
559+fn find_parent_start(mut node: Node) -> Option<Node> {
560+ let start = node.start_byte();
561+
562+ while node.start_byte() >= start || !node.is_named() {
563+ node = node.parent()?;
564+ }
565+
566+ Some(node)
567+}
568+
569+pub fn move_parent_node_end(
570+ syntax: &Syntax,
571+ text: RopeSlice,
572+ selection: Selection,
573+ dir: Direction,
574+ movement: Movement,
575+) -> Selection {
576+ let tree = syntax.tree();
577+
578+ selection.transform(|range| {
579+ let start_from = text.char_to_byte(range.from());
580+ let start_to = text.char_to_byte(range.to());
581+
582+ let mut node = match tree
583+ .root_node()
584+ .named_descendant_for_byte_range(start_from, start_to)
585+ {
586+ Some(node) => node,
587+ None => {
588+ log::debug!(
589+ "no descendant found for byte range: {} - {}",
590+ start_from,
591+ start_to
592+ );
593+ return range;
594+ }
595+ };
596+
597+ let mut end_head = match dir {
598+ // moving forward, we always want to move one past the end of the
599+ // current node, so use the end byte of the current node, which is an exclusive
600+ // end of the range
601+ Direction::Forward => text.byte_to_char(node.end_byte()),
602+
603+ // moving backward, we want the cursor to land on the start char of
604+ // the current node, or if it is already at the start of a node, to traverse up to
605+ // the parent
606+ Direction::Backward => {
607+ let end_head = text.byte_to_char(node.start_byte());
608+
609+ // if we're already on the beginning, look up to the parent
610+ if end_head == range.cursor(text) {
611+ node = find_parent_start(node).unwrap_or(node);
612+ text.byte_to_char(node.start_byte())
613+ } else {
614+ end_head
615+ }
616+ }
617+ };
618+
619+ if movement == Movement::Move {
620+ // preserve direction of original range
621+ if range.direction() == Direction::Forward {
622+ Range::new(end_head, end_head + 1)
623+ } else {
624+ Range::new(end_head + 1, end_head)
625+ }
626+ } else {
627+ // if we end up with a forward range, then adjust it to be one past
628+ // where we want
629+ if end_head >= range.anchor {
630+ end_head += 1;
631+ }
632+
633+ Range::new(range.anchor, end_head)
634+ }
635+ })
636+}
637+
552638#[cfg(test)]
553639mod test {
554640 use ropey::Rope;
@@ -1445,6 +1531,100 @@ mod test {
14451531 }
14461532 }
14471533
1534+ #[test]
1535+ fn test_behaviour_when_moving_to_end_of_prev_long_words() {
1536+ let tests = [
1537+ (
1538+ "Basic backward motion from the middle of a word",
1539+ vec![(1, Range::new(3, 3), Range::new(4, 0))],
1540+ ),
1541+ ("Starting from after boundary retreats the anchor",
1542+ vec![(1, Range::new(0, 9), Range::new(8, 0))],
1543+ ),
1544+ (
1545+ "Jump to end of a word succeeded by whitespace",
1546+ vec![(1, Range::new(10, 10), Range::new(10, 4))],
1547+ ),
1548+ (
1549+ " Jump to start of line from end of word preceded by whitespace",
1550+ vec![(1, Range::new(3, 4), Range::new(4, 0))],
1551+ ),
1552+ ("Previous anchor is irrelevant for backward motions",
1553+ vec![(1, Range::new(12, 5), Range::new(6, 0))]),
1554+ (
1555+ " Starting from whitespace moves to first space in sequence",
1556+ vec![(1, Range::new(0, 4), Range::new(4, 0))],
1557+ ),
1558+ ("Identifiers_with_underscores are considered a single word",
1559+ vec![(1, Range::new(0, 20), Range::new(20, 0))]),
1560+ (
1561+ "Jumping\n \nback through a newline selects whitespace",
1562+ vec![(1, Range::new(0, 13), Range::new(12, 8))],
1563+ ),
1564+ (
1565+ "Jumping to start of word from the end selects the word",
1566+ vec![(1, Range::new(6, 7), Range::new(7, 0))],
1567+ ),
1568+ (
1569+ "alphanumeric.!,and.?=punctuation are treated exactly the same",
1570+ vec![(1, Range::new(29, 30), Range::new(30, 0))],
1571+ ),
1572+ (
1573+ "... ... punctuation and spaces behave as expected",
1574+ vec![
1575+ (1, Range::new(0, 10), Range::new(9, 3)),
1576+ (1, Range::new(10, 6), Range::new(7, 3)),
1577+ ],
1578+ ),
1579+ (".._.._ punctuation is joined by underscores into a single block",
1580+ vec![(1, Range::new(0, 6), Range::new(6, 0))]),
1581+ (
1582+ "Newlines\n\nare bridged seamlessly.",
1583+ vec![(1, Range::new(0, 10), Range::new(8, 0))],
1584+ ),
1585+ (
1586+ "Jumping \n\n\n\n\nback from within a newline group selects previous block",
1587+ vec![(1, Range::new(0, 13), Range::new(11, 7))],
1588+ ),
1589+ (
1590+ "Failed motions do not modify the range",
1591+ vec![(0, Range::new(3, 0), Range::new(3, 0))],
1592+ ),
1593+ (
1594+ "Multiple motions at once resolve correctly",
1595+ vec![(3, Range::new(19, 19), Range::new(8, 0))],
1596+ ),
1597+ (
1598+ "Excessive motions are performed partially",
1599+ vec![(999, Range::new(40, 40), Range::new(9, 0))],
1600+ ),
1601+ (
1602+ "", // Edge case of moving backwards in empty string
1603+ vec![(1, Range::new(0, 0), Range::new(0, 0))],
1604+ ),
1605+ (
1606+ "\n\n\n\n\n", // Edge case of moving backwards in all newlines
1607+ vec![(1, Range::new(5, 5), Range::new(0, 0))],
1608+ ),
1609+ (" \n \nJumping back through alternated space blocks and newlines selects the space blocks",
1610+ vec![
1611+ (1, Range::new(0, 8), Range::new(7, 4)),
1612+ (1, Range::new(7, 4), Range::new(3, 0)),
1613+ ]),
1614+ ("ヒーリ..クス multibyte characters behave as normal characters, including when interacting with punctuation",
1615+ vec![
1616+ (1, Range::new(0, 8), Range::new(7, 0)),
1617+ ]),
1618+ ];
1619+
1620+ for (sample, scenario) in tests {
1621+ for (count, begin, expected_end) in scenario.into_iter() {
1622+ let range = move_prev_long_word_end(Rope::from(sample).slice(..), begin, count);
1623+ assert_eq!(range, expected_end, "Case failed: [{}]", sample);
1624+ }
1625+ }
1626+ }
1627+
14481628 #[test]
14491629 fn test_behaviour_when_moving_to_prev_paragraph_single() {
14501630 let tests = [
@@ -1474,7 +1654,7 @@ mod test {
14741654 let text = Rope::from(s.as_str());
14751655 let selection =
14761656 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Move));
1477− let actual = crate::test::plain(&s, selection);
1657+ let actual = crate::test::plain(s.as_ref(), &selection);
14781658 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
14791659 }
14801660 }
@@ -1497,7 +1677,7 @@ mod test {
14971677 let text = Rope::from(s.as_str());
14981678 let selection =
14991679 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 2, Movement::Move));
1500− let actual = crate::test::plain(&s, selection);
1680+ let actual = crate::test::plain(s.as_ref(), &selection);
15011681 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
15021682 }
15031683 }
@@ -1520,7 +1700,7 @@ mod test {
15201700 let text = Rope::from(s.as_str());
15211701 let selection = selection
15221702 .transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Extend));
1523− let actual = crate::test::plain(&s, selection);
1703+ let actual = crate::test::plain(s.as_ref(), &selection);
15241704 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
15251705 }
15261706 }
@@ -1540,7 +1720,7 @@ mod test {
15401720 "a\nb\n\n#[goto\nthird\n\n|]#paragraph",
15411721 ),
15421722 (
1543− "a\nb#[\n|]#\ngoto\nsecond\n\nparagraph",
1723+ "a\nb#[\n|]#\n\ngoto\nsecond\n\nparagraph",
15441724 "a\nb#[\n\n|]#goto\nsecond\n\nparagraph",
15451725 ),
15461726 (
@@ -1562,7 +1742,7 @@ mod test {
15621742 let text = Rope::from(s.as_str());
15631743 let selection =
15641744 selection.transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Move));
1565− let actual = crate::test::plain(&s, selection);
1745+ let actual = crate::test::plain(s.as_ref(), &selection);
15661746 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
15671747 }
15681748 }
@@ -1585,7 +1765,7 @@ mod test {
15851765 let text = Rope::from(s.as_str());
15861766 let selection =
15871767 selection.transform(|r| move_next_paragraph(text.slice(..), r, 2, Movement::Move));
1588− let actual = crate::test::plain(&s, selection);
1768+ let actual = crate::test::plain(s.as_ref(), &selection);
15891769 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
15901770 }
15911771 }
@@ -1608,7 +1788,7 @@ mod test {
16081788 let text = Rope::from(s.as_str());
16091789 let selection = selection
16101790 .transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Extend));
1611− let actual = crate::test::plain(&s, selection);
1791+ let actual = crate::test::plain(s.as_ref(), &selection);
16121792 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
16131793 }
16141794 }
helix-core/src/path.rs+27−8
@@ -40,6 +40,21 @@ pub fn expand_tilde(path: &Path) -> PathBuf {
4040/// needs to improve on.
4141/// Copied from cargo: <https://github.com/rust-lang/cargo/blob/070e459c2d8b79c5b2ac5218064e7603329c92ae/crates/cargo-util/src/paths.rs#L81>
4242pub fn get_normalized_path(path: &Path) -> PathBuf {
43+ // normalization strategy is to canonicalize first ancestor path that exists (i.e., canonicalize as much as possible),
44+ // then run handrolled normalization on the non-existent remainder
45+ let (base, path) = path
46+ .ancestors()
47+ .find_map(|base| {
48+ let canonicalized_base = dunce::canonicalize(base).ok()?;
49+ let remainder = path.strip_prefix(base).ok()?.into();
50+ Some((canonicalized_base, remainder))
51+ })
52+ .unwrap_or_else(|| (PathBuf::new(), PathBuf::from(path)));
53+
54+ if path.as_os_str().is_empty() {
55+ return base;
56+ }
57+
4358 let mut components = path.components().peekable();
4459 let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
4560 components.next();
@@ -63,32 +78,36 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
6378 }
6479 }
6580 }
66− ret
81+ base.join(ret)
6782}
6883
6984/// Returns the canonical, absolute form of a path with all intermediate components normalized.
7085///
7186/// This function is used instead of `std::fs::canonicalize` because we don't want to verify
7287/// here if the path exists, just normalize it's components.
73−pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
88+pub fn get_canonicalized_path(path: &Path) -> PathBuf {
7489 let path = expand_tilde(path);
7590 let path = if path.is_relative() {
76− std::env::current_dir().map(|current_dir| current_dir.join(path))?
91+ helix_loader::current_working_dir().join(path)
7792 } else {
7893 path
7994 };
8095
81− Ok(get_normalized_path(path.as_path()))
96+ get_normalized_path(path.as_path())
8297}
8398
8499pub fn get_relative_path(path: &Path) -> PathBuf {
100+ let path = PathBuf::from(path);
85101 let path = if path.is_absolute() {
86− let cwdir = std::env::current_dir().expect("couldn't determine current directory");
87− path.strip_prefix(cwdir).unwrap_or(path)
102+ let cwdir = get_normalized_path(&helix_loader::current_working_dir());
103+ get_normalized_path(&path)
104+ .strip_prefix(cwdir)
105+ .map(PathBuf::from)
106+ .unwrap_or(path)
88107 } else {
89108 path
90109 };
91− fold_home_dir(path)
110+ fold_home_dir(&path)
92111}
93112
94113/// Returns a truncated filepath where the basepart of the path is reduced to the first
@@ -121,7 +140,7 @@ pub fn get_relative_path(path: &Path) -> PathBuf {
121140/// ```
122141///
123142pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {
124− let cwd = std::env::current_dir().unwrap_or_default();
143+ let cwd = helix_loader::current_working_dir();
125144 let path = path
126145 .as_ref()
127146 .strip_prefix(cwd)
helix-core/src/position.rs+41−16
@@ -109,7 +109,7 @@ pub fn visual_coords_at_pos(text: RopeSlice, pos: usize, tab_width: usize) -> Po
109109/// softwrapping positions are estimated with an O(1) algorithm
110110/// to ensure consistent performance for large lines (currently unimplemented)
111111///
112−/// Usualy you want to use `visual_offset_from_anchor` instead but this function
112+/// Usually you want to use `visual_offset_from_anchor` instead but this function
113113/// can be useful (and faster) if
114114/// * You already know the visual position of the block
115115/// * You only care about the horizontal offset (column) and not the vertical offset (row)
@@ -137,6 +137,12 @@ pub fn visual_offset_from_block(
137137 (last_pos, block_start)
138138}
139139
140+#[derive(Debug, PartialEq, Eq, Clone, Copy)]
141+pub enum VisualOffsetError {
142+ PosBeforeAnchorRow,
143+ PosAfterMaxRow,
144+}
145+
140146/// Returns the visual offset from the start of the visual line
141147/// that contains anchor.
142148pub fn visual_offset_from_anchor(
@@ -146,28 +152,46 @@ pub fn visual_offset_from_anchor(
146152 text_fmt: &TextFormat,
147153 annotations: &TextAnnotations,
148154 max_rows: usize,
149−) -> Option<(Position, usize)> {
155+) -> Result<(Position, usize), VisualOffsetError> {
150156 let (formatter, block_start) =
151157 DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);
152158 let mut char_pos = block_start;
153159 let mut anchor_line = None;
160+ let mut found_pos = None;
154161 let mut last_pos = Position::default();
155162
163+ if pos < block_start {
164+ return Err(VisualOffsetError::PosBeforeAnchorRow);
165+ }
166+
156167 for (grapheme, vpos) in formatter {
157168 last_pos = vpos;
158169 char_pos += grapheme.doc_chars();
159170
160− if char_pos > anchor && anchor_line.is_none() {
161− anchor_line = Some(last_pos.row);
162− }
163171 if char_pos > pos {
164− last_pos.row -= anchor_line.unwrap();
165− return Some((last_pos, block_start));
172+ if let Some(anchor_line) = anchor_line {
173+ last_pos.row -= anchor_line;
174+ return Ok((last_pos, block_start));
175+ } else {
176+ found_pos = Some(last_pos);
177+ }
178+ }
179+ if char_pos > anchor && anchor_line.is_none() {
180+ if let Some(mut found_pos) = found_pos {
181+ return if found_pos.row == last_pos.row {
182+ found_pos.row = 0;
183+ Ok((found_pos, block_start))
184+ } else {
185+ Err(VisualOffsetError::PosBeforeAnchorRow)
186+ };
187+ } else {
188+ anchor_line = Some(last_pos.row);
189+ }
166190 }
167191
168192 if let Some(anchor_line) = anchor_line {
169193 if vpos.row >= anchor_line + max_rows {
170− return None;
194+ return Err(VisualOffsetError::PosAfterMaxRow);
171195 }
172196 }
173197 }
@@ -175,7 +199,7 @@ pub fn visual_offset_from_anchor(
175199 let anchor_line = anchor_line.unwrap_or(last_pos.row);
176200 last_pos.row -= anchor_line;
177201
178− Some((last_pos, block_start))
202+ Ok((last_pos, block_start))
179203}
180204
181205/// Convert (line, column) coordinates to a character index.
@@ -267,7 +291,7 @@ pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize)
267291///
268292/// If no (text) grapheme starts at exactly at the specified column the
269293/// start of the grapheme to the left is returned. If there is no grapheme
270−/// to the left (for example if the line starts with virtual text) then the positiong
294+/// to the left (for example if the line starts with virtual text) then the positioning
271295/// of the next grapheme to the right is returned.
272296///
273297/// If the `line` coordinate is beyond the end of the file, the EOF
@@ -285,18 +309,19 @@ pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize)
285309/// on the visual line is returned if the visual line contains any text:
286310/// If the visual line at the specified offset is a virtual line generated by a `LineAnnotation`
287311/// the previous char_index is returned, together with the remaining vertical offset (`virtual_lines`)
288−pub fn char_idx_at_visual_offset<'a>(
289− text: RopeSlice<'a>,
312+pub fn char_idx_at_visual_offset(
313+ text: RopeSlice,
290314 mut anchor: usize,
291315 mut row_offset: isize,
292316 column: usize,
293317 text_fmt: &TextFormat,
294318 annotations: &TextAnnotations,
295319) -> (usize, usize) {
320+ let mut pos = anchor;
296321 // convert row relative to visual line containing anchor to row relative to a block containing anchor (anchor may change)
297322 loop {
298323 let (visual_pos_in_block, block_char_offset) =
299− visual_offset_from_block(text, anchor, anchor, text_fmt, annotations);
324+ visual_offset_from_block(text, anchor, pos, text_fmt, annotations);
300325 row_offset += visual_pos_in_block.row as isize;
301326 anchor = block_char_offset;
302327 if row_offset >= 0 {
@@ -308,10 +333,10 @@ pub fn char_idx_at_visual_offset<'a>(
308333 break;
309334 }
310335 // the row_offset is negative so we need to look at the previous block
311− // set the anchor to the last char before the current block
312− // this char index is also always a line earlier so increase the row_offset by 1
336+ // set the anchor to the last char before the current block so that we can compute
337+ // the distance of this block from the start of the previous block
338+ pos = anchor;
313339 anchor -= 1;
314− row_offset += 1;
315340 }
316341
317342 char_idx_at_visual_block_offset(
helix-core/src/register.rsdeleted−81
@@ -1,81 +0,0 @@
1−use std::collections::HashMap;
2−
3−#[derive(Debug)]
4−pub struct Register {
5− name: char,
6− values: Vec<String>,
7−}
8−
9−impl Register {
10− pub const fn new(name: char) -> Self {
11− Self {
12− name,
13− values: Vec::new(),
14− }
15− }
16−
17− pub fn new_with_values(name: char, values: Vec<String>) -> Self {
18− Self { name, values }
19− }
20−
21− pub const fn name(&self) -> char {
22− self.name
23− }
24−
25− pub fn read(&self) -> &[String] {
26− &self.values
27− }
28−
29− pub fn write(&mut self, values: Vec<String>) {
30− self.values = values;
31− }
32−
33− pub fn push(&mut self, value: String) {
34− self.values.push(value);
35− }
36−}
37−
38−/// Currently just wraps a `HashMap` of `Register`s
39−#[derive(Debug, Default)]
40−pub struct Registers {
41− inner: HashMap<char, Register>,
42−}
43−
44−impl Registers {
45− pub fn get(&self, name: char) -> Option<&Register> {
46− self.inner.get(&name)
47− }
48−
49− pub fn read(&self, name: char) -> Option<&[String]> {
50− self.get(name).map(|reg| reg.read())
51− }
52−
53− pub fn write(&mut self, name: char, values: Vec<String>) {
54− if name != '_' {
55− self.inner
56− .insert(name, Register::new_with_values(name, values));
57− }
58− }
59−
60− pub fn push(&mut self, name: char, value: String) {
61− if name != '_' {
62− if let Some(r) = self.inner.get_mut(&name) {
63− r.push(value);
64− } else {
65− self.write(name, vec![value]);
66− }
67− }
68− }
69−
70− pub fn first(&self, name: char) -> Option<&String> {
71− self.read(name).and_then(|entries| entries.first())
72− }
73−
74− pub fn last(&self, name: char) -> Option<&String> {
75− self.read(name).and_then(|entries| entries.last())
76− }
77−
78− pub fn inner(&self) -> &HashMap<char, Register> {
79− &self.inner
80− }
81−}
helix-core/src/rope_reader.rsnew file+37
@@ -0,0 +1,37 @@
1+use std::io;
2+
3+use ropey::iter::Chunks;
4+use ropey::RopeSlice;
5+
6+pub struct RopeReader<'a> {
7+ current_chunk: &'a [u8],
8+ chunks: Chunks<'a>,
9+}
10+
11+impl<'a> RopeReader<'a> {
12+ pub fn new(rope: RopeSlice<'a>) -> RopeReader<'a> {
13+ RopeReader {
14+ current_chunk: &[],
15+ chunks: rope.chunks(),
16+ }
17+ }
18+}
19+
20+impl io::Read for RopeReader<'_> {
21+ fn read(&mut self, mut buf: &mut [u8]) -> io::Result<usize> {
22+ let buf_len = buf.len();
23+ loop {
24+ let read_bytes = self.current_chunk.read(buf)?;
25+ buf = &mut buf[read_bytes..];
26+ if buf.is_empty() {
27+ return Ok(buf_len);
28+ }
29+
30+ if let Some(next_chunk) = self.chunks.next() {
31+ self.current_chunk = next_chunk.as_bytes();
32+ } else {
33+ return Ok(buf_len - buf.len());
34+ }
35+ }
36+ }
37+}
helix-core/src/selection.rs+102−49
@@ -38,7 +38,7 @@ use std::borrow::Cow;
3838/// Ranges are considered to be inclusive on the left and
3939/// exclusive on the right, regardless of anchor-head ordering.
4040/// This means, for example, that non-zero-width ranges that
41−/// are directly adjecent, sharing an edge, do not overlap.
41+/// are directly adjacent, sharing an edge, do not overlap.
4242/// However, a zero-width range will overlap with the shared
4343/// left-edge of another range.
4444///
@@ -161,34 +161,35 @@ impl Range {
161161 self.from() <= pos && pos < self.to()
162162 }
163163
164− /// Map a range through a set of changes. Returns a new range representing the same position
165− /// after the changes are applied.
166− pub fn map(self, changes: &ChangeSet) -> Self {
164+ /// Map a range through a set of changes. Returns a new range representing
165+ /// the same position after the changes are applied. Note that this
166+ /// function runs in O(N) (N is number of changes) and can therefore
167+ /// cause performance problems if run for a large number of ranges as the
168+ /// complexity is then O(MN) (for multicuror M=N usually). Instead use
169+ /// [Selection::map] or [ChangeSet::update_positions] instead
170+ pub fn map(mut self, changes: &ChangeSet) -> Self {
167171 use std::cmp::Ordering;
168− let (anchor, head) = match self.anchor.cmp(&self.head) {
169− Ordering::Equal => (
170− changes.map_pos(self.anchor, Assoc::After),
171− changes.map_pos(self.head, Assoc::After),
172− ),
173− Ordering::Less => (
174− changes.map_pos(self.anchor, Assoc::After),
175− changes.map_pos(self.head, Assoc::Before),
176− ),
177− Ordering::Greater => (
178− changes.map_pos(self.anchor, Assoc::Before),
179− changes.map_pos(self.head, Assoc::After),
180− ),
181− };
182−
183− // We want to return a new `Range` with `horiz == None` every time,
184− // even if the anchor and head haven't changed, because we don't
185− // know if the *visual* position hasn't changed due to
186− // character-width or grapheme changes earlier in the text.
187− Self {
188− anchor,
189− head,
190− old_visual_position: None,
172+ if changes.is_empty() {
173+ return self;
191174 }
175+
176+ let positions_to_map = match self.anchor.cmp(&self.head) {
177+ Ordering::Equal => [
178+ (&mut self.anchor, Assoc::After),
179+ (&mut self.head, Assoc::After),
180+ ],
181+ Ordering::Less => [
182+ (&mut self.anchor, Assoc::After),
183+ (&mut self.head, Assoc::Before),
184+ ],
185+ Ordering::Greater => [
186+ (&mut self.head, Assoc::After),
187+ (&mut self.anchor, Assoc::Before),
188+ ],
189+ };
190+ changes.update_positions(positions_to_map.into_iter());
191+ self.old_visual_position = None;
192+ self
192193 }
193194
194195 /// Extend the range to cover at least `from` `to`.
@@ -451,17 +452,36 @@ impl Selection {
451452 /// Map selections over a set of changes. Useful for adjusting the selection position after
452453 /// applying changes to a document.
453454 pub fn map(self, changes: &ChangeSet) -> Self {
455+ self.map_no_normalize(changes).normalize()
456+ }
457+
458+ /// Map selections over a set of changes. Useful for adjusting the selection position after
459+ /// applying changes to a document. Doesn't normalize the selection
460+ pub fn map_no_normalize(mut self, changes: &ChangeSet) -> Self {
454461 if changes.is_empty() {
455462 return self;
456463 }
457464
458− Self::new(
459− self.ranges
460− .into_iter()
461− .map(|range| range.map(changes))
462− .collect(),
463− self.primary_index,
464− )
465+ let positions_to_map = self.ranges.iter_mut().flat_map(|range| {
466+ use std::cmp::Ordering;
467+ range.old_visual_position = None;
468+ match range.anchor.cmp(&range.head) {
469+ Ordering::Equal => [
470+ (&mut range.anchor, Assoc::After),
471+ (&mut range.head, Assoc::After),
472+ ],
473+ Ordering::Less => [
474+ (&mut range.anchor, Assoc::After),
475+ (&mut range.head, Assoc::Before),
476+ ],
477+ Ordering::Greater => [
478+ (&mut range.head, Assoc::After),
479+ (&mut range.anchor, Assoc::Before),
480+ ],
481+ }
482+ });
483+ changes.update_positions(positions_to_map);
484+ self
465485 }
466486
467487 pub fn ranges(&self) -> &[Range] {
@@ -497,6 +517,9 @@ impl Selection {
497517
498518 /// Normalizes a `Selection`.
499519 fn normalize(mut self) -> Self {
520+ if self.len() < 2 {
521+ return self;
522+ }
500523 let mut primary = self.ranges[self.primary_index];
501524 self.ranges.sort_unstable_by_key(Range::from);
502525
@@ -522,7 +545,14 @@ impl Selection {
522545 self
523546 }
524547
525− // Merges all ranges that are consecutive
548+ /// Replaces ranges with one spanning from first to last range.
549+ pub fn merge_ranges(self) -> Self {
550+ let first = self.ranges.first().unwrap();
551+ let last = self.ranges.last().unwrap();
552+ Selection::new(smallvec![first.merge(*last)], 0)
553+ }
554+
555+ /// Merges all ranges that are consecutive.
526556 pub fn merge_consecutive_ranges(mut self) -> Self {
527557 let mut primary = self.ranges[self.primary_index];
528558
@@ -554,17 +584,12 @@ impl Selection {
554584 assert!(!ranges.is_empty());
555585 debug_assert!(primary_index < ranges.len());
556586
557− let mut selection = Self {
587+ let selection = Self {
558588 ranges,
559589 primary_index,
560590 };
561591
562− if selection.ranges.len() > 1 {
563− // TODO: only normalize if needed (any ranges out of order)
564− selection = selection.normalize();
565− }
566−
567− selection
592+ selection.normalize()
568593 }
569594
570595 /// Takes a closure and maps each `Range` over the closure.
@@ -578,6 +603,16 @@ impl Selection {
578603 self.normalize()
579604 }
580605
606+ /// Takes a closure and maps each `Range` over the closure to multiple `Range`s.
607+ pub fn transform_iter<F, I>(mut self, f: F) -> Self
608+ where
609+ F: FnMut(Range) -> I,
610+ I: Iterator<Item = Range>,
611+ {
612+ self.ranges = self.ranges.into_iter().flat_map(f).collect();
613+ self.normalize()
614+ }
615+
581616 // Ensures the selection adheres to the following invariants:
582617 // 1. All ranges are grapheme aligned.
583618 // 2. All ranges are at least 1 character wide, unless at the
@@ -595,11 +630,19 @@ impl Selection {
595630 self.transform(|range| Range::point(range.cursor(text)))
596631 }
597632
598− pub fn fragments<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = Cow<str>> + 'a {
633+ pub fn fragments<'a>(
634+ &'a self,
635+ text: RopeSlice<'a>,
636+ ) -> impl DoubleEndedIterator<Item = Cow<'a, str>> + ExactSizeIterator<Item = Cow<str>> + 'a
637+ {
599638 self.ranges.iter().map(move |range| range.fragment(text))
600639 }
601640
602− pub fn slices<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = RopeSlice> + 'a {
641+ pub fn slices<'a>(
642+ &'a self,
643+ text: RopeSlice<'a>,
644+ ) -> impl DoubleEndedIterator<Item = RopeSlice<'a>> + ExactSizeIterator<Item = RopeSlice<'a>> + 'a
645+ {
603646 self.ranges.iter().map(move |range| range.slice(text))
604647 }
605648
@@ -615,11 +658,6 @@ impl Selection {
615658
616659 // returns true if self ⊇ other
617660 pub fn contains(&self, other: &Selection) -> bool {
618− // can't contain other if it is larger
619− if other.len() > self.len() {
620− return false;
621− }
622−
623661 let (mut iter_self, mut iter_other) = (self.iter(), other.iter());
624662 let (mut ele_self, mut ele_other) = (iter_self.next(), iter_other.next());
625663
@@ -656,6 +694,15 @@ impl<'a> IntoIterator for &'a Selection {
656694 }
657695}
658696
697+impl IntoIterator for Selection {
698+ type Item = Range;
699+ type IntoIter = smallvec::IntoIter<[Range; 1]>;
700+
701+ fn into_iter(self) -> smallvec::IntoIter<[Range; 1]> {
702+ self.ranges.into_iter()
703+ }
704+}
705+
659706// TODO: checkSelection -> check if valid for doc length && sorted
660707
661708pub fn keep_or_remove_matches(
@@ -1230,5 +1277,11 @@ mod test {
12301277 vec!((3, 4), (7, 9))
12311278 ));
12321279 assert!(!contains(vec!((1, 1), (5, 6)), vec!((1, 6))));
1280+
1281+ // multiple ranges of other are all contained in some ranges of self,
1282+ assert!(contains(
1283+ vec!((1, 4), (7, 10)),
1284+ vec!((1, 2), (3, 4), (7, 9))
1285+ ));
12331286 }
12341287}
helix-core/src/shellwords.rs+2−2
@@ -294,14 +294,14 @@ mod test {
294294 #[test]
295295 fn test_lists() {
296296 let input =
297− r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "qoutes"]'"#;
297+ r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "quotes"]'"#;
298298 let shellwords = Shellwords::from(input);
299299 let result = shellwords.words().to_vec();
300300 let expected = vec![
301301 Cow::from(":set"),
302302 Cow::from("statusline.center"),
303303 Cow::from(r#"["file-type","file-encoding"]"#),
304− Cow::from(r#"["list", "in", "qoutes"]"#),
304+ Cow::from(r#"["list", "in", "quotes"]"#),
305305 ];
306306 assert_eq!(expected, result);
307307 }
helix-core/src/surround.rs+111−29
@@ -275,51 +275,133 @@ mod test {
275275
276276 #[test]
277277 fn test_get_surround_pos() {
278− let doc = Rope::from("(some) (chars)\n(newline)");
279− let slice = doc.slice(..);
280− let selection = Selection::new(
281− SmallVec::from_slice(&[Range::point(2), Range::point(9), Range::point(20)]),
282− 0,
283− );
278+ #[rustfmt::skip]
279+ let (doc, selection, expectations) =
280+ rope_with_selections_and_expectations(
281+ "(some) (chars)\n(newline)",
282+ "_ ^ _ _ ^ _\n_ ^ _"
283+ );
284284
285− // cursor on s[o]me, c[h]ars, newl[i]ne
286285 assert_eq!(
287− get_surround_pos(slice, &selection, Some('('), 1)
288− .unwrap()
289− .as_slice(),
290− &[0, 5, 7, 13, 15, 23]
286+ get_surround_pos(doc.slice(..), &selection, Some('('), 1).unwrap(),
287+ expectations
291288 );
292289 }
293290
294291 #[test]
295− fn test_get_surround_pos_bail() {
296− let doc = Rope::from("[some]\n(chars)xx\n(newline)");
297− let slice = doc.slice(..);
292+ fn test_get_surround_pos_bail_different_surround_chars() {
293+ #[rustfmt::skip]
294+ let (doc, selection, _) =
295+ rope_with_selections_and_expectations(
296+ "[some]\n(chars)xx\n(newline)",
297+ " ^ \n ^ \n "
298+ );
298299
299− let selection =
300− Selection::new(SmallVec::from_slice(&[Range::point(2), Range::point(9)]), 0);
301− // cursor on s[o]me, c[h]ars
302300 assert_eq!(
303− get_surround_pos(slice, &selection, Some('('), 1),
304− Err(Error::PairNotFound) // different surround chars
301+ get_surround_pos(doc.slice(..), &selection, Some('('), 1),
302+ Err(Error::PairNotFound)
305303 );
304+ }
305+
306+ #[test]
307+ fn test_get_surround_pos_bail_overlapping_surround_chars() {
308+ #[rustfmt::skip]
309+ let (doc, selection, _) =
310+ rope_with_selections_and_expectations(
311+ "[some]\n(chars)xx\n(newline)",
312+ " \n ^ \n ^ "
313+ );
306314
307− let selection = Selection::new(
308− SmallVec::from_slice(&[Range::point(14), Range::point(24)]),
309− 0,
310− );
311− // cursor on [x]x, newli[n]e
312315 assert_eq!(
313− get_surround_pos(slice, &selection, Some('('), 1),
316+ get_surround_pos(doc.slice(..), &selection, Some('('), 1),
314317 Err(Error::PairNotFound) // overlapping surround chars
315318 );
319+ }
320+
321+ #[test]
322+ fn test_get_surround_pos_bail_cursor_overlap() {
323+ #[rustfmt::skip]
324+ let (doc, selection, _) =
325+ rope_with_selections_and_expectations(
326+ "[some]\n(chars)xx\n(newline)",
327+ " ^^ \n \n "
328+ );
316329
317− let selection =
318− Selection::new(SmallVec::from_slice(&[Range::point(2), Range::point(3)]), 0);
319− // cursor on s[o][m]e
320330 assert_eq!(
321− get_surround_pos(slice, &selection, Some('['), 1),
331+ get_surround_pos(doc.slice(..), &selection, Some('['), 1),
322332 Err(Error::CursorOverlap)
323333 );
324334 }
335+
336+ #[test]
337+ fn test_find_nth_pairs_pos_quote_success() {
338+ #[rustfmt::skip]
339+ let (doc, selection, expectations) =
340+ rope_with_selections_and_expectations(
341+ "some 'quoted text' on this 'line'\n'and this one'",
342+ " _ ^ _ \n "
343+ );
344+
345+ assert_eq!(2, expectations.len());
346+ assert_eq!(
347+ find_nth_pairs_pos(doc.slice(..), '\'', selection.primary(), 1)
348+ .expect("find should succeed"),
349+ (expectations[0], expectations[1])
350+ )
351+ }
352+
353+ #[test]
354+ fn test_find_nth_pairs_pos_nested_quote_success() {
355+ #[rustfmt::skip]
356+ let (doc, selection, expectations) =
357+ rope_with_selections_and_expectations(
358+ "some 'nested 'quoted' text' on this 'line'\n'and this one'",
359+ " _ ^ _ \n "
360+ );
361+
362+ assert_eq!(2, expectations.len());
363+ assert_eq!(
364+ find_nth_pairs_pos(doc.slice(..), '\'', selection.primary(), 2)
365+ .expect("find should succeed"),
366+ (expectations[0], expectations[1])
367+ )
368+ }
369+
370+ #[test]
371+ fn test_find_nth_pairs_pos_inside_quote_ambiguous() {
372+ #[rustfmt::skip]
373+ let (doc, selection, _) =
374+ rope_with_selections_and_expectations(
375+ "some 'nested 'quoted' text' on this 'line'\n'and this one'",
376+ " ^ \n "
377+ );
378+
379+ assert_eq!(
380+ find_nth_pairs_pos(doc.slice(..), '\'', selection.primary(), 1),
381+ Err(Error::CursorOnAmbiguousPair)
382+ )
383+ }
384+
385+ // Create a Rope and a matching Selection using a specification language.
386+ // ^ is a single-point selection.
387+ // _ is an expected index. These are returned as a Vec<usize> for use in assertions.
388+ fn rope_with_selections_and_expectations(
389+ text: &str,
390+ spec: &str,
391+ ) -> (Rope, Selection, Vec<usize>) {
392+ if text.len() != spec.len() {
393+ panic!("specification must match text length -- are newlines aligned?");
394+ }
395+
396+ let rope = Rope::from(text);
397+
398+ let selections: SmallVec<[Range; 1]> = spec
399+ .match_indices('^')
400+ .map(|(i, _)| Range::point(i))
401+ .collect();
402+
403+ let expectations: Vec<usize> = spec.match_indices('_').map(|(i, _)| i).collect();
404+
405+ (rope, Selection::new(selections, 0), expectations)
406+ }
325407}
helix-core/src/syntax.rs+444−170
@@ -4,7 +4,7 @@ use crate::{
44 diagnostic::Severity,
55 regex::Regex,
66 transaction::{ChangeSet, Operation},
7− Rope, RopeSlice, Tendril,
7+ RopeSlice, Tendril,
88};
99
1010use ahash::RandomState;
@@ -16,17 +16,17 @@ use slotmap::{DefaultKey as LayerId, HopSlotMap};
1616use std::{
1717 borrow::Cow,
1818 cell::RefCell,
19− collections::{HashMap, VecDeque},
20− fmt,
19+ collections::{HashMap, HashSet, VecDeque},
20+ fmt::{self, Display},
2121 hash::{Hash, Hasher},
2222 mem::{replace, transmute},
23− path::Path,
23+ path::{Path, PathBuf},
2424 str::FromStr,
2525 sync::Arc,
2626};
2727
2828use once_cell::sync::{Lazy, OnceCell};
29−use serde::{Deserialize, Serialize};
29+use serde::{ser::SerializeSeq, Deserialize, Serialize};
3030
3131use helix_loader::grammar::{get_language, load_runtime_file};
3232
@@ -48,6 +48,21 @@ where
4848 .transpose()
4949}
5050
51+fn deserialize_tab_width<'de, D>(deserializer: D) -> Result<usize, D::Error>
52+where
53+ D: serde::Deserializer<'de>,
54+{
55+ usize::deserialize(deserializer).and_then(|n| {
56+ if n > 0 && n <= 16 {
57+ Ok(n)
58+ } else {
59+ Err(serde::de::Error::custom(
60+ "tab width must be a value from 1 to 16 inclusive",
61+ ))
62+ }
63+ })
64+}
65+
5166pub fn deserialize_auto_pairs<'de, D>(deserializer: D) -> Result<Option<AutoPairs>, D::Error>
5267where
5368 D: serde::Deserializer<'de>,
@@ -60,8 +75,11 @@ fn default_timeout() -> u64 {
6075}
6176
6277#[derive(Debug, Serialize, Deserialize)]
78+#[serde(rename_all = "kebab-case")]
6379pub struct Configuration {
6480 pub language: Vec<LanguageConfiguration>,
81+ #[serde(default)]
82+ pub language_server: HashMap<String, LanguageServerConfiguration>,
6583}
6684
6785impl Default for Configuration {
@@ -75,17 +93,19 @@ impl Default for Configuration {
7593#[serde(rename_all = "kebab-case", deny_unknown_fields)]
7694pub struct LanguageConfiguration {
7795 #[serde(rename = "name")]
78− pub language_id: String, // c-sharp, rust
96+ pub language_id: String, // c-sharp, rust, tsx
97+ #[serde(rename = "language-id")]
98+ // see the table under https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocumentItem
99+ pub language_server_language_id: Option<String>, // csharp, rust, typescriptreact, for the language-server
79100 pub scope: String, // source.rust
80101 pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
81102 #[serde(default)]
82103 pub shebangs: Vec<String>, // interpreter(s) associated with language
83− pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
104+ #[serde(default)]
105+ pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
84106 pub comment_token: Option<String>,
85− pub max_line_length: Option<usize>,
86−
87− #[serde(default, skip_serializing, deserialize_with = "deserialize_lsp_config")]
88− pub config: Option<serde_json::Value>,
107+ pub text_width: Option<usize>,
108+ pub soft_wrap: Option<SoftWrap>,
89109
90110 #[serde(default)]
91111 pub auto_format: bool,
@@ -106,8 +126,13 @@ pub struct LanguageConfiguration {
106126 #[serde(skip)]
107127 pub(crate) highlight_config: OnceCell<Option<Arc<HighlightConfiguration>>>,
108128 // tags_config OnceCell<> https://github.com/tree-sitter/tree-sitter/pull/583
109− #[serde(skip_serializing_if = "Option::is_none")]
110− pub language_server: Option<LanguageServerConfiguration>,
129+ #[serde(
130+ default,
131+ skip_serializing_if = "Vec::is_empty",
132+ serialize_with = "serialize_lang_features",
133+ deserialize_with = "deserialize_lang_features"
134+ )]
135+ pub language_servers: Vec<LanguageServerFeatures>,
111136 #[serde(skip_serializing_if = "Option::is_none")]
112137 pub indent: Option<IndentationConfiguration>,
113138
@@ -126,6 +151,12 @@ pub struct LanguageConfiguration {
126151 pub auto_pairs: Option<AutoPairs>,
127152
128153 pub rulers: Option<Vec<u16>>, // if set, override editor's rulers
154+
155+ /// Hardcoded LSP root directories relative to the workspace root, like `examples` or `tools/fuzz`.
156+ /// Falling back to the current working directory if none are configured.
157+ pub workspace_lsp_roots: Option<Vec<PathBuf>>,
158+ #[serde(default)]
159+ pub persistent_diagnostic_sources: Vec<String>,
129160}
130161
131162#[derive(Debug, PartialEq, Eq, Hash)]
@@ -182,9 +213,9 @@ impl<'de> Deserialize<'de> for FileType {
182213 M: serde::de::MapAccess<'de>,
183214 {
184215 match map.next_entry::<String, String>()? {
185− Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix(
186− suffix.replace('/', &std::path::MAIN_SEPARATOR.to_string()),
187− )),
216+ Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
217+ suffix.replace('/', std::path::MAIN_SEPARATOR_STR)
218+ })),
188219 Some((key, _value)) => Err(serde::de::Error::custom(format!(
189220 "unknown key in `file-types` list: {}",
190221 key
@@ -200,6 +231,133 @@ impl<'de> Deserialize<'de> for FileType {
200231 }
201232}
202233
234+#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
235+#[serde(rename_all = "kebab-case")]
236+pub enum LanguageServerFeature {
237+ Format,
238+ GotoDeclaration,
239+ GotoDefinition,
240+ GotoTypeDefinition,
241+ GotoReference,
242+ GotoImplementation,
243+ // Goto, use bitflags, combining previous Goto members?
244+ SignatureHelp,
245+ Hover,
246+ DocumentHighlight,
247+ Completion,
248+ CodeAction,
249+ WorkspaceCommand,
250+ DocumentSymbols,
251+ WorkspaceSymbols,
252+ // Symbols, use bitflags, see above?
253+ Diagnostics,
254+ RenameSymbol,
255+ InlayHints,
256+}
257+
258+impl Display for LanguageServerFeature {
259+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
260+ use LanguageServerFeature::*;
261+ let feature = match self {
262+ Format => "format",
263+ GotoDeclaration => "goto-declaration",
264+ GotoDefinition => "goto-definition",
265+ GotoTypeDefinition => "goto-type-definition",
266+ GotoReference => "goto-type-definition",
267+ GotoImplementation => "goto-implementation",
268+ SignatureHelp => "signature-help",
269+ Hover => "hover",
270+ DocumentHighlight => "document-highlight",
271+ Completion => "completion",
272+ CodeAction => "code-action",
273+ WorkspaceCommand => "workspace-command",
274+ DocumentSymbols => "document-symbols",
275+ WorkspaceSymbols => "workspace-symbols",
276+ Diagnostics => "diagnostics",
277+ RenameSymbol => "rename-symbol",
278+ InlayHints => "inlay-hints",
279+ };
280+ write!(f, "{feature}",)
281+ }
282+}
283+
284+#[derive(Debug, Serialize, Deserialize)]
285+#[serde(untagged, rename_all = "kebab-case", deny_unknown_fields)]
286+enum LanguageServerFeatureConfiguration {
287+ #[serde(rename_all = "kebab-case")]
288+ Features {
289+ #[serde(default, skip_serializing_if = "HashSet::is_empty")]
290+ only_features: HashSet<LanguageServerFeature>,
291+ #[serde(default, skip_serializing_if = "HashSet::is_empty")]
292+ except_features: HashSet<LanguageServerFeature>,
293+ name: String,
294+ },
295+ Simple(String),
296+}
297+
298+#[derive(Debug, Default)]
299+pub struct LanguageServerFeatures {
300+ pub name: String,
301+ pub only: HashSet<LanguageServerFeature>,
302+ pub excluded: HashSet<LanguageServerFeature>,
303+}
304+
305+impl LanguageServerFeatures {
306+ pub fn has_feature(&self, feature: LanguageServerFeature) -> bool {
307+ (self.only.is_empty() || self.only.contains(&feature)) && !self.excluded.contains(&feature)
308+ }
309+}
310+
311+fn deserialize_lang_features<'de, D>(
312+ deserializer: D,
313+) -> Result<Vec<LanguageServerFeatures>, D::Error>
314+where
315+ D: serde::Deserializer<'de>,
316+{
317+ let raw: Vec<LanguageServerFeatureConfiguration> = Deserialize::deserialize(deserializer)?;
318+ let res = raw
319+ .into_iter()
320+ .map(|config| match config {
321+ LanguageServerFeatureConfiguration::Simple(name) => LanguageServerFeatures {
322+ name,
323+ ..Default::default()
324+ },
325+ LanguageServerFeatureConfiguration::Features {
326+ only_features,
327+ except_features,
328+ name,
329+ } => LanguageServerFeatures {
330+ name,
331+ only: only_features,
332+ excluded: except_features,
333+ },
334+ })
335+ .collect();
336+ Ok(res)
337+}
338+fn serialize_lang_features<S>(
339+ map: &Vec<LanguageServerFeatures>,
340+ serializer: S,
341+) -> Result<S::Ok, S::Error>
342+where
343+ S: serde::Serializer,
344+{
345+ let mut serializer = serializer.serialize_seq(Some(map.len()))?;
346+ for features in map {
347+ let features = if features.only.is_empty() && features.excluded.is_empty() {
348+ LanguageServerFeatureConfiguration::Simple(features.name.to_owned())
349+ } else {
350+ LanguageServerFeatureConfiguration::Features {
351+ only_features: features.only.clone(),
352+ except_features: features.excluded.clone(),
353+ name: features.name.to_owned(),
354+ }
355+ };
356+ serializer.serialize_element(&features)?;
357+ }
358+ serializer.end()
359+}
360+
203361#[derive(Debug, Serialize, Deserialize)]
204362#[serde(rename_all = "kebab-case")]
205363pub struct LanguageServerConfiguration {
@@ -209,9 +367,10 @@ pub struct LanguageServerConfiguration {
209367 pub args: Vec<String>,
210368 #[serde(default, skip_serializing_if = "HashMap::is_empty")]
211369 pub environment: HashMap<String, String>,
370+ #[serde(default, skip_serializing, deserialize_with = "deserialize_lsp_config")]
371+ pub config: Option<serde_json::Value>,
212372 #[serde(default = "default_timeout")]
213373 pub timeout: u64,
214− pub language_id: Option<String>,
215374}
216375
217376#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -280,10 +439,27 @@ pub struct DebuggerQuirks {
280439#[derive(Debug, Serialize, Deserialize)]
281440#[serde(rename_all = "kebab-case")]
282441pub struct IndentationConfiguration {
442+ #[serde(deserialize_with = "deserialize_tab_width")]
283443 pub tab_width: usize,
284444 pub unit: String,
285445}
286446
447+/// How the indentation for a newly inserted line should be determined.
448+/// If the selected heuristic is not available (e.g. because the current
449+/// language has no tree-sitter indent queries), a simpler one will be used.
450+#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
451+#[serde(rename_all = "kebab-case")]
452+pub enum IndentationHeuristic {
453+ /// Just copy the indentation of the line that the cursor is currently on.
454+ Simple,
455+ /// Use tree-sitter indent queries to compute the expected absolute indentation level of the new line.
456+ TreeSitter,
457+ /// Use tree-sitter indent queries to compute the expected difference in indentation between the new line
458+ /// and the line before. Add this to the actual indentation level of the line before.
459+ #[default]
460+ Hybrid,
461+}
462+
287463/// Configuration for auto pairs
288464#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
289465#[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
@@ -546,6 +722,35 @@ impl LanguageConfiguration {
546722 .ok()
547723 }
548724}
725+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
726+#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
727+pub struct SoftWrap {
728+ /// Soft wrap lines that exceed viewport width. Default to off
729+ // NOTE: Option on purpose because the struct is shared between language config and global config.
730+ // By default the option is None so that the language config falls back to the global config unless explicitly set.
731+ pub enable: Option<bool>,
732+ /// Maximum space left free at the end of the line.
733+ /// This space is used to wrap text at word boundaries. If that is not possible within this limit
734+ /// the word is simply split at the end of the line.
735+ ///
736+ /// This is automatically hard-limited to a quarter of the viewport to ensure correct display on small views.
737+ ///
738+ /// Default to 20
739+ pub max_wrap: Option<u16>,
740+ /// Maximum number of indentation that can be carried over from the previous line when softwrapping.
741+ /// If a line is indented further then this limit it is rendered at the start of the viewport instead.
742+ ///
743+ /// This is automatically hard-limited to a quarter of the viewport to ensure correct display on small views.
744+ ///
745+ /// Default to 40
746+ pub max_indent_retain: Option<u16>,
747+ /// Indicator placed at the beginning of softwrapped lines
748+ ///
749+ /// Defaults to ↪
750+ pub wrap_indicator: Option<String>,
751+ /// Softwrap at `text_width` instead of viewport width if it is shorter
752+ pub wrap_at_text_width: Option<bool>,
753+}
549754
550755// Expose loader as Lazy<> global since it's always static?
551756
@@ -557,6 +762,8 @@ pub struct Loader {
557762 language_config_ids_by_suffix: HashMap<String, usize>,
558763 language_config_ids_by_shebang: HashMap<String, usize>,
559764
765+ language_server_configs: HashMap<String, LanguageServerConfiguration>,
766+
560767 scopes: ArcSwap<Vec<String>>,
561768}
562769
@@ -564,6 +771,7 @@ impl Loader {
564771 pub fn new(config: Configuration) -> Self {
565772 let mut loader = Self {
566773 language_configs: Vec::new(),
774+ language_server_configs: config.language_server,
567775 language_config_ids_by_extension: HashMap::new(),
568776 language_config_ids_by_suffix: HashMap::new(),
569777 language_config_ids_by_shebang: HashMap::new(),
@@ -626,11 +834,13 @@ impl Loader {
626834 // TODO: content_regex handling conflict resolution
627835 }
628836
629− pub fn language_config_for_shebang(&self, source: &Rope) -> Option<Arc<LanguageConfiguration>> {
837+ pub fn language_config_for_shebang(
838+ &self,
839+ source: RopeSlice,
840+ ) -> Option<Arc<LanguageConfiguration>> {
630841 let line = Cow::from(source.line(0));
631− static SHEBANG_REGEX: Lazy<Regex> = Lazy::new(|| {
632− Regex::new(r"^#!\s*(?:\S*[/\\](?:env\s+(?:\-\S+\s+)*)?)?([^\s\.\d]+)").unwrap()
633− });
842+ static SHEBANG_REGEX: Lazy<Regex> =
843+ Lazy::new(|| Regex::new(&["^", SHEBANG].concat()).unwrap());
634844 let configuration_id = SHEBANG_REGEX
635845 .captures(&line)
636846 .and_then(|cap| self.language_config_ids_by_shebang.get(&cap[1]));
@@ -652,15 +862,14 @@ impl Loader {
652862 .cloned()
653863 }
654864
655− pub fn language_configuration_for_injection_string(
656− &self,
657− string: &str,
658− ) -> Option<Arc<LanguageConfiguration>> {
865+ /// Unlike language_config_for_language_id, which only returns Some for an exact id, this
866+ /// function will perform a regex match on the given string to find the closest language match.
867+ pub fn language_config_for_name(&self, name: &str) -> Option<Arc<LanguageConfiguration>> {
659868 let mut best_match_length = 0;
660869 let mut best_match_position = None;
661870 for (i, configuration) in self.language_configs.iter().enumerate() {
662871 if let Some(injection_regex) = &configuration.injection_regex {
663− if let Some(mat) = injection_regex.find(string) {
872+ if let Some(mat) = injection_regex.find(name) {
664873 let length = mat.end() - mat.start();
665874 if length > best_match_length {
666875 best_match_position = Some(i);
@@ -670,17 +879,30 @@ impl Loader {
670879 }
671880 }
672881
673− if let Some(i) = best_match_position {
674− let configuration = &self.language_configs[i];
675− return Some(configuration.clone());
882+ best_match_position.map(|i| self.language_configs[i].clone())
883+ }
884+
885+ pub fn language_configuration_for_injection_string(
886+ &self,
887+ capture: &InjectionLanguageMarker,
888+ ) -> Option<Arc<LanguageConfiguration>> {
889+ match capture {
890+ InjectionLanguageMarker::Name(string) => self.language_config_for_name(string),
891+ InjectionLanguageMarker::Filename(file) => self.language_config_for_file_name(file),
892+ InjectionLanguageMarker::Shebang(shebang) => {
893+ self.language_config_for_language_id(shebang)
894+ }
676895 }
677− None
678896 }
679897
680898 pub fn language_configs(&self) -> impl Iterator<Item = &Arc<LanguageConfiguration>> {
681899 self.language_configs.iter()
682900 }
683901
902+ pub fn language_server_configs(&self) -> &HashMap<String, LanguageServerConfiguration> {
903+ &self.language_server_configs
904+ }
905+
684906 pub fn set_scopes(&self, scopes: Vec<String>) {
685907 self.scopes.store(Arc::new(scopes));
686908
@@ -724,7 +946,11 @@ fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<st
724946}
725947
726948impl Syntax {
727− pub fn new(source: &Rope, config: Arc<HighlightConfiguration>, loader: Arc<Loader>) -> Self {
949+ pub fn new(
950+ source: RopeSlice,
951+ config: Arc<HighlightConfiguration>,
952+ loader: Arc<Loader>,
953+ ) -> Option<Self> {
728954 let root_layer = LanguageLayer {
729955 tree: None,
730956 config,
@@ -749,24 +975,26 @@ impl Syntax {
749975 loader,
750976 };
751977
752− syntax
753− .update(source, source, &ChangeSet::new(source))
754− .unwrap();
978+ let res = syntax.update(source, source, &ChangeSet::new(source));
755979
756− syntax
980+ if res.is_err() {
981+ log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
982+ return None;
983+ }
984+ Some(syntax)
757985 }
758986
759987 pub fn update(
760988 &mut self,
761− old_source: &Rope,
762− source: &Rope,
989+ old_source: RopeSlice,
990+ source: RopeSlice,
763991 changeset: &ChangeSet,
764992 ) -> Result<(), Error> {
765993 let mut queue = VecDeque::new();
766994 queue.push_back(self.root);
767995
768996 let scopes = self.loader.scopes.load();
769− let injection_callback = |language: &str| {
997+ let injection_callback = |language: &InjectionLanguageMarker| {
770998 self.loader
771999 .language_configuration_for_injection_string(language)
7721000 .and_then(|language_config| language_config.highlight_config(&scopes))
@@ -881,6 +1109,7 @@ impl Syntax {
8811109
8821110 PARSER.with(|ts_parser| {
8831111 let ts_parser = &mut ts_parser.borrow_mut();
1112+ ts_parser.parser.set_timeout_micros(1000 * 500); // half a second is pretty generours
8841113 let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
8851114 // TODO: might need to set cursor range
8861115 cursor.set_byte_range(0..usize::MAX);
@@ -925,14 +1154,37 @@ impl Syntax {
9251154 layer.tree().root_node(),
9261155 RopeProvider(source_slice),
9271156 );
1157+ let mut combined_injections = vec![
1158+ (None, Vec::new(), IncludedChildren::default());
1159+ layer.config.combined_injections_patterns.len()
1160+ ];
9281161 let mut injections = Vec::new();
1162+ let mut last_injection_end = 0;
9291163 for mat in matches {
930− let (language_name, content_node, included_children) = injection_for_match(
931− &layer.config,
932− &layer.config.injections_query,
933− &mat,
934− source_slice,
935− );
1164+ let (injection_capture, content_node, included_children) = layer
1165+ .config
1166+ .injection_for_match(&layer.config.injections_query, &mat, source_slice);
1167+
1168+ // in case this is a combined injection save it for more processing later
1169+ if let Some(combined_injection_idx) = layer
1170+ .config
1171+ .combined_injections_patterns
1172+ .iter()
1173+ .position(|&pattern| pattern == mat.pattern_index)
1174+ {
1175+ let entry = &mut combined_injections[combined_injection_idx];
1176+ if injection_capture.is_some() {
1177+ entry.0 = injection_capture;
1178+ }
1179+ if let Some(content_node) = content_node {
1180+ if content_node.start_byte() >= last_injection_end {
1181+ entry.1.push(content_node);
1182+ last_injection_end = content_node.end_byte();
1183+ }
1184+ }
1185+ entry.2 = included_children;
1186+ continue;
1187+ }
9361188
9371189 // Explicitly remove this match so that none of its other captures will remain
9381190 // in the stream of captures.
@@ -940,59 +1192,31 @@ impl Syntax {
9401192
9411193 // If a language is found with the given name, then add a new language layer
9421194 // to the highlighted document.
943− if let (Some(language_name), Some(content_node)) = (language_name, content_node)
1195+ if let (Some(injection_capture), Some(content_node)) =
1196+ (injection_capture, content_node)
9441197 {
945− if let Some(config) = (injection_callback)(&language_name) {
1198+ if let Some(config) = (injection_callback)(&injection_capture) {
9461199 let ranges =
9471200 intersect_ranges(&layer.ranges, &[content_node], included_children);
9481201
9491202 if !ranges.is_empty() {
1203+ if content_node.start_byte() < last_injection_end {
1204+ continue;
1205+ }
1206+ last_injection_end = content_node.end_byte();
9501207 injections.push((config, ranges));
9511208 }
9521209 }
9531210 }
9541211 }
9551212
956− // Process combined injections.
957− if let Some(combined_injections_query) = &layer.config.combined_injections_query {
958− let mut injections_by_pattern_index =
959− vec![
960− (None, Vec::new(), IncludedChildren::default());
961− combined_injections_query.pattern_count()
962− ];
963− let matches = cursor.matches(
964− combined_injections_query,
965− layer.tree().root_node(),
966− RopeProvider(source_slice),
967− );
968− for mat in matches {
969− let entry = &mut injections_by_pattern_index[mat.pattern_index];
970− let (language_name, content_node, included_children) = injection_for_match(
971− &layer.config,
972− combined_injections_query,
973− &mat,
974− source_slice,
975− );
976− if language_name.is_some() {
977− entry.0 = language_name;
978− }
979− if let Some(content_node) = content_node {
980− entry.1.push(content_node);
981− }
982− entry.2 = included_children;
983− }
984− for (lang_name, content_nodes, included_children) in injections_by_pattern_index
985− {
986− if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
987− if let Some(config) = (injection_callback)(&lang_name) {
988− let ranges = intersect_ranges(
989− &layer.ranges,
990− &content_nodes,
991− included_children,
992− );
993− if !ranges.is_empty() {
994− injections.push((config, ranges));
995− }
1213+ for (lang_name, content_nodes, included_children) in combined_injections {
1214+ if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
1215+ if let Some(config) = (injection_callback)(&lang_name) {
1216+ let ranges =
1217+ intersect_ranges(&layer.ranges, &content_nodes, included_children);
1218+ if !ranges.is_empty() {
1219+ injections.push((config, ranges));
9961220 }
9971221 }
9981222 }
@@ -1129,6 +1353,7 @@ impl Syntax {
11291353bitflags! {
11301354 /// Flags that track the status of a layer
11311355 /// in the `Sytaxn::update` function
1356+ #[derive(Debug)]
11321357 struct LayerUpdateFlags : u32{
11331358 const MODIFIED = 0b001;
11341359 const MOVED = 0b010;
@@ -1181,7 +1406,7 @@ impl LanguageLayer {
11811406 self.tree.as_ref().unwrap()
11821407 }
11831408
1184− fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {
1409+ fn parse(&mut self, parser: &mut Parser, source: RopeSlice) -> Result<(), Error> {
11851410 parser
11861411 .set_included_ranges(&self.ranges)
11871412 .map_err(|_| Error::InvalidRanges)?;
@@ -1196,7 +1421,7 @@ impl LanguageLayer {
11961421 &mut |byte, _| {
11971422 if byte <= source.len_bytes() {
11981423 let (chunk, start_byte, _, _) = source.chunk_at_byte(byte);
1199− chunk[byte - start_byte..].as_bytes()
1424+ &chunk.as_bytes()[byte - start_byte..]
12001425 } else {
12011426 // out of range
12021427 &[]
@@ -1212,7 +1437,7 @@ impl LanguageLayer {
12121437}
12131438
12141439pub(crate) fn generate_edits(
1215− old_text: &Rope,
1440+ old_text: RopeSlice,
12161441 changeset: &ChangeSet,
12171442) -> Vec<tree_sitter::InputEdit> {
12181443 use Operation::*;
@@ -1228,7 +1453,7 @@ pub(crate) fn generate_edits(
12281453
12291454 // TODO; this is a lot easier with Change instead of Operation.
12301455
1231− fn point_at_pos(text: &Rope, pos: usize) -> (usize, Point) {
1456+ fn point_at_pos(text: RopeSlice, pos: usize) -> (usize, Point) {
12321457 let byte = text.char_to_byte(pos); // <- attempted to index past end
12331458 let line = text.char_to_line(pos);
12341459 let line_start_byte = text.line_to_byte(line);
@@ -1354,12 +1579,14 @@ pub struct HighlightConfiguration {
13541579 pub language: Grammar,
13551580 pub query: Query,
13561581 injections_query: Query,
1357− combined_injections_query: Option<Query>,
1582+ combined_injections_patterns: Vec<usize>,
13581583 highlights_pattern_index: usize,
13591584 highlight_indices: ArcSwap<Vec<Option<Highlight>>>,
13601585 non_local_variable_patterns: Vec<bool>,
13611586 injection_content_capture_index: Option<u32>,
13621587 injection_language_capture_index: Option<u32>,
1588+ injection_filename_capture_index: Option<u32>,
1589+ injection_shebang_capture_index: Option<u32>,
13631590 local_scope_capture_index: Option<u32>,
13641591 local_def_capture_index: Option<u32>,
13651592 local_def_value_capture_index: Option<u32>,
@@ -1403,7 +1630,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
14031630}
14041631
14051632pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1406−impl<'a> TextProvider<'a> for RopeProvider<'a> {
1633+impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
14071634 type I = ChunksBytes<'a>;
14081635
14091636 fn text(&mut self, node: Node) -> Self::I {
@@ -1417,7 +1644,7 @@ impl<'a> TextProvider<'a> for RopeProvider<'a> {
14171644struct HighlightIterLayer<'a> {
14181645 _tree: Option<Tree>,
14191646 cursor: QueryCursor,
1420− captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
1647+ captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
14211648 config: &'a HighlightConfiguration,
14221649 highlight_end_stack: Vec<usize>,
14231650 scope_stack: Vec<LocalScope<'a>>,
@@ -1468,26 +1695,15 @@ impl HighlightConfiguration {
14681695 }
14691696 }
14701697
1471− let mut injections_query = Query::new(language, injection_query)?;
1472−
1473− // Construct a separate query just for dealing with the 'combined injections'.
1474− // Disable the combined injection patterns in the main query.
1475− let mut combined_injections_query = Query::new(language, injection_query)?;
1476− let mut has_combined_queries = false;
1477− for pattern_index in 0..injections_query.pattern_count() {
1478− let settings = injections_query.property_settings(pattern_index);
1479− if settings.iter().any(|s| &*s.key == "injection.combined") {
1480− has_combined_queries = true;
1481− injections_query.disable_pattern(pattern_index);
1482− } else {
1483− combined_injections_query.disable_pattern(pattern_index);
1484− }
1485− }
1486− let combined_injections_query = if has_combined_queries {
1487− Some(combined_injections_query)
1488− } else {
1489− None
1490− };
1698+ let injections_query = Query::new(language, injection_query)?;
1699+ let combined_injections_patterns = (0..injections_query.pattern_count())
1700+ .filter(|&i| {
1701+ injections_query
1702+ .property_settings(i)
1703+ .iter()
1704+ .any(|s| &*s.key == "injection.combined")
1705+ })
1706+ .collect();
14911707
14921708 // Find all of the highlighting patterns that are disabled for nodes that
14931709 // have been identified as local variables.
@@ -1503,6 +1719,8 @@ impl HighlightConfiguration {
15031719 // Store the numeric ids for all of the special captures.
15041720 let mut injection_content_capture_index = None;
15051721 let mut injection_language_capture_index = None;
1722+ let mut injection_filename_capture_index = None;
1723+ let mut injection_shebang_capture_index = None;
15061724 let mut local_def_capture_index = None;
15071725 let mut local_def_value_capture_index = None;
15081726 let mut local_ref_capture_index = None;
@@ -1523,6 +1741,8 @@ impl HighlightConfiguration {
15231741 match name.as_str() {
15241742 "injection.content" => injection_content_capture_index = i,
15251743 "injection.language" => injection_language_capture_index = i,
1744+ "injection.filename" => injection_filename_capture_index = i,
1745+ "injection.shebang" => injection_shebang_capture_index = i,
15261746 _ => {}
15271747 }
15281748 }
@@ -1532,12 +1752,14 @@ impl HighlightConfiguration {
15321752 language,
15331753 query,
15341754 injections_query,
1535− combined_injections_query,
1755+ combined_injections_patterns,
15361756 highlights_pattern_index,
15371757 highlight_indices,
15381758 non_local_variable_patterns,
15391759 injection_content_capture_index,
15401760 injection_language_capture_index,
1761+ injection_filename_capture_index,
1762+ injection_shebang_capture_index,
15411763 local_scope_capture_index,
15421764 local_def_capture_index,
15431765 local_def_value_capture_index,
@@ -1596,6 +1818,90 @@ impl HighlightConfiguration {
15961818
15971819 self.highlight_indices.store(Arc::new(indices));
15981820 }
1821+
1822+ fn injection_pair<'a>(
1823+ &self,
1824+ query_match: &QueryMatch<'a, 'a>,
1825+ source: RopeSlice<'a>,
1826+ ) -> (Option<InjectionLanguageMarker<'a>>, Option<Node<'a>>) {
1827+ let mut injection_capture = None;
1828+ let mut content_node = None;
1829+
1830+ for capture in query_match.captures {
1831+ let index = Some(capture.index);
1832+ if index == self.injection_language_capture_index {
1833+ let name = byte_range_to_str(capture.node.byte_range(), source);
1834+ injection_capture = Some(InjectionLanguageMarker::Name(name));
1835+ } else if index == self.injection_filename_capture_index {
1836+ let name = byte_range_to_str(capture.node.byte_range(), source);
1837+ let path = Path::new(name.as_ref()).to_path_buf();
1838+ injection_capture = Some(InjectionLanguageMarker::Filename(path.into()));
1839+ } else if index == self.injection_shebang_capture_index {
1840+ let node_slice = source.byte_slice(capture.node.byte_range());
1841+
1842+ // some languages allow space and newlines before the actual string content
1843+ // so a shebang could be on either the first or second line
1844+ let lines = if let Ok(end) = node_slice.try_line_to_byte(2) {
1845+ node_slice.byte_slice(..end)
1846+ } else {
1847+ node_slice
1848+ };
1849+
1850+ static SHEBANG_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(SHEBANG).unwrap());
1851+
1852+ injection_capture = SHEBANG_REGEX
1853+ .captures(&Cow::from(lines))
1854+ .map(|cap| InjectionLanguageMarker::Shebang(cap[1].to_owned()))
1855+ } else if index == self.injection_content_capture_index {
1856+ content_node = Some(capture.node);
1857+ }
1858+ }
1859+ (injection_capture, content_node)
1860+ }
1861+
1862+ fn injection_for_match<'a>(
1863+ &self,
1864+ query: &'a Query,
1865+ query_match: &QueryMatch<'a, 'a>,
1866+ source: RopeSlice<'a>,
1867+ ) -> (
1868+ Option<InjectionLanguageMarker<'a>>,
1869+ Option<Node<'a>>,
1870+ IncludedChildren,
1871+ ) {
1872+ let (mut injection_capture, content_node) = self.injection_pair(query_match, source);
1873+
1874+ let mut included_children = IncludedChildren::default();
1875+ for prop in query.property_settings(query_match.pattern_index) {
1876+ match prop.key.as_ref() {
1877+ // In addition to specifying the language name via the text of a
1878+ // captured node, it can also be hard-coded via a `#set!` predicate
1879+ // that sets the injection.language key.
1880+ "injection.language" if injection_capture.is_none() => {
1881+ injection_capture = prop
1882+ .value
1883+ .as_ref()
1884+ .map(|s| InjectionLanguageMarker::Name(s.as_ref().into()));
1885+ }
1886+
1887+ // By default, injections do not include the *children* of an
1888+ // `injection.content` node - only the ranges that belong to the
1889+ // node itself. This can be changed using a `#set!` predicate that
1890+ // sets the `injection.include-children` key.
1891+ "injection.include-children" => included_children = IncludedChildren::All,
1892+
1893+ // Some queries might only exclude named children but include unnamed
1894+ // children in their `injection.content` node. This can be enabled using
1895+ // a `#set!` predicate that sets the `injection.include-unnamed-children` key.
1896+ "injection.include-unnamed-children" => {
1897+ included_children = IncludedChildren::Unnamed
1898+ }
1899+ _ => {}
1900+ }
1901+ }
1902+
1903+ (injection_capture, content_node, included_children)
1904+ }
15991905}
16001906
16011907impl<'a> HighlightIterLayer<'a> {
@@ -2007,56 +2313,15 @@ impl<'a> Iterator for HighlightIter<'a> {
20072313 }
20082314}
20092315
2010−fn injection_for_match<'a>(
2011− config: &HighlightConfiguration,
2012− query: &'a Query,
2013− query_match: &QueryMatch<'a, 'a>,
2014− source: RopeSlice<'a>,
2015−) -> (Option<Cow<'a, str>>, Option<Node<'a>>, IncludedChildren) {
2016− let content_capture_index = config.injection_content_capture_index;
2017− let language_capture_index = config.injection_language_capture_index;
2018−
2019− let mut language_name = None;
2020− let mut content_node = None;
2021− for capture in query_match.captures {
2022− let index = Some(capture.index);
2023− if index == language_capture_index {
2024− let name = byte_range_to_str(capture.node.byte_range(), source);
2025− language_name = Some(name);
2026− } else if index == content_capture_index {
2027− content_node = Some(capture.node);
2028− }
2029− }
2030−
2031− let mut included_children = IncludedChildren::default();
2032− for prop in query.property_settings(query_match.pattern_index) {
2033− match prop.key.as_ref() {
2034− // In addition to specifying the language name via the text of a
2035− // captured node, it can also be hard-coded via a `#set!` predicate
2036− // that sets the injection.language key.
2037− "injection.language" => {
2038− if language_name.is_none() {
2039− language_name = prop.value.as_ref().map(|s| s.as_ref().into())
2040− }
2041− }
2042−
2043− // By default, injections do not include the *children* of an
2044− // `injection.content` node - only the ranges that belong to the
2045− // node itself. This can be changed using a `#set!` predicate that
2046− // sets the `injection.include-children` key.
2047− "injection.include-children" => included_children = IncludedChildren::All,
2048−
2049− // Some queries might only exclude named children but include unnamed
2050− // children in their `injection.content` node. This can be enabled using
2051− // a `#set!` predicate that sets the `injection.include-unnamed-children` key.
2052− "injection.include-unnamed-children" => included_children = IncludedChildren::Unnamed,
2053− _ => {}
2054− }
2055− }
2056−
2057− (language_name, content_node, included_children)
2316+#[derive(Debug, Clone)]
2317+pub enum InjectionLanguageMarker<'a> {
2318+ Name(Cow<'a, str>),
2319+ Filename(Cow<'a, Path>),
2320+ Shebang(String),
20582321}
20592322
2323+const SHEBANG: &str = r"#!\s*(?:\S*[/\\](?:env\s+(?:\-\S+\s+)*)?)?([^\s\.\d]+)";
2324+
20602325pub struct Merge<I> {
20612326 iter: I,
20622327 spans: Box<dyn Iterator<Item = (usize, std::ops::Range<usize>)>>,
@@ -2272,7 +2537,10 @@ mod test {
22722537 "#,
22732538 );
22742539
2275− let loader = Loader::new(Configuration { language: vec![] });
2540+ let loader = Loader::new(Configuration {
2541+ language: vec![],
2542+ language_server: HashMap::new(),
2543+ });
22762544 let language = get_language("rust").unwrap();
22772545
22782546 let query = Query::new(language, query_str).unwrap();
@@ -2280,7 +2548,7 @@ mod test {
22802548 let mut cursor = QueryCursor::new();
22812549
22822550 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2283− let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
2551+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
22842552
22852553 let root = syntax.tree().root_node();
22862554 let mut test = |capture, range| {
@@ -2331,7 +2599,10 @@ mod test {
23312599 .map(String::from)
23322600 .collect();
23332601
2334− let loader = Loader::new(Configuration { language: vec![] });
2602+ let loader = Loader::new(Configuration {
2603+ language: vec![],
2604+ language_server: HashMap::new(),
2605+ });
23352606
23362607 let language = get_language("rust").unwrap();
23372608 let config = HighlightConfiguration::new(
@@ -2351,7 +2622,7 @@ mod test {
23512622 fn main() {}
23522623 ",
23532624 );
2354− let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
2625+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
23552626 let tree = syntax.tree();
23562627 let root = tree.root_node();
23572628 assert_eq!(root.kind(), "source_file");
@@ -2378,7 +2649,7 @@ mod test {
23782649 &doc,
23792650 vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
23802651 );
2381− let edits = generate_edits(&doc, transaction.changes());
2652+ let edits = generate_edits(doc.slice(..), transaction.changes());
23822653 // transaction.apply(&mut state);
23832654
23842655 assert_eq!(
@@ -2407,7 +2678,7 @@ mod test {
24072678 let mut doc = Rope::from("fn test() {}");
24082679 let transaction =
24092680 Transaction::change(&doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
2410− let edits = generate_edits(&doc, transaction.changes());
2681+ let edits = generate_edits(doc.slice(..), transaction.changes());
24112682 transaction.apply(&mut doc);
24122683
24132684 assert_eq!(doc, "fn test(a: u32) {}");
@@ -2434,11 +2705,14 @@ mod test {
24342705 ) {
24352706 let source = Rope::from_str(source);
24362707
2437− let loader = Loader::new(Configuration { language: vec![] });
2708+ let loader = Loader::new(Configuration {
2709+ language: vec![],
2710+ language_server: HashMap::new(),
2711+ });
24382712 let language = get_language(language_name).unwrap();
24392713
24402714 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2441− let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
2715+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
24422716
24432717 let root = syntax
24442718 .tree()
helix-core/src/test.rs+139−18
@@ -1,7 +1,9 @@
11//! Test helpers.
22use crate::{Range, Selection};
3+use ropey::Rope;
34use smallvec::SmallVec;
45use std::cmp::Reverse;
6+use unicode_segmentation::UnicodeSegmentation;
57
68/// Convert annotated test string to test string and selection.
79///
@@ -10,6 +12,10 @@ use std::cmp::Reverse;
1012/// `#[` for primary selection with head after anchor followed by `|]#`.
1113/// `#(` for secondary selection with head after anchor followed by `|)#`.
1214///
15+/// If the selection contains any LF or CRLF sequences, which are immediately
16+/// followed by the same grapheme, then the subsequent one is removed. This is
17+/// to allow representing having the cursor over the end of the line.
18+///
1319/// # Examples
1420///
1521/// ```
@@ -30,23 +36,23 @@ use std::cmp::Reverse;
3036pub fn print(s: &str) -> (String, Selection) {
3137 let mut primary_idx = None;
3238 let mut ranges = SmallVec::new();
33− let mut iter = s.chars().peekable();
39+ let mut iter = UnicodeSegmentation::graphemes(s, true).peekable();
3440 let mut left = String::with_capacity(s.len());
3541
3642 'outer: while let Some(c) = iter.next() {
3743 let start = left.chars().count();
3844
39− if c != '#' {
40− left.push(c);
45+ if c != "#" {
46+ left.push_str(c);
4147 continue;
4248 }
4349
4450 let (is_primary, close_pair) = match iter.next() {
45− Some('[') => (true, ']'),
46− Some('(') => (false, ')'),
51+ Some("[") => (true, "]"),
52+ Some("(") => (false, ")"),
4753 Some(ch) => {
4854 left.push('#');
49− left.push(ch);
55+ left.push_str(ch);
5056 continue;
5157 }
5258 None => break,
@@ -56,24 +62,45 @@ pub fn print(s: &str) -> (String, Selection) {
5662 panic!("primary `#[` already appeared {:?} {:?}", left, s);
5763 }
5864
59− let head_at_beg = iter.next_if_eq(&'|').is_some();
65+ let head_at_beg = iter.next_if_eq(&"|").is_some();
66+ let last_grapheme = |s: &str| {
67+ UnicodeSegmentation::graphemes(s, true)
68+ .last()
69+ .map(String::from)
70+ };
6071
6172 while let Some(c) = iter.next() {
62− if !(c == close_pair && iter.peek() == Some(&'#')) {
63− left.push(c);
73+ let next = iter.peek();
74+ let mut prev = last_grapheme(left.as_str());
75+
76+ if !(c == close_pair && next == Some(&"#")) {
77+ left.push_str(c);
6478 continue;
6579 }
6680
6781 if !head_at_beg {
68− let prev = left.pop().unwrap();
69− if prev != '|' {
70− left.push(prev);
71− left.push(c);
72− continue;
82+ match &prev {
83+ Some(p) if p != "|" => {
84+ left.push_str(c);
85+ continue;
86+ }
87+ Some(p) if p == "|" => {
88+ left.pop().unwrap(); // pop the |
89+ prev = last_grapheme(left.as_str());
90+ }
91+ _ => (),
7392 }
7493 }
7594
7695 iter.next(); // skip "#"
96+ let next = iter.peek();
97+
98+ // skip explicit line end inside selection
99+ if (prev == Some(String::from("\r\n")) || prev == Some(String::from("\n")))
100+ && next.map(|n| String::from(*n)) == prev
101+ {
102+ iter.next();
103+ }
77104
78105 if is_primary {
79106 primary_idx = Some(ranges.len());
@@ -118,14 +145,16 @@ pub fn print(s: &str) -> (String, Selection) {
118145/// use smallvec::smallvec;
119146///
120147/// assert_eq!(
121−/// plain("abc", Selection::new(smallvec![Range::new(0, 1), Range::new(3, 2)], 0)),
148+/// plain("abc", &Selection::new(smallvec![Range::new(0, 1), Range::new(3, 2)], 0)),
122149/// "#[a|]#b#(|c)#".to_owned()
123150/// );
124151/// ```
125−pub fn plain(s: &str, selection: Selection) -> String {
152+pub fn plain<R: Into<Rope>>(s: R, selection: &Selection) -> String {
153+ let s = s.into();
126154 let primary = selection.primary_index();
127− let mut out = String::with_capacity(s.len() + 5 * selection.len());
128− out.push_str(s);
155+ let mut out = String::with_capacity(s.len_bytes() + 5 * selection.len());
156+ out.push_str(&s.to_string());
157+
129158 let mut insertion: Vec<_> = selection
130159 .iter()
131160 .enumerate()
@@ -138,7 +167,9 @@ pub fn plain(s: &str, selection: Selection) -> String {
138167 (false, false) => [(range.anchor, ")#"), (range.head, "#(|")],
139168 }
140169 })
170+ .map(|(char_idx, marker)| (s.char_to_byte(char_idx), marker))
141171 .collect();
172+
142173 // insert in reverse order
143174 insertion.sort_unstable_by_key(|k| Reverse(k.0));
144175 for (i, s) in insertion {
@@ -262,4 +293,94 @@ mod test {
262293 print("hello #[|👨‍👩‍👧‍👦]# goodbye")
263294 );
264295 }
296+
297+ #[test]
298+ fn plain_single() {
299+ assert_eq!("#[|h]#ello", plain("hello", &Selection::single(1, 0)));
300+ assert_eq!("#[h|]#ello", plain("hello", &Selection::single(0, 1)));
301+ assert_eq!("#[|hell]#o", plain("hello", &Selection::single(4, 0)));
302+ assert_eq!("#[hell|]#o", plain("hello", &Selection::single(0, 4)));
303+ assert_eq!("#[|hello]#", plain("hello", &Selection::single(5, 0)));
304+ assert_eq!("#[hello|]#", plain("hello", &Selection::single(0, 5)));
305+ }
306+
307+ #[test]
308+ fn plain_multi() {
309+ assert_eq!(
310+ plain(
311+ "hello",
312+ &Selection::new(
313+ SmallVec::from_slice(&[Range::new(1, 0), Range::new(5, 4)]),
314+ 0
315+ )
316+ ),
317+ String::from("#[|h]#ell#(|o)#")
318+ );
319+ assert_eq!(
320+ plain(
321+ "hello",
322+ &Selection::new(
323+ SmallVec::from_slice(&[Range::new(0, 1), Range::new(4, 5)]),
324+ 0
325+ )
326+ ),
327+ String::from("#[h|]#ell#(o|)#")
328+ );
329+ assert_eq!(
330+ plain(
331+ "hello",
332+ &Selection::new(
333+ SmallVec::from_slice(&[Range::new(2, 0), Range::new(5, 3)]),
334+ 0
335+ )
336+ ),
337+ String::from("#[|he]#l#(|lo)#")
338+ );
339+ assert_eq!(
340+ plain(
341+ "hello\r\nhello\r\nhello\r\n",
342+ &Selection::new(
343+ SmallVec::from_slice(&[
344+ Range::new(7, 5),
345+ Range::new(21, 19),
346+ Range::new(14, 12)
347+ ]),
348+ 0
349+ )
350+ ),
351+ String::from("hello#[|\r\n]#hello#(|\r\n)#hello#(|\r\n)#")
352+ );
353+ }
354+
355+ #[test]
356+ fn plain_multi_byte_code_point() {
357+ assert_eq!(
358+ plain("„“", &Selection::single(1, 0)),
359+ String::from("#[|„]#“")
360+ );
361+ assert_eq!(
362+ plain("„“", &Selection::single(2, 1)),
363+ String::from("„#[|“]#")
364+ );
365+ assert_eq!(
366+ plain("„“", &Selection::single(0, 1)),
367+ String::from("#[„|]#“")
368+ );
369+ assert_eq!(
370+ plain("„“", &Selection::single(1, 2)),
371+ String::from("„#[“|]#")
372+ );
373+ assert_eq!(
374+ plain("they said „hello“", &Selection::single(11, 10)),
375+ String::from("they said #[|„]#hello“")
376+ );
377+ }
378+
379+ #[test]
380+ fn plain_multi_code_point_grapheme() {
381+ assert_eq!(
382+ plain("hello 👨‍👩‍👧‍👦 goodbye", &Selection::single(13, 6)),
383+ String::from("hello #[|👨‍👩‍👧‍👦]# goodbye")
384+ );
385+ }
265386}
helix-core/src/text_annotations.rs+26−26
@@ -1,5 +1,4 @@
11use std::cell::Cell;
2−use std::convert::identity;
32use std::ops::Range;
43use std::rc::Rc;
54
@@ -15,6 +14,15 @@ pub struct InlineAnnotation {
1514 pub char_idx: usize,
1615}
1716
17+impl InlineAnnotation {
18+ pub fn new(char_idx: usize, text: impl Into<Tendril>) -> Self {
19+ Self {
20+ char_idx,
21+ text: text.into(),
22+ }
23+ }
24+}
25+
1826/// Represents a **single Grapheme** that is part of the document
1927/// that start at `char_idx` that will be replaced with
2028/// a different `grapheme`.
@@ -33,22 +41,13 @@ pub struct InlineAnnotation {
3341/// use helix_core::text_annotations::Overlay;
3442///
3543/// // replaces a
36−/// Overlay {
37−/// char_idx: 0,
38−/// grapheme: "X".into(),
39−/// };
44+/// Overlay::new(0, "X");
4045///
4146/// // replaces X͎̊͢͜͝͡
42−/// Overlay{
43−/// char_idx: 1,
44−/// grapheme: "\t".into(),
45−/// };
47+/// Overlay::new(1, "\t");
4648///
4749/// // replaces b
48−/// Overlay{
49−/// char_idx: 6,
50−/// grapheme: "X̢̢̟͖̲͌̋̇͑͝".into(),
51−/// };
50+/// Overlay::new(6, "X̢̢̟͖̲͌̋̇͑͝");
5251/// ```
5352///
5453/// The following examples are invalid uses
@@ -57,16 +56,10 @@ pub struct InlineAnnotation {
5756/// use helix_core::text_annotations::Overlay;
5857///
5958/// // overlay is not aligned at grapheme boundary
60−/// Overlay{
61−/// char_idx: 3,
62−/// grapheme: "x".into(),
63−/// };
59+/// Overlay::new(3, "x");
6460///
6561/// // overlay contains multiple graphemes
66−/// Overlay{
67−/// char_idx: 0,
68−/// grapheme: "xy".into(),
69−/// };
62+/// Overlay::new(0, "xy");
7063/// ```
7164#[derive(Debug, Clone)]
7265pub struct Overlay {
@@ -74,6 +67,15 @@ pub struct Overlay {
7467 pub grapheme: Tendril,
7568}
7669
70+impl Overlay {
71+ pub fn new(char_idx: usize, grapheme: impl Into<Tendril>) -> Self {
72+ Self {
73+ char_idx,
74+ grapheme: grapheme.into(),
75+ }
76+ }
77+}
78+
7779/// Line annotations allow for virtual text between normal
7880/// text lines. They cause `height` empty lines to be inserted
7981/// below the document line that contains `anchor_char_idx`.
@@ -110,9 +112,7 @@ impl<A, M> Layer<A, M> {
110112 pub fn reset_pos(&self, char_idx: usize, get_char_idx: impl Fn(&A) -> usize) {
111113 let new_index = self
112114 .annotations
113− .binary_search_by_key(&char_idx, get_char_idx)
114− .unwrap_or_else(identity);
115−
115+ .partition_point(|annot| get_char_idx(annot) < char_idx);
116116 self.current_index.set(new_index);
117117 }
118118
@@ -172,7 +172,7 @@ impl TextAnnotations {
172172 for char_idx in char_range {
173173 if let Some((_, Some(highlight))) = self.overlay_at(char_idx) {
174174 // we don't know the number of chars the original grapheme takes
175− // however it doesn't matter as highlight bounderies are automatically
175+ // however it doesn't matter as highlight boundaries are automatically
176176 // aligned to grapheme boundaries in the rendering code
177177 highlights.push((highlight.0, char_idx..char_idx + 1))
178178 }
@@ -203,7 +203,7 @@ impl TextAnnotations {
203203
204204 /// Add new grapheme overlays.
205205 ///
206− /// The overlayed grapheme will be rendered with `highlight`
206+ /// The overlaid grapheme will be rendered with `highlight`
207207 /// patched on top of `ui.text`.
208208 ///
209209 /// The overlays **must be sorted** by their `char_idx`.
helix-core/src/textobject.rs+3−3
@@ -437,7 +437,7 @@ mod test {
437437 let text = Rope::from(s.as_str());
438438 let selection = selection
439439 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 1));
440− let actual = crate::test::plain(&s, selection);
440+ let actual = crate::test::plain(s.as_ref(), &selection);
441441 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
442442 }
443443 }
@@ -460,7 +460,7 @@ mod test {
460460 let text = Rope::from(s.as_str());
461461 let selection = selection
462462 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Inside, 2));
463− let actual = crate::test::plain(&s, selection);
463+ let actual = crate::test::plain(s.as_ref(), &selection);
464464 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
465465 }
466466 }
@@ -491,7 +491,7 @@ mod test {
491491 let text = Rope::from(s.as_str());
492492 let selection = selection
493493 .transform(|r| textobject_paragraph(text.slice(..), r, TextObject::Around, 1));
494− let actual = crate::test::plain(&s, selection);
494+ let actual = crate::test::plain(s.as_ref(), &selection);
495495 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
496496 }
497497 }
helix-core/src/transaction.rs+309−51
@@ -1,8 +1,12 @@
1−use crate::{Range, Rope, Selection, Tendril};
2−use std::borrow::Cow;
1+use ropey::RopeSlice;
2+use smallvec::SmallVec;
3+
4+use crate::{chars::char_is_word, Range, Rope, Selection, Tendril};
5+use std::{borrow::Cow, iter::once};
36
47/// (from, to, replacement)
58pub type Change = (usize, usize, Option<Tendril>);
9+pub type Deletion = (usize, usize);
610
711// TODO: pub(crate)
812#[derive(Debug, Clone, PartialEq, Eq)]
@@ -19,6 +23,30 @@ pub enum Operation {
1923pub enum Assoc {
2024 Before,
2125 After,
26+ /// Acts like `After` if a word character is inserted
27+ /// after the position, otherwise acts like `Before`
28+ AfterWord,
29+ /// Acts like `Before` if a word character is inserted
30+ /// before the position, otherwise acts like `After`
31+ BeforeWord,
32+}
33+
34+impl Assoc {
35+ /// Whether to stick to gaps
36+ fn stay_at_gaps(self) -> bool {
37+ !matches!(self, Self::BeforeWord | Self::AfterWord)
38+ }
39+
40+ fn insert_offset(self, s: &str) -> usize {
41+ let chars = s.chars().count();
42+ match self {
43+ Assoc::After => chars,
44+ Assoc::AfterWord => s.chars().take_while(|&c| char_is_word(c)).count(),
45+ // return position before inserted text
46+ Assoc::Before => 0,
47+ Assoc::BeforeWord => chars - s.chars().rev().take_while(|&c| char_is_word(c)).count(),
48+ }
49+ }
2250}
2351
2452#[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -39,7 +67,7 @@ impl ChangeSet {
3967 }
4068
4169 #[must_use]
42− pub fn new(doc: &Rope) -> Self {
70+ pub fn new(doc: RopeSlice) -> Self {
4371 let len = doc.len_chars();
4472 Self {
4573 changes: Vec::new(),
@@ -323,20 +351,75 @@ impl ChangeSet {
323351 self.changes.is_empty() || self.changes == [Operation::Retain(self.len)]
324352 }
325353
326− /// Map a position through the changes.
354+ /// Map a (mostly) *sorted* list of positions through the changes.
327355 ///
328− /// `assoc` indicates which size to associate the position with. `Before` will keep the
329− /// position close to the character before, and will place it before insertions over that
330− /// range, or at that point. `After` will move it forward, placing it at the end of such
331− /// insertions.
332− pub fn map_pos(&self, pos: usize, assoc: Assoc) -> usize {
356+ /// This is equivalent to updating each position with `map_pos`:
357+ ///
358+ /// ``` no-compile
359+ /// for (pos, assoc) in positions {
360+ /// *pos = changes.map_pos(*pos, assoc);
361+ /// }
362+ /// ```
363+ /// However this function is significantly faster for sorted lists running
364+ /// in `O(N+M)` instead of `O(NM)`. This function also handles unsorted/
365+ /// partially sorted lists. However, in that case worst case complexity is
366+ /// again `O(MN)`. For lists that are often/mostly sorted (like the end of diagnostic ranges)
367+ /// performance is usally close to `O(N + M)`
368+ pub fn update_positions<'a>(&self, positions: impl Iterator<Item = (&'a mut usize, Assoc)>) {
333369 use Operation::*;
370+
371+ let mut positions = positions.peekable();
372+
334373 let mut old_pos = 0;
335374 let mut new_pos = 0;
375+ let mut iter = self.changes.iter().enumerate().peekable();
376+
377+ 'outer: loop {
378+ macro_rules! map {
379+ ($map: expr, $i: expr) => {
380+ loop {
381+ let Some((pos, assoc)) = positions.peek_mut() else { return; };
382+ if **pos < old_pos {
383+ // Positions are not sorted, revert to the last Operation that
384+ // contains this position and continue iterating from there.
385+ // We can unwrap here since `pos` can not be negative
386+ // (unsigned integer) and iterating backwards to the start
387+ // should always move us back to the start
388+ for (i, change) in self.changes[..$i].iter().enumerate().rev() {
389+ match change {
390+ Retain(i) => {
391+ old_pos -= i;
392+ new_pos -= i;
393+ }
394+ Delete(i) => {
395+ old_pos -= i;
396+ }
397+ Insert(ins) => {
398+ new_pos -= ins.chars().count();
399+ }
400+ }
401+ if old_pos <= **pos {
402+ iter = self.changes[i..].iter().enumerate().peekable();
403+ }
404+ }
405+ debug_assert!(old_pos <= **pos, "Reverse Iter across changeset works");
406+ continue 'outer;
407+ }
408+ let Some(new_pos) = $map(**pos, *assoc) else { break; };
409+ **pos = new_pos;
410+ positions.next();
411+ }
412+ };
413+ }
336414
337− let mut iter = self.changes.iter().peekable();
415+ let Some((i, change)) = iter.next() else {
416+ map!(
417+ |pos, _| (old_pos == pos).then_some(new_pos),
418+ self.changes.len()
419+ );
420+ break;
421+ };
338422
339− while let Some(change) = iter.next() {
340423 let len = match change {
341424 Delete(i) | Retain(i) => *i,
342425 Insert(_) => 0,
@@ -345,61 +428,65 @@ impl ChangeSet {
345428
346429 match change {
347430 Retain(_) => {
348− if old_end > pos {
349− return new_pos + (pos - old_pos);
350− }
431+ map!(
432+ |pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)),
433+ i
434+ );
351435 new_pos += len;
352436 }
353437 Delete(_) => {
354438 // in range
355− if old_end > pos {
356− return new_pos;
357− }
439+ map!(|pos, _| (old_end > pos).then_some(new_pos), i);
358440 }
359441 Insert(s) => {
360− let ins = s.chars().count();
361−
362442 // a subsequent delete means a replace, consume it
363− if let Some(Delete(len)) = iter.peek() {
443+ if let Some((_, Delete(len))) = iter.peek() {
364444 iter.next();
365445
366446 old_end = old_pos + len;
367447 // in range of replaced text
368− if old_end > pos {
369− // at point or tracking before
370− if pos == old_pos || assoc == Assoc::Before {
371− return new_pos;
372− } else {
373− // place to end of insert
374− return new_pos + ins;
375− }
376− }
448+ map!(
449+ |pos, assoc: Assoc| (old_end > pos).then(|| {
450+ // at point or tracking before
451+ if pos == old_pos && assoc.stay_at_gaps() {
452+ new_pos
453+ } else {
454+ // place to end of insert
455+ new_pos + assoc.insert_offset(s)
456+ }
457+ }),
458+ i
459+ );
377460 } else {
378461 // at insert point
379− if old_pos == pos {
380− // return position before inserted text
381− if assoc == Assoc::Before {
382− return new_pos;
383− } else {
384− // after text
385− return new_pos + ins;
386− }
387− }
462+ map!(
463+ |pos, assoc: Assoc| (old_pos == pos).then(|| {
464+ // return position before inserted text
465+ new_pos + assoc.insert_offset(s)
466+ }),
467+ i
468+ );
388469 }
389470
390− new_pos += ins;
471+ new_pos += s.chars().count();
391472 }
392473 }
393474 old_pos = old_end;
394475 }
476+ let out_of_bounds: Vec<_> = positions.collect();
395477
396− if pos > old_pos {
397− panic!(
398− "Position {} is out of range for changeset len {}!",
399− pos, old_pos
400− )
401− }
402− new_pos
478+ panic!("Positions {out_of_bounds:?} are out of range for changeset len {old_pos}!",)
479+ }
480+
481+ /// Map a position through the changes.
482+ ///
483+ /// `assoc` indicates which side to associate the position with. `Before` will keep the
484+ /// position close to the character before, and will place it before insertions over that
485+ /// range, or at that point. `After` will move it forward, placing it at the end of such
486+ /// insertions.
487+ pub fn map_pos(&self, mut pos: usize, assoc: Assoc) -> usize {
488+ self.update_positions(once((&mut pos, assoc)));
489+ pos
403490 }
404491
405492 pub fn changes_iter(&self) -> ChangeIterator {
@@ -419,7 +506,7 @@ impl Transaction {
419506 /// Create a new, empty transaction.
420507 pub fn new(doc: &Rope) -> Self {
421508 Self {
422− changes: ChangeSet::new(doc),
509+ changes: ChangeSet::new(doc.slice(..)),
423510 selection: None,
424511 }
425512 }
@@ -466,6 +553,33 @@ impl Transaction {
466553 self
467554 }
468555
556+ /// Generate a transaction from a set of potentially overlapping changes. The `change_ranges`
557+ /// iterator yield the range (of removed text) in the old document for each edit. If any change
558+ /// overlaps with a range overlaps with a previous range then that range is ignored.
559+ ///
560+ /// The `process_change` callback is called for each edit that is not ignored (in the order
561+ /// yielded by `changes`) and should return the new text that the associated range will be
562+ /// replaced with.
563+ ///
564+ /// To make this function more flexible the iterator can yield additional data for each change
565+ /// that is passed to `process_change`
566+ pub fn change_ignore_overlapping<T>(
567+ doc: &Rope,
568+ change_ranges: impl Iterator<Item = (usize, usize, T)>,
569+ mut process_change: impl FnMut(usize, usize, T) -> Option<Tendril>,
570+ ) -> Self {
571+ let mut last = 0;
572+ let changes = change_ranges.filter_map(|(from, to, data)| {
573+ if from < last {
574+ return None;
575+ }
576+ let tendril = process_change(from, to, data);
577+ last = to;
578+ Some((from, to, tendril))
579+ });
580+ Self::change(doc, changes)
581+ }
582+
469583 /// Generate a transaction from a set of changes.
470584 pub fn change<I>(doc: &Rope, changes: I) -> Self
471585 where
@@ -505,6 +619,46 @@ impl Transaction {
505619 Self::from(changeset)
506620 }
507621
622+ /// Generate a transaction from a set of potentially overlapping deletions
623+ /// by merging overlapping deletions together.
624+ pub fn delete<I>(doc: &Rope, deletions: I) -> Self
625+ where
626+ I: Iterator<Item = Deletion>,
627+ {
628+ let len = doc.len_chars();
629+
630+ let (lower, upper) = deletions.size_hint();
631+ let size = upper.unwrap_or(lower);
632+ let mut changeset = ChangeSet::with_capacity(2 * size + 1); // rough estimate
633+
634+ let mut last = 0;
635+ for (mut from, to) in deletions {
636+ if last > to {
637+ continue;
638+ }
639+ if last > from {
640+ from = last
641+ }
642+ debug_assert!(
643+ from <= to,
644+ "Edit end must end before it starts (should {from} <= {to})"
645+ );
646+ // Retain from last "to" to current "from"
647+ changeset.retain(from - last);
648+ changeset.delete(to - from);
649+ last = to;
650+ }
651+
652+ changeset.retain(len - last);
653+
654+ Self::from(changeset)
655+ }
656+
657+ pub fn insert_at_eof(mut self, text: Tendril) -> Transaction {
658+ self.changes.insert(text);
659+ self
660+ }
661+
508662 /// Generate a transaction with a change per selection range.
509663 pub fn change_by_selection<F>(doc: &Rope, selection: &Selection, f: F) -> Self
510664 where
@@ -513,6 +667,54 @@ impl Transaction {
513667 Self::change(doc, selection.iter().map(f))
514668 }
515669
670+ pub fn change_by_selection_ignore_overlapping(
671+ doc: &Rope,
672+ selection: &Selection,
673+ mut change_range: impl FnMut(&Range) -> (usize, usize),
674+ mut create_tendril: impl FnMut(usize, usize) -> Option<Tendril>,
675+ ) -> (Transaction, Selection) {
676+ let mut last_selection_idx = None;
677+ let mut new_primary_idx = None;
678+ let mut ranges: SmallVec<[Range; 1]> = SmallVec::new();
679+ let process_change = |change_start, change_end, (idx, range): (usize, &Range)| {
680+ // update the primary idx
681+ if idx == selection.primary_index() {
682+ new_primary_idx = Some(idx);
683+ } else if new_primary_idx.is_none() {
684+ if idx > selection.primary_index() {
685+ new_primary_idx = last_selection_idx;
686+ } else {
687+ last_selection_idx = Some(idx);
688+ }
689+ }
690+ ranges.push(*range);
691+ create_tendril(change_start, change_end)
692+ };
693+ let transaction = Self::change_ignore_overlapping(
694+ doc,
695+ selection.iter().enumerate().map(|range| {
696+ let (change_start, change_end) = change_range(range.1);
697+ (change_start, change_end, range)
698+ }),
699+ process_change,
700+ );
701+
702+ (
703+ transaction,
704+ Selection::new(ranges, new_primary_idx.unwrap_or(0)),
705+ )
706+ }
707+
708+ /// Generate a transaction with a deletion per selection range.
709+ /// Compared to using `change_by_selection` directly these ranges may overlap.
710+ /// In that case they are merged
711+ pub fn delete_by_selection<F>(doc: &Rope, selection: &Selection, f: F) -> Self
712+ where
713+ F: FnMut(&Range) -> Deletion,
714+ {
715+ Self::delete(doc, selection.iter().map(f))
716+ }
717+
516718 /// Insert text at each selection head.
517719 pub fn insert(doc: &Rope, selection: &Selection, text: Tendril) -> Self {
518720 Self::change_by_selection(doc, selection, |range| {
@@ -685,6 +887,62 @@ mod test {
685887 };
686888 assert_eq!(cs.map_pos(2, Assoc::Before), 2);
687889 assert_eq!(cs.map_pos(2, Assoc::After), 2);
890+ // unsorted selection
891+ let cs = ChangeSet {
892+ changes: vec![
893+ Insert("ab".into()),
894+ Delete(2),
895+ Insert("cd".into()),
896+ Delete(2),
897+ ],
898+ len: 4,
899+ len_after: 4,
900+ };
901+ let mut positions = [4, 2];
902+ cs.update_positions(positions.iter_mut().map(|pos| (pos, Assoc::After)));
903+ assert_eq!(positions, [4, 2]);
904+ // stays at word boundary
905+ let cs = ChangeSet {
906+ changes: vec![
907+ Retain(2), // <space><space>
908+ Insert(" ab".into()),
909+ Retain(2), // cd
910+ Insert("de ".into()),
911+ ],
912+ len: 4,
913+ len_after: 10,
914+ };
915+ assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 3);
916+ assert_eq!(cs.map_pos(4, Assoc::AfterWord), 9);
917+ let cs = ChangeSet {
918+ changes: vec![
919+ Retain(1), // <space>
920+ Insert(" b".into()),
921+ Delete(1), // c
922+ Retain(1), // d
923+ Insert("e ".into()),
924+ Delete(1), // <space>
925+ ],
926+ len: 5,
927+ len_after: 7,
928+ };
929+ assert_eq!(cs.map_pos(1, Assoc::BeforeWord), 2);
930+ assert_eq!(cs.map_pos(3, Assoc::AfterWord), 5);
931+ let cs = ChangeSet {
932+ changes: vec![
933+ Retain(1), // <space>
934+ Insert("a".into()),
935+ Delete(2), // <space>b
936+ Retain(1), // d
937+ Insert("e".into()),
938+ Delete(1), // f
939+ Retain(1), // <space>
940+ ],
941+ len: 5,
942+ len_after: 7,
943+ };
944+ assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 1);
945+ assert_eq!(cs.map_pos(4, Assoc::AfterWord), 4);
688946 }
689947
690948 #[test]
@@ -751,9 +1009,9 @@ mod test {
7511009 #[test]
7521010 fn combine_with_empty() {
7531011 let empty = Rope::from("");
754− let a = ChangeSet::new(&empty);
1012+ let a = ChangeSet::new(empty.slice(..));
7551013
756− let mut b = ChangeSet::new(&empty);
1014+ let mut b = ChangeSet::new(empty.slice(..));
7571015 b.insert("a".into());
7581016
7591017 let changes = a.compose(b);
@@ -767,9 +1025,9 @@ mod test {
7671025 const TEST_CASE: &str = "Hello, これはヘリックスエディターです!";
7681026
7691027 let empty = Rope::from("");
770− let a = ChangeSet::new(&empty);
1028+ let a = ChangeSet::new(empty.slice(..));
7711029
772− let mut b = ChangeSet::new(&empty);
1030+ let mut b = ChangeSet::new(empty.slice(..));
7731031 b.insert(TEST_CASE.into());
7741032
7751033 let changes = a.compose(b);
helix-core/src/wrap.rs+4−2
@@ -1,7 +1,9 @@
11use smartstring::{LazyCompact, SmartString};
2+use textwrap::{Options, WordSplitter::NoHyphenation};
23
34/// Given a slice of text, return the text re-wrapped to fit it
45/// within the given width.
5−pub fn reflow_hard_wrap(text: &str, max_line_len: usize) -> SmartString<LazyCompact> {
6− textwrap::refill(text, max_line_len).into()
6+pub fn reflow_hard_wrap(text: &str, text_width: usize) -> SmartString<LazyCompact> {
7+ let options = Options::new(text_width).word_splitter(NoHyphenation);
8+ textwrap::refill(text, options).into()
79}
helix-core/tests/data/indent/cpp.cppnew file+48
@@ -0,0 +1,48 @@
1+std::vector<std::string>
2+fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
3+ char* parm5, bool parm6);
4+
5+std::vector<std::string>
6+fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
7+ char* parm5, bool parm6) {
8+ auto lambda = []() {
9+ return 0;
10+ };
11+ auto lambda_with_a_really_long_name_that_uses_a_whole_line
12+ = [](int some_more_aligned_parameters,
13+ std::string parm2) {
14+ do_smth();
15+ };
16+ if (brace_on_same_line) {
17+ do_smth();
18+ } else if (brace_on_next_line)
19+ {
20+ do_smth();
21+ } else if (another_condition) {
22+ do_smth();
23+ }
24+ else {
25+ do_smth();
26+ }
27+ if (inline_if_statement)
28+ do_smth();
29+ if (another_inline_if_statement)
30+ return [](int parm1, char* parm2) {
31+ this_is_a_really_pointless_lambda();
32+ };
33+
34+ switch (var) {
35+ case true:
36+ return -1;
37+ case false:
38+ return 42;
39+ }
40+}
41+
42+class MyClass : public MyBaseClass {
43+public:
44+ MyClass();
45+ void public_fn();
46+private:
47+ super_secret_private_fn();
48+}
helix-core/tests/data/indent/indent.rsdeleted−1
@@ -1 +0,0 @@
1−../../../src/indent.rs
helix-core/tests/data/indent/languages.toml+13
@@ -11,3 +11,16 @@ indent = { tab-width = 4, unit = " " }
1111[[grammar]]
1212name = "rust"
1313source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
14+
15+[[language]]
16+name = "cpp"
17+scope = "source.cpp"
18+injection-regex = "cpp"
19+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H"]
20+roots = []
21+comment-token = "//"
22+indent = { tab-width = 2, unit = " " }
23+
24+[[grammar]]
25+name = "cpp"
26+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1" }
helix-core/tests/indent.rs+187−26
@@ -1,36 +1,192 @@
11use helix_core::{
2− indent::{treesitter_indent_for_pos, IndentStyle},
3− syntax::Loader,
2+ indent::{indent_level_for_line, treesitter_indent_for_pos, IndentStyle},
3+ syntax::{Configuration, Loader},
44 Syntax,
55};
6−use std::path::PathBuf;
6+use ropey::Rope;
7+use std::{ops::Range, path::PathBuf, process::Command};
78
89#[test]
910fn test_treesitter_indent_rust() {
10− test_treesitter_indent("rust.rs", "source.rust");
11+ standard_treesitter_test("rust.rs", "source.rust");
1112}
13+
14+#[test]
15+fn test_treesitter_indent_cpp() {
16+ standard_treesitter_test("cpp.cpp", "source.cpp");
17+}
18+
19+#[test]
20+fn test_treesitter_indent_rust_helix() {
21+ // We pin a specific git revision to prevent unrelated changes from causing the indent tests to fail.
22+ // Ideally, someone updates this once in a while and fixes any errors that occur.
23+ let rev = "af382768cdaf89ff547dbd8f644a1bddd90e7c8f";
24+ let files = Command::new("git")
25+ .args([
26+ "ls-tree",
27+ "-r",
28+ "--name-only",
29+ "--full-tree",
30+ rev,
31+ "helix-term/src",
32+ ])
33+ .output()
34+ .unwrap();
35+ let files = String::from_utf8(files.stdout).unwrap();
36+
37+ let ignored_files = vec![
38+ // Contains many macros that tree-sitter does not parse in a meaningful way and is otherwise not very interesting
39+ "helix-term/src/health.rs",
40+ ];
41+
42+ for file in files.split_whitespace() {
43+ if ignored_files.contains(&file) {
44+ continue;
45+ }
46+ let ignored_lines: Vec<Range<usize>> = match file {
47+ "helix-term/src/application.rs" => vec![
48+ // We can't handle complicated indent rules inside macros (`json!` in this case) since
49+ // the tree-sitter grammar only parses them as `token_tree` and `identifier` nodes.
50+ 1045..1051,
51+ ],
52+ "helix-term/src/commands.rs" => vec![
53+ // This is broken because of the current handling of `call_expression`
54+ // (i.e. having an indent query for it but outdenting again in specific cases).
55+ // The indent query is needed to correctly handle multi-line arguments in function calls
56+ // inside indented `field_expression` nodes (which occurs fairly often).
57+ //
58+ // Once we have the `@indent.always` capture type, it might be possible to just have an indent
59+ // capture for the `arguments` field of a call expression. That could enable us to correctly
60+ // handle this.
61+ 2226..2230,
62+ ],
63+ "helix-term/src/commands/dap.rs" => vec![
64+ // Complex `format!` macro
65+ 46..52,
66+ ],
67+ "helix-term/src/commands/lsp.rs" => vec![
68+ // Macro
69+ 624..627,
70+ // Return type declaration of a closure. `cargo fmt` adds an additional space here,
71+ // which we cannot (yet) model with our indent queries.
72+ 878..879,
73+ // Same as in `helix-term/src/commands.rs`
74+ 1335..1343,
75+ ],
76+ "helix-term/src/config.rs" => vec![
77+ // Multiline string
78+ 146..152,
79+ ],
80+ "helix-term/src/keymap.rs" => vec![
81+ // Complex macro (see above)
82+ 456..470,
83+ // Multiline string without indent
84+ 563..567,
85+ ],
86+ "helix-term/src/main.rs" => vec![
87+ // Multiline string
88+ 44..70,
89+ ],
90+ "helix-term/src/ui/completion.rs" => vec![
91+ // Macro
92+ 218..232,
93+ ],
94+ "helix-term/src/ui/editor.rs" => vec![
95+ // The chained function calls here are not indented, probably because of the comment
96+ // in between. Since `cargo fmt` doesn't even attempt to format it, there's probably
97+ // no point in trying to indent this correctly.
98+ 342..350,
99+ ],
100+ "helix-term/src/ui/lsp.rs" => vec![
101+ // Macro
102+ 56..61,
103+ ],
104+ "helix-term/src/ui/statusline.rs" => vec![
105+ // Same as in `helix-term/src/commands.rs`
106+ 436..442,
107+ 450..456,
108+ ],
109+ _ => Vec::new(),
110+ };
111+
112+ let git_object = rev.to_string() + ":" + file;
113+ let content = Command::new("git")
114+ .args(["cat-file", "blob", &git_object])
115+ .output()
116+ .unwrap();
117+ let doc = Rope::from_reader(&mut content.stdout.as_slice()).unwrap();
118+ test_treesitter_indent(file, doc, "source.rust", ignored_lines);
119+ }
120+}
121+
12122#[test]
13−fn test_treesitter_indent_rust_2() {
14− test_treesitter_indent("indent.rs", "source.rust");
15− // TODO Use commands.rs as indentation test.
16− // Currently this fails because we can't align the parameters of a closure yet
17− // test_treesitter_indent("commands.rs", "source.rust");
123+fn test_indent_level_for_line_with_spaces() {
124+ let tab_width: usize = 4;
125+ let indent_width: usize = 4;
126+
127+ let line = ropey::Rope::from_str(" Indented with 8 spaces");
128+
129+ let indent_level = indent_level_for_line(line.slice(0..), tab_width, indent_width);
130+ assert_eq!(indent_level, 2)
18131}
19132
20−fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
133+#[test]
134+fn test_indent_level_for_line_with_tabs() {
135+ let tab_width: usize = 4;
136+ let indent_width: usize = 4;
137+
138+ let line = ropey::Rope::from_str("\t\tIndented with 2 tabs");
139+
140+ let indent_level = indent_level_for_line(line.slice(0..), tab_width, indent_width);
141+ assert_eq!(indent_level, 2)
142+}
143+
144+#[test]
145+fn test_indent_level_for_line_with_spaces_and_tabs() {
146+ let tab_width: usize = 4;
147+ let indent_width: usize = 4;
148+
149+ let line = ropey::Rope::from_str(" \t \tIndented with mix of spaces and tabs");
150+
151+ let indent_level = indent_level_for_line(line.slice(0..), tab_width, indent_width);
152+ assert_eq!(indent_level, 2)
153+}
154+
155+fn indent_tests_dir() -> PathBuf {
21156 let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
22157 test_dir.push("tests/data/indent");
158+ test_dir
159+}
23160
24− let mut test_file = test_dir.clone();
25− test_file.push(file_name);
26− let test_file = std::fs::File::open(test_file).unwrap();
161+fn indent_test_path(name: &str) -> PathBuf {
162+ let mut path = indent_tests_dir();
163+ path.push(name);
164+ path
165+}
166+
167+fn indent_tests_config() -> Configuration {
168+ let mut config_path = indent_tests_dir();
169+ config_path.push("languages.toml");
170+ let config = std::fs::read_to_string(config_path).unwrap();
171+ toml::from_str(&config).unwrap()
172+}
173+
174+fn standard_treesitter_test(file_name: &str, lang_scope: &str) {
175+ let test_path = indent_test_path(file_name);
176+ let test_file = std::fs::File::open(test_path).unwrap();
27177 let doc = ropey::Rope::from_reader(test_file).unwrap();
178+ test_treesitter_indent(file_name, doc, lang_scope, Vec::new())
179+}
28180
29− let mut config_file = test_dir;
30− config_file.push("languages.toml");
31− let config = std::fs::read_to_string(config_file).unwrap();
32− let config = toml::from_str(&config).unwrap();
33− let loader = Loader::new(config);
181+/// Test that all the lines in the given file are indented as expected.
182+/// ignored_lines is a list of (1-indexed) line ranges that are excluded from this test.
183+fn test_treesitter_indent(
184+ test_name: &str,
185+ doc: Rope,
186+ lang_scope: &str,
187+ ignored_lines: Vec<std::ops::Range<usize>>,
188+) {
189+ let loader = Loader::new(indent_tests_config());
34190
35191 // set runtime path so we can find the queries
36192 let mut runtime = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -38,30 +194,35 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
38194 std::env::set_var("HELIX_RUNTIME", runtime.to_str().unwrap());
39195
40196 let language_config = loader.language_config_for_scope(lang_scope).unwrap();
197+ let indent_style = IndentStyle::from_str(&language_config.indent.as_ref().unwrap().unit);
41198 let highlight_config = language_config.highlight_config(&[]).unwrap();
42− let syntax = Syntax::new(&doc, highlight_config, std::sync::Arc::new(loader));
43− let indent_query = language_config.indent_query().unwrap();
44199 let text = doc.slice(..);
200+ let syntax = Syntax::new(text, highlight_config, std::sync::Arc::new(loader)).unwrap();
201+ let indent_query = language_config.indent_query().unwrap();
45202
46203 for i in 0..doc.len_lines() {
47204 let line = text.line(i);
205+ if ignored_lines.iter().any(|range| range.contains(&(i + 1))) {
206+ continue;
207+ }
48208 if let Some(pos) = helix_core::find_first_non_whitespace_char(line) {
49− let tab_and_indent_width: usize = 4;
209+ let tab_width: usize = 4;
50210 let suggested_indent = treesitter_indent_for_pos(
51211 indent_query,
52212 &syntax,
53− &IndentStyle::Spaces(tab_and_indent_width as u8),
54− tab_and_indent_width,
55− tab_and_indent_width,
213+ tab_width,
214+ indent_style.indent_width(tab_width),
56215 text,
57216 i,
58217 text.line_to_char(i) + pos,
59218 false,
60219 )
61− .unwrap();
220+ .unwrap()
221+ .to_string(&indent_style, tab_width);
62222 assert!(
63223 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
64− "Wrong indentation on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
224+ "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
225+ test_name,
65226 i+1,
66227 line.slice(..line.len_chars()-1),
67228 suggested_indent,
helix-dap/Cargo.toml+11−9
@@ -1,25 +1,27 @@
11[package]
22name = "helix-dap"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2018"
6−license = "MPL-2.0"
73description = "DAP client implementation for Helix project"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
9+categories.workspace = true
10+repository.workspace = true
11+homepage.workspace = true
1112
1213# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1314
1415[dependencies]
15−helix-core = { version = "0.6", path = "../helix-core" }
16+helix-core = { path = "../helix-core" }
17+
1618anyhow = "1.0"
1719log = "0.4"
1820serde = { version = "1.0", features = ["derive"] }
1921serde_json = "1.0"
2022thiserror = "1.0"
2123tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
22−which = "4.4"
24+which = "5.0.0"
2325
2426[dev-dependencies]
2527fern = "0.6"
helix-dap/src/client.rs+27−6
@@ -33,6 +33,7 @@ pub struct Client {
3333 server_tx: UnboundedSender<Payload>,
3434 request_counter: AtomicU64,
3535 connection_type: Option<ConnectionType>,
36+ starting_request_args: Option<Value>,
3637 pub caps: Option<DebuggerCapabilities>,
3738 // thread_id -> frames
3839 pub stack_frames: HashMap<ThreadId, Vec<StackFrame>>,
@@ -61,12 +62,10 @@ impl Client {
6162 if command.is_empty() {
6263 return Result::Err(Error::Other(anyhow!("Command not provided")));
6364 }
64− if transport == "tcp" && port_arg.is_some() {
65− Self::tcp_process(command, args, port_arg.unwrap(), id).await
66− } else if transport == "stdio" {
67− Self::stdio(command, args, id)
68− } else {
69− Result::Err(Error::Other(anyhow!("Incorrect transport {}", transport)))
65+ match (transport, port_arg) {
66+ ("tcp", Some(port_arg)) => Self::tcp_process(command, args, port_arg, id).await,
67+ ("stdio", _) => Self::stdio(command, args, id),
68+ _ => Result::Err(Error::Other(anyhow!("Incorrect transport {}", transport))),
7069 }
7170 }
7271
@@ -87,6 +86,7 @@ impl Client {
8786 request_counter: AtomicU64::new(0),
8887 caps: None,
8988 connection_type: None,
89+ starting_request_args: None,
9090 stack_frames: HashMap::new(),
9191 thread_states: HashMap::new(),
9292 thread_id: None,
@@ -158,6 +158,10 @@ impl Client {
158158 )
159159 }
160160
161+ pub fn starting_request_args(&self) -> &Option<Value> {
162+ &self.starting_request_args
163+ }
164+
161165 pub async fn tcp_process(
162166 cmd: &str,
163167 args: Vec<&str>,
@@ -356,14 +360,25 @@ impl Client {
356360
357361 pub fn launch(&mut self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
358362 self.connection_type = Some(ConnectionType::Launch);
363+ self.starting_request_args = Some(args.clone());
359364 self.call::<requests::Launch>(args)
360365 }
361366
362367 pub fn attach(&mut self, args: serde_json::Value) -> impl Future<Output = Result<Value>> {
363368 self.connection_type = Some(ConnectionType::Attach);
369+ self.starting_request_args = Some(args.clone());
364370 self.call::<requests::Attach>(args)
365371 }
366372
373+ pub fn restart(&self) -> impl Future<Output = Result<Value>> {
374+ let args = if let Some(args) = &self.starting_request_args {
375+ args.clone()
376+ } else {
377+ Value::Null
378+ };
379+ self.call::<requests::Restart>(args)
380+ }
381+
367382 pub async fn set_breakpoints(
368383 &self,
369384 file: PathBuf,
@@ -495,4 +510,10 @@ impl Client {
495510
496511 self.call::<requests::SetExceptionBreakpoints>(args)
497512 }
513+
514+ pub fn current_stack_frame(&self) -> Option<&StackFrame> {
515+ self.stack_frames
516+ .get(&self.thread_id?)?
517+ .get(self.active_frame?)
518+ }
498519}
helix-dap/src/transport.rs+28−18
@@ -230,38 +230,48 @@ impl Transport {
230230 }
231231 }
232232
233− async fn recv(
233+ async fn recv_inner(
234234 transport: Arc<Self>,
235235 mut server_stdout: Box<dyn AsyncBufRead + Unpin + Send>,
236236 client_tx: UnboundedSender<Payload>,
237− ) {
237+ ) -> Result<()> {
238238 let mut recv_buffer = String::new();
239239 loop {
240− match Self::recv_server_message(&mut server_stdout, &mut recv_buffer).await {
241− Ok(msg) => {
242− transport
243− .process_server_message(&client_tx, msg)
244− .await
245− .unwrap();
246− }
247− Err(err) => {
248− error!("err: <- {:?}", err);
249− break;
250− }
251− }
240+ let msg = Self::recv_server_message(&mut server_stdout, &mut recv_buffer).await?;
241+ transport.process_server_message(&client_tx, msg).await?;
252242 }
253243 }
254244
255− async fn send(
245+ async fn recv(
246+ transport: Arc<Self>,
247+ server_stdout: Box<dyn AsyncBufRead + Unpin + Send>,
248+ client_tx: UnboundedSender<Payload>,
249+ ) {
250+ if let Err(err) = Self::recv_inner(transport, server_stdout, client_tx).await {
251+ error!("err: <- {:?}", err);
252+ }
253+ }
254+
255+ async fn send_inner(
256256 transport: Arc<Self>,
257257 mut server_stdin: Box<dyn AsyncWrite + Unpin + Send>,
258258 mut client_rx: UnboundedReceiver<Payload>,
259− ) {
259+ ) -> Result<()> {
260260 while let Some(payload) = client_rx.recv().await {
261261 transport
262262 .send_payload_to_server(&mut server_stdin, payload)
263− .await
264− .unwrap()
263+ .await?;
264+ }
265+ Ok(())
266+ }
267+
268+ async fn send(
269+ transport: Arc<Self>,
270+ server_stdin: Box<dyn AsyncWrite + Unpin + Send>,
271+ client_rx: UnboundedReceiver<Payload>,
272+ ) {
273+ if let Err(err) = Self::send_inner(transport, server_stdin, client_rx).await {
274+ error!("err: <- {:?}", err);
265275 }
266276 }
267277
helix-dap/src/types.rs+11−2
@@ -378,7 +378,7 @@ pub mod requests {
378378
379379 impl Request for Launch {
380380 type Arguments = Value;
381− type Result = Value;
381+ type Result = ();
382382 const COMMAND: &'static str = "launch";
383383 }
384384
@@ -387,7 +387,7 @@ pub mod requests {
387387
388388 impl Request for Attach {
389389 type Arguments = Value;
390− type Result = Value;
390+ type Result = ();
391391 const COMMAND: &'static str = "attach";
392392 }
393393
@@ -402,6 +402,15 @@ pub mod requests {
402402 pub suspend_debuggee: Option<bool>,
403403 }
404404
405+ #[derive(Debug)]
406+ pub enum Restart {}
407+
408+ impl Request for Restart {
409+ type Arguments = Value;
410+ type Result = ();
411+ const COMMAND: &'static str = "restart";
412+ }
413+
405414 #[derive(Debug)]
406415 pub enum Disconnect {}
407416
helix-event/Cargo.tomlnew file+16
@@ -0,0 +1,16 @@
1+[package]
2+name = "helix-event"
3+version.workspace = true
4+authors.workspace = true
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
8+categories.workspace = true
9+repository.workspace = true
10+homepage.workspace = true
11+
12+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13+
14+[dependencies]
15+tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot"] }
16+parking_lot = { version = "0.12", features = ["send_guard"] }
helix-event/src/lib.rsnew file+8
@@ -0,0 +1,8 @@
1+//! `helix-event` contains systems that allow (often async) communication between
2+//! different editor components without strongly coupling them. Currently this
3+//! crate only contains some smaller facilities but the intend is to add more
4+//! functionality in the future ( like a generic hook system)
5+
6+pub use redraw::{lock_frame, redraw_requested, request_redraw, start_frame, RenderLockGuard};
7+
8+mod redraw;
helix-event/src/redraw.rsnew file+49
@@ -0,0 +1,49 @@
1+//! Signals that control when/if the editor redraws
2+
3+use std::future::Future;
4+
5+use parking_lot::{RwLock, RwLockReadGuard};
6+use tokio::sync::Notify;
7+
8+/// A `Notify` instance that can be used to (asynchronously) request
9+/// the editor the render a new frame.
10+static REDRAW_NOTIFY: Notify = Notify::const_new();
11+
12+/// A `RwLock` that prevents the next frame from being
13+/// drawn until an exclusive (write) lock can be acquired.
14+/// This allows asynchsonous tasks to acquire `non-exclusive`
15+/// locks (read) to prevent the next frame from being drawn
16+/// until a certain computation has finished.
17+static RENDER_LOCK: RwLock<()> = RwLock::new(());
18+
19+pub type RenderLockGuard = RwLockReadGuard<'static, ()>;
20+
21+/// Requests that the editor is redrawn. The redraws are debounced (currently to
22+/// 30FPS) so this can be called many times without causing a ton of frames to
23+/// be rendered.
24+pub fn request_redraw() {
25+ REDRAW_NOTIFY.notify_one();
26+}
27+
28+/// Returns a future that will yield once a redraw has been asynchronously
29+/// requested using [`request_redraw`].
30+pub fn redraw_requested() -> impl Future<Output = ()> {
31+ REDRAW_NOTIFY.notified()
32+}
33+
34+/// Wait until all locks acquired with [`lock_frame`] have been released.
35+/// This function is called before rendering and is intended to allow the frame
36+/// to wait for async computations that should be included in the current frame.
37+pub fn start_frame() {
38+ drop(RENDER_LOCK.write());
39+ // exhaust any leftover redraw notifications
40+ let notify = REDRAW_NOTIFY.notified();
41+ tokio::pin!(notify);
42+ notify.enable();
43+}
44+
45+/// Acquires the render lock which will prevent the next frame from being drawn
46+/// until the returned guard is dropped.
47+pub fn lock_frame() -> RenderLockGuard {
48+ RENDER_LOCK.read()
49+}
helix-loader/Cargo.toml+16−12
@@ -1,13 +1,14 @@
11[package]
22name = "helix-loader"
3−version = "0.6.0"
4−description = "A post-modern text editor."
5−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
6−edition = "2021"
7−license = "MPL-2.0"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
3+description = "Build bootstrapping for Helix crates"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
9+categories.workspace = true
10+repository.workspace = true
11+homepage.workspace = true
1112
1213[[bin]]
1314name = "hx-loader"
@@ -17,16 +18,19 @@ path = "src/main.rs"
1718anyhow = "1"
1819serde = { version = "1.0", features = ["derive"] }
1920toml = "0.7"
20−etcetera = "0.4"
21−tree-sitter = "0.20"
22−once_cell = "1.17"
21+etcetera = "0.8"
22+tree-sitter.workspace = true
23+once_cell = "1.19"
2324log = "0.4"
25+which = "5.0.0"
2426
2527# TODO: these two should be on !wasm32 only
2628
2729# cloning/compiling tree-sitter grammars
2830cc = { version = "1" }
2931threadpool = { version = "1.0" }
32+tempfile = "3.8.1"
33+dunce = "1.0.4"
3034
3135[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
32−libloading = "0.7"
36+libloading = "0.8"
helix-loader/build.rs+56−5
@@ -1,7 +1,18 @@
11use std::borrow::Cow;
2+use std::path::Path;
23use std::process::Command;
34
4−const VERSION: &str = include_str!("../VERSION");
5+const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR");
6+const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");
7+const PATCH: &str = env!("CARGO_PKG_VERSION_PATCH");
8+
9+fn get_calver() -> String {
10+ if PATCH == "0" {
11+ format!("{MAJOR}.{MINOR}")
12+ } else {
13+ format!("{MAJOR}.{MINOR}.{PATCH}")
14+ }
15+}
516
617fn main() {
718 let git_hash = Command::new("git")
@@ -11,9 +22,10 @@ fn main() {
1122 .filter(|output| output.status.success())
1223 .and_then(|x| String::from_utf8(x.stdout).ok());
1324
14− let version: Cow<_> = match git_hash {
15− Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
16− None => VERSION.into(),
25+ let calver = get_calver();
26+ let version: Cow<_> = match &git_hash {
27+ Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(),
28+ None => calver.into(),
1729 };
1830
1931 println!(
@@ -21,6 +33,45 @@ fn main() {
2133 std::env::var("TARGET").unwrap()
2234 );
2335
24− println!("cargo:rerun-if-changed=../VERSION");
2536 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
37+
38+ if git_hash.is_none() {
39+ return;
40+ }
41+
42+ // we need to revparse because the git dir could be anywhere if you are
43+ // using detached worktrees but there is no good way to obtain an OsString
44+ // from command output so for now we can't accept non-utf8 paths here
45+ // probably rare enouch where it doesn't matter tough we could use gitoxide
46+ // here but that would be make it a hard dependency and slow compile times
47+ let Some(git_dir): Option<String> = Command::new("git")
48+ .args(["rev-parse", "--git-dir"])
49+ .output()
50+ .ok()
51+ .filter(|output| output.status.success())
52+ .and_then(|x| String::from_utf8(x.stdout).ok())
53+ else {
54+ return;
55+ };
56+ // If heads starts pointing at something else (different branch)
57+ // we need to return
58+ let head = Path::new(&git_dir).join("HEAD");
59+ if head.exists() {
60+ println!("cargo:rerun-if-changed={}", head.display());
61+ }
62+ // if the thing head points to (branch) itself changes
63+ // we need to return
64+ let Some(head_ref): Option<String> = Command::new("git")
65+ .args(["symbolic-ref", "HEAD"])
66+ .output()
67+ .ok()
68+ .filter(|output| output.status.success())
69+ .and_then(|x| String::from_utf8(x.stdout).ok())
70+ else {
71+ return;
72+ };
73+ let head_ref = Path::new(&git_dir).join(head_ref);
74+ if head_ref.exists() {
75+ println!("cargo:rerun-if-changed={}", head_ref.display());
76+ }
2677}
helix-loader/src/config.rs+32−31
@@ -9,37 +9,38 @@ pub fn default_lang_config() -> toml::Value {
99
1010/// User configured languages.toml file, merged with the default config.
1111pub fn user_lang_config() -> Result<toml::Value, toml::de::Error> {
12− let config = crate::local_config_dirs()
13− .into_iter()
14− .chain([crate::config_dir()].into_iter())
15− .map(|path| path.join("languages.toml"))
16− .filter_map(|file| {
17− std::fs::read_to_string(file)
18− .map(|config| toml::from_str(&config))
19− .ok()
20− })
21− .collect::<Result<Vec<_>, _>>()?
22− .into_iter()
23− .chain([default_lang_config()].into_iter())
24− .fold(toml::Value::Table(toml::value::Table::default()), |a, b| {
25− // combines for example
26− // b:
27− // [[language]]
28− // name = "toml"
29− // language-server = { command = "taplo", args = ["lsp", "stdio"] }
30− //
31− // a:
32− // [[language]]
33− // language-server = { command = "/usr/bin/taplo" }
34− //
35− // into:
36− // [[language]]
37− // name = "toml"
38− // language-server = { command = "/usr/bin/taplo" }
39− //
40− // thus it overrides the third depth-level of b with values of a if they exist, but otherwise merges their values
41− crate::merge_toml_values(b, a, 3)
42− });
12+ let config = [
13+ crate::config_dir(),
14+ crate::find_workspace().0.join(".helix"),
15+ ]
16+ .into_iter()
17+ .map(|path| path.join("languages.toml"))
18+ .filter_map(|file| {
19+ std::fs::read_to_string(file)
20+ .map(|config| toml::from_str(&config))
21+ .ok()
22+ })
23+ .collect::<Result<Vec<_>, _>>()?
24+ .into_iter()
25+ .fold(default_lang_config(), |a, b| {
26+ // combines for example
27+ // b:
28+ // [[language]]
29+ // name = "toml"
30+ // language-server = { command = "taplo", args = ["lsp", "stdio"] }
31+ //
32+ // a:
33+ // [[language]]
34+ // language-server = { command = "/usr/bin/taplo" }
35+ //
36+ // into:
37+ // [[language]]
38+ // name = "toml"
39+ // language-server = { command = "/usr/bin/taplo" }
40+ //
41+ // thus it overrides the third depth-level of b with values of a if they exist, but otherwise merges their values
42+ crate::merge_toml_values(a, b, 3)
43+ });
4344
4445 Ok(config)
4546}
helix-loader/src/grammar.rs+135−55
@@ -1,4 +1,4 @@
1−use anyhow::{anyhow, Context, Result};
1+use anyhow::{anyhow, bail, Context, Result};
22use serde::{Deserialize, Serialize};
33use std::fs;
44use std::time::SystemTime;
@@ -8,6 +8,7 @@ use std::{
88 process::Command,
99 sync::mpsc::channel,
1010};
11+use tempfile::TempPath;
1112use tree_sitter::Language;
1213
1314#[cfg(unix)]
@@ -67,8 +68,9 @@ pub fn get_language(name: &str) -> Result<Language> {
6768#[cfg(not(target_arch = "wasm32"))]
6869pub fn get_language(name: &str) -> Result<Language> {
6970 use libloading::{Library, Symbol};
70− let mut library_path = crate::runtime_dir().join("grammars").join(name);
71− library_path.set_extension(DYLIB_EXTENSION);
71+ let mut rel_library_path = PathBuf::new().join("grammars").join(name);
72+ rel_library_path.set_extension(DYLIB_EXTENSION);
73+ let library_path = crate::runtime_file(&rel_library_path);
7274
7375 let library = unsafe { Library::new(&library_path) }
7476 .with_context(|| format!("Error opening dynamic library {:?}", library_path))?;
@@ -83,7 +85,16 @@ pub fn get_language(name: &str) -> Result<Language> {
8385 Ok(language)
8486}
8587
88+fn ensure_git_is_available() -> Result<()> {
89+ match which::which("git") {
90+ Ok(_cmd) => Ok(()),
91+ Err(err) => Err(anyhow::anyhow!("'git' could not be found ({err})")),
92+ }
93+}
94+
8695pub fn fetch_grammars() -> Result<()> {
96+ ensure_git_is_available()?;
97+
8798 // We do not need to fetch local grammars.
8899 let mut grammars = get_grammar_configs()?;
89100 grammars.retain(|grammar| !matches!(grammar.source, GrammarSource::Local { .. }));
@@ -96,15 +107,12 @@ pub fn fetch_grammars() -> Result<()> {
96107 let mut git_up_to_date = 0;
97108 let mut non_git = Vec::new();
98109
99− for res in results {
110+ for (grammar_id, res) in results {
100111 match res {
101112 Ok(FetchStatus::GitUpToDate) => git_up_to_date += 1,
102− Ok(FetchStatus::GitUpdated {
103− grammar_id,
104− revision,
105− }) => git_updated.push((grammar_id, revision)),
106− Ok(FetchStatus::NonGit { grammar_id }) => non_git.push(grammar_id),
107− Err(e) => errors.push(e),
113+ Ok(FetchStatus::GitUpdated { revision }) => git_updated.push((grammar_id, revision)),
114+ Ok(FetchStatus::NonGit) => non_git.push(grammar_id),
115+ Err(e) => errors.push((grammar_id, e)),
108116 }
109117 }
110118
@@ -136,16 +144,18 @@ pub fn fetch_grammars() -> Result<()> {
136144
137145 if !errors.is_empty() {
138146 let len = errors.len();
139− println!("{} grammars failed to fetch", len);
140− for (i, error) in errors.into_iter().enumerate() {
141− println!("\tFailure {}/{}: {}", i + 1, len, error);
147+ for (i, (grammar, error)) in errors.into_iter().enumerate() {
148+ println!("Failure {}/{len}: {grammar} {error}", i + 1);
142149 }
150+ bail!("{len} grammars failed to fetch");
143151 }
144152
145153 Ok(())
146154}
147155
148156pub fn build_grammars(target: Option<String>) -> Result<()> {
157+ ensure_git_is_available()?;
158+
149159 let grammars = get_grammar_configs()?;
150160 println!("Building {} grammars", grammars.len());
151161 let results = run_parallel(grammars, move |grammar| {
@@ -156,11 +166,11 @@ pub fn build_grammars(target: Option<String>) -> Result<()> {
156166 let mut already_built = 0;
157167 let mut built = Vec::new();
158168
159− for res in results {
169+ for (grammar_id, res) in results {
160170 match res {
161171 Ok(BuildStatus::AlreadyBuilt) => already_built += 1,
162− Ok(BuildStatus::Built { grammar_id }) => built.push(grammar_id),
163− Err(e) => errors.push(e),
172+ Ok(BuildStatus::Built) => built.push(grammar_id),
173+ Err(e) => errors.push((grammar_id, e)),
164174 }
165175 }
166176
@@ -177,10 +187,10 @@ pub fn build_grammars(target: Option<String>) -> Result<()> {
177187
178188 if !errors.is_empty() {
179189 let len = errors.len();
180− println!("{} grammars failed to build", len);
181− for (i, error) in errors.into_iter().enumerate() {
182− println!("\tFailure {}/{}: {}", i, len, error);
190+ for (i, (grammar_id, error)) in errors.into_iter().enumerate() {
191+ println!("Failure {}/{len}: {grammar_id} {error}", i + 1);
183192 }
193+ bail!("{len} grammars failed to build");
184194 }
185195
186196 Ok(())
@@ -212,7 +222,7 @@ fn get_grammar_configs() -> Result<Vec<GrammarConfiguration>> {
212222 Ok(grammars)
213223}
214224
215−fn run_parallel<F, Res>(grammars: Vec<GrammarConfiguration>, job: F) -> Vec<Result<Res>>
225+fn run_parallel<F, Res>(grammars: Vec<GrammarConfiguration>, job: F) -> Vec<(String, Result<Res>)>
216226where
217227 F: Fn(GrammarConfiguration) -> Result<Res> + Send + 'static + Clone,
218228 Res: Send + 'static,
@@ -227,7 +237,7 @@ where
227237 pool.execute(move || {
228238 // Ignore any SendErrors, if any job in another thread has encountered an
229239 // error the Receiver will be closed causing this send to fail.
230− let _ = tx.send(job(grammar));
240+ let _ = tx.send((grammar.grammar_id.clone(), job(grammar)));
231241 });
232242 }
233243
@@ -238,13 +248,8 @@ where
238248
239249enum FetchStatus {
240250 GitUpToDate,
241− GitUpdated {
242− grammar_id: String,
243− revision: String,
244− },
245− NonGit {
246− grammar_id: String,
247− },
251+ GitUpdated { revision: String },
252+ NonGit,
248253}
249254
250255fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
@@ -252,7 +257,9 @@ fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
252257 remote, revision, ..
253258 } = grammar.source
254259 {
255− let grammar_dir = crate::runtime_dir()
260+ let grammar_dir = crate::runtime_dirs()
261+ .first()
262+ .expect("No runtime directories provided") // guaranteed by post-condition
256263 .join("grammars")
257264 .join("sources")
258265 .join(&grammar.grammar_id);
@@ -283,17 +290,12 @@ fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
283290 )?;
284291 git(&grammar_dir, ["checkout", &revision])?;
285292
286− Ok(FetchStatus::GitUpdated {
287− grammar_id: grammar.grammar_id,
288− revision,
289− })
293+ Ok(FetchStatus::GitUpdated { revision })
290294 } else {
291295 Ok(FetchStatus::GitUpToDate)
292296 }
293297 } else {
294− Ok(FetchStatus::NonGit {
295− grammar_id: grammar.grammar_id,
296− })
298+ Ok(FetchStatus::NonGit)
297299 }
298300}
299301
@@ -343,14 +345,16 @@ where
343345
344346enum BuildStatus {
345347 AlreadyBuilt,
346− Built { grammar_id: String },
348+ Built,
347349}
348350
349351fn build_grammar(grammar: GrammarConfiguration, target: Option<&str>) -> Result<BuildStatus> {
350352 let grammar_dir = if let GrammarSource::Local { path } = &grammar.source {
351353 PathBuf::from(&path)
352354 } else {
353− crate::runtime_dir()
355+ crate::runtime_dirs()
356+ .first()
357+ .expect("No runtime directories provided") // guaranteed by post-condition
354358 .join("grammars")
355359 .join("sources")
356360 .join(&grammar.grammar_id)
@@ -401,10 +405,25 @@ fn build_tree_sitter_library(
401405 None
402406 }
403407 };
404− let parser_lib_path = crate::runtime_dir().join("grammars");
408+ let parser_lib_path = crate::runtime_dirs()
409+ .first()
410+ .expect("No runtime directories provided") // guaranteed by post-condition
411+ .join("grammars");
405412 let mut library_path = parser_lib_path.join(&grammar.grammar_id);
406413 library_path.set_extension(DYLIB_EXTENSION);
407414
415+ // if we are running inside a buildscript emit cargo metadata
416+ // to detect if we are running from a buildscript check some env variables
417+ // that cargo only sets for build scripts
418+ if std::env::var("OUT_DIR").is_ok() && std::env::var("CARGO").is_ok() {
419+ if let Some(scanner_path) = scanner_path.as_ref().and_then(|path| path.to_str()) {
420+ println!("cargo:rerun-if-changed={scanner_path}");
421+ }
422+ if let Some(parser_path) = parser_path.to_str() {
423+ println!("cargo:rerun-if-changed={parser_path}");
424+ }
425+ }
426+
408427 let recompile = needs_recompile(&library_path, &parser_path, &scanner_path)
409428 .context("Failed to compare source and binary timestamps")?;
410429
@@ -425,16 +444,53 @@ fn build_tree_sitter_library(
425444 for (key, value) in compiler.env() {
426445 command.env(key, value);
427446 }
447+
428448 command.args(compiler.args());
449+ // used to delay dropping the temporary object file until after the compilation is complete
450+ let _path_guard;
429451
430− if cfg!(all(windows, target_env = "msvc")) {
452+ if compiler.is_like_msvc() {
431453 command
432454 .args(["/nologo", "/LD", "/I"])
433455 .arg(header_path)
434456 .arg("/Od")
435− .arg("/utf-8");
457+ .arg("/utf-8")
458+ .arg("/std:c11");
436459 if let Some(scanner_path) = scanner_path.as_ref() {
437− command.arg(scanner_path);
460+ if scanner_path.extension() == Some("c".as_ref()) {
461+ command.arg(scanner_path);
462+ } else {
463+ let mut cpp_command = Command::new(compiler.path());
464+ cpp_command.current_dir(src_path);
465+ for (key, value) in compiler.env() {
466+ cpp_command.env(key, value);
467+ }
468+ cpp_command.args(compiler.args());
469+ let object_file =
470+ library_path.with_file_name(format!("{}_scanner.obj", &grammar.grammar_id));
471+ cpp_command
472+ .args(["/nologo", "/LD", "/I"])
473+ .arg(header_path)
474+ .arg("/Od")
475+ .arg("/utf-8")
476+ .arg("/std:c++14")
477+ .arg(format!("/Fo{}", object_file.display()))
478+ .arg("/c")
479+ .arg(scanner_path);
480+ let output = cpp_command
481+ .output()
482+ .context("Failed to execute C++ compiler")?;
483+
484+ if !output.status.success() {
485+ return Err(anyhow!(
486+ "Parser compilation failed.\nStdout: {}\nStderr: {}",
487+ String::from_utf8_lossy(&output.stdout),
488+ String::from_utf8_lossy(&output.stderr)
489+ ));
490+ }
491+ command.arg(&object_file);
492+ _path_guard = TempPath::from_path(object_file);
493+ }
438494 }
439495
440496 command
@@ -446,20 +502,49 @@ fn build_tree_sitter_library(
446502 .arg("-shared")
447503 .arg("-fPIC")
448504 .arg("-fno-exceptions")
449− .arg("-g")
450505 .arg("-I")
451506 .arg(header_path)
452507 .arg("-o")
453− .arg(&library_path)
454− .arg("-O3");
508+ .arg(&library_path);
509+
455510 if let Some(scanner_path) = scanner_path.as_ref() {
456511 if scanner_path.extension() == Some("c".as_ref()) {
457− command.arg("-xc").arg("-std=c99").arg(scanner_path);
512+ command.arg("-xc").arg("-std=c11").arg(scanner_path);
458513 } else {
459− command.arg(scanner_path);
514+ let mut cpp_command = Command::new(compiler.path());
515+ cpp_command.current_dir(src_path);
516+ for (key, value) in compiler.env() {
517+ cpp_command.env(key, value);
518+ }
519+ cpp_command.args(compiler.args());
520+ let object_file =
521+ library_path.with_file_name(format!("{}_scanner.o", &grammar.grammar_id));
522+ cpp_command
523+ .arg("-fPIC")
524+ .arg("-fno-exceptions")
525+ .arg("-I")
526+ .arg(header_path)
527+ .arg("-o")
528+ .arg(&object_file)
529+ .arg("-std=c++14")
530+ .arg("-c")
531+ .arg(scanner_path);
532+ let output = cpp_command
533+ .output()
534+ .context("Failed to execute C++ compiler")?;
535+ if !output.status.success() {
536+ return Err(anyhow!(
537+ "Parser compilation failed.\nStdout: {}\nStderr: {}",
538+ String::from_utf8_lossy(&output.stdout),
539+ String::from_utf8_lossy(&output.stderr)
540+ ));
541+ }
542+
543+ command.arg(&object_file);
544+ _path_guard = TempPath::from_path(object_file);
460545 }
461546 }
462− command.arg("-xc").arg(parser_path);
547+ command.arg("-xc").arg("-std=c11").arg(parser_path);
463548 if cfg!(all(
464549 unix,
465550 not(any(target_os = "macos", target_os = "illumos"))
@@ -479,9 +564,7 @@ fn build_tree_sitter_library(
479564 ));
480565 }
481566
482− Ok(BuildStatus::Built {
483− grammar_id: grammar.grammar_id,
484− })
567+ Ok(BuildStatus::Built)
485568}
486569
487570fn needs_recompile(
@@ -511,9 +594,6 @@ fn mtime(path: &Path) -> Result<SystemTime> {
511594/// Gives the contents of a file from a language's `runtime/queries/<lang>`
512595/// directory
513596pub fn load_runtime_file(language: &str, filename: &str) -> Result<String, std::io::Error> {
514− let path = crate::RUNTIME_DIR
515− .join("queries")
516− .join(language)
517− .join(filename);
597+ let path = crate::runtime_file(&PathBuf::new().join("queries").join(language).join(filename));
518598 std::fs::read_to_string(path)
519599}
helix-loader/src/lib.rs+165−54
@@ -2,54 +2,143 @@ pub mod config;
22pub mod grammar;
33
44use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
5−use std::path::PathBuf;
5+use std::path::{Path, PathBuf};
6+use std::sync::RwLock;
67
78pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
89
9−pub static RUNTIME_DIR: once_cell::sync::Lazy<PathBuf> = once_cell::sync::Lazy::new(runtime_dir);
10+static CWD: RwLock<Option<PathBuf>> = RwLock::new(None);
11+
12+static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
13+ once_cell::sync::Lazy::new(prioritize_runtime_dirs);
1014
1115static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
1216
13−pub fn initialize_config_file(specified_file: Option<PathBuf>) {
14− let config_file = specified_file.unwrap_or_else(|| {
15− let config_dir = config_dir();
17+static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
1618
17− if !config_dir.exists() {
18− std::fs::create_dir_all(&config_dir).ok();
19− }
19+// Get the current working directory.
20+// This information is managed internally as the call to std::env::current_dir
21+// might fail if the cwd has been deleted.
22+pub fn current_working_dir() -> PathBuf {
23+ if let Some(path) = &*CWD.read().unwrap() {
24+ return path.clone();
25+ }
26+
27+ let path = std::env::current_dir()
28+ .and_then(dunce::canonicalize)
29+ .expect("Couldn't determine current working directory");
30+ let mut cwd = CWD.write().unwrap();
31+ *cwd = Some(path.clone());
2032
21− config_dir.join("config.toml")
22− });
33+ path
34+}
35+
36+pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
37+ let path = dunce::canonicalize(path)?;
38+ std::env::set_current_dir(&path)?;
39+ let mut cwd = CWD.write().unwrap();
40+ *cwd = Some(path);
41+ Ok(())
42+}
2343
24− // We should only initialize this value once.
44+pub fn initialize_config_file(specified_file: Option<PathBuf>) {
45+ let config_file = specified_file.unwrap_or_else(default_config_file);
46+ ensure_parent_dir(&config_file);
2547 CONFIG_FILE.set(config_file).ok();
2648}
2749
28−pub fn runtime_dir() -> PathBuf {
29− if let Ok(dir) = std::env::var("HELIX_RUNTIME") {
30− return dir.into();
31− }
50+pub fn initialize_log_file(specified_file: Option<PathBuf>) {
51+ let log_file = specified_file.unwrap_or_else(default_log_file);
52+ ensure_parent_dir(&log_file);
53+ LOG_FILE.set(log_file).ok();
54+}
3255
56+/// A list of runtime directories from highest to lowest priority
57+///
58+/// The priority is:
59+///
60+/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
61+/// 2. subdirectory of user config directory (always included)
62+/// 3. `HELIX_RUNTIME` (if environment variable is set)
63+/// 4. `HELIX_DEFAULT_RUNTIME` (if environment variable is set *at build time*)
64+/// 5. subdirectory of path to helix executable (always included)
65+///
66+/// Postcondition: returns at least two paths (they might not exist).
67+fn prioritize_runtime_dirs() -> Vec<PathBuf> {
68+ const RT_DIR: &str = "runtime";
69+ // Adding higher priority first
70+ let mut rt_dirs = Vec::new();
3371 if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
3472 // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
35− let path = std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
73+ let path = PathBuf::from(dir).parent().unwrap().join(RT_DIR);
3674 log::debug!("runtime dir: {}", path.to_string_lossy());
37− return path;
75+ rt_dirs.push(path);
3876 }
3977
40− const RT_DIR: &str = "runtime";
41− let conf_dir = config_dir().join(RT_DIR);
42− if conf_dir.exists() {
43− return conf_dir;
78+ let conf_rt_dir = config_dir().join(RT_DIR);
79+ rt_dirs.push(conf_rt_dir);
80+
81+ if let Ok(dir) = std::env::var("HELIX_RUNTIME") {
82+ rt_dirs.push(dir.into());
83+ }
84+
85+ // If this variable is set during build time, it will always be included
86+ // in the lookup list. This allows downstream packagers to set a fallback
87+ // directory to a location that is conventional on their distro so that they
88+ // need not resort to a wrapper script or a global environment variable.
89+ if let Some(dir) = std::option_env!("HELIX_DEFAULT_RUNTIME") {
90+ rt_dirs.push(dir.into());
4491 }
4592
4693 // fallback to location of the executable being run
4794 // canonicalize the path in case the executable is symlinked
48− std::env::current_exe()
95+ let exe_rt_dir = std::env::current_exe()
4996 .ok()
5097 .and_then(|path| std::fs::canonicalize(path).ok())
5198 .and_then(|path| path.parent().map(|path| path.to_path_buf().join(RT_DIR)))
52− .unwrap()
99+ .unwrap();
100+ rt_dirs.push(exe_rt_dir);
101+ rt_dirs
102+}
103+
104+/// Runtime directories ordered from highest to lowest priority
105+///
106+/// All directories should be checked when looking for files.
107+///
108+/// Postcondition: returns at least one path (it might not exist).
109+pub fn runtime_dirs() -> &'static [PathBuf] {
110+ &RUNTIME_DIRS
111+}
112+
113+/// Find file with path relative to runtime directory
114+///
115+/// `rel_path` should be the relative path from within the `runtime/` directory.
116+/// The valid runtime directories are searched in priority order and the first
117+/// file found to exist is returned, otherwise None.
118+fn find_runtime_file(rel_path: &Path) -> Option<PathBuf> {
119+ RUNTIME_DIRS.iter().find_map(|rt_dir| {
120+ let path = rt_dir.join(rel_path);
121+ if path.exists() {
122+ Some(path)
123+ } else {
124+ None
125+ }
126+ })
127+}
128+
129+/// Find file with path relative to runtime directory
130+///
131+/// `rel_path` should be the relative path from within the `runtime/` directory.
132+/// The valid runtime directories are searched in priority order and the first
133+/// file found to exist is returned, otherwise the path to the final attempt
134+/// that failed.
135+pub fn runtime_file(rel_path: &Path) -> PathBuf {
136+ find_runtime_file(rel_path).unwrap_or_else(|| {
137+ RUNTIME_DIRS
138+ .last()
139+ .map(|dir| dir.join(rel_path))
140+ .unwrap_or_default()
141+ })
53142}
54143
55144pub fn config_dir() -> PathBuf {
@@ -60,15 +149,6 @@ pub fn config_dir() -> PathBuf {
60149 path
61150}
62151
63−pub fn local_config_dirs() -> Vec<PathBuf> {
64− let directories = find_local_config_dirs()
65− .into_iter()
66− .map(|path| path.join(".helix"))
67− .collect();
68− log::debug!("Located configuration folders: {:?}", directories);
69− directories
70−}
71−
72152pub fn cache_dir() -> PathBuf {
73153 // TODO: allow env var override
74154 let strategy = choose_base_strategy().expect("Unable to find the config directory!");
@@ -78,34 +158,23 @@ pub fn cache_dir() -> PathBuf {
78158}
79159
80160pub fn config_file() -> PathBuf {
81− CONFIG_FILE
82− .get()
83− .map(|path| path.to_path_buf())
84− .unwrap_or_else(|| config_dir().join("config.toml"))
161+ CONFIG_FILE.get().map(|path| path.to_path_buf()).unwrap()
85162}
86163
87−pub fn lang_config_file() -> PathBuf {
88− config_dir().join("languages.toml")
164+pub fn log_file() -> PathBuf {
165+ LOG_FILE.get().map(|path| path.to_path_buf()).unwrap()
89166}
90167
91−pub fn log_file() -> PathBuf {
92− cache_dir().join("helix.log")
168+pub fn workspace_config_file() -> PathBuf {
169+ find_workspace().0.join(".helix").join("config.toml")
93170}
94171
95−pub fn find_local_config_dirs() -> Vec<PathBuf> {
96− let current_dir = std::env::current_dir().expect("unable to determine current directory");
97− let mut directories = Vec::new();
172+pub fn lang_config_file() -> PathBuf {
173+ config_dir().join("languages.toml")
174+}
98175
99− for ancestor in current_dir.ancestors() {
100− if ancestor.join(".git").exists() {
101− directories.push(ancestor.to_path_buf());
102− // Don't go higher than repo if we're in one
103− break;
104− } else if ancestor.join(".helix").is_dir() {
105− directories.push(ancestor.to_path_buf());
106− }
107− }
108− directories
176+pub fn default_log_file() -> PathBuf {
177+ cache_dir().join("helix.log")
109178}
110179
111180/// Merge two TOML documents, merging values from `right` onto `left`
@@ -177,13 +246,55 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
177246 }
178247}
179248
249+/// Finds the current workspace folder.
250+/// Used as a ceiling dir for LSP root resolution, the filepicker and potentially as a future filewatching root
251+///
252+/// This function starts searching the FS upward from the CWD
253+/// and returns the first directory that contains either `.git` or `.helix`.
254+/// If no workspace was found returns (CWD, true).
255+/// Otherwise (workspace, false) is returned
256+pub fn find_workspace() -> (PathBuf, bool) {
257+ let current_dir = current_working_dir();
258+ for ancestor in current_dir.ancestors() {
259+ if ancestor.join(".git").exists() || ancestor.join(".helix").exists() {
260+ return (ancestor.to_owned(), false);
261+ }
262+ }
263+
264+ (current_dir, true)
265+}
266+
267+fn default_config_file() -> PathBuf {
268+ config_dir().join("config.toml")
269+}
270+
271+fn ensure_parent_dir(path: &Path) {
272+ if let Some(parent) = path.parent() {
273+ if !parent.exists() {
274+ std::fs::create_dir_all(parent).ok();
275+ }
276+ }
277+}
278+
180279#[cfg(test)]
181280mod merge_toml_tests {
182281 use std::str;
183282
184− use super::merge_toml_values;
283+ use super::{current_working_dir, merge_toml_values, set_current_working_dir};
185284 use toml::Value;
186285
286+ #[test]
287+ fn current_dir_is_set() {
288+ let new_path = dunce::canonicalize(std::env::temp_dir()).unwrap();
289+ let cwd = current_working_dir();
290+ assert_ne!(cwd, new_path);
291+
292+ set_current_working_dir(&new_path).expect("Couldn't set new path");
293+
294+ let cwd = current_working_dir();
295+ assert_eq!(cwd, new_path);
296+ }
297+
187298 #[test]
188299 fn language_toml_map_merges() {
189300 const USER: &str = r#"
helix-lsp/Cargo.toml+17−13
@@ -1,28 +1,32 @@
11[package]
22name = "helix-lsp"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
73description = "LSP client implementation for Helix project"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
9+categories.workspace = true
10+repository.workspace = true
11+homepage.workspace = true
1112
1213# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1314
1415[dependencies]
15−helix-core = { version = "0.6", path = "../helix-core" }
16−helix-loader = { version = "0.6", path = "../helix-loader" }
16+helix-core = { path = "../helix-core" }
17+helix-loader = { path = "../helix-loader" }
18+helix-parsec = { path = "../helix-parsec" }
1719
1820anyhow = "1.0"
1921futures-executor = "0.3"
2022futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
23+globset = "0.4.14"
2124log = "0.4"
22−lsp-types = { version = "0.94" }
25+lsp-types = { version = "0.95" }
2326serde = { version = "1.0", features = ["derive"] }
2427serde_json = "1.0"
2528thiserror = "1.0"
26−tokio = { version = "1.25", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
27−tokio-stream = "0.1.12"
28−which = "4.4"
29+tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
30+tokio-stream = "0.1.14"
31+which = "5.0.0"
32+parking_lot = "0.12.1"
helix-lsp/src/client.rs+463−55
@@ -1,22 +1,27 @@
11use crate::{
2− jsonrpc,
2+ find_lsp_workspace, jsonrpc,
33 transport::{Payload, Transport},
44 Call, Error, OffsetEncoding, Result,
55};
66
7−use helix_core::{find_root, ChangeSet, Rope};
7+use helix_core::{find_workspace, path, syntax::LanguageServerFeature, ChangeSet, Rope};
88use helix_loader::{self, VERSION_AND_GIT_HASH};
9−use lsp::PositionEncodingKind;
9+use lsp::{
10+ notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
11+ DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, WorkspaceFolder,
12+ WorkspaceFoldersChangeEvent,
13+};
1014use lsp_types as lsp;
15+use parking_lot::Mutex;
1116use serde::Deserialize;
1217use serde_json::Value;
13−use std::collections::HashMap;
1418use std::future::Future;
1519use std::process::Stdio;
1620use std::sync::{
1721 atomic::{AtomicU64, Ordering},
1822 Arc,
1923};
24+use std::{collections::HashMap, path::PathBuf};
2025use tokio::{
2126 io::{BufReader, BufWriter},
2227 process::{Child, Command},
@@ -26,9 +31,21 @@ use tokio::{
2631 },
2732};
2833
34+fn workspace_for_uri(uri: lsp::Url) -> WorkspaceFolder {
35+ lsp::WorkspaceFolder {
36+ name: uri
37+ .path_segments()
38+ .and_then(|segments| segments.last())
39+ .map(|basename| basename.to_string())
40+ .unwrap_or_default(),
41+ uri,
42+ }
43+}
44+
2945#[derive(Debug)]
3046pub struct Client {
3147 id: usize,
48+ name: String,
3249 _process: Child,
3350 server_tx: UnboundedSender<Payload>,
3451 request_counter: AtomicU64,
@@ -36,20 +53,131 @@ pub struct Client {
3653 config: Option<Value>,
3754 root_path: std::path::PathBuf,
3855 root_uri: Option<lsp::Url>,
39− workspace_folders: Vec<lsp::WorkspaceFolder>,
56+ workspace_folders: Mutex<Vec<lsp::WorkspaceFolder>>,
57+ initialize_notify: Arc<Notify>,
58+ /// workspace folders added while the server is still initializing
4059 req_timeout: u64,
4160}
4261
4362impl Client {
44− #[allow(clippy::type_complexity)]
45− #[allow(clippy::too_many_arguments)]
63+ pub fn try_add_doc(
64+ self: &Arc<Self>,
65+ root_markers: &[String],
66+ manual_roots: &[PathBuf],
67+ doc_path: Option<&std::path::PathBuf>,
68+ may_support_workspace: bool,
69+ ) -> bool {
70+ let (workspace, workspace_is_cwd) = find_workspace();
71+ let workspace = path::get_normalized_path(&workspace);
72+ let root = find_lsp_workspace(
73+ doc_path
74+ .and_then(|x| x.parent().and_then(|x| x.to_str()))
75+ .unwrap_or("."),
76+ root_markers,
77+ manual_roots,
78+ &workspace,
79+ workspace_is_cwd,
80+ );
81+ let root_uri = root
82+ .as_ref()
83+ .and_then(|root| lsp::Url::from_file_path(root).ok());
84+
85+ if self.root_path == root.unwrap_or(workspace)
86+ || root_uri.as_ref().map_or(false, |root_uri| {
87+ self.workspace_folders
88+ .lock()
89+ .iter()
90+ .any(|workspace| &workspace.uri == root_uri)
91+ })
92+ {
93+ // workspace URI is already registered so we can use this client
94+ return true;
95+ }
96+
97+ // this server definitely doesn't support multiple workspace, no need to check capabilities
98+ if !may_support_workspace {
99+ return false;
100+ }
101+
102+ let Some(capabilities) = self.capabilities.get() else {
103+ let client = Arc::clone(self);
104+ // initialization hasn't finished yet, deal with this new root later
105+ // TODO: In the edgecase that a **new root** is added
106+ // for an LSP that **doesn't support workspace_folders** before initaliation is finished
107+ // the new roots are ignored.
108+ // That particular edgecase would require retroactively spawning new LSP
109+ // clients and therefore also require us to retroactively update the corresponding
110+ // documents LSP client handle. It's doable but a pretty weird edgecase so let's
111+ // wait and see if anyone ever runs into it.
112+ tokio::spawn(async move {
113+ client.initialize_notify.notified().await;
114+ if let Some(workspace_folders_caps) = client
115+ .capabilities()
116+ .workspace
117+ .as_ref()
118+ .and_then(|cap| cap.workspace_folders.as_ref())
119+ .filter(|cap| cap.supported.unwrap_or(false))
120+ {
121+ client.add_workspace_folder(
122+ root_uri,
123+ &workspace_folders_caps.change_notifications,
124+ );
125+ }
126+ });
127+ return true;
128+ };
129+
130+ if let Some(workspace_folders_caps) = capabilities
131+ .workspace
132+ .as_ref()
133+ .and_then(|cap| cap.workspace_folders.as_ref())
134+ .filter(|cap| cap.supported.unwrap_or(false))
135+ {
136+ self.add_workspace_folder(root_uri, &workspace_folders_caps.change_notifications);
137+ true
138+ } else {
139+ // the server doesn't support multi workspaces, we need a new client
140+ false
141+ }
142+ }
143+
144+ fn add_workspace_folder(
145+ &self,
146+ root_uri: Option<lsp::Url>,
147+ change_notifications: &Option<OneOf<bool, String>>,
148+ ) {
149+ // root_uri is None just means that there isn't really any LSP workspace
150+ // associated with this file. For servers that support multiple workspaces
151+ // there is just one server so we can always just use that shared instance.
152+ // No need to add a new workspace root here as there is no logical root for this file
153+ // let the server deal with this
154+ let Some(root_uri) = root_uri else {
155+ return;
156+ };
157+
158+ // server supports workspace folders, let's add the new root to the list
159+ self.workspace_folders
160+ .lock()
161+ .push(workspace_for_uri(root_uri.clone()));
162+ if &Some(OneOf::Left(false)) == change_notifications {
163+ // server specifically opted out of DidWorkspaceChange notifications
164+ // let's assume the server will request the workspace folders itself
165+ // and that we can therefore reuse the client (but are done now)
166+ return;
167+ }
168+ tokio::spawn(self.did_change_workspace(vec![workspace_for_uri(root_uri)], Vec::new()));
169+ }
170+
171+ #[allow(clippy::type_complexity, clippy::too_many_arguments)]
46172 pub fn start(
47173 cmd: &str,
48174 args: &[String],
49175 config: Option<Value>,
50176 server_environment: HashMap<String, String>,
51177 root_markers: &[String],
178+ manual_roots: &[PathBuf],
52179 id: usize,
180+ name: String,
53181 req_timeout: u64,
54182 doc_path: Option<&std::path::PathBuf>,
55183 ) -> Result<(Self, UnboundedReceiver<(usize, Call)>, Arc<Notify>)> {
@@ -74,47 +202,51 @@ impl Client {
74202 let stderr = BufReader::new(process.stderr.take().expect("Failed to open stderr"));
75203
76204 let (server_rx, server_tx, initialize_notify) =
77− Transport::start(reader, writer, stderr, id);
78−
79− let root_path = find_root(
80− doc_path.and_then(|x| x.parent().and_then(|x| x.to_str())),
205+ Transport::start(reader, writer, stderr, id, name.clone());
206+ let (workspace, workspace_is_cwd) = find_workspace();
207+ let workspace = path::get_normalized_path(&workspace);
208+ let root = find_lsp_workspace(
209+ doc_path
210+ .and_then(|x| x.parent().and_then(|x| x.to_str()))
211+ .unwrap_or("."),
81212 root_markers,
213+ manual_roots,
214+ &workspace,
215+ workspace_is_cwd,
82216 );
83217
84− let root_uri = lsp::Url::from_file_path(root_path.clone()).ok();
218+ // `root_uri` and `workspace_folder` can be empty in case there is no workspace
219+ // `root_url` can not, use `workspace` as a fallback
220+ let root_path = root.clone().unwrap_or_else(|| workspace.clone());
221+ let root_uri = root.and_then(|root| lsp::Url::from_file_path(root).ok());
85222
86− // TODO: support multiple workspace folders
87223 let workspace_folders = root_uri
88224 .clone()
89− .map(|root| {
90− vec![lsp::WorkspaceFolder {
91− name: root
92− .path_segments()
93− .and_then(|segments| segments.last())
94− .map(|basename| basename.to_string())
95− .unwrap_or_default(),
96− uri: root,
97− }]
98− })
225+ .map(|root| vec![workspace_for_uri(root)])
99226 .unwrap_or_default();
100227
101228 let client = Self {
102229 id,
230+ name,
103231 _process: process,
104232 server_tx,
105233 request_counter: AtomicU64::new(0),
106234 capabilities: OnceCell::new(),
107235 config,
108236 req_timeout,
109−
110237 root_path,
111238 root_uri,
112− workspace_folders,
239+ workspace_folders: Mutex::new(workspace_folders),
240+ initialize_notify: initialize_notify.clone(),
113241 };
114242
115243 Ok((client, server_rx, initialize_notify))
116244 }
117245
246+ pub fn name(&self) -> &str {
247+ &self.name
248+ }
249+
118250 pub fn id(&self) -> usize {
119251 self.id
120252 }
@@ -145,6 +277,87 @@ impl Client {
145277 .expect("language server not yet initialized!")
146278 }
147279
280+ /// Client has to be initialized otherwise this function panics
281+ #[inline]
282+ pub fn supports_feature(&self, feature: LanguageServerFeature) -> bool {
283+ let capabilities = self.capabilities();
284+
285+ use lsp::*;
286+ match feature {
287+ LanguageServerFeature::Format => matches!(
288+ capabilities.document_formatting_provider,
289+ Some(OneOf::Left(true) | OneOf::Right(_))
290+ ),
291+ LanguageServerFeature::GotoDeclaration => matches!(
292+ capabilities.declaration_provider,
293+ Some(
294+ DeclarationCapability::Simple(true)
295+ | DeclarationCapability::RegistrationOptions(_)
296+ | DeclarationCapability::Options(_),
297+ )
298+ ),
299+ LanguageServerFeature::GotoDefinition => matches!(
300+ capabilities.definition_provider,
301+ Some(OneOf::Left(true) | OneOf::Right(_))
302+ ),
303+ LanguageServerFeature::GotoTypeDefinition => matches!(
304+ capabilities.type_definition_provider,
305+ Some(
306+ TypeDefinitionProviderCapability::Simple(true)
307+ | TypeDefinitionProviderCapability::Options(_),
308+ )
309+ ),
310+ LanguageServerFeature::GotoReference => matches!(
311+ capabilities.references_provider,
312+ Some(OneOf::Left(true) | OneOf::Right(_))
313+ ),
314+ LanguageServerFeature::GotoImplementation => matches!(
315+ capabilities.implementation_provider,
316+ Some(
317+ ImplementationProviderCapability::Simple(true)
318+ | ImplementationProviderCapability::Options(_),
319+ )
320+ ),
321+ LanguageServerFeature::SignatureHelp => capabilities.signature_help_provider.is_some(),
322+ LanguageServerFeature::Hover => matches!(
323+ capabilities.hover_provider,
324+ Some(HoverProviderCapability::Simple(true) | HoverProviderCapability::Options(_),)
325+ ),
326+ LanguageServerFeature::DocumentHighlight => matches!(
327+ capabilities.document_highlight_provider,
328+ Some(OneOf::Left(true) | OneOf::Right(_))
329+ ),
330+ LanguageServerFeature::Completion => capabilities.completion_provider.is_some(),
331+ LanguageServerFeature::CodeAction => matches!(
332+ capabilities.code_action_provider,
333+ Some(
334+ CodeActionProviderCapability::Simple(true)
335+ | CodeActionProviderCapability::Options(_),
336+ )
337+ ),
338+ LanguageServerFeature::WorkspaceCommand => {
339+ capabilities.execute_command_provider.is_some()
340+ }
341+ LanguageServerFeature::DocumentSymbols => matches!(
342+ capabilities.document_symbol_provider,
343+ Some(OneOf::Left(true) | OneOf::Right(_))
344+ ),
345+ LanguageServerFeature::WorkspaceSymbols => matches!(
346+ capabilities.workspace_symbol_provider,
347+ Some(OneOf::Left(true) | OneOf::Right(_))
348+ ),
349+ LanguageServerFeature::Diagnostics => true, // there's no extra server capability
350+ LanguageServerFeature::RenameSymbol => matches!(
351+ capabilities.rename_provider,
352+ Some(OneOf::Left(true)) | Some(OneOf::Right(_))
353+ ),
354+ LanguageServerFeature::InlayHints => matches!(
355+ capabilities.inlay_hint_provider,
356+ Some(OneOf::Left(true) | OneOf::Right(InlayHintServerCapabilities::Options(_)))
357+ ),
358+ }
359+ }
360+
148361 pub fn offset_encoding(&self) -> OffsetEncoding {
149362 self.capabilities()
150363 .position_encoding
@@ -154,7 +367,7 @@ impl Client {
154367 "utf-16" => Some(OffsetEncoding::Utf16),
155368 "utf-32" => Some(OffsetEncoding::Utf32),
156369 encoding => {
157− log::error!("Server provided invalid position encording {encoding}, defaulting to utf-16");
370+ log::error!("Server provided invalid position encoding {encoding}, defaulting to utf-16");
158371 None
159372 },
160373 })
@@ -165,8 +378,10 @@ impl Client {
165378 self.config.as_ref()
166379 }
167380
168− pub fn workspace_folders(&self) -> &[lsp::WorkspaceFolder] {
169− &self.workspace_folders
381+ pub async fn workspace_folders(
382+ &self,
383+ ) -> parking_lot::MutexGuard<'_, Vec<lsp::WorkspaceFolder>> {
384+ self.workspace_folders.lock()
170385 }
171386
172387 /// Execute a RPC request on the language server.
@@ -186,12 +401,22 @@ impl Client {
186401 &self,
187402 params: R::Params,
188403 ) -> impl Future<Output = Result<Value>>
404+ where
405+ R::Params: serde::Serialize,
406+ {
407+ self.call_with_timeout::<R>(params, self.req_timeout)
408+ }
409+
410+ fn call_with_timeout<R: lsp::request::Request>(
411+ &self,
412+ params: R::Params,
413+ timeout_secs: u64,
414+ ) -> impl Future<Output = Result<Value>>
189415 where
190416 R::Params: serde::Serialize,
191417 {
192418 let server_tx = self.server_tx.clone();
193419 let id = self.next_request_id();
194− let timeout_secs = self.req_timeout;
195420
196421 async move {
197422 use std::time::Duration;
@@ -286,7 +511,7 @@ impl Client {
286511 // General messages
287512 // -------------------------------------------------------------------------------------------
288513
289− pub(crate) async fn initialize(&self) -> Result<lsp::InitializeResult> {
514+ pub(crate) async fn initialize(&self, enable_snippets: bool) -> Result<lsp::InitializeResult> {
290515 if let Some(config) = &self.config {
291516 log::info!("Using custom LSP config: {}", config);
292517 }
@@ -294,7 +519,7 @@ impl Client {
294519 #[allow(deprecated)]
295520 let params = lsp::InitializeParams {
296521 process_id: Some(std::process::id()),
297− workspace_folders: Some(self.workspace_folders.clone()),
522+ workspace_folders: Some(self.workspace_folders.lock().clone()),
298523 // root_path is obsolete, but some clients like pyright still use it so we specify both.
299524 // clients will prefer _uri if possible
300525 root_path: self.root_path.to_str().map(|path| path.to_owned()),
@@ -315,12 +540,35 @@ impl Client {
315540 execute_command: Some(lsp::DynamicRegistrationClientCapabilities {
316541 dynamic_registration: Some(false),
317542 }),
543+ inlay_hint: Some(lsp::InlayHintWorkspaceClientCapabilities {
544+ refresh_support: Some(false),
545+ }),
546+ workspace_edit: Some(lsp::WorkspaceEditClientCapabilities {
547+ document_changes: Some(true),
548+ resource_operations: Some(vec![
549+ lsp::ResourceOperationKind::Create,
550+ lsp::ResourceOperationKind::Rename,
551+ lsp::ResourceOperationKind::Delete,
552+ ]),
553+ failure_handling: Some(lsp::FailureHandlingKind::Abort),
554+ normalizes_line_endings: Some(false),
555+ change_annotation_support: None,
556+ }),
557+ did_change_watched_files: Some(lsp::DidChangeWatchedFilesClientCapabilities {
558+ dynamic_registration: Some(true),
559+ relative_pattern_support: Some(false),
560+ }),
561+ file_operations: Some(lsp::WorkspaceFileOperationsClientCapabilities {
562+ will_rename: Some(true),
563+ did_rename: Some(true),
564+ ..Default::default()
565+ }),
318566 ..Default::default()
319567 }),
320568 text_document: Some(lsp::TextDocumentClientCapabilities {
321569 completion: Some(lsp::CompletionClientCapabilities {
322570 completion_item: Some(lsp::CompletionItemCapability {
323− snippet_support: Some(false),
571+ snippet_support: Some(enable_snippets),
324572 resolve_support: Some(lsp::CompletionItemCapabilityResolveSupport {
325573 properties: vec![
326574 String::from("documentation"),
@@ -359,7 +607,7 @@ impl Client {
359607 }),
360608 rename: Some(lsp::RenameClientCapabilities {
361609 dynamic_registration: Some(false),
362− prepare_support: Some(false),
610+ prepare_support: Some(true),
363611 prepare_support_default_behavior: None,
364612 honors_change_annotations: Some(false),
365613 }),
@@ -381,11 +629,22 @@ impl Client {
381629 .collect(),
382630 },
383631 }),
632+ is_preferred_support: Some(true),
633+ disabled_support: Some(true),
634+ data_support: Some(true),
635+ resolve_support: Some(CodeActionCapabilityResolveSupport {
636+ properties: vec!["edit".to_owned(), "command".to_owned()],
637+ }),
384638 ..Default::default()
385639 }),
386640 publish_diagnostics: Some(lsp::PublishDiagnosticsClientCapabilities {
641+ version_support: Some(true),
387642 ..Default::default()
388643 }),
644+ inlay_hint: Some(lsp::InlayHintClientCapabilities {
645+ dynamic_registration: Some(false),
646+ resolve_support: None,
647+ }),
389648 ..Default::default()
390649 }),
391650 window: Some(lsp::WindowClientCapabilities {
@@ -394,8 +653,8 @@ impl Client {
394653 }),
395654 general: Some(lsp::GeneralClientCapabilities {
396655 position_encodings: Some(vec![
397− PositionEncodingKind::UTF32,
398656 PositionEncodingKind::UTF8,
657+ PositionEncodingKind::UTF32,
399658 PositionEncodingKind::UTF16,
400659 ]),
401660 ..Default::default()
@@ -408,6 +667,7 @@ impl Client {
408667 version: Some(String::from(VERSION_AND_GIT_HASH)),
409668 }),
410669 locale: None, // TODO
670+ work_done_progress_params: lsp::WorkDoneProgressParams::default(),
411671 };
412672
413673 self.request::<lsp::request::Initialize>(params).await
@@ -446,6 +706,75 @@ impl Client {
446706 )
447707 }
448708
709+ pub fn did_change_workspace(
710+ &self,
711+ added: Vec<WorkspaceFolder>,
712+ removed: Vec<WorkspaceFolder>,
713+ ) -> impl Future<Output = Result<()>> {
714+ self.notify::<DidChangeWorkspaceFolders>(DidChangeWorkspaceFoldersParams {
715+ event: WorkspaceFoldersChangeEvent { added, removed },
716+ })
717+ }
718+
719+ pub fn prepare_file_rename(
720+ &self,
721+ old_uri: &lsp::Url,
722+ new_uri: &lsp::Url,
723+ ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
724+ let capabilities = self.capabilities.get().unwrap();
725+
726+ // Return early if the server does not support willRename feature
727+ match &capabilities.workspace {
728+ Some(workspace) => match &workspace.file_operations {
729+ Some(op) => {
730+ op.will_rename.as_ref()?;
731+ }
732+ _ => return None,
733+ },
734+ _ => return None,
735+ }
736+
737+ let files = vec![lsp::FileRename {
738+ old_uri: old_uri.to_string(),
739+ new_uri: new_uri.to_string(),
740+ }];
741+ let request = self.call_with_timeout::<lsp::request::WillRenameFiles>(
742+ lsp::RenameFilesParams { files },
743+ 5,
744+ );
745+
746+ Some(async move {
747+ let json = request.await?;
748+ let response: Option<lsp::WorkspaceEdit> = serde_json::from_value(json)?;
749+ Ok(response.unwrap_or_default())
750+ })
751+ }
752+
753+ pub fn did_file_rename(
754+ &self,
755+ old_uri: &lsp::Url,
756+ new_uri: &lsp::Url,
757+ ) -> Option<impl Future<Output = std::result::Result<(), Error>>> {
758+ let capabilities = self.capabilities.get().unwrap();
759+
760+ // Return early if the server does not support DidRename feature
761+ match &capabilities.workspace {
762+ Some(workspace) => match &workspace.file_operations {
763+ Some(op) => {
764+ op.did_rename.as_ref()?;
765+ }
766+ _ => return None,
767+ },
768+ _ => return None,
769+ }
770+
771+ let files = vec![lsp::FileRename {
772+ old_uri: old_uri.to_string(),
773+ new_uri: new_uri.to_string(),
774+ }];
775+ Some(self.notify::<lsp::notification::DidRenameFiles>(lsp::RenameFilesParams { files }))
776+ }
777+
449778 // -------------------------------------------------------------------------------------------
450779 // Text document
451780 // -------------------------------------------------------------------------------------------
@@ -489,7 +818,11 @@ impl Client {
489818 // Calculation is therefore a bunch trickier.
490819
491820 use helix_core::RopeSlice;
492− fn traverse(pos: lsp::Position, text: RopeSlice) -> lsp::Position {
821+ fn traverse(
822+ pos: lsp::Position,
823+ text: RopeSlice,
824+ offset_encoding: OffsetEncoding,
825+ ) -> lsp::Position {
493826 let lsp::Position {
494827 mut line,
495828 mut character,
@@ -506,7 +839,11 @@ impl Client {
506839 line += 1;
507840 character = 0;
508841 } else {
509− character += ch.len_utf16() as u32;
842+ character += match offset_encoding {
843+ OffsetEncoding::Utf8 => ch.len_utf8() as u32,
844+ OffsetEncoding::Utf16 => ch.len_utf16() as u32,
845+ OffsetEncoding::Utf32 => 1,
846+ };
510847 }
511848 }
512849 lsp::Position { line, character }
@@ -527,7 +864,7 @@ impl Client {
527864 }
528865 Delete(_) => {
529866 let start = pos_to_lsp_pos(new_text, new_pos, offset_encoding);
530− let end = traverse(start, old_text.slice(old_pos..old_end));
867+ let end = traverse(start, old_text.slice(old_pos..old_end), offset_encoding);
531868
532869 // deletion
533870 changes.push(lsp::TextDocumentContentChangeEvent {
@@ -544,7 +881,8 @@ impl Client {
544881 // a subsequent delete means a replace, consume it
545882 let end = if let Some(Delete(len)) = iter.peek() {
546883 old_end = old_pos + len;
547− let end = traverse(start, old_text.slice(old_pos..old_end));
884+ let end =
885+ traverse(start, old_text.slice(old_pos..old_end), offset_encoding);
548886
549887 iter.next();
550888
@@ -632,20 +970,19 @@ impl Client {
632970 ) -> Option<impl Future<Output = Result<()>>> {
633971 let capabilities = self.capabilities.get().unwrap();
634972
635− let include_text = match &capabilities.text_document_sync {
636− Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
637− save: Some(options),
973+ let include_text = match &capabilities.text_document_sync.as_ref()? {
974+ lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
975+ save: options,
638976 ..
639− })) => match options {
977+ }) => match options.as_ref()? {
640978 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
641979 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
642980 include_text,
643981 }) => include_text.unwrap_or(false),
644− // Supported(false)
645− _ => return None,
982+ lsp::TextDocumentSyncSaveOptions::Supported(false) => return None,
646983 },
647− // unsupported
648− _ => return None,
984+ // see: https://github.com/microsoft/language-server-protocol/issues/288
985+ lsp::TextDocumentSyncCapability::Kind(..) => false,
649986 };
650987
651988 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
@@ -702,6 +1039,24 @@ impl Client {
7021039 Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
7031040 }
7041041
1042+ pub fn resolve_code_action(
1043+ &self,
1044+ code_action: lsp::CodeAction,
1045+ ) -> Option<impl Future<Output = Result<Value>>> {
1046+ let capabilities = self.capabilities.get().unwrap();
1047+
1048+ // Return early if the server does not support resolving code actions.
1049+ match capabilities.code_action_provider {
1050+ Some(lsp::CodeActionProviderCapability::Options(lsp::CodeActionOptions {
1051+ resolve_provider: Some(true),
1052+ ..
1053+ })) => (),
1054+ _ => return None,
1055+ }
1056+
1057+ Some(self.call::<lsp::request::CodeActionResolveRequest>(code_action))
1058+ }
1059+
7051060 pub fn text_document_signature_help(
7061061 &self,
7071062 text_document: lsp::TextDocumentIdentifier,
@@ -726,6 +1081,31 @@ impl Client {
7261081 Some(self.call::<lsp::request::SignatureHelpRequest>(params))
7271082 }
7281083
1084+ pub fn text_document_range_inlay_hints(
1085+ &self,
1086+ text_document: lsp::TextDocumentIdentifier,
1087+ range: lsp::Range,
1088+ work_done_token: Option<lsp::ProgressToken>,
1089+ ) -> Option<impl Future<Output = Result<Value>>> {
1090+ let capabilities = self.capabilities.get().unwrap();
1091+
1092+ match capabilities.inlay_hint_provider {
1093+ Some(
1094+ lsp::OneOf::Left(true)
1095+ | lsp::OneOf::Right(lsp::InlayHintServerCapabilities::Options(_)),
1096+ ) => (),
1097+ _ => return None,
1098+ }
1099+
1100+ let params = lsp::InlayHintParams {
1101+ text_document,
1102+ range,
1103+ work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
1104+ };
1105+
1106+ Some(self.call::<lsp::request::InlayHintRequest>(params))
1107+ }
1108+
7291109 pub fn text_document_hover(
7301110 &self,
7311111 text_document: lsp::TextDocumentIdentifier,
@@ -986,6 +1366,7 @@ impl Client {
9861366 &self,
9871367 text_document: lsp::TextDocumentIdentifier,
9881368 position: lsp::Position,
1369+ include_declaration: bool,
9891370 work_done_token: Option<lsp::ProgressToken>,
9901371 ) -> Option<impl Future<Output = Result<Value>>> {
9911372 let capabilities = self.capabilities.get().unwrap();
@@ -1002,7 +1383,7 @@ impl Client {
10021383 position,
10031384 },
10041385 context: lsp::ReferenceContext {
1005− include_declaration: true,
1386+ include_declaration,
10061387 },
10071388 work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
10081389 partial_result_params: lsp::PartialResultParams {
@@ -1034,6 +1415,29 @@ impl Client {
10341415 Some(self.call::<lsp::request::DocumentSymbolRequest>(params))
10351416 }
10361417
1418+ pub fn prepare_rename(
1419+ &self,
1420+ text_document: lsp::TextDocumentIdentifier,
1421+ position: lsp::Position,
1422+ ) -> Option<impl Future<Output = Result<Value>>> {
1423+ let capabilities = self.capabilities.get().unwrap();
1424+
1425+ match capabilities.rename_provider {
1426+ Some(lsp::OneOf::Right(lsp::RenameOptions {
1427+ prepare_provider: Some(true),
1428+ ..
1429+ })) => (),
1430+ _ => return None,
1431+ }
1432+
1433+ let params = lsp::TextDocumentPositionParams {
1434+ text_document,
1435+ position,
1436+ };
1437+
1438+ Some(self.call::<lsp::request::PrepareRenameRequest>(params))
1439+ }
1440+
10371441 // empty string to get all symbols
10381442 pub fn workspace_symbols(&self, query: String) -> Option<impl Future<Output = Result<Value>>> {
10391443 let capabilities = self.capabilities.get().unwrap();
@@ -1087,14 +1491,9 @@ impl Client {
10871491 position: lsp::Position,
10881492 new_name: String,
10891493 ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
1090− let capabilities = self.capabilities.get().unwrap();
1091−
1092− // Return early if the language server does not support renaming.
1093− match capabilities.rename_provider {
1094− Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
1095− // None | Some(false)
1096− _ => return None,
1097− };
1494+ if !self.supports_feature(LanguageServerFeature::RenameSymbol) {
1495+ return None;
1496+ }
10981497
10991498 let params = lsp::RenameParams {
11001499 text_document_position: lsp::TextDocumentPositionParams {
@@ -1132,4 +1531,13 @@ impl Client {
11321531
11331532 Some(self.call::<lsp::request::ExecuteCommand>(params))
11341533 }
1534+
1535+ pub fn did_change_watched_files(
1536+ &self,
1537+ changes: Vec<lsp::FileEvent>,
1538+ ) -> impl Future<Output = std::result::Result<(), Error>> {
1539+ self.notify::<lsp::notification::DidChangeWatchedFiles>(lsp::DidChangeWatchedFilesParams {
1540+ changes,
1541+ })
1542+ }
11351543}
helix-lsp/src/file_event.rsnew file+193
@@ -0,0 +1,193 @@
1+use std::{collections::HashMap, path::PathBuf, sync::Weak};
2+
3+use globset::{GlobBuilder, GlobSetBuilder};
4+use tokio::sync::mpsc;
5+
6+use crate::{lsp, Client};
7+
8+enum Event {
9+ FileChanged {
10+ path: PathBuf,
11+ },
12+ Register {
13+ client_id: usize,
14+ client: Weak<Client>,
15+ registration_id: String,
16+ options: lsp::DidChangeWatchedFilesRegistrationOptions,
17+ },
18+ Unregister {
19+ client_id: usize,
20+ registration_id: String,
21+ },
22+ RemoveClient {
23+ client_id: usize,
24+ },
25+}
26+
27+#[derive(Default)]
28+struct ClientState {
29+ client: Weak<Client>,
30+ registered: HashMap<String, globset::GlobSet>,
31+}
32+
33+/// The Handler uses a dedicated tokio task to respond to file change events by
34+/// forwarding changes to LSPs that have registered for notifications with a
35+/// matching glob.
36+///
37+/// When an LSP registers for the DidChangeWatchedFiles notification, the
38+/// Handler is notified by sending the registration details in addition to a
39+/// weak reference to the LSP client. This is done so that the Handler can have
40+/// access to the client without preventing the client from being dropped if it
41+/// is closed and the Handler isn't properly notified.
42+#[derive(Clone, Debug)]
43+pub struct Handler {
44+ tx: mpsc::UnboundedSender<Event>,
45+}
46+
47+impl Default for Handler {
48+ fn default() -> Self {
49+ Self::new()
50+ }
51+}
52+
53+impl Handler {
54+ pub fn new() -> Self {
55+ let (tx, rx) = mpsc::unbounded_channel();
56+ tokio::spawn(Self::run(rx));
57+ Self { tx }
58+ }
59+
60+ pub fn register(
61+ &self,
62+ client_id: usize,
63+ client: Weak<Client>,
64+ registration_id: String,
65+ options: lsp::DidChangeWatchedFilesRegistrationOptions,
66+ ) {
67+ let _ = self.tx.send(Event::Register {
68+ client_id,
69+ client,
70+ registration_id,
71+ options,
72+ });
73+ }
74+
75+ pub fn unregister(&self, client_id: usize, registration_id: String) {
76+ let _ = self.tx.send(Event::Unregister {
77+ client_id,
78+ registration_id,
79+ });
80+ }
81+
82+ pub fn file_changed(&self, path: PathBuf) {
83+ let _ = self.tx.send(Event::FileChanged { path });
84+ }
85+
86+ pub fn remove_client(&self, client_id: usize) {
87+ let _ = self.tx.send(Event::RemoveClient { client_id });
88+ }
89+
90+ async fn run(mut rx: mpsc::UnboundedReceiver<Event>) {
91+ let mut state: HashMap<usize, ClientState> = HashMap::new();
92+ while let Some(event) = rx.recv().await {
93+ match event {
94+ Event::FileChanged { path } => {
95+ log::debug!("Received file event for {:?}", &path);
96+
97+ state.retain(|id, client_state| {
98+ if !client_state
99+ .registered
100+ .values()
101+ .any(|glob| glob.is_match(&path))
102+ {
103+ return true;
104+ }
105+ let Some(client) = client_state.client.upgrade() else {
106+ log::warn!("LSP client was dropped: {id}");
107+ return false;
108+ };
109+ let Ok(uri) = lsp::Url::from_file_path(&path) else {
110+ return true;
111+ };
112+ log::debug!(
113+ "Sending didChangeWatchedFiles notification to client '{}'",
114+ client.name()
115+ );
116+ if let Err(err) = crate::block_on(client
117+ .did_change_watched_files(vec![lsp::FileEvent {
118+ uri,
119+ // We currently always send the CHANGED state
120+ // since we don't actually have more context at
121+ // the moment.
122+ typ: lsp::FileChangeType::CHANGED,
123+ }]))
124+ {
125+ log::warn!("Failed to send didChangeWatchedFiles notification to client: {err}");
126+ }
127+ true
128+ });
129+ }
130+ Event::Register {
131+ client_id,
132+ client,
133+ registration_id,
134+ options: ops,
135+ } => {
136+ log::debug!(
137+ "Registering didChangeWatchedFiles for client '{}' with id '{}'",
138+ client_id,
139+ registration_id
140+ );
141+
142+ let entry = state.entry(client_id).or_insert_with(ClientState::default);
143+ entry.client = client;
144+
145+ let mut builder = GlobSetBuilder::new();
146+ for watcher in ops.watchers {
147+ if let lsp::GlobPattern::String(pattern) = watcher.glob_pattern {
148+ if let Ok(glob) = GlobBuilder::new(&pattern).build() {
149+ builder.add(glob);
150+ }
151+ }
152+ }
153+ match builder.build() {
154+ Ok(globset) => {
155+ entry.registered.insert(registration_id, globset);
156+ }
157+ Err(err) => {
158+ // Remove any old state for that registration id and
159+ // remove the entire client if it's now empty.
160+ entry.registered.remove(&registration_id);
161+ if entry.registered.is_empty() {
162+ state.remove(&client_id);
163+ }
164+ log::warn!(
165+ "Unable to build globset for LSP didChangeWatchedFiles {err}"
166+ )
167+ }
168+ }
169+ }
170+ Event::Unregister {
171+ client_id,
172+ registration_id,
173+ } => {
174+ log::debug!(
175+ "Unregistering didChangeWatchedFiles with id '{}' for client '{}'",
176+ registration_id,
177+ client_id
178+ );
179+ if let Some(client_state) = state.get_mut(&client_id) {
180+ client_state.registered.remove(&registration_id);
181+ if client_state.registered.is_empty() {
182+ state.remove(&client_id);
183+ }
184+ }
185+ }
186+ Event::RemoveClient { client_id } => {
187+ log::debug!("Removing LSP client: {client_id}");
188+ state.remove(&client_id);
189+ }
190+ }
191+ }
192+ }
193+}
helix-lsp/src/lib.rs+449−102
@@ -1,5 +1,7 @@
11mod client;
2+pub mod file_event;
23pub mod jsonrpc;
4+pub mod snippet;
35mod transport;
46
57pub use client::Client;
@@ -9,22 +11,23 @@ pub use lsp::{Position, Url};
911pub use lsp_types as lsp;
1012
1113use futures_util::stream::select_all::SelectAll;
12−use helix_core::syntax::{LanguageConfiguration, LanguageServerConfiguration};
14+use helix_core::{
15+ path,
16+ syntax::{LanguageConfiguration, LanguageServerConfiguration, LanguageServerFeatures},
17+};
1318use tokio::sync::mpsc::UnboundedReceiver;
1419
1520use std::{
16− collections::{hash_map::Entry, HashMap},
17− sync::{
18− atomic::{AtomicUsize, Ordering},
19− Arc,
20− },
21+ collections::HashMap,
22+ path::{Path, PathBuf},
23+ sync::Arc,
2124};
2225
2326use thiserror::Error;
2427use tokio_stream::wrappers::UnboundedReceiverStream;
2528
2629pub type Result<T> = core::result::Result<T, Error>;
27−type LanguageId = String;
30+pub type LanguageServerName = String;
2831
2932#[derive(Error, Debug)]
3033pub enum Error {
@@ -44,7 +47,7 @@ pub enum Error {
4447 Other(#[from] anyhow::Error),
4548}
4649
47−#[derive(Clone, Copy, Debug, Default)]
50+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
4851pub enum OffsetEncoding {
4952 /// UTF-8 code units aka bytes
5053 Utf8,
@@ -58,6 +61,7 @@ pub enum OffsetEncoding {
5861pub mod util {
5962 use super::*;
6063 use helix_core::line_ending::{line_end_byte_index, line_end_char_index};
64+ use helix_core::{chars, RopeSlice, SmallVec};
6165 use helix_core::{diagnostic::NumberOrString, Range, Rope, Selection, Tendril, Transaction};
6266
6367 /// Converts a diagnostic in the document to [`lsp::Diagnostic`].
@@ -126,7 +130,11 @@ pub mod util {
126130 ) -> Option<usize> {
127131 let pos_line = pos.line as usize;
128132 if pos_line > doc.len_lines() - 1 {
129− return None;
133+ // If it extends past the end, truncate it to the end. This is because the
134+ // way the LSP describes the range including the last newline is by
135+ // specifying a line number after what we would call the last line.
136+ log::warn!("LSP position {pos:?} out of range assuming EOF");
137+ return Some(doc.len_chars());
130138 }
131139
132140 // We need to be careful here to fully comply ith the LSP spec.
@@ -142,10 +150,10 @@ pub mod util {
142150 // > ‘\n’, ‘\r\n’ and ‘\r’. Positions are line end character agnostic.
143151 // > So you can not specify a position that denotes \r|\n or \n| where | represents the character offset.
144152 //
145− // This means that while the line must be in bounds the `charater`
153+ // This means that while the line must be in bounds the `character`
146154 // must be capped to the end of the line.
147155 // Note that the end of the line here is **before** the line terminator
148− // so we must use `line_end_char_index` istead of `doc.line_to_char(pos_line + 1)`
156+ // so we must use `line_end_char_index` instead of `doc.line_to_char(pos_line + 1)`
149157 //
150158 // FIXME: Helix does not fully comply with the LSP spec for line terminators.
151159 // The LSP standard requires that line terminators are ['\n', '\r\n', '\r'].
@@ -236,49 +244,251 @@ pub mod util {
236244
237245 pub fn lsp_range_to_range(
238246 doc: &Rope,
239− range: lsp::Range,
247+ mut range: lsp::Range,
240248 offset_encoding: OffsetEncoding,
241249 ) -> Option<Range> {
250+ // This is sort of an edgecase. It's not clear from the spec how to deal with
251+ // ranges where end < start. They don't make much sense but vscode simply caps start to end
252+ // and because it's not specified quite a few LS rely on this as a result (for example the TS server)
253+ if range.start > range.end {
254+ log::error!(
255+ "Invalid LSP range start {:?} > end {:?}, using an empty range at the end instead",
256+ range.start,
257+ range.end
258+ );
259+ range.start = range.end;
260+ }
242261 let start = lsp_pos_to_pos(doc, range.start, offset_encoding)?;
243262 let end = lsp_pos_to_pos(doc, range.end, offset_encoding)?;
244263
245264 Some(Range::new(start, end))
246265 }
247266
267+ /// If the LS did not provide a range for the completion or the range of the
268+ /// primary cursor can not be used for the secondary cursor, this function
269+ /// can be used to find the completion range for a cursor
270+ fn find_completion_range(text: RopeSlice, replace_mode: bool, cursor: usize) -> (usize, usize) {
271+ let start = cursor
272+ - text
273+ .chars_at(cursor)
274+ .reversed()
275+ .take_while(|ch| chars::char_is_word(*ch))
276+ .count();
277+ let mut end = cursor;
278+ if replace_mode {
279+ end += text
280+ .chars_at(cursor)
281+ .skip(1)
282+ .take_while(|ch| chars::char_is_word(*ch))
283+ .count();
284+ }
285+ (start, end)
286+ }
287+ fn completion_range(
288+ text: RopeSlice,
289+ edit_offset: Option<(i128, i128)>,
290+ replace_mode: bool,
291+ cursor: usize,
292+ ) -> Option<(usize, usize)> {
293+ let res = match edit_offset {
294+ Some((start_offset, end_offset)) => {
295+ let start_offset = cursor as i128 + start_offset;
296+ if start_offset < 0 {
297+ return None;
298+ }
299+ let end_offset = cursor as i128 + end_offset;
300+ if end_offset > text.len_chars() as i128 {
301+ return None;
302+ }
303+ (start_offset as usize, end_offset as usize)
304+ }
305+ None => find_completion_range(text, replace_mode, cursor),
306+ };
307+ Some(res)
308+ }
309+
248310 /// Creates a [Transaction] from the [lsp::TextEdit] in a completion response.
249311 /// The transaction applies the edit to all cursors.
250312 pub fn generate_transaction_from_completion_edit(
251313 doc: &Rope,
252314 selection: &Selection,
253− edit: lsp::TextEdit,
254− offset_encoding: OffsetEncoding,
315+ edit_offset: Option<(i128, i128)>,
316+ replace_mode: bool,
317+ new_text: String,
255318 ) -> Transaction {
256− let replacement: Option<Tendril> = if edit.new_text.is_empty() {
319+ let replacement: Option<Tendril> = if new_text.is_empty() {
257320 None
258321 } else {
259− Some(edit.new_text.into())
322+ Some(new_text.into())
260323 };
261324
262325 let text = doc.slice(..);
263− let primary_cursor = selection.primary().cursor(text);
326+ let (removed_start, removed_end) = completion_range(
327+ text,
328+ edit_offset,
329+ replace_mode,
330+ selection.primary().cursor(text),
331+ )
332+ .expect("transaction must be valid for primary selection");
333+ let removed_text = text.slice(removed_start..removed_end);
264334
265− let start_offset = match lsp_pos_to_pos(doc, edit.range.start, offset_encoding) {
266− Some(start) => start as i128 - primary_cursor as i128,
267− None => return Transaction::new(doc),
268− };
269− let end_offset = match lsp_pos_to_pos(doc, edit.range.end, offset_encoding) {
270− Some(end) => end as i128 - primary_cursor as i128,
271− None => return Transaction::new(doc),
272− };
335+ let (transaction, mut selection) = Transaction::change_by_selection_ignore_overlapping(
336+ doc,
337+ selection,
338+ |range| {
339+ let cursor = range.cursor(text);
340+ completion_range(text, edit_offset, replace_mode, cursor)
341+ .filter(|(start, end)| text.slice(start..end) == removed_text)
342+ .unwrap_or_else(|| find_completion_range(text, replace_mode, cursor))
343+ },
344+ |_, _| replacement.clone(),
345+ );
346+ if transaction.changes().is_empty() {
347+ return transaction;
348+ }
349+ selection = selection.map(transaction.changes());
350+ transaction.with_selection(selection)
351+ }
352+
353+ /// Creates a [Transaction] from the [snippet::Snippet] in a completion response.
354+ /// The transaction applies the edit to all cursors.
355+ #[allow(clippy::too_many_arguments)]
356+ pub fn generate_transaction_from_snippet(
357+ doc: &Rope,
358+ selection: &Selection,
359+ edit_offset: Option<(i128, i128)>,
360+ replace_mode: bool,
361+ snippet: snippet::Snippet,
362+ line_ending: &str,
363+ include_placeholder: bool,
364+ tab_width: usize,
365+ indent_width: usize,
366+ ) -> Transaction {
367+ let text = doc.slice(..);
368+
369+ let mut off = 0i128;
370+ let mut mapped_doc = doc.clone();
371+ let mut selection_tabstops: SmallVec<[_; 1]> = SmallVec::new();
372+ let (removed_start, removed_end) = completion_range(
373+ text,
374+ edit_offset,
375+ replace_mode,
376+ selection.primary().cursor(text),
377+ )
378+ .expect("transaction must be valid for primary selection");
379+ let removed_text = text.slice(removed_start..removed_end);
380+
381+ let (transaction, mut selection) = Transaction::change_by_selection_ignore_overlapping(
382+ doc,
383+ selection,
384+ |range| {
385+ let cursor = range.cursor(text);
386+ completion_range(text, edit_offset, replace_mode, cursor)
387+ .filter(|(start, end)| text.slice(start..end) == removed_text)
388+ .unwrap_or_else(|| find_completion_range(text, replace_mode, cursor))
389+ },
390+ |replacement_start, replacement_end| {
391+ let mapped_replacement_start = (replacement_start as i128 + off) as usize;
392+ let mapped_replacement_end = (replacement_end as i128 + off) as usize;
393+
394+ let line_idx = mapped_doc.char_to_line(mapped_replacement_start);
395+ let indent_level = helix_core::indent::indent_level_for_line(
396+ mapped_doc.line(line_idx),
397+ tab_width,
398+ indent_width,
399+ ) * indent_width;
400+
401+ let newline_with_offset = format!(
402+ "{line_ending}{blank:indent_level$}",
403+ line_ending = line_ending,
404+ blank = ""
405+ );
406+
407+ let (replacement, tabstops) =
408+ snippet::render(&snippet, &newline_with_offset, include_placeholder);
409+ selection_tabstops.push((mapped_replacement_start, tabstops));
410+ mapped_doc.remove(mapped_replacement_start..mapped_replacement_end);
411+ mapped_doc.insert(mapped_replacement_start, &replacement);
412+ off +=
413+ replacement_start as i128 - replacement_end as i128 + replacement.len() as i128;
414+
415+ Some(replacement)
416+ },
417+ );
418+
419+ let changes = transaction.changes();
420+ if changes.is_empty() {
421+ return transaction;
422+ }
273423
274− Transaction::change_by_selection(doc, selection, |range| {
275− let cursor = range.cursor(text);
276− (
277− (cursor as i128 + start_offset) as usize,
278− (cursor as i128 + end_offset) as usize,
279− replacement.clone(),
280− )
281− })
424+ // Don't normalize to avoid merging/reording selections which would
425+ // break the association between tabstops and selections. Most ranges
426+ // will be replaced by tabstops anyways and the final selection will be
427+ // normalized anyways
428+ selection = selection.map_no_normalize(changes);
429+ let mut mapped_selection = SmallVec::with_capacity(selection.len());
430+ let mut mapped_primary_idx = 0;
431+ let primary_range = selection.primary();
432+ for (range, (tabstop_anchor, tabstops)) in selection.into_iter().zip(selection_tabstops) {
433+ if range == primary_range {
434+ mapped_primary_idx = mapped_selection.len()
435+ }
436+
437+ let tabstops = tabstops.first().filter(|tabstops| !tabstops.is_empty());
438+ let Some(tabstops) = tabstops else {
439+ // no tabstop normal mapping
440+ mapped_selection.push(range);
441+ continue;
442+ };
443+
444+ // expand the selection to cover the tabstop to retain the helix selection semantic
445+ // the tabstop closest to the range simply replaces `head` while anchor remains in place
446+ // the remaining tabstops receive their own single-width cursor
447+ if range.head < range.anchor {
448+ let last_idx = tabstops.len() - 1;
449+ let last_tabstop = tabstop_anchor + tabstops[last_idx].0;
450+
451+ // if selection is forward but was moved to the right it is
452+ // contained entirely in the replacement text, just do a point
453+ // selection (fallback below)
454+ if range.anchor > last_tabstop {
455+ let range = Range::new(range.anchor, last_tabstop);
456+ mapped_selection.push(range);
457+ let rem_tabstops = tabstops[..last_idx]
458+ .iter()
459+ .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
460+ mapped_selection.extend(rem_tabstops);
461+ continue;
462+ }
463+ } else {
464+ let first_tabstop = tabstop_anchor + tabstops[0].0;
465+
466+ // if selection is forward but was moved to the right it is
467+ // contained entirely in the replacement text, just do a point
468+ // selection (fallback below)
469+ if range.anchor < first_tabstop {
470+ // we can't properly compute the the next grapheme
471+ // here because the transaction hasn't been applied yet
472+ // that is not a problem because the range gets grapheme aligned anyway
473+ // tough so just adding one will always cause head to be grapheme
474+ // aligned correctly when applied to the document
475+ let range = Range::new(range.anchor, first_tabstop + 1);
476+ mapped_selection.push(range);
477+ let rem_tabstops = tabstops[1..]
478+ .iter()
479+ .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
480+ mapped_selection.extend(rem_tabstops);
481+ continue;
482+ }
483+ };
484+
485+ let tabstops = tabstops
486+ .iter()
487+ .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
488+ mapped_selection.extend(tabstops);
489+ }
490+
491+ transaction.with_selection(Selection::new(mapped_selection, mapped_primary_idx))
282492 }
283493
284494 pub fn generate_transaction_from_edits(
@@ -337,6 +547,8 @@ pub enum MethodCall {
337547 ApplyWorkspaceEdit(lsp::ApplyWorkspaceEditParams),
338548 WorkspaceFolders,
339549 WorkspaceConfiguration(lsp::ConfigurationParams),
550+ RegisterCapability(lsp::RegistrationParams),
551+ UnregisterCapability(lsp::UnregistrationParams),
340552}
341553
342554impl MethodCall {
@@ -356,6 +568,14 @@ impl MethodCall {
356568 let params: lsp::ConfigurationParams = params.parse()?;
357569 Self::WorkspaceConfiguration(params)
358570 }
571+ lsp::request::RegisterCapability::METHOD => {
572+ let params: lsp::RegistrationParams = params.parse()?;
573+ Self::RegisterCapability(params)
574+ }
575+ lsp::request::UnregisterCapability::METHOD => {
576+ let params: lsp::UnregistrationParams = params.parse()?;
577+ Self::UnregisterCapability(params)
578+ }
359579 _ => {
360580 return Err(Error::Unhandled);
361581 }
@@ -411,99 +631,162 @@ impl Notification {
411631
412632#[derive(Debug)]
413633pub struct Registry {
414− inner: HashMap<LanguageId, (usize, Arc<Client>)>,
415−
416− counter: AtomicUsize,
634+ inner: HashMap<LanguageServerName, Vec<Arc<Client>>>,
635+ syn_loader: Arc<helix_core::syntax::Loader>,
636+ counter: usize,
417637 pub incoming: SelectAll<UnboundedReceiverStream<(usize, Call)>>,
418−}
419−
420−impl Default for Registry {
421− fn default() -> Self {
422− Self::new()
423− }
638+ pub file_event_handler: file_event::Handler,
424639}
425640
426641impl Registry {
427− pub fn new() -> Self {
642+ pub fn new(syn_loader: Arc<helix_core::syntax::Loader>) -> Self {
428643 Self {
429644 inner: HashMap::new(),
430− counter: AtomicUsize::new(0),
645+ syn_loader,
646+ counter: 0,
431647 incoming: SelectAll::new(),
648+ file_event_handler: file_event::Handler::new(),
432649 }
433650 }
434651
435652 pub fn get_by_id(&self, id: usize) -> Option<&Client> {
436653 self.inner
437654 .values()
438− .find(|(client_id, _)| client_id == &id)
439− .map(|(_, client)| client.as_ref())
655+ .flatten()
656+ .find(|client| client.id() == id)
657+ .map(|client| &**client)
440658 }
441659
442660 pub fn remove_by_id(&mut self, id: usize) {
443− self.inner.retain(|_, (client_id, _)| client_id != &id)
661+ self.file_event_handler.remove_client(id);
662+ self.inner.retain(|_, language_servers| {
663+ language_servers.retain(|ls| id != ls.id());
664+ !language_servers.is_empty()
665+ });
666+ }
667+
668+ fn start_client(
669+ &mut self,
670+ name: String,
671+ ls_config: &LanguageConfiguration,
672+ doc_path: Option<&std::path::PathBuf>,
673+ root_dirs: &[PathBuf],
674+ enable_snippets: bool,
675+ ) -> Result<Arc<Client>> {
676+ let config = self
677+ .syn_loader
678+ .language_server_configs()
679+ .get(&name)
680+ .ok_or_else(|| anyhow::anyhow!("Language server '{name}' not defined"))?;
681+ let id = self.counter;
682+ self.counter += 1;
683+ let NewClient(client, incoming) = start_client(
684+ id,
685+ name,
686+ ls_config,
687+ config,
688+ doc_path,
689+ root_dirs,
690+ enable_snippets,
691+ )?;
692+ self.incoming.push(UnboundedReceiverStream::new(incoming));
693+ Ok(client)
444694 }
445695
696+ /// If this method is called, all documents that have a reference to language servers used by the language config have to refresh their language servers,
697+ /// as it could be that language servers of these documents were stopped by this method.
698+ /// See helix_view::editor::Editor::refresh_language_servers
446699 pub fn restart(
447700 &mut self,
448701 language_config: &LanguageConfiguration,
449702 doc_path: Option<&std::path::PathBuf>,
450− ) -> Result<Option<Arc<Client>>> {
451− let config = match &language_config.language_server {
452− Some(config) => config,
453− None => return Ok(None),
454− };
455−
456− let scope = language_config.scope.clone();
457−
458− match self.inner.entry(scope) {
459− Entry::Vacant(_) => Ok(None),
460− Entry::Occupied(mut entry) => {
461− // initialize a new client
462− let id = self.counter.fetch_add(1, Ordering::Relaxed);
463−
464− let NewClientResult(client, incoming) =
465− start_client(id, language_config, config, doc_path)?;
466− self.incoming.push(UnboundedReceiverStream::new(incoming));
467−
468− let (_, old_client) = entry.insert((id, client.clone()));
703+ root_dirs: &[PathBuf],
704+ enable_snippets: bool,
705+ ) -> Result<Vec<Arc<Client>>> {
706+ language_config
707+ .language_servers
708+ .iter()
709+ .filter_map(|LanguageServerFeatures { name, .. }| {
710+ if self.inner.contains_key(name) {
711+ let client = match self.start_client(
712+ name.clone(),
713+ language_config,
714+ doc_path,
715+ root_dirs,
716+ enable_snippets,
717+ ) {
718+ Ok(client) => client,
719+ error => return Some(error),
720+ };
721+ let old_clients = self
722+ .inner
723+ .insert(name.clone(), vec![client.clone()])
724+ .unwrap();
725+
726+ for old_client in old_clients {
727+ self.file_event_handler.remove_client(old_client.id());
728+ tokio::spawn(async move {
729+ let _ = old_client.force_shutdown().await;
730+ });
731+ }
732+
733+ Some(Ok(client))
734+ } else {
735+ None
736+ }
737+ })
738+ .collect()
739+ }
469740
741+ pub fn stop(&mut self, name: &str) {
742+ if let Some(clients) = self.inner.remove(name) {
743+ for client in clients {
744+ self.file_event_handler.remove_client(client.id());
470745 tokio::spawn(async move {
471− let _ = old_client.force_shutdown().await;
746+ let _ = client.force_shutdown().await;
472747 });
473−
474− Ok(Some(client))
475748 }
476749 }
477750 }
478751
479− pub fn get(
480− &mut self,
481− language_config: &LanguageConfiguration,
482− doc_path: Option<&std::path::PathBuf>,
483− ) -> Result<Option<Arc<Client>>> {
484− let config = match &language_config.language_server {
485− Some(config) => config,
486− None => return Ok(None),
487− };
488−
489− match self.inner.entry(language_config.scope.clone()) {
490− Entry::Occupied(entry) => Ok(Some(entry.get().1.clone())),
491− Entry::Vacant(entry) => {
492− // initialize a new client
493− let id = self.counter.fetch_add(1, Ordering::Relaxed);
494−
495− let NewClientResult(client, incoming) =
496− start_client(id, language_config, config, doc_path)?;
497− self.incoming.push(UnboundedReceiverStream::new(incoming));
498−
499− entry.insert((id, client.clone()));
500− Ok(Some(client))
501− }
502− }
752+ pub fn get<'a>(
753+ &'a mut self,
754+ language_config: &'a LanguageConfiguration,
755+ doc_path: Option<&'a std::path::PathBuf>,
756+ root_dirs: &'a [PathBuf],
757+ enable_snippets: bool,
758+ ) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {
759+ language_config.language_servers.iter().map(
760+ move |LanguageServerFeatures { name, .. }| {
761+ if let Some(clients) = self.inner.get(name) {
762+ if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
763+ client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
764+ }) {
765+ return (name.to_owned(), Ok(client.clone()));
766+ }
767+ }
768+ match self.start_client(
769+ name.clone(),
770+ language_config,
771+ doc_path,
772+ root_dirs,
773+ enable_snippets,
774+ ) {
775+ Ok(client) => {
776+ self.inner
777+ .entry(name.to_owned())
778+ .or_default()
779+ .push(client.clone());
780+ (name.clone(), Ok(client))
781+ }
782+ Err(err) => (name.to_owned(), Err(err)),
783+ }
784+ },
785+ )
503786 }
504787
505788 pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
506− self.inner.values().map(|(_, client)| client)
789+ self.inner.values().flatten()
507790 }
508791}
509792
@@ -585,23 +868,28 @@ impl LspProgressMap {
585868 }
586869}
587870
588−struct NewClientResult(Arc<Client>, UnboundedReceiver<(usize, Call)>);
871+struct NewClient(Arc<Client>, UnboundedReceiver<(usize, Call)>);
589872
590873/// start_client takes both a LanguageConfiguration and a LanguageServerConfiguration to ensure that
591874/// it is only called when it makes sense.
592875fn start_client(
593876 id: usize,
877+ name: String,
594878 config: &LanguageConfiguration,
595879 ls_config: &LanguageServerConfiguration,
596880 doc_path: Option<&std::path::PathBuf>,
597−) -> Result<NewClientResult> {
881+ root_dirs: &[PathBuf],
882+ enable_snippets: bool,
883+) -> Result<NewClient> {
598884 let (client, incoming, initialize_notify) = Client::start(
599885 &ls_config.command,
600886 &ls_config.args,
601− config.config.clone(),
887+ ls_config.config.clone(),
602888 ls_config.environment.clone(),
603889 &config.roots,
890+ config.workspace_lsp_roots.as_deref().unwrap_or(root_dirs),
604891 id,
892+ name,
605893 ls_config.timeout,
606894 doc_path,
607895 )?;
@@ -616,7 +904,7 @@ fn start_client(
616904 .capabilities
617905 .get_or_try_init(|| {
618906 _client
619− .initialize()
907+ .initialize(enable_snippets)
620908 .map_ok(|response| response.capabilities)
621909 })
622910 .await;
@@ -635,7 +923,66 @@ fn start_client(
635923 initialize_notify.notify_one();
636924 });
637925
638− Ok(NewClientResult(client, incoming))
926+ Ok(NewClient(client, incoming))
927+}
928+
929+/// Find an LSP workspace of a file using the following mechanism:
930+/// * if the file is outside `workspace` return `None`
931+/// * start at `file` and search the file tree upward
932+/// * stop the search at the first `root_dirs` entry that contains `file`
933+/// * if no `root_dirs` matches `file` stop at workspace
934+/// * Returns the top most directory that contains a `root_marker`
935+/// * If no root marker and we stopped at a `root_dirs` entry, return the directory we stopped at
936+/// * If we stopped at `workspace` instead and `workspace_is_cwd == false` return `None`
937+/// * If we stopped at `workspace` instead and `workspace_is_cwd == true` return `workspace`
938+pub fn find_lsp_workspace(
939+ file: &str,
940+ root_markers: &[String],
941+ root_dirs: &[PathBuf],
942+ workspace: &Path,
943+ workspace_is_cwd: bool,
944+) -> Option<PathBuf> {
945+ let file = std::path::Path::new(file);
946+ let mut file = if file.is_absolute() {
947+ file.to_path_buf()
948+ } else {
949+ let current_dir = helix_loader::current_working_dir();
950+ current_dir.join(file)
951+ };
952+ file = path::get_normalized_path(&file);
953+
954+ if !file.starts_with(workspace) {
955+ return None;
956+ }
957+
958+ let mut top_marker = None;
959+ for ancestor in file.ancestors() {
960+ if root_markers
961+ .iter()
962+ .any(|marker| ancestor.join(marker).exists())
963+ {
964+ top_marker = Some(ancestor);
965+ }
966+
967+ if root_dirs
968+ .iter()
969+ .any(|root_dir| path::get_normalized_path(&workspace.join(root_dir)) == ancestor)
970+ {
971+ // if the worskapce is the cwd do not search any higher for workspaces
972+ // but specify
973+ return Some(top_marker.unwrap_or(workspace).to_owned());
974+ }
975+ if ancestor == workspace {
976+ // if the workspace is the CWD, let the LSP decide what the workspace
977+ // is
978+ return top_marker
979+ .or_else(|| (!workspace_is_cwd).then_some(workspace))
980+ .map(Path::to_owned);
981+ }
982+ }
983+
984+ debug_assert!(false, "workspace must be an ancestor of <file>");
985+ None
639986}
640987
641988#[cfg(test)]
@@ -656,16 +1003,16 @@ mod tests {
6561003
6571004 test_case!("", (0, 0) => Some(0));
6581005 test_case!("", (0, 1) => Some(0));
659− test_case!("", (1, 0) => None);
1006+ test_case!("", (1, 0) => Some(0));
6601007 test_case!("\n\n", (0, 0) => Some(0));
6611008 test_case!("\n\n", (1, 0) => Some(1));
6621009 test_case!("\n\n", (1, 1) => Some(1));
6631010 test_case!("\n\n", (2, 0) => Some(2));
664− test_case!("\n\n", (3, 0) => None);
1011+ test_case!("\n\n", (3, 0) => Some(2));
6651012 test_case!("test\n\n\n\ncase", (4, 3) => Some(11));
6661013 test_case!("test\n\n\n\ncase", (4, 4) => Some(12));
6671014 test_case!("test\n\n\n\ncase", (4, 5) => Some(12));
668− test_case!("", (u32::MAX, u32::MAX) => None);
1015+ test_case!("", (u32::MAX, u32::MAX) => Some(0));
6691016 }
6701017
6711018 #[test]
helix-lsp/src/snippet.rsnew file+1010
@@ -0,0 +1,1010 @@
1+use std::borrow::Cow;
2+
3+use anyhow::{anyhow, Result};
4+use helix_core::{smallvec, SmallVec, Tendril};
5+
6+#[derive(Debug, PartialEq, Eq)]
7+pub enum CaseChange {
8+ Upcase,
9+ Downcase,
10+ Capitalize,
11+}
12+
13+#[derive(Debug, PartialEq, Eq)]
14+pub enum FormatItem {
15+ Text(Tendril),
16+ Capture(usize),
17+ CaseChange(usize, CaseChange),
18+ Conditional(usize, Option<Tendril>, Option<Tendril>),
19+}
20+
21+#[derive(Debug, PartialEq, Eq)]
22+pub struct Regex {
23+ value: Tendril,
24+ replacement: Vec<FormatItem>,
25+ options: Tendril,
26+}
27+
28+#[derive(Debug, PartialEq, Eq)]
29+pub enum SnippetElement<'a> {
30+ Tabstop {
31+ tabstop: usize,
32+ },
33+ Placeholder {
34+ tabstop: usize,
35+ value: Vec<SnippetElement<'a>>,
36+ },
37+ Choice {
38+ tabstop: usize,
39+ choices: Vec<Tendril>,
40+ },
41+ Variable {
42+ name: &'a str,
43+ default: Option<Vec<SnippetElement<'a>>>,
44+ regex: Option<Regex>,
45+ },
46+ Text(Tendril),
47+}
48+
49+#[derive(Debug, PartialEq, Eq)]
50+pub struct Snippet<'a> {
51+ elements: Vec<SnippetElement<'a>>,
52+}
53+
54+pub fn parse(s: &str) -> Result<Snippet<'_>> {
55+ parser::parse(s).map_err(|rest| anyhow!("Failed to parse snippet. Remaining input: {}", rest))
56+}
57+
58+fn render_elements(
59+ snippet_elements: &[SnippetElement<'_>],
60+ insert: &mut Tendril,
61+ offset: &mut usize,
62+ tabstops: &mut Vec<(usize, (usize, usize))>,
63+ newline_with_offset: &str,
64+ include_placeholder: bool,
65+) {
66+ use SnippetElement::*;
67+
68+ for element in snippet_elements {
69+ match element {
70+ Text(text) => {
71+ // small optimization to avoid calling replace when it's unnecessary
72+ let text = if text.contains('\n') {
73+ Cow::Owned(text.replace('\n', newline_with_offset))
74+ } else {
75+ Cow::Borrowed(text.as_str())
76+ };
77+ *offset += text.chars().count();
78+ insert.push_str(&text);
79+ }
80+ Variable {
81+ name: _,
82+ regex: _,
83+ r#default,
84+ } => {
85+ // TODO: variables. For now, fall back to the default, which defaults to "".
86+ render_elements(
87+ r#default.as_deref().unwrap_or_default(),
88+ insert,
89+ offset,
90+ tabstops,
91+ newline_with_offset,
92+ include_placeholder,
93+ );
94+ }
95+ &Tabstop { tabstop } => {
96+ tabstops.push((tabstop, (*offset, *offset)));
97+ }
98+ Placeholder {
99+ tabstop,
100+ value: inner_snippet_elements,
101+ } => {
102+ let start_offset = *offset;
103+ if include_placeholder {
104+ render_elements(
105+ inner_snippet_elements,
106+ insert,
107+ offset,
108+ tabstops,
109+ newline_with_offset,
110+ include_placeholder,
111+ );
112+ }
113+ tabstops.push((*tabstop, (start_offset, *offset)));
114+ }
115+ &Choice {
116+ tabstop,
117+ choices: _,
118+ } => {
119+ // TODO: choices
120+ tabstops.push((tabstop, (*offset, *offset)));
121+ }
122+ }
123+ }
124+}
125+
126+#[allow(clippy::type_complexity)] // only used one time
127+pub fn render(
128+ snippet: &Snippet<'_>,
129+ newline_with_offset: &str,
130+ include_placeholder: bool,
131+) -> (Tendril, Vec<SmallVec<[(usize, usize); 1]>>) {
132+ let mut insert = Tendril::new();
133+ let mut tabstops = Vec::new();
134+ let mut offset = 0;
135+
136+ render_elements(
137+ &snippet.elements,
138+ &mut insert,
139+ &mut offset,
140+ &mut tabstops,
141+ newline_with_offset,
142+ include_placeholder,
143+ );
144+
145+ // sort in ascending order (except for 0, which should always be the last one (per lsp doc))
146+ tabstops.sort_unstable_by_key(|(n, _)| if *n == 0 { usize::MAX } else { *n });
147+
148+ // merge tabstops with the same index (we take advantage of the fact that we just sorted them
149+ // above to simply look backwards)
150+ let mut ntabstops = Vec::<SmallVec<[(usize, usize); 1]>>::new();
151+ {
152+ let mut prev = None;
153+ for (tabstop, r) in tabstops {
154+ if prev == Some(tabstop) {
155+ let len_1 = ntabstops.len() - 1;
156+ ntabstops[len_1].push(r);
157+ } else {
158+ prev = Some(tabstop);
159+ ntabstops.push(smallvec![r]);
160+ }
161+ }
162+ }
163+
164+ (insert, ntabstops)
165+}
166+
167+mod parser {
168+ use helix_core::Tendril;
169+ use helix_parsec::*;
170+
171+ use super::{CaseChange, FormatItem, Regex, Snippet, SnippetElement};
172+
173+ /*
174+ https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#snippet_syntax
175+
176+ any ::= tabstop | placeholder | choice | variable | text
177+ tabstop ::= '$' int | '${' int '}'
178+ placeholder ::= '${' int ':' any '}'
179+ choice ::= '${' int '|' text (',' text)* '|}'
180+ variable ::= '$' var | '${' var }'
181+ | '${' var ':' any '}'
182+ | '${' var '/' regex '/' (format | text)+ '/' options '}'
183+ format ::= '$' int | '${' int '}'
184+ | '${' int ':' '/upcase' | '/downcase' | '/capitalize' '}'
185+ | '${' int ':+' if '}'
186+ | '${' int ':?' if ':' else '}'
187+ | '${' int ':-' else '}' | '${' int ':' else '}'
188+ regex ::= Regular Expression value (ctor-string)
189+ options ::= Regular Expression option (ctor-options)
190+ var ::= [_a-zA-Z] [_a-zA-Z0-9]*
191+ int ::= [0-9]+
192+ text ::= .*
193+ if ::= text
194+ else ::= text
195+ */
196+
197+ fn var<'a>() -> impl Parser<'a, Output = &'a str> {
198+ // var = [_a-zA-Z][_a-zA-Z0-9]*
199+ move |input: &'a str| {
200+ input
201+ .char_indices()
202+ .take_while(|(p, c)| {
203+ *c == '_'
204+ || if *p == 0 {
205+ c.is_ascii_alphabetic()
206+ } else {
207+ c.is_ascii_alphanumeric()
208+ }
209+ })
210+ .last()
211+ .map(|(index, c)| {
212+ let index = index + c.len_utf8();
213+ (&input[index..], &input[0..index])
214+ })
215+ .ok_or(input)
216+ }
217+ }
218+
219+ const TEXT_ESCAPE_CHARS: &[char] = &['\\', '}', '$'];
220+ const CHOICE_TEXT_ESCAPE_CHARS: &[char] = &['\\', '|', ','];
221+
222+ fn text<'a>(
223+ escape_chars: &'static [char],
224+ term_chars: &'static [char],
225+ ) -> impl Parser<'a, Output = Tendril> {
226+ move |input: &'a str| {
227+ let mut chars = input.char_indices().peekable();
228+ let mut res = Tendril::new();
229+ while let Some((i, c)) = chars.next() {
230+ match c {
231+ '\\' => {
232+ if let Some(&(_, c)) = chars.peek() {
233+ if escape_chars.contains(&c) {
234+ chars.next();
235+ res.push(c);
236+ continue;
237+ }
238+ }
239+ res.push('\\');
240+ }
241+ c if term_chars.contains(&c) => return Ok((&input[i..], res)),
242+ c => res.push(c),
243+ }
244+ }
245+
246+ Ok(("", res))
247+ }
248+ }
249+
250+ fn digit<'a>() -> impl Parser<'a, Output = usize> {
251+ filter_map(take_while(|c| c.is_ascii_digit()), |s| s.parse().ok())
252+ }
253+
254+ fn case_change<'a>() -> impl Parser<'a, Output = CaseChange> {
255+ use CaseChange::*;
256+
257+ choice!(
258+ map("upcase", |_| Upcase),
259+ map("downcase", |_| Downcase),
260+ map("capitalize", |_| Capitalize),
261+ )
262+ }
263+
264+ fn format<'a>() -> impl Parser<'a, Output = FormatItem> {
265+ use FormatItem::*;
266+
267+ choice!(
268+ // '$' int
269+ map(right("$", digit()), Capture),
270+ // '${' int '}'
271+ map(seq!("${", digit(), "}"), |seq| Capture(seq.1)),
272+ // '${' int ':' '/upcase' | '/downcase' | '/capitalize' '}'
273+ map(seq!("${", digit(), ":/", case_change(), "}"), |seq| {
274+ CaseChange(seq.1, seq.3)
275+ }),
276+ // '${' int ':+' if '}'
277+ map(
278+ seq!("${", digit(), ":+", text(TEXT_ESCAPE_CHARS, &['}']), "}"),
279+ |seq| { Conditional(seq.1, Some(seq.3), None) }
280+ ),
281+ // '${' int ':?' if ':' else '}'
282+ map(
283+ seq!(
284+ "${",
285+ digit(),
286+ ":?",
287+ text(TEXT_ESCAPE_CHARS, &[':']),
288+ ":",
289+ text(TEXT_ESCAPE_CHARS, &['}']),
290+ "}"
291+ ),
292+ |seq| { Conditional(seq.1, Some(seq.3), Some(seq.5)) }
293+ ),
294+ // '${' int ':-' else '}' | '${' int ':' else '}'
295+ map(
296+ seq!(
297+ "${",
298+ digit(),
299+ ":",
300+ optional("-"),
301+ text(TEXT_ESCAPE_CHARS, &['}']),
302+ "}"
303+ ),
304+ |seq| { Conditional(seq.1, None, Some(seq.4)) }
305+ ),
306+ )
307+ }
308+
309+ fn regex<'a>() -> impl Parser<'a, Output = Regex> {
310+ map(
311+ seq!(
312+ "/",
313+ // TODO parse as ECMAScript and convert to rust regex
314+ text(&['/'], &['/']),
315+ "/",
316+ zero_or_more(choice!(
317+ format(),
318+ // text doesn't parse $, if format fails we just accept the $ as text
319+ map("$", |_| FormatItem::Text("$".into())),
320+ map(text(&['\\', '/'], &['/', '$']), FormatItem::Text),
321+ )),
322+ "/",
323+ // vscode really doesn't allow escaping } here
324+ // so it's impossible to write a regex escape containing a }
325+ // we can consider deviating here and allowing the escape
326+ text(&[], &['}']),
327+ ),
328+ |(_, value, _, replacement, _, options)| Regex {
329+ value,
330+ replacement,
331+ options,
332+ },
333+ )
334+ }
335+
336+ fn tabstop<'a>() -> impl Parser<'a, Output = SnippetElement<'a>> {
337+ map(
338+ or(
339+ right("$", digit()),
340+ map(seq!("${", digit(), "}"), |values| values.1),
341+ ),
342+ |digit| SnippetElement::Tabstop { tabstop: digit },
343+ )
344+ }
345+
346+ fn placeholder<'a>() -> impl Parser<'a, Output = SnippetElement<'a>> {
347+ map(
348+ seq!(
349+ "${",
350+ digit(),
351+ ":",
352+ // according to the grammar there is just a single anything here.
353+ // However in the prose it is explained that placeholders can be nested.
354+ // The example there contains both a placeholder text and a nested placeholder
355+ // which indicates a list. Looking at the VSCode sourcecode, the placeholder
356+ // is indeed parsed as zero_or_more so the grammar is simply incorrect here
357+ zero_or_more(anything(TEXT_ESCAPE_CHARS, true)),
358+ "}"
359+ ),
360+ |seq| SnippetElement::Placeholder {
361+ tabstop: seq.1,
362+ value: seq.3,
363+ },
364+ )
365+ }
366+
367+ fn choice<'a>() -> impl Parser<'a, Output = SnippetElement<'a>> {
368+ map(
369+ seq!(
370+ "${",
371+ digit(),
372+ "|",
373+ sep(text(CHOICE_TEXT_ESCAPE_CHARS, &['|', ',']), ","),
374+ "|}",
375+ ),
376+ |seq| SnippetElement::Choice {
377+ tabstop: seq.1,
378+ choices: seq.3,
379+ },
380+ )
381+ }
382+
383+ fn variable<'a>() -> impl Parser<'a, Output = SnippetElement<'a>> {
384+ choice!(
385+ // $var
386+ map(right("$", var()), |name| SnippetElement::Variable {
387+ name,
388+ default: None,
389+ regex: None,
390+ }),
391+ // ${var}
392+ map(seq!("${", var(), "}",), |values| SnippetElement::Variable {
393+ name: values.1,
394+ default: None,
395+ regex: None,
396+ }),
397+ // ${var:default}
398+ map(
399+ seq!(
400+ "${",
401+ var(),
402+ ":",
403+ zero_or_more(anything(TEXT_ESCAPE_CHARS, true)),
404+ "}",
405+ ),
406+ |values| SnippetElement::Variable {
407+ name: values.1,
408+ default: Some(values.3),
409+ regex: None,
410+ }
411+ ),
412+ // ${var/value/format/options}
413+ map(seq!("${", var(), regex(), "}"), |values| {
414+ SnippetElement::Variable {
415+ name: values.1,
416+ default: None,
417+ regex: Some(values.2),
418+ }
419+ }),
420+ )
421+ }
422+
423+ fn anything<'a>(
424+ escape_chars: &'static [char],
425+ end_at_brace: bool,
426+ ) -> impl Parser<'a, Output = SnippetElement<'a>> {
427+ let term_chars: &[_] = if end_at_brace { &['$', '}'] } else { &['$'] };
428+ move |input: &'a str| {
429+ let parser = choice!(
430+ tabstop(),
431+ placeholder(),
432+ choice(),
433+ variable(),
434+ map("$", |_| SnippetElement::Text("$".into())),
435+ map(text(escape_chars, term_chars), SnippetElement::Text),
436+ );
437+ parser.parse(input)
438+ }
439+ }
440+
441+ fn snippet<'a>() -> impl Parser<'a, Output = Snippet<'a>> {
442+ map(one_or_more(anything(TEXT_ESCAPE_CHARS, false)), |parts| {
443+ Snippet { elements: parts }
444+ })
445+ }
446+
447+ pub fn parse(s: &str) -> Result<Snippet, &str> {
448+ snippet().parse(s).and_then(|(remainder, snippet)| {
449+ if remainder.is_empty() {
450+ Ok(snippet)
451+ } else {
452+ Err(remainder)
453+ }
454+ })
455+ }
456+
457+ #[cfg(test)]
458+ mod test {
459+ use super::SnippetElement::*;
460+ use super::*;
461+
462+ #[test]
463+ fn empty_string_is_error() {
464+ assert_eq!(Err(""), parse(""));
465+ }
466+
467+ #[test]
468+ fn parse_placeholders_in_function_call() {
469+ assert_eq!(
470+ Ok(Snippet {
471+ elements: vec![
472+ Text("match(".into()),
473+ Placeholder {
474+ tabstop: 1,
475+ value: vec!(Text("Arg1".into())),
476+ },
477+ Text(")".into())
478+ ]
479+ }),
480+ parse("match(${1:Arg1})")
481+ )
482+ }
483+
484+ #[test]
485+ fn unterminated_placeholder() {
486+ assert_eq!(
487+ Ok(Snippet {
488+ elements: vec![Text("match(".into()), Text("$".into()), Text("{1:)".into())]
489+ }),
490+ parse("match(${1:)")
491+ )
492+ }
493+
494+ #[test]
495+ fn parse_empty_placeholder() {
496+ assert_eq!(
497+ Ok(Snippet {
498+ elements: vec![
499+ Text("match(".into()),
500+ Placeholder {
501+ tabstop: 1,
502+ value: vec![],
503+ },
504+ Text(")".into())
505+ ]
506+ }),
507+ parse("match(${1:})")
508+ )
509+ }
510+
511+ #[test]
512+ fn parse_placeholders_in_statement() {
513+ assert_eq!(
514+ Ok(Snippet {
515+ elements: vec![
516+ Text("local ".into()),
517+ Placeholder {
518+ tabstop: 1,
519+ value: vec!(Text("var".into())),
520+ },
521+ Text(" = ".into()),
522+ Placeholder {
523+ tabstop: 1,
524+ value: vec!(Text("value".into())),
525+ },
526+ ]
527+ }),
528+ parse("local ${1:var} = ${1:value}")
529+ )
530+ }
531+
532+ #[test]
533+ fn parse_tabstop_nested_in_placeholder() {
534+ assert_eq!(
535+ Ok(Snippet {
536+ elements: vec![Placeholder {
537+ tabstop: 1,
538+ value: vec!(Text("var, ".into()), Tabstop { tabstop: 2 },),
539+ },]
540+ }),
541+ parse("${1:var, $2}")
542+ )
543+ }
544+
545+ #[test]
546+ fn parse_placeholder_nested_in_placeholder() {
547+ assert_eq!(
548+ Ok(Snippet {
549+ elements: vec![Placeholder {
550+ tabstop: 1,
551+ value: vec!(
552+ Text("foo ".into()),
553+ Placeholder {
554+ tabstop: 2,
555+ value: vec!(Text("bar".into())),
556+ },
557+ ),
558+ },]
559+ }),
560+ parse("${1:foo ${2:bar}}")
561+ )
562+ }
563+
564+ #[test]
565+ fn parse_all() {
566+ assert_eq!(
567+ Ok(Snippet {
568+ elements: vec![
569+ Text("hello ".into()),
570+ Tabstop { tabstop: 1 },
571+ Tabstop { tabstop: 2 },
572+ Text(" ".into()),
573+ Choice {
574+ tabstop: 1,
575+ choices: vec!["one".into(), "two".into(), "three".into()]
576+ },
577+ Text(" ".into()),
578+ Variable {
579+ name: "name",
580+ default: Some(vec![Text("foo".into())]),
581+ regex: None
582+ },
583+ Text(" ".into()),
584+ Variable {
585+ name: "var",
586+ default: None,
587+ regex: None
588+ },
589+ Text(" ".into()),
590+ Variable {
591+ name: "TM",
592+ default: None,
593+ regex: None
594+ },
595+ ]
596+ }),
597+ parse("hello $1${2} ${1|one,two,three|} ${name:foo} $var $TM")
598+ );
599+ }
600+
601+ #[test]
602+ fn regex_capture_replace() {
603+ assert_eq!(
604+ Ok(Snippet {
605+ elements: vec![Variable {
606+ name: "TM_FILENAME",
607+ default: None,
608+ regex: Some(Regex {
609+ value: "(.*).+$".into(),
610+ replacement: vec![FormatItem::Capture(1), FormatItem::Text("$".into())],
611+ options: Tendril::new(),
612+ }),
613+ }]
614+ }),
615+ parse("${TM_FILENAME/(.*).+$/$1$/}")
616+ );
617+ }
618+
619+ #[test]
620+ fn rust_macro() {
621+ assert_eq!(
622+ Ok(Snippet {
623+ elements: vec![
624+ Text("macro_rules! ".into()),
625+ Tabstop { tabstop: 1 },
626+ Text(" {\n (".into()),
627+ Tabstop { tabstop: 2 },
628+ Text(") => {\n ".into()),
629+ Tabstop { tabstop: 0 },
630+ Text("\n };\n}".into())
631+ ]
632+ }),
633+ parse("macro_rules! $1 {\n ($2) => {\n $0\n };\n}")
634+ );
635+ }
636+
637+ fn assert_text(snippet: &str, parsed_text: &str) {
638+ let res = parse(snippet).unwrap();
639+ let text = crate::snippet::render(&res, "\n", true).0;
640+ assert_eq!(text, parsed_text)
641+ }
642+
643+ #[test]
644+ fn robust_parsing() {
645+ assert_text("$", "$");
646+ assert_text("\\\\$", "\\$");
647+ assert_text("{", "{");
648+ assert_text("\\}", "}");
649+ assert_text("\\abc", "\\abc");
650+ assert_text("foo${f:\\}}bar", "foo}bar");
651+ assert_text("\\{", "\\{");
652+ assert_text("I need \\\\\\$", "I need \\$");
653+ assert_text("\\", "\\");
654+ assert_text("\\{{", "\\{{");
655+ assert_text("{{", "{{");
656+ assert_text("{{dd", "{{dd");
657+ assert_text("}}", "}}");
658+ assert_text("ff}}", "ff}}");
659+ assert_text("farboo", "farboo");
660+ assert_text("far{{}}boo", "far{{}}boo");
661+ assert_text("far{{123}}boo", "far{{123}}boo");
662+ assert_text("far\\{{123}}boo", "far\\{{123}}boo");
663+ assert_text("far{{id:bern}}boo", "far{{id:bern}}boo");
664+ assert_text("far{{id:bern {{basel}}}}boo", "far{{id:bern {{basel}}}}boo");
665+ assert_text(
666+ "far{{id:bern {{id:basel}}}}boo",
667+ "far{{id:bern {{id:basel}}}}boo",
668+ );
669+ assert_text(
670+ "far{{id:bern {{id2:basel}}}}boo",
671+ "far{{id:bern {{id2:basel}}}}boo",
672+ );
673+ assert_text("${}$\\a\\$\\}\\\\", "${}$\\a$}\\");
674+ assert_text("farboo", "farboo");
675+ assert_text("far{{}}boo", "far{{}}boo");
676+ assert_text("far{{123}}boo", "far{{123}}boo");
677+ assert_text("far\\{{123}}boo", "far\\{{123}}boo");
678+ assert_text("far`123`boo", "far`123`boo");
679+ assert_text("far\\`123\\`boo", "far\\`123\\`boo");
680+ assert_text("\\$far-boo", "$far-boo");
681+ }
682+
683+ fn assert_snippet(snippet: &str, expect: &[SnippetElement]) {
684+ let parsed_snippet = parse(snippet).unwrap();
685+ assert_eq!(parsed_snippet.elements, expect.to_owned())
686+ }
687+
688+ #[test]
689+ fn parse_variable() {
690+ use SnippetElement::*;
691+ assert_snippet(
692+ "$far-boo",
693+ &[
694+ Variable {
695+ name: "far",
696+ default: None,
697+ regex: None,
698+ },
699+ Text("-boo".into()),
700+ ],
701+ );
702+ assert_snippet(
703+ "far$farboo",
704+ &[
705+ Text("far".into()),
706+ Variable {
707+ name: "farboo",
708+ regex: None,
709+ default: None,
710+ },
711+ ],
712+ );
713+ assert_snippet(
714+ "far${farboo}",
715+ &[
716+ Text("far".into()),
717+ Variable {
718+ name: "farboo",
719+ regex: None,
720+ default: None,
721+ },
722+ ],
723+ );
724+ assert_snippet("$123", &[Tabstop { tabstop: 123 }]);
725+ assert_snippet(
726+ "$farboo",
727+ &[Variable {
728+ name: "farboo",
729+ regex: None,
730+ default: None,
731+ }],
732+ );
733+ assert_snippet(
734+ "$far12boo",
735+ &[Variable {
736+ name: "far12boo",
737+ regex: None,
738+ default: None,
739+ }],
740+ );
741+ assert_snippet(
742+ "000_${far}_000",
743+ &[
744+ Text("000_".into()),
745+ Variable {
746+ name: "far",
747+ regex: None,
748+ default: None,
749+ },
750+ Text("_000".into()),
751+ ],
752+ );
753+ }
754+
755+ #[test]
756+ fn parse_variable_transform() {
757+ assert_snippet(
758+ "${foo///}",
759+ &[Variable {
760+ name: "foo",
761+ regex: Some(Regex {
762+ value: Tendril::new(),
763+ replacement: Vec::new(),
764+ options: Tendril::new(),
765+ }),
766+ default: None,
767+ }],
768+ );
769+ assert_snippet(
770+ "${foo/regex/format/gmi}",
771+ &[Variable {
772+ name: "foo",
773+ regex: Some(Regex {
774+ value: "regex".into(),
775+ replacement: vec![FormatItem::Text("format".into())],
776+ options: "gmi".into(),
777+ }),
778+ default: None,
779+ }],
780+ );
781+ assert_snippet(
782+ "${foo/([A-Z][a-z])/format/}",
783+ &[Variable {
784+ name: "foo",
785+ regex: Some(Regex {
786+ value: "([A-Z][a-z])".into(),
787+ replacement: vec![FormatItem::Text("format".into())],
788+ options: Tendril::new(),
789+ }),
790+ default: None,
791+ }],
792+ );
793+
794+ // invalid regex TODO: reneable tests once we actually parse this regex flavour
795+ // assert_text(
796+ // "${foo/([A-Z][a-z])/format/GMI}",
797+ // "${foo/([A-Z][a-z])/format/GMI}",
798+ // );
799+ // assert_text(
800+ // "${foo/([A-Z][a-z])/format/funky}",
801+ // "${foo/([A-Z][a-z])/format/funky}",
802+ // );
803+ // assert_text("${foo/([A-Z][a-z]/format/}", "${foo/([A-Z][a-z]/format/}");
804+ assert_text(
805+ "${foo/regex\\/format/options}",
806+ "${foo/regex\\/format/options}",
807+ );
808+
809+ // tricky regex
810+ assert_snippet(
811+ "${foo/m\\/atch/$1/i}",
812+ &[Variable {
813+ name: "foo",
814+ regex: Some(Regex {
815+ value: "m/atch".into(),
816+ replacement: vec![FormatItem::Capture(1)],
817+ options: "i".into(),
818+ }),
819+ default: None,
820+ }],
821+ );
822+
823+ // incomplete
824+ assert_text("${foo///", "${foo///");
825+ assert_text("${foo/regex/format/options", "${foo/regex/format/options");
826+
827+ // format string
828+ assert_snippet(
829+ "${foo/.*/${0:fooo}/i}",
830+ &[Variable {
831+ name: "foo",
832+ regex: Some(Regex {
833+ value: ".*".into(),
834+ replacement: vec![FormatItem::Conditional(0, None, Some("fooo".into()))],
835+ options: "i".into(),
836+ }),
837+ default: None,
838+ }],
839+ );
840+ assert_snippet(
841+ "${foo/.*/${1}/i}",
842+ &[Variable {
843+ name: "foo",
844+ regex: Some(Regex {
845+ value: ".*".into(),
846+ replacement: vec![FormatItem::Capture(1)],
847+ options: "i".into(),
848+ }),
849+ default: None,
850+ }],
851+ );
852+ assert_snippet(
853+ "${foo/.*/$1/i}",
854+ &[Variable {
855+ name: "foo",
856+ regex: Some(Regex {
857+ value: ".*".into(),
858+ replacement: vec![FormatItem::Capture(1)],
859+ options: "i".into(),
860+ }),
861+ default: None,
862+ }],
863+ );
864+ assert_snippet(
865+ "${foo/.*/This-$1-encloses/i}",
866+ &[Variable {
867+ name: "foo",
868+ regex: Some(Regex {
869+ value: ".*".into(),
870+ replacement: vec![
871+ FormatItem::Text("This-".into()),
872+ FormatItem::Capture(1),
873+ FormatItem::Text("-encloses".into()),
874+ ],
875+ options: "i".into(),
876+ }),
877+ default: None,
878+ }],
879+ );
880+ assert_snippet(
881+ "${foo/.*/complex${1:else}/i}",
882+ &[Variable {
883+ name: "foo",
884+ regex: Some(Regex {
885+ value: ".*".into(),
886+ replacement: vec![
887+ FormatItem::Text("complex".into()),
888+ FormatItem::Conditional(1, None, Some("else".into())),
889+ ],
890+ options: "i".into(),
891+ }),
892+ default: None,
893+ }],
894+ );
895+ assert_snippet(
896+ "${foo/.*/complex${1:-else}/i}",
897+ &[Variable {
898+ name: "foo",
899+ regex: Some(Regex {
900+ value: ".*".into(),
901+ replacement: vec![
902+ FormatItem::Text("complex".into()),
903+ FormatItem::Conditional(1, None, Some("else".into())),
904+ ],
905+ options: "i".into(),
906+ }),
907+ default: None,
908+ }],
909+ );
910+ assert_snippet(
911+ "${foo/.*/complex${1:+if}/i}",
912+ &[Variable {
913+ name: "foo",
914+ regex: Some(Regex {
915+ value: ".*".into(),
916+ replacement: vec![
917+ FormatItem::Text("complex".into()),
918+ FormatItem::Conditional(1, Some("if".into()), None),
919+ ],
920+ options: "i".into(),
921+ }),
922+ default: None,
923+ }],
924+ );
925+ assert_snippet(
926+ "${foo/.*/complex${1:?if:else}/i}",
927+ &[Variable {
928+ name: "foo",
929+ regex: Some(Regex {
930+ value: ".*".into(),
931+ replacement: vec![
932+ FormatItem::Text("complex".into()),
933+ FormatItem::Conditional(1, Some("if".into()), Some("else".into())),
934+ ],
935+ options: "i".into(),
936+ }),
937+ default: None,
938+ }],
939+ );
940+ assert_snippet(
941+ "${foo/.*/complex${1:/upcase}/i}",
942+ &[Variable {
943+ name: "foo",
944+ regex: Some(Regex {
945+ value: ".*".into(),
946+ replacement: vec![
947+ FormatItem::Text("complex".into()),
948+ FormatItem::CaseChange(1, CaseChange::Upcase),
949+ ],
950+ options: "i".into(),
951+ }),
952+ default: None,
953+ }],
954+ );
955+ assert_snippet(
956+ "${TM_DIRECTORY/src\\//$1/}",
957+ &[Variable {
958+ name: "TM_DIRECTORY",
959+ regex: Some(Regex {
960+ value: "src/".into(),
961+ replacement: vec![FormatItem::Capture(1)],
962+ options: Tendril::new(),
963+ }),
964+ default: None,
965+ }],
966+ );
967+ assert_snippet(
968+ "${TM_SELECTED_TEXT/a/\\/$1/g}",
969+ &[Variable {
970+ name: "TM_SELECTED_TEXT",
971+ regex: Some(Regex {
972+ value: "a".into(),
973+ replacement: vec![FormatItem::Text("/".into()), FormatItem::Capture(1)],
974+ options: "g".into(),
975+ }),
976+ default: None,
977+ }],
978+ );
979+ assert_snippet(
980+ "${TM_SELECTED_TEXT/a/in\\/$1ner/g}",
981+ &[Variable {
982+ name: "TM_SELECTED_TEXT",
983+ regex: Some(Regex {
984+ value: "a".into(),
985+ replacement: vec![
986+ FormatItem::Text("in/".into()),
987+ FormatItem::Capture(1),
988+ FormatItem::Text("ner".into()),
989+ ],
990+ options: "g".into(),
991+ }),
992+ default: None,
993+ }],
994+ );
995+ assert_snippet(
996+ "${TM_SELECTED_TEXT/a/end\\//g}",
997+ &[Variable {
998+ name: "TM_SELECTED_TEXT",
999+ regex: Some(Regex {
1000+ value: "a".into(),
1001+ replacement: vec![FormatItem::Text("end/".into())],
1002+ options: "g".into(),
1003+ }),
1004+ default: None,
1005+ }],
1006+ );
1007+ }
1008+ // TODO port more tests from https://github.com/microsoft/vscode/blob/dce493cb6e36346ef2714e82c42ce14fc461b15c/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
1009+ }
1010+}
helix-lsp/src/transport.rs+52−21
@@ -38,6 +38,7 @@ enum ServerMessage {
3838#[derive(Debug)]
3939pub struct Transport {
4040 id: usize,
41+ name: String,
4142 pending_requests: Mutex<HashMap<jsonrpc::Id, Sender<Result<Value>>>>,
4243}
4344
@@ -47,6 +48,7 @@ impl Transport {
4748 server_stdin: BufWriter<ChildStdin>,
4849 server_stderr: BufReader<ChildStderr>,
4950 id: usize,
51+ name: String,
5052 ) -> (
5153 UnboundedReceiver<(usize, jsonrpc::Call)>,
5254 UnboundedSender<Payload>,
@@ -58,6 +60,7 @@ impl Transport {
5860
5961 let transport = Self {
6062 id,
63+ name,
6164 pending_requests: Mutex::new(HashMap::default()),
6265 };
6366
@@ -83,6 +86,7 @@ impl Transport {
8386 async fn recv_server_message(
8487 reader: &mut (impl AsyncBufRead + Unpin + Send),
8588 buffer: &mut String,
89+ language_server_name: &str,
8690 ) -> Result<ServerMessage> {
8791 let mut content_length = None;
8892 loop {
@@ -124,7 +128,7 @@ impl Transport {
124128 reader.read_exact(&mut content).await?;
125129 let msg = std::str::from_utf8(&content).context("invalid utf8 from server")?;
126130
127− info!("<- {}", msg);
131+ info!("{language_server_name} <- {msg}");
128132
129133 // try parsing as output (server response) or call (server request)
130134 let output: serde_json::Result<ServerMessage> = serde_json::from_str(msg);
@@ -135,12 +139,13 @@ impl Transport {
135139 async fn recv_server_error(
136140 err: &mut (impl AsyncBufRead + Unpin + Send),
137141 buffer: &mut String,
142+ language_server_name: &str,
138143 ) -> Result<()> {
139144 buffer.truncate(0);
140145 if err.read_line(buffer).await? == 0 {
141146 return Err(Error::StreamClosed);
142147 };
143− error!("err <- {:?}", buffer);
148+ error!("{language_server_name} err <- {buffer:?}");
144149
145150 Ok(())
146151 }
@@ -162,15 +167,17 @@ impl Transport {
162167 Payload::Notification(value) => serde_json::to_string(&value)?,
163168 Payload::Response(error) => serde_json::to_string(&error)?,
164169 };
165− self.send_string_to_server(server_stdin, json).await
170+ self.send_string_to_server(server_stdin, json, &self.name)
171+ .await
166172 }
167173
168174 async fn send_string_to_server(
169175 &self,
170176 server_stdin: &mut BufWriter<ChildStdin>,
171177 request: String,
178+ language_server_name: &str,
172179 ) -> Result<()> {
173− info!("-> {}", request);
180+ info!("{language_server_name} -> {request}");
174181
175182 // send the headers
176183 server_stdin
@@ -189,9 +196,13 @@ impl Transport {
189196 &self,
190197 client_tx: &UnboundedSender<(usize, jsonrpc::Call)>,
191198 msg: ServerMessage,
199+ language_server_name: &str,
192200 ) -> Result<()> {
193201 match msg {
194− ServerMessage::Output(output) => self.process_request_response(output).await?,
202+ ServerMessage::Output(output) => {
203+ self.process_request_response(output, language_server_name)
204+ .await?
205+ }
195206 ServerMessage::Call(call) => {
196207 client_tx
197208 .send((self.id, call))
@@ -202,14 +213,18 @@ impl Transport {
202213 Ok(())
203214 }
204215
205− async fn process_request_response(&self, output: jsonrpc::Output) -> Result<()> {
216+ async fn process_request_response(
217+ &self,
218+ output: jsonrpc::Output,
219+ language_server_name: &str,
220+ ) -> Result<()> {
206221 let (id, result) = match output {
207222 jsonrpc::Output::Success(jsonrpc::Success { id, result, .. }) => {
208− info!("<- {}", result);
223+ info!("{language_server_name} <- {}", result);
209224 (id, Ok(result))
210225 }
211226 jsonrpc::Output::Failure(jsonrpc::Failure { id, error, .. }) => {
212− error!("<- {}", error);
227+ error!("{language_server_name} <- {error}");
213228 (id, Err(error.into()))
214229 }
215230 };
@@ -240,12 +255,17 @@ impl Transport {
240255 ) {
241256 let mut recv_buffer = String::new();
242257 loop {
243− match Self::recv_server_message(&mut server_stdout, &mut recv_buffer).await {
258+ match Self::recv_server_message(&mut server_stdout, &mut recv_buffer, &transport.name)
259+ .await
260+ {
244261 Ok(msg) => {
245− match transport.process_server_message(&client_tx, msg).await {
262+ match transport
263+ .process_server_message(&client_tx, msg, &transport.name)
264+ .await
265+ {
246266 Ok(_) => {}
247267 Err(err) => {
248− error!("err: <- {:?}", err);
268+ error!("{} err: <- {err:?}", transport.name);
249269 break;
250270 }
251271 };
@@ -270,7 +290,7 @@ impl Transport {
270290 params: jsonrpc::Params::None,
271291 }));
272292 match transport
273− .process_server_message(&client_tx, notification)
293+ .process_server_message(&client_tx, notification, &transport.name)
274294 .await
275295 {
276296 Ok(_) => {}
@@ -281,20 +301,22 @@ impl Transport {
281301 break;
282302 }
283303 Err(err) => {
284− error!("err: <- {:?}", err);
304+ error!("{} err: <- {err:?}", transport.name);
285305 break;
286306 }
287307 }
288308 }
289309 }
290310
291− async fn err(_transport: Arc<Self>, mut server_stderr: BufReader<ChildStderr>) {
311+ async fn err(transport: Arc<Self>, mut server_stderr: BufReader<ChildStderr>) {
292312 let mut recv_buffer = String::new();
293313 loop {
294− match Self::recv_server_error(&mut server_stderr, &mut recv_buffer).await {
314+ match Self::recv_server_error(&mut server_stderr, &mut recv_buffer, &transport.name)
315+ .await
316+ {
295317 Ok(_) => {}
296318 Err(err) => {
297− error!("err: <- {:?}", err);
319+ error!("{} err: <- {err:?}", transport.name);
298320 break;
299321 }
300322 }
@@ -331,6 +353,11 @@ impl Transport {
331353 }
332354 }
333355
356+ fn is_shutdown(payload: &Payload) -> bool {
357+ use lsp_types::request::{Request, Shutdown};
358+ matches!(payload, Payload::Request { value: jsonrpc::MethodCall { method, .. }, .. } if method == Shutdown::METHOD)
359+ }
360+
334361 // TODO: events that use capabilities need to do the right thing
335362
336363 loop {
@@ -348,10 +375,11 @@ impl Transport {
348375 method: lsp_types::notification::Initialized::METHOD.to_string(),
349376 params: jsonrpc::Params::None,
350377 }));
351− match transport.process_server_message(&client_tx, notification).await {
378+ let language_server_name = &transport.name;
379+ match transport.process_server_message(&client_tx, notification, language_server_name).await {
352380 Ok(_) => {}
353381 Err(err) => {
354− error!("err: <- {:?}", err);
382+ error!("{language_server_name} err: <- {err:?}");
355383 }
356384 }
357385
@@ -361,14 +389,17 @@ impl Transport {
361389 match transport.send_payload_to_server(&mut server_stdin, msg).await {
362390 Ok(_) => {}
363391 Err(err) => {
364− error!("err: <- {:?}", err);
392+ error!("{language_server_name} err: <- {err:?}");
365393 }
366394 }
367395 }
368396 }
369397 msg = client_rx.recv() => {
370398 if let Some(msg) = msg {
371− if is_pending && !is_initialize(&msg) {
399+ if is_pending && is_shutdown(&msg) {
400+ log::info!("Language server not initialized, shutting down");
401+ break;
402+ } else if is_pending && !is_initialize(&msg) {
372403 // ignore notifications
373404 if let Payload::Notification(_) = msg {
374405 continue;
@@ -380,7 +411,7 @@ impl Transport {
380411 match transport.send_payload_to_server(&mut server_stdin, msg).await {
381412 Ok(_) => {}
382413 Err(err) => {
383− error!("err: <- {:?}", err);
414+ error!("{} err: <- {err:?}", transport.name);
384415 }
385416 }
386417 }
helix-parsec/Cargo.tomlnew file+14
@@ -0,0 +1,14 @@
1+[package]
2+name = "helix-parsec"
3+description = "Parser combinators for Helix"
4+include = ["src/**/*", "README.md"]
5+version.workspace = true
6+authors.workspace = true
7+edition.workspace = true
8+license.workspace = true
9+rust-version.workspace = true
10+categories.workspace = true
11+repository.workspace = true
12+homepage.workspace = true
13+
14+[dependencies]
helix-parsec/src/lib.rsnew file+574
@@ -0,0 +1,574 @@
1+//! Parser-combinator functions
2+//!
3+//! This module provides parsers and parser combinators which can be used
4+//! together to build parsers by functional composition.
5+
6+// This module implements parser combinators following https://bodil.lol/parser-combinators/.
7+// `sym` (trait implementation for `&'static str`), `map`, `pred` (filter), `one_or_more`,
8+// `zero_or_more`, as well as the `Parser` trait originate mostly from that post.
9+// The remaining parsers and parser combinators are either based on
10+// https://github.com/archseer/snippets.nvim/blob/a583da6ef130d2a4888510afd8c4e5ffd62d0dce/lua/snippet/parser.lua#L5-L138
11+// or are novel.
12+
13+// When a parser matches the input successfully, it returns `Ok((next_input, some_value))`
14+// where the type of the returned value depends on the parser. If the parser fails to match,
15+// it returns `Err(input)`.
16+type ParseResult<'a, Output> = Result<(&'a str, Output), &'a str>;
17+
18+/// A parser or parser-combinator.
19+///
20+/// Parser-combinators compose multiple parsers together to parse input.
21+/// For example, two basic parsers (`&'static str`s) may be combined with
22+/// a parser-combinator like [or] to produce a new parser.
23+///
24+/// ```
25+/// use helix_parsec::{or, Parser};
26+/// let foo = "foo"; // matches "foo" literally
27+/// let bar = "bar"; // matches "bar" literally
28+/// let foo_or_bar = or(foo, bar); // matches either "foo" or "bar"
29+/// assert_eq!(Ok(("", "foo")), foo_or_bar.parse("foo"));
30+/// assert_eq!(Ok(("", "bar")), foo_or_bar.parse("bar"));
31+/// assert_eq!(Err("baz"), foo_or_bar.parse("baz"));
32+/// ```
33+pub trait Parser<'a> {
34+ type Output;
35+
36+ fn parse(&self, input: &'a str) -> ParseResult<'a, Self::Output>;
37+}
38+
39+// Most parser-combinators are written as higher-order functions which take some
40+// parser(s) as input and return a new parser: a function that takes input and returns
41+// a parse result. The underlying implementation of [Parser::parse] for these functions
42+// is simply application.
43+#[doc(hidden)]
44+impl<'a, F, T> Parser<'a> for F
45+where
46+ F: Fn(&'a str) -> ParseResult<T>,
47+{
48+ type Output = T;
49+
50+ fn parse(&self, input: &'a str) -> ParseResult<'a, Self::Output> {
51+ self(input)
52+ }
53+}
54+
55+/// A parser which matches the string literal exactly.
56+///
57+/// This parser succeeds if the next characters in the input are equal to the given
58+/// string literal.
59+///
60+/// Note that [str::parse] interferes with calling [Parser::parse] on string literals
61+/// directly; this trait implementation works when used within any parser combinator
62+/// but does not work on its own. To call [Parser::parse] on a parser for a string
63+/// literal, use the [token] parser.
64+///
65+/// # Examples
66+///
67+/// ```
68+/// use helix_parsec::{or, Parser};
69+/// let parser = or("foo", "bar");
70+/// assert_eq!(Ok(("", "foo")), parser.parse("foo"));
71+/// assert_eq!(Ok(("", "bar")), parser.parse("bar"));
72+/// assert_eq!(Err("baz"), parser.parse("baz"));
73+/// ```
74+impl<'a> Parser<'a> for &'static str {
75+ type Output = &'a str;
76+
77+ fn parse(&self, input: &'a str) -> ParseResult<'a, Self::Output> {
78+ match input.get(0..self.len()) {
79+ Some(actual) if actual == *self => Ok((&input[self.len()..], &input[0..self.len()])),
80+ _ => Err(input),
81+ }
82+ }
83+}
84+
85+// Parsers
86+
87+/// A parser which matches the given string literally.
88+///
89+/// This function is a convenience for interpreting string literals as parsers
90+/// and is only necessary to avoid conflict with [str::parse]. See the documentation
91+/// for the `&'static str` implementation of [Parser].
92+///
93+/// # Examples
94+///
95+/// ```
96+/// use helix_parsec::{token, Parser};
97+/// let parser = token("foo");
98+/// assert_eq!(Ok(("", "foo")), parser.parse("foo"));
99+/// assert_eq!(Err("bar"), parser.parse("bar"));
100+/// ```
101+pub fn token<'a>(literal: &'static str) -> impl Parser<'a, Output = &'a str> {
102+ literal
103+}
104+
105+/// A parser which matches all values until the specified pattern is found.
106+///
107+/// If the pattern is not found, this parser does not match. The input up to the
108+/// character which returns `true` is returned but not that character itself.
109+///
110+/// If the pattern function returns true on the first input character, this
111+/// parser fails.
112+///
113+/// # Examples
114+///
115+/// ```
116+/// use helix_parsec::{take_until, Parser};
117+/// let parser = take_until(|c| c == '.');
118+/// assert_eq!(Ok((".bar", "foo")), parser.parse("foo.bar"));
119+/// assert_eq!(Err(".foo"), parser.parse(".foo"));
120+/// assert_eq!(Err("foo"), parser.parse("foo"));
121+/// ```
122+pub fn take_until<'a, F>(pattern: F) -> impl Parser<'a, Output = &'a str>
123+where
124+ F: Fn(char) -> bool,
125+{
126+ move |input: &'a str| match input.find(&pattern) {
127+ Some(index) if index != 0 => Ok((&input[index..], &input[0..index])),
128+ _ => Err(input),
129+ }
130+}
131+
132+/// A parser which matches all values until the specified pattern no longer match.
133+///
134+/// This parser only ever fails if the input has a length of zero.
135+///
136+/// # Examples
137+///
138+/// ```
139+/// use helix_parsec::{take_while, Parser};
140+/// let parser = take_while(|c| c == '1');
141+/// assert_eq!(Ok(("2", "11")), parser.parse("112"));
142+/// assert_eq!(Err("22"), parser.parse("22"));
143+/// ```
144+pub fn take_while<'a, F>(pattern: F) -> impl Parser<'a, Output = &'a str>
145+where
146+ F: Fn(char) -> bool,
147+{
148+ move |input: &'a str| match input
149+ .char_indices()
150+ .take_while(|(_p, c)| pattern(*c))
151+ .last()
152+ {
153+ Some((index, c)) => {
154+ let index = index + c.len_utf8();
155+ Ok((&input[index..], &input[0..index]))
156+ }
157+ _ => Err(input),
158+ }
159+}
160+
161+// Variadic parser combinators
162+
163+/// A parser combinator which matches a sequence of parsers in an all-or-nothing fashion.
164+///
165+/// The returned value is a tuple containing the outputs of all parsers in order. Each
166+/// parser in the sequence may be typed differently.
167+///
168+/// # Examples
169+///
170+/// ```
171+/// use helix_parsec::{seq, Parser};
172+/// let parser = seq!("<", "a", ">");
173+/// assert_eq!(Ok(("", ("<", "a", ">"))), parser.parse("<a>"));
174+/// assert_eq!(Err("<b>"), parser.parse("<b>"));
175+/// ```
176+#[macro_export]
177+macro_rules! seq {
178+ ($($parsers: expr),+ $(,)?) => {
179+ ($($parsers),+)
180+ }
181+}
182+
183+// Seq is implemented using trait-implementations of Parser for various size tuples.
184+// This allows sequences to be typed heterogeneously.
185+macro_rules! seq_impl {
186+ ($($parser:ident),+) => {
187+ #[allow(non_snake_case)]
188+ impl<'a, $($parser),+> Parser<'a> for ($($parser),+)
189+ where
190+ $($parser: Parser<'a>),+
191+ {
192+ type Output = ($($parser::Output),+);
193+
194+ fn parse(&self, input: &'a str) -> ParseResult<'a, Self::Output> {
195+ let ($($parser),+) = self;
196+ seq_body_impl!(input, input, $($parser),+ ; )
197+ }
198+ }
199+ }
200+}
201+
202+macro_rules! seq_body_impl {
203+ ($input:expr, $next_input:expr, $head:ident, $($tail:ident),+ ; $(,)? $($acc:ident),*) => {
204+ match $head.parse($next_input) {
205+ Ok((next_input, $head)) => seq_body_impl!($input, next_input, $($tail),+ ; $($acc),*, $head),
206+ Err(_) => Err($input),
207+ }
208+ };
209+ ($input:expr, $next_input:expr, $last:ident ; $(,)? $($acc:ident),*) => {
210+ match $last.parse($next_input) {
211+ Ok((next_input, last)) => Ok((next_input, ($($acc),+, last))),
212+ Err(_) => Err($input),
213+ }
214+ }
215+}
216+
217+seq_impl!(A, B);
218+seq_impl!(A, B, C);
219+seq_impl!(A, B, C, D);
220+seq_impl!(A, B, C, D, E);
221+seq_impl!(A, B, C, D, E, F);
222+seq_impl!(A, B, C, D, E, F, G);
223+seq_impl!(A, B, C, D, E, F, G, H);
224+seq_impl!(A, B, C, D, E, F, G, H, I);
225+seq_impl!(A, B, C, D, E, F, G, H, I, J);
226+
227+/// A parser combinator which chooses the first of the input parsers which matches
228+/// successfully.
229+///
230+/// All input parsers must have the same output type. This is a variadic form for [or].
231+///
232+/// # Examples
233+///
234+/// ```
235+/// use helix_parsec::{choice, or, Parser};
236+/// let parser = choice!("foo", "bar", "baz");
237+/// assert_eq!(Ok(("", "foo")), parser.parse("foo"));
238+/// assert_eq!(Ok(("", "bar")), parser.parse("bar"));
239+/// assert_eq!(Err("quiz"), parser.parse("quiz"));
240+/// ```
241+#[macro_export]
242+macro_rules! choice {
243+ ($parser: expr $(,)?) => {
244+ $parser
245+ };
246+ ($parser: expr, $($rest: expr),+ $(,)?) => {
247+ or($parser, choice!($($rest),+))
248+ }
249+}
250+
251+// Ordinary parser combinators
252+
253+/// A parser combinator which takes a parser as input and maps the output using the
254+/// given transformation function.
255+///
256+/// This corresponds to [Result::map]. The value is only mapped if the input parser
257+/// matches against input.
258+///
259+/// # Examples
260+///
261+/// ```
262+/// use helix_parsec::{map, Parser};
263+/// let parser = map("123", |s| s.parse::<i32>().unwrap());
264+/// assert_eq!(Ok(("", 123)), parser.parse("123"));
265+/// assert_eq!(Err("abc"), parser.parse("abc"));
266+/// ```
267+pub fn map<'a, P, F, T>(parser: P, map_fn: F) -> impl Parser<'a, Output = T>
268+where
269+ P: Parser<'a>,
270+ F: Fn(P::Output) -> T,
271+{
272+ move |input| {
273+ parser
274+ .parse(input)
275+ .map(|(next_input, result)| (next_input, map_fn(result)))
276+ }
277+}
278+
279+/// A parser combinator which succeeds if the given parser matches the input and
280+/// the given `filter_map_fn` returns `Some`.
281+///
282+/// # Examples
283+///
284+/// ```
285+/// use helix_parsec::{filter_map, take_until, Parser};
286+/// let parser = filter_map(take_until(|c| c == '.'), |s| s.parse::<i32>().ok());
287+/// assert_eq!(Ok((".456", 123)), parser.parse("123.456"));
288+/// assert_eq!(Err("abc.def"), parser.parse("abc.def"));
289+/// ```
290+pub fn filter_map<'a, P, F, T>(parser: P, filter_map_fn: F) -> impl Parser<'a, Output = T>
291+where
292+ P: Parser<'a>,
293+ F: Fn(P::Output) -> Option<T>,
294+{
295+ move |input| match parser.parse(input) {
296+ Ok((next_input, value)) => match filter_map_fn(value) {
297+ Some(value) => Ok((next_input, value)),
298+ None => Err(input),
299+ },
300+ Err(_) => Err(input),
301+ }
302+}
303+
304+/// A parser combinator which succeeds if the first given parser matches the input and
305+/// the second given parse also matches.
306+///
307+/// # Examples
308+///
309+/// ```
310+/// use helix_parsec::{reparse_as, take_until, one_or_more, Parser};
311+/// let parser = reparse_as(take_until(|c| c == '/'), one_or_more("a"));
312+/// assert_eq!(Ok(("/bb", vec!["a", "a"])), parser.parse("aa/bb"));
313+/// ```
314+pub fn reparse_as<'a, P1, P2, T>(parser1: P1, parser2: P2) -> impl Parser<'a, Output = T>
315+where
316+ P1: Parser<'a, Output = &'a str>,
317+ P2: Parser<'a, Output = T>,
318+{
319+ filter_map(parser1, move |str| {
320+ parser2.parse(str).map(|(_, value)| value).ok()
321+ })
322+}
323+
324+/// A parser combinator which only matches the input when the predicate function
325+/// returns true.
326+///
327+/// # Examples
328+///
329+/// ```
330+/// use helix_parsec::{filter, take_until, Parser};
331+/// let parser = filter(take_until(|c| c == '.'), |s| s == &"123");
332+/// assert_eq!(Ok((".456", "123")), parser.parse("123.456"));
333+/// assert_eq!(Err("456.123"), parser.parse("456.123"));
334+/// ```
335+pub fn filter<'a, P, F, T>(parser: P, pred_fn: F) -> impl Parser<'a, Output = T>
336+where
337+ P: Parser<'a, Output = T>,
338+ F: Fn(&P::Output) -> bool,
339+{
340+ move |input| {
341+ if let Ok((next_input, value)) = parser.parse(input) {
342+ if pred_fn(&value) {
343+ return Ok((next_input, value));
344+ }
345+ }
346+ Err(input)
347+ }
348+}
349+
350+/// A parser combinator which matches either of the input parsers.
351+///
352+/// Both parsers must have the same output type. For a variadic form which
353+/// can take any number of parsers, use `choice!`.
354+///
355+/// # Examples
356+///
357+/// ```
358+/// use helix_parsec::{or, Parser};
359+/// let parser = or("foo", "bar");
360+/// assert_eq!(Ok(("", "foo")), parser.parse("foo"));
361+/// assert_eq!(Ok(("", "bar")), parser.parse("bar"));
362+/// assert_eq!(Err("baz"), parser.parse("baz"));
363+/// ```
364+pub fn or<'a, P1, P2, T>(parser1: P1, parser2: P2) -> impl Parser<'a, Output = T>
365+where
366+ P1: Parser<'a, Output = T>,
367+ P2: Parser<'a, Output = T>,
368+{
369+ move |input| match parser1.parse(input) {
370+ ok @ Ok(_) => ok,
371+ Err(_) => parser2.parse(input),
372+ }
373+}
374+
375+/// A parser combinator which attempts to match the given parser, returning a
376+/// `None` output value if the parser does not match.
377+///
378+/// The parser produced with this combinator always succeeds. If the given parser
379+/// succeeds, `Some(value)` is returned where `value` is the output of the given
380+/// parser. Otherwise, `None`.
381+///
382+/// # Examples
383+///
384+/// ```
385+/// use helix_parsec::{optional, Parser};
386+/// let parser = optional("foo");
387+/// assert_eq!(Ok(("bar", Some("foo"))), parser.parse("foobar"));
388+/// assert_eq!(Ok(("bar", None)), parser.parse("bar"));
389+/// ```
390+pub fn optional<'a, P, T>(parser: P) -> impl Parser<'a, Output = Option<T>>
391+where
392+ P: Parser<'a, Output = T>,
393+{
394+ move |input| match parser.parse(input) {
395+ Ok((next_input, value)) => Ok((next_input, Some(value))),
396+ Err(_) => Ok((input, None)),
397+ }
398+}
399+
400+/// A parser combinator which runs the given parsers in sequence and returns the
401+/// value of `left` if both are matched.
402+///
403+/// This is useful for two-element sequences in which you only want the output
404+/// value of the `left` parser.
405+///
406+/// # Examples
407+///
408+/// ```
409+/// use helix_parsec::{left, Parser};
410+/// let parser = left("foo", "bar");
411+/// assert_eq!(Ok(("", "foo")), parser.parse("foobar"));
412+/// ```
413+pub fn left<'a, L, R, T>(left: L, right: R) -> impl Parser<'a, Output = T>
414+where
415+ L: Parser<'a, Output = T>,
416+ R: Parser<'a>,
417+{
418+ map(seq!(left, right), |(left_value, _)| left_value)
419+}
420+
421+/// A parser combinator which runs the given parsers in sequence and returns the
422+/// value of `right` if both are matched.
423+///
424+/// This is useful for two-element sequences in which you only want the output
425+/// value of the `right` parser.
426+///
427+/// # Examples
428+///
429+/// ```
430+/// use helix_parsec::{right, Parser};
431+/// let parser = right("foo", "bar");
432+/// assert_eq!(Ok(("", "bar")), parser.parse("foobar"));
433+/// ```
434+pub fn right<'a, L, R, T>(left: L, right: R) -> impl Parser<'a, Output = T>
435+where
436+ L: Parser<'a>,
437+ R: Parser<'a, Output = T>,
438+{
439+ map(seq!(left, right), |(_, right_value)| right_value)
440+}
441+
442+/// A parser combinator which matches the given parser against the input zero or
443+/// more times.
444+///
445+/// This parser always succeeds and returns the empty Vec when it matched zero
446+/// times.
447+///
448+/// # Examples
449+///
450+/// ```
451+/// use helix_parsec::{zero_or_more, Parser};
452+/// let parser = zero_or_more("a");
453+/// assert_eq!(Ok(("", vec![])), parser.parse(""));
454+/// assert_eq!(Ok(("", vec!["a"])), parser.parse("a"));
455+/// assert_eq!(Ok(("", vec!["a", "a"])), parser.parse("aa"));
456+/// assert_eq!(Ok(("bb", vec![])), parser.parse("bb"));
457+/// ```
458+pub fn zero_or_more<'a, P, T>(parser: P) -> impl Parser<'a, Output = Vec<T>>
459+where
460+ P: Parser<'a, Output = T>,
461+{
462+ let parser = non_empty(parser);
463+ move |mut input| {
464+ let mut values = Vec::new();
465+
466+ while let Ok((next_input, value)) = parser.parse(input) {
467+ input = next_input;
468+ values.push(value);
469+ }
470+
471+ Ok((input, values))
472+ }
473+}
474+
475+/// A parser combinator which matches the given parser against the input one or
476+/// more times.
477+///
478+/// This parser combinator acts the same as [zero_or_more] but must match at
479+/// least once.
480+///
481+/// # Examples
482+///
483+/// ```
484+/// use helix_parsec::{one_or_more, Parser};
485+/// let parser = one_or_more("a");
486+/// assert_eq!(Err(""), parser.parse(""));
487+/// assert_eq!(Ok(("", vec!["a"])), parser.parse("a"));
488+/// assert_eq!(Ok(("", vec!["a", "a"])), parser.parse("aa"));
489+/// assert_eq!(Err("bb"), parser.parse("bb"));
490+/// ```
491+pub fn one_or_more<'a, P, T>(parser: P) -> impl Parser<'a, Output = Vec<T>>
492+where
493+ P: Parser<'a, Output = T>,
494+{
495+ let parser = non_empty(parser);
496+ move |mut input| {
497+ let mut values = Vec::new();
498+
499+ match parser.parse(input) {
500+ Ok((next_input, value)) => {
501+ input = next_input;
502+ values.push(value);
503+ }
504+ Err(err) => return Err(err),
505+ }
506+
507+ while let Ok((next_input, value)) = parser.parse(input) {
508+ input = next_input;
509+ values.push(value);
510+ }
511+
512+ Ok((input, values))
513+ }
514+}
515+
516+/// A parser combinator which matches one or more instances of the given parser
517+/// interspersed with the separator parser.
518+///
519+/// Output values of the separator parser are discarded.
520+///
521+/// This is typically used to parse function arguments or list items.
522+///
523+/// # Examples
524+///
525+/// ```rust
526+/// use helix_parsec::{sep, Parser};
527+/// let parser = sep("a", ",");
528+/// assert_eq!(Ok(("", vec!["a", "a", "a"])), parser.parse("a,a,a"));
529+/// ```
530+pub fn sep<'a, P, S, T>(parser: P, separator: S) -> impl Parser<'a, Output = Vec<T>>
531+where
532+ P: Parser<'a, Output = T>,
533+ S: Parser<'a>,
534+{
535+ move |mut input| {
536+ let mut values = Vec::new();
537+
538+ match parser.parse(input) {
539+ Ok((next_input, value)) => {
540+ input = next_input;
541+ values.push(value);
542+ }
543+ Err(err) => return Err(err),
544+ }
545+
546+ loop {
547+ match separator.parse(input) {
548+ Ok((next_input, _)) => input = next_input,
549+ Err(_) => break,
550+ }
551+
552+ match parser.parse(input) {
553+ Ok((next_input, value)) => {
554+ input = next_input;
555+ values.push(value);
556+ }
557+ Err(_) => break,
558+ }
559+ }
560+
561+ Ok((input, values))
562+ }
563+}
564+
565+pub fn non_empty<'a, T>(p: impl Parser<'a, Output = T>) -> impl Parser<'a, Output = T> {
566+ move |input| {
567+ let (new_input, res) = p.parse(input)?;
568+ if new_input.len() == input.len() {
569+ Err(input)
570+ } else {
571+ Ok((new_input, res))
572+ }
573+ }
574+}
helix-term/Cargo.toml+33−24
@@ -1,16 +1,16 @@
11[package]
22name = "helix-term"
3−version = "0.6.0"
43description = "A post-modern text editor."
5−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
6−edition = "2021"
7−license = "MPL-2.0"
8−categories = ["editor", "command-line-utilities"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
114include = ["src/**/*", "README.md"]
125default-run = "hx"
13−rust-version = "1.57"
6+version.workspace = true
7+authors.workspace = true
8+edition.workspace = true
9+license.workspace = true
10+rust-version.workspace = true
11+categories.workspace = true
12+repository.workspace = true
13+homepage.workspace = true
1414
1515[features]
1616default = ["git"]
@@ -23,21 +23,22 @@ name = "hx"
2323path = "src/main.rs"
2424
2525[dependencies]
26−helix-core = { version = "0.6", path = "../helix-core" }
27−helix-view = { version = "0.6", path = "../helix-view" }
28−helix-lsp = { version = "0.6", path = "../helix-lsp" }
29−helix-dap = { version = "0.6", path = "../helix-dap" }
30−helix-vcs = { version = "0.6", path = "../helix-vcs" }
31−helix-loader = { version = "0.6", path = "../helix-loader" }
26+helix-core = { path = "../helix-core" }
27+helix-event = { path = "../helix-event" }
28+helix-view = { path = "../helix-view" }
29+helix-lsp = { path = "../helix-lsp" }
30+helix-dap = { path = "../helix-dap" }
31+helix-vcs = { path = "../helix-vcs" }
32+helix-loader = { path = "../helix-loader" }
3233
3334anyhow = "1"
34−once_cell = "1.17"
35+once_cell = "1.19"
3536
36−which = "4.4"
37+which = "5.0.0"
3738
3839tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
3940tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
40−crossterm = { version = "0.25", features = ["event-stream"] }
41+crossterm = { version = "0.27", features = ["event-stream"] }
4142signal-hook = "0.3"
4243tokio-stream = "0.1"
4344futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
@@ -49,13 +50,17 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
4950log = "0.4"
5051
5152# File picker
52−fuzzy-matcher = "0.3"
53+nucleo.workspace = true
5354ignore = "0.4"
5455# markdown doc rendering
5556pulldown-cmark = { version = "0.9", default-features = false }
5657# file type detection
5758content_inspector = "0.2.4"
5859
60+# opening URLs
61+open = "5.0.1"
62+url = "2.5.0"
63+
5964# config
6065toml = "0.7"
6166
@@ -63,16 +68,20 @@ serde_json = "1.0"
6368serde = { version = "1.0", features = ["derive"] }
6469
6570# ripgrep for global search
66−grep-regex = "0.1.10"
67−grep-searcher = "0.1.10"
71+grep-regex = "0.1.12"
72+grep-searcher = "0.1.13"
6873
6974[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
7075signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
76+libc = "0.2.151"
77+
78+[target.'cfg(target_os = "macos")'.dependencies]
79+crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
7180
7281[build-dependencies]
73−helix-loader = { version = "0.6", path = "../helix-loader" }
82+helix-loader = { path = "../helix-loader" }
7483
7584[dev-dependencies]
76−smallvec = "1.10"
77−indoc = "2.0.0"
78−tempfile = "3.3.0"
85+smallvec = "1.11"
86+indoc = "2.0.4"
87+tempfile = "3.8.1"
helix-term/src/application.rs+402−274

This diff is too big to show here.

helix-term/src/args.rs+29

This diff is too big to show here.

helix-term/src/commands.rs+1200−678

This diff is too big to show here.

helix-term/src/commands/dap.rs+90−57

This diff is too big to show here.

helix-term/src/commands/lsp.rs+828−490

This diff is too big to show here.

helix-term/src/commands/typed.rs+1316−746

This diff is too big to show here.

helix-term/src/compositor.rs+12

This diff is too big to show here.

helix-term/src/config.rs+110−30

This diff is too big to show here.

helix-term/src/health.rs+74−24

This diff is too big to show here.

helix-term/src/keymap.rs+119−166

This diff is too big to show here.

helix-term/src/keymap/default.rs+16−8

This diff is too big to show here.

helix-term/src/keymap/macros.rs+3−4

This diff is too big to show here.

helix-term/src/main.rs+36−31

This diff is too big to show here.

helix-term/src/ui/completion.rs+214−112

This diff is too big to show here.

helix-term/src/ui/document.rs+91−49

This diff is too big to show here.

helix-term/src/ui/editor.rs+233−134

This diff is too big to show here.

helix-term/src/ui/fuzzy_match.rsdeleted−239

This diff is too big to show here.

helix-term/src/ui/fuzzy_match/test.rsdeleted−47

This diff is too big to show here.

helix-term/src/ui/lsp.rs+5−3

This diff is too big to show here.

helix-term/src/ui/markdown.rs+24−18

This diff is too big to show here.

helix-term/src/ui/menu.rs+74−40

This diff is too big to show here.

helix-term/src/ui/mod.rs+112−183

This diff is too big to show here.

helix-term/src/ui/overlay.rs+1−1

This diff is too big to show here.

helix-term/src/ui/picker.rs+630−575

This diff is too big to show here.

helix-term/src/ui/popup.rs+44−18

This diff is too big to show here.

helix-term/src/ui/prompt.rs+70−53

This diff is too big to show here.

helix-term/src/ui/statusline.rs+44−7

This diff is too big to show here.

helix-term/src/ui/text.rs+1−1

This diff is too big to show here.

helix-term/tests/integration.rs+3−5

This diff is too big to show here.

helix-term/tests/test/auto_indent.rs+3−9

This diff is too big to show here.

helix-term/tests/test/auto_pairs.rs+5−11

This diff is too big to show here.

helix-term/tests/test/commands.rs+212−162

This diff is too big to show here.

helix-term/tests/test/commands/movement.rsnew file+452

This diff is too big to show here.

helix-term/tests/test/write.rs → helix-term/tests/test/commands/write.rsrenamed+254−7

This diff is too big to show here.

helix-term/tests/test/helpers.rs+53−26

This diff is too big to show here.

helix-term/tests/test/languages/go.rsnew file+41

This diff is too big to show here.

helix-term/tests/test/languages/mod.rsnew file+4

This diff is too big to show here.

helix-term/tests/test/languages/yaml.rsnew file+819

This diff is too big to show here.

helix-term/tests/test/movement.rs+54−43

This diff is too big to show here.

helix-term/tests/test/splits.rs+8−6

This diff is too big to show here.

helix-tui/Cargo.toml+17−15

This diff is too big to show here.

helix-tui/src/backend/crossterm.rs+168−45

This diff is too big to show here.

helix-tui/src/backend/mod.rs+5−1

This diff is too big to show here.

helix-tui/src/backend/test.rs+17

This diff is too big to show here.

helix-tui/src/buffer.rs+43−2

This diff is too big to show here.

helix-tui/src/lib.rs+9−3

This diff is too big to show here.

helix-tui/src/terminal.rs+26−14

This diff is too big to show here.

helix-tui/src/text.rs+3−1

This diff is too big to show here.

helix-tui/src/widgets/block.rs+2−7

This diff is too big to show here.

helix-tui/src/widgets/mod.rs+2−2

This diff is too big to show here.

helix-tui/src/widgets/table.rs+19−7

This diff is too big to show here.

helix-vcs/Cargo.toml+15−11

This diff is too big to show here.

helix-vcs/src/diff.rs+48−35

This diff is too big to show here.

helix-vcs/src/diff/line_cache.rs+15−7

This diff is too big to show here.

helix-vcs/src/diff/worker.rs+12−15

This diff is too big to show here.

helix-vcs/src/diff/worker/test.rs+4−8

This diff is too big to show here.

helix-vcs/src/git.rs+67−33

This diff is too big to show here.

helix-vcs/src/git/test.rs+6−6

This diff is too big to show here.

helix-vcs/src/lib.rs+32−5

This diff is too big to show here.

helix-view/Cargo.toml+23−18

This diff is too big to show here.

helix-view/src/clipboard.rs+8−3

This diff is too big to show here.

helix-view/src/document.rs+771−174

This diff is too big to show here.

helix-view/src/editor.rs+336−134

This diff is too big to show here.

helix-view/src/graphics.rs+3−2

This diff is too big to show here.

helix-view/src/gutter.rs+64−43

This diff is too big to show here.

helix-view/src/handlers/dap.rs+2−3

This diff is too big to show here.

helix-view/src/info.rs+5−25

This diff is too big to show here.

helix-view/src/input.rs+67−3

This diff is too big to show here.

helix-view/src/keyboard.rs+1

This diff is too big to show here.

helix-view/src/lib.rs+1

This diff is too big to show here.

helix-view/src/register.rsnew file+333

This diff is too big to show here.

helix-view/src/theme.rs+79−47

This diff is too big to show here.

helix-view/src/tree.rs+6−8

This diff is too big to show here.

helix-view/src/view.rs+88−41

This diff is too big to show here.

languages.toml+1105−303

This diff is too big to show here.

logo.svg+1−1

This diff is too big to show here.

runtime/queries/_javascript/highlights.scmnew file+36

This diff is too big to show here.

runtime/queries/_javascript/locals.scmnew file+14

This diff is too big to show here.

runtime/queries/_javascript/tags.scmnew file+88

This diff is too big to show here.

runtime/queries/_jsx/highlights.scmnew file+43

This diff is too big to show here.

runtime/queries/_jsx/indents.scmnew file+6

This diff is too big to show here.

runtime/queries/_typescript/highlights.scmnew file+142

This diff is too big to show here.

runtime/queries/_typescript/indents.scmnew file+5

This diff is too big to show here.

runtime/queries/_typescript/locals.scmnew file+33

This diff is too big to show here.

runtime/queries/_typescript/tags.scmnew file+23

This diff is too big to show here.

runtime/queries/_typescript/textobjects.scmnew file+6

This diff is too big to show here.

runtime/queries/agda/highlights.scmnew file+124

This diff is too big to show here.

runtime/queries/bash/indents.scm+1

This diff is too big to show here.

runtime/queries/bash/textobjects.scmnew file+9

This diff is too big to show here.

runtime/queries/blueprint/highlights.scmnew file+61

This diff is too big to show here.

runtime/queries/c/highlights.scm+1

This diff is too big to show here.

runtime/queries/c/indents.scm+19−1

This diff is too big to show here.

runtime/queries/cairo/highlights.scm+1−94

This diff is too big to show here.

runtime/queries/cairo/indents.scmnew file+1

This diff is too big to show here.

runtime/queries/cairo/injections.scm+2−4

This diff is too big to show here.

runtime/queries/cairo/locals.scmnew file+1

This diff is too big to show here.

runtime/queries/cairo/textobjects.scmnew file+1

This diff is too big to show here.

runtime/queries/capnp/folds.scmnew file+14

This diff is too big to show here.

runtime/queries/capnp/highlights.scmnew file+141

This diff is too big to show here.

runtime/queries/capnp/indents.scmnew file+19

This diff is too big to show here.

runtime/queries/capnp/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/capnp/locals.scmnew file+96

This diff is too big to show here.

runtime/queries/comment/highlights.scm+20−4

This diff is too big to show here.

runtime/queries/common-lisp/indents.scmnew file+1

This diff is too big to show here.

runtime/queries/cpp/highlights.scm+1−1

This diff is too big to show here.

runtime/queries/dart/highlights.scm+3−1

This diff is too big to show here.

runtime/queries/dbml/highlights.scmnew file+44

This diff is too big to show here.

runtime/queries/dockerfile/highlights.scm+4−1

This diff is too big to show here.

runtime/queries/dtd/highlights.scmnew file+39

This diff is too big to show here.

runtime/queries/dtd/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/ecma/README.mdnew file+14

This diff is too big to show here.

runtime/queries/ecma/highlights.scm+49−21

This diff is too big to show here.

runtime/queries/ecma/indents.scm+6

This diff is too big to show here.

runtime/queries/ecma/locals.scm+17−3

This diff is too big to show here.

runtime/queries/elm/textobjects.scmnew file+63

This diff is too big to show here.

runtime/queries/erlang/highlights.scm+10−10

This diff is too big to show here.

runtime/queries/forth/highlights.scmnew file+7

This diff is too big to show here.

runtime/queries/fortran/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/fsharp/highlights.scmnew file+196

This diff is too big to show here.

runtime/queries/fsharp/locals.scmnew file+25

This diff is too big to show here.

runtime/queries/gas/highlights.scmnew file+21

This diff is too big to show here.

runtime/queries/gas/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/gas/textobjects.scmnew file+2

This diff is too big to show here.

runtime/queries/gdscript/highlights.scm+86−29

This diff is too big to show here.

runtime/queries/gdscript/indents.scm+1−1

This diff is too big to show here.

runtime/queries/gemini/highlights.scmnew file+26

This diff is too big to show here.

runtime/queries/git-commit/highlights.scm+5−1

This diff is too big to show here.

runtime/queries/git-commit/textobjects.scmnew file+2

This diff is too big to show here.

runtime/queries/gleam/highlights.scm+17−5

This diff is too big to show here.

runtime/queries/gn/highlights.scmnew file+42

This diff is too big to show here.

runtime/queries/gn/injections.scmnew file+15

This diff is too big to show here.

runtime/queries/gn/locals.scmnew file+16

This diff is too big to show here.

runtime/queries/go/highlights.scm+67−26

This diff is too big to show here.

runtime/queries/go/indents.scm+16−4

This diff is too big to show here.

runtime/queries/go/locals.scm+11−3

This diff is too big to show here.

runtime/queries/godot-resource/injections.scm+16

This diff is too big to show here.

runtime/queries/hare/highlights.scm+4−1

This diff is too big to show here.

runtime/queries/haskell-persistent/folds.scmnew file+3

This diff is too big to show here.

runtime/queries/haskell-persistent/highlights.scmnew file+37

This diff is too big to show here.

runtime/queries/haskell-persistent/locals.scmnew file+1

This diff is too big to show here.

runtime/queries/haskell/highlights.scm+24−11

This diff is too big to show here.

runtime/queries/haskell/injections.scm+12

This diff is too big to show here.

runtime/queries/haskell/textobjects.scm+1−1

This diff is too big to show here.

runtime/queries/hurl/highlights.scmnew file+127

This diff is too big to show here.

runtime/queries/hurl/indents.scmnew file+11

This diff is too big to show here.

runtime/queries/hurl/injections.scmnew file+14

This diff is too big to show here.

runtime/queries/janet/highlights.scmnew file+1

This diff is too big to show here.

runtime/queries/java/highlights.scm+81−2

This diff is too big to show here.

runtime/queries/java/indents.scmnew file+35

This diff is too big to show here.

runtime/queries/javascript/highlights.scm+2−37

This diff is too big to show here.

runtime/queries/javascript/indents.scm+3−1

This diff is too big to show here.

runtime/queries/javascript/injections.scm+3−1

This diff is too big to show here.

runtime/queries/javascript/locals.scm+3−1

This diff is too big to show here.

runtime/queries/javascript/tags.scm+2−87

This diff is too big to show here.

runtime/queries/javascript/textobjects.scm+3−1

This diff is too big to show here.

runtime/queries/jinja/highlights.scmnew file+7

This diff is too big to show here.

runtime/queries/jinja/injections.scmnew file+4

This diff is too big to show here.

runtime/queries/json5/highlights.scmnew file+11

This diff is too big to show here.

runtime/queries/jsx/highlights.scm+2−36

This diff is too big to show here.

runtime/queries/jsx/indents.scm+2−8

This diff is too big to show here.

runtime/queries/jsx/injections.scm+3−1

This diff is too big to show here.

runtime/queries/jsx/locals.scm+3−1

This diff is too big to show here.

runtime/queries/jsx/tags.scmnew file+3

This diff is too big to show here.

runtime/queries/jsx/textobjects.scm+3−1

This diff is too big to show here.

runtime/queries/julia/indents.scmnew file+16

This diff is too big to show here.

runtime/queries/julia/injections.scm+6

This diff is too big to show here.

runtime/queries/julia/textobjects.scmnew file+46

This diff is too big to show here.

runtime/queries/just/folds.scmnew file+4

This diff is too big to show here.

runtime/queries/just/highlights.scmnew file+33

This diff is too big to show here.

runtime/queries/just/indents.scmnew file+3

This diff is too big to show here.

runtime/queries/just/injections.scmnew file+16

This diff is too big to show here.

runtime/queries/just/locals.scmnew file+10

This diff is too big to show here.

runtime/queries/just/textobjects.scmnew file+48

This diff is too big to show here.

runtime/queries/kdl/highlights.scm+4−4

This diff is too big to show here.

runtime/queries/kdl/indents.scmnew file+3

This diff is too big to show here.

runtime/queries/kdl/textobjects.scmnew file+27

This diff is too big to show here.

runtime/queries/kotlin/highlights.scm+4−1

This diff is too big to show here.

runtime/queries/kotlin/locals.scmnew file+15

This diff is too big to show here.

runtime/queries/log/highlights.scmnew file+10

This diff is too big to show here.

runtime/queries/lpf/highlights.scmnew file+19

This diff is too big to show here.

runtime/queries/make/highlights.scm+6−1

This diff is too big to show here.

runtime/queries/make/injections.scm+3

This diff is too big to show here.

runtime/queries/markdoc/highlights.scmnew file+16

This diff is too big to show here.

runtime/queries/markdoc/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/markdown.inline/injections.scm+6−1

This diff is too big to show here.

runtime/queries/markdown/highlights.scm+10−1

This diff is too big to show here.

runtime/queries/markdown/injections.scm+4

This diff is too big to show here.

runtime/queries/matlab/context.scmnew file+41

This diff is too big to show here.

runtime/queries/matlab/folds.scmnew file+11

This diff is too big to show here.

runtime/queries/matlab/highlights.scm+108−77

This diff is too big to show here.

runtime/queries/matlab/indents.scmnew file+23

This diff is too big to show here.

runtime/queries/matlab/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/matlab/locals.scmnew file+19

This diff is too big to show here.

runtime/queries/matlab/textobjects.scmnew file+9

This diff is too big to show here.

runtime/queries/nasm/highlights.scmnew file+126

This diff is too big to show here.

runtime/queries/nasm/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/nasm/textobjects.scmnew file+15

This diff is too big to show here.

runtime/queries/nickel/highlights.scm+2−2

This diff is too big to show here.

runtime/queries/nickel/indents.scm+1−1

This diff is too big to show here.

runtime/queries/nickel/injections.scmnew file+3

This diff is too big to show here.

runtime/queries/nim/highlights.scmnew file+315

This diff is too big to show here.

runtime/queries/nim/indents.scmnew file+54

This diff is too big to show here.

runtime/queries/nim/textobjects.scmnew file+19

This diff is too big to show here.

runtime/queries/nix/highlights.scm+6−1

This diff is too big to show here.

runtime/queries/nix/injections.scm+29−3

This diff is too big to show here.

runtime/queries/nu/folds.scmdeleted−4

This diff is too big to show here.

runtime/queries/nu/highlights.scm+276−44

This diff is too big to show here.

runtime/queries/nu/injections.scm+1−1

This diff is too big to show here.

runtime/queries/nu/locals.scmdeleted−13

This diff is too big to show here.

runtime/queries/nunjucks/highlights.scmnew file+1

This diff is too big to show here.

runtime/queries/nunjucks/injections.scmnew file+1

This diff is too big to show here.

runtime/queries/ocaml/highlights.scm+2

This diff is too big to show here.

runtime/queries/odin/highlights.scm+18−133

This diff is too big to show here.

runtime/queries/odin/indents.scmnew file+16

This diff is too big to show here.

runtime/queries/odin/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/opencl/highlights.scmnew file+150

This diff is too big to show here.

runtime/queries/opencl/indents.scmnew file+1

This diff is too big to show here.

runtime/queries/opencl/injections.scmnew file+1

This diff is too big to show here.

runtime/queries/opencl/textobjects.scmnew file+1

This diff is too big to show here.

runtime/queries/perl/fold.scmnew file+19

This diff is too big to show here.

runtime/queries/perl/highlights.scm+72−155

This diff is too big to show here.

runtime/queries/perl/indents.scm+25−11

This diff is too big to show here.

runtime/queries/perl/injections.scm+3−1

This diff is too big to show here.

runtime/queries/perl/textobjects.scm+10−13

This diff is too big to show here.

runtime/queries/php/highlights.scm+229−40

This diff is too big to show here.

runtime/queries/php/injections.scm+19

This diff is too big to show here.

runtime/queries/pod/highlights.scmnew file+61

This diff is too big to show here.

runtime/queries/prql/highlights.scmnew file+143

This diff is too big to show here.

runtime/queries/prql/injections.scmnew file+8

This diff is too big to show here.

runtime/queries/purescript/highlights.scm+164−1

This diff is too big to show here.

runtime/queries/purescript/injections.scm+2−1

This diff is too big to show here.

runtime/queries/purescript/locals.scm+4−1

This diff is too big to show here.

runtime/queries/purescript/textobjects.scmnew file+13

This diff is too big to show here.

runtime/queries/python/highlights.scm+7−1

This diff is too big to show here.

runtime/queries/python/indents.scm+9

This diff is too big to show here.

runtime/queries/racket/indents.scmnew file+1

This diff is too big to show here.

runtime/queries/regex/highlights.scm+1−1

This diff is too big to show here.

runtime/queries/rego/highlights.scmnew file+68

This diff is too big to show here.

runtime/queries/rego/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/robot/highlights.scmnew file+59

This diff is too big to show here.

runtime/queries/ron/highlights.scm+43−1

This diff is too big to show here.

runtime/queries/ron/indents.scm+12−1

This diff is too big to show here.

runtime/queries/ron/injections.scm+2−1

This diff is too big to show here.

runtime/queries/rst/highlights.scmnew file+38

This diff is too big to show here.

runtime/queries/ruby/highlights.scm+82−38

This diff is too big to show here.

runtime/queries/ruby/injections.scm+6

This diff is too big to show here.

runtime/queries/rust/highlights.scm+7

This diff is too big to show here.

runtime/queries/rust/indents.scm+69−2

This diff is too big to show here.

runtime/queries/rust/injections.scm+10−4

This diff is too big to show here.

runtime/queries/rust/locals.scm+14−1

This diff is too big to show here.

runtime/queries/rust/textobjects.scm+4−1

This diff is too big to show here.

runtime/queries/scala/locals.scmnew file+29

This diff is too big to show here.

runtime/queries/scheme/highlights.scm+5

This diff is too big to show here.

runtime/queries/scheme/indents.scmnew file+43

This diff is too big to show here.

runtime/queries/slint/highlights.scm+118−72

This diff is too big to show here.

runtime/queries/slint/indents.scm+6−5

This diff is too big to show here.

runtime/queries/slint/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/slint/locals.scm+1−1

This diff is too big to show here.

runtime/queries/smali/folds.scmnew file+12

This diff is too big to show here.

runtime/queries/smali/highlights.scmnew file+216

This diff is too big to show here.

runtime/queries/smali/indents.scmnew file+31

This diff is too big to show here.

runtime/queries/smali/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/smali/locals.scmnew file+42

This diff is too big to show here.

runtime/queries/smithy/highlights.scmnew file+102

This diff is too big to show here.

runtime/queries/sql/highlights.scm+326−176

This diff is too big to show here.

runtime/queries/strace/highlights.scmnew file+8

This diff is too big to show here.

runtime/queries/svelte/indents.scmnew file+18

This diff is too big to show here.

runtime/queries/svelte/injections.scm+10

This diff is too big to show here.

runtime/queries/sway/highlights.scmnew file+336

This diff is too big to show here.

runtime/queries/sway/indents.scmnew file+71

This diff is too big to show here.

runtime/queries/sway/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/sway/locals.scmnew file+17

This diff is too big to show here.

runtime/queries/sway/textobjects.scmnew file+52

This diff is too big to show here.

runtime/queries/t32/highlights.scmnew file+227

This diff is too big to show here.

runtime/queries/t32/injections.scmnew file+2

This diff is too big to show here.

runtime/queries/templ/highlights.scmnew file+99

This diff is too big to show here.

runtime/queries/templ/injections.scmnew file+4

This diff is too big to show here.

runtime/queries/todotxt/highlights.scmnew file+6

This diff is too big to show here.

runtime/queries/toml/highlights.scm+15−2

This diff is too big to show here.

runtime/queries/tsx/highlights.scm+3−1

This diff is too big to show here.

runtime/queries/tsx/indents.scm+3−1

This diff is too big to show here.

runtime/queries/tsx/injections.scm+3−1

This diff is too big to show here.

runtime/queries/tsx/locals.scmnew file+3

This diff is too big to show here.

runtime/queries/tsx/tags.scmnew file+3

This diff is too big to show here.

runtime/queries/tsx/textobjects.scm+3−1

This diff is too big to show here.

runtime/queries/typescript/highlights.scm+2−76

This diff is too big to show here.

runtime/queries/typescript/indents.scm+2−6

This diff is too big to show here.

runtime/queries/typescript/injections.scm+3−1

This diff is too big to show here.

runtime/queries/typescript/locals.scm+3−2

This diff is too big to show here.

runtime/queries/typescript/tags.scm+2−22

This diff is too big to show here.

runtime/queries/typescript/textobjects.scm+2−7

This diff is too big to show here.

runtime/queries/typst/highlights.scmnew file+77

This diff is too big to show here.

runtime/queries/typst/injections.scmnew file+6

This diff is too big to show here.

runtime/queries/unison/highlights.scmnew file+87

This diff is too big to show here.

runtime/queries/unison/injections.scmnew file+1

This diff is too big to show here.

runtime/queries/v/highlights.scm+158−67

This diff is too big to show here.

runtime/queries/v/indents.scmnew file+16

This diff is too big to show here.

runtime/queries/v/injections.scmnew file+6

This diff is too big to show here.

runtime/queries/v/textobjects.scmnew file+27

This diff is too big to show here.

runtime/queries/vhdl/highlights.scmnew file+338

This diff is too big to show here.

runtime/queries/webc/highlights.scmnew file+1

This diff is too big to show here.

runtime/queries/webc/injections.scmnew file+1

This diff is too big to show here.

runtime/queries/wren/highlights.scmnew file+82

This diff is too big to show here.

runtime/queries/wren/indents.scmnew file+29

This diff is too big to show here.

runtime/queries/wren/injections.scmnew file+3

This diff is too big to show here.

runtime/queries/wren/locals.scmnew file+21

This diff is too big to show here.

runtime/queries/wren/textobjects.scmnew file+16

This diff is too big to show here.

runtime/queries/yaml/indents.scm+35−1

This diff is too big to show here.

runtime/queries/yaml/injections.scm+52

This diff is too big to show here.

runtime/queries/yuck/highlights.scm+88−47

This diff is too big to show here.

runtime/queries/yuck/injections.scm+1−1

This diff is too big to show here.

runtime/queries/zig/highlights.scm+5−2

This diff is too big to show here.

runtime/queries/zig/textobjects.scm+3−3

This diff is too big to show here.

runtime/themes/README.md+8

This diff is too big to show here.

runtime/themes/acme.toml+2

This diff is too big to show here.

runtime/themes/adwaita-dark.tomlnew file+172

This diff is too big to show here.

runtime/themes/amberwood.tomlnew file+138

This diff is too big to show here.

runtime/themes/autumn.toml+72−64

This diff is too big to show here.

runtime/themes/autumn_night.toml+13−11

This diff is too big to show here.

runtime/themes/ayu_dark.toml+12−2

This diff is too big to show here.

runtime/themes/ayu_evolve.toml+2

This diff is too big to show here.

runtime/themes/ayu_light.toml+13−3

This diff is too big to show here.

runtime/themes/ayu_mirage.toml+12−2

This diff is too big to show here.

runtime/themes/base16_transparent.toml+7−1

This diff is too big to show here.

runtime/themes/boo_berry.toml+1

This diff is too big to show here.

runtime/themes/catppuccin_frappe.toml+2

This diff is too big to show here.

runtime/themes/catppuccin_latte.toml+2

This diff is too big to show here.

runtime/themes/catppuccin_macchiato.toml+2

This diff is too big to show here.

runtime/themes/catppuccin_mocha.toml+24−14

This diff is too big to show here.

runtime/themes/cyan_light.tomlnew file+154

This diff is too big to show here.

runtime/themes/darcula-solid.toml+1−4

This diff is too big to show here.

runtime/themes/darcula.toml+11−4

This diff is too big to show here.

runtime/themes/dark_high_contrast.toml+6−1

This diff is too big to show here.

runtime/themes/dark_plus.toml+2

This diff is too big to show here.

runtime/themes/dracula.toml+128−70

This diff is too big to show here.

runtime/themes/dracula_at_night.toml+2

This diff is too big to show here.

runtime/themes/emacs.toml+1

This diff is too big to show here.

runtime/themes/everblush.tomlnew file+115

This diff is too big to show here.

runtime/themes/everforest_dark.toml+75−54

This diff is too big to show here.

runtime/themes/everforest_light.toml+75−54

This diff is too big to show here.

runtime/themes/ferra.tomlnew file+83

This diff is too big to show here.

runtime/themes/flatwhite.toml+3

This diff is too big to show here.

runtime/themes/fleet_dark.toml+8−6

This diff is too big to show here.

runtime/themes/gruber-darker.tomlnew file+114

This diff is too big to show here.

runtime/themes/gruvbox.toml+2

This diff is too big to show here.

runtime/themes/gruvbox_dark_hard.toml+2−96

This diff is too big to show here.

runtime/themes/gruvbox_dark_soft.tomlnew file+7

This diff is too big to show here.

runtime/themes/gruvbox_light.toml+1−77

This diff is too big to show here.

runtime/themes/horizon-dark.tomlnew file+80

This diff is too big to show here.

runtime/themes/jellybeans.toml+1−1

This diff is too big to show here.

runtime/themes/kanagawa.toml+32−24

This diff is too big to show here.

runtime/themes/kaolin-dark.tomlnew file+108

This diff is too big to show here.

runtime/themes/kaolin-light.tomlnew file+60

This diff is too big to show here.

runtime/themes/kaolin-valley-dark.tomlnew file+73

This diff is too big to show here.

runtime/themes/licenses/everforest.LICENSEnew file+21

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi.LICENSEnew file+5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSEnew file+5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_tinted.LICENSEnew file+5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_tritanopia.LICENSEnew file+5

This diff is too big to show here.

runtime/themes/licenses/poimandres.LICENSEnew file+21

This diff is too big to show here.

runtime/themes/licenses/serika-syntax.LICENSEnew file+21

This diff is too big to show here.

runtime/themes/licenses/sonokai.LICENSEnew file+21

This diff is too big to show here.

runtime/themes/licenses/starlight.LICENSEnew file+24

This diff is too big to show here.

runtime/themes/material_darker.tomlnew file+20

This diff is too big to show here.

runtime/themes/material_deep_ocean.tomlnew file+123

This diff is too big to show here.

runtime/themes/material_oceanic.tomlnew file+21

This diff is too big to show here.

runtime/themes/material_palenight.tomlnew file+19

This diff is too big to show here.

runtime/themes/mellow.toml+1

This diff is too big to show here.

runtime/themes/merionette.tomlnew file+98

This diff is too big to show here.

runtime/themes/modus_operandi.tomlnew file+194

This diff is too big to show here.

runtime/themes/modus_operandi_deuteranopia.tomlnew file+46

This diff is too big to show here.

runtime/themes/modus_operandi_tinted.tomlnew file+45

This diff is too big to show here.

runtime/themes/modus_operandi_tritanopia.tomlnew file+73

This diff is too big to show here.

runtime/themes/modus_vivendi.tomlnew file+242

This diff is too big to show here.

runtime/themes/modus_vivendi_deuteranopia.tomlnew file+158

This diff is too big to show here.

runtime/themes/modus_vivendi_tinted.tomlnew file+144

This diff is too big to show here.

runtime/themes/modus_vivendi_tritanopia.tomlnew file+186

This diff is too big to show here.

runtime/themes/molokai.tomlnew file+48

This diff is too big to show here.

runtime/themes/monokai.toml+7−2

This diff is too big to show here.

runtime/themes/naysayer.tomlnew file+91

This diff is too big to show here.

runtime/themes/new_moon.tomlnew file+124

This diff is too big to show here.

runtime/themes/nightfox.toml+9−4

This diff is too big to show here.

runtime/themes/noctis.toml+34−32

This diff is too big to show here.

runtime/themes/nord-night.tomlnew file+23

This diff is too big to show here.

runtime/themes/nord.toml+162−102

This diff is too big to show here.

runtime/themes/onedark.toml+5

This diff is too big to show here.

runtime/themes/onedarker.toml+3

This diff is too big to show here.

runtime/themes/onelight.toml+150−89

This diff is too big to show here.

runtime/themes/papercolor-dark.toml+67−115

This diff is too big to show here.

runtime/themes/papercolor-light.toml+194−102

This diff is too big to show here.

runtime/themes/poimandres.tomlnew file+113

This diff is too big to show here.

runtime/themes/poimandres_storm.tomlnew file+19

This diff is too big to show here.

runtime/themes/pop-dark.toml+9−5

This diff is too big to show here.

runtime/themes/rasmus.toml+1

This diff is too big to show here.

runtime/themes/rose_pine.toml+36−32

This diff is too big to show here.

runtime/themes/rose_pine_dawn.toml+1−1

This diff is too big to show here.

runtime/themes/rose_pine_moon.toml+1−1

This diff is too big to show here.

runtime/themes/serika-dark.toml+2−1

This diff is too big to show here.

runtime/themes/serika-light.toml+1

This diff is too big to show here.

runtime/themes/solarized_dark.toml+1

This diff is too big to show here.

runtime/themes/solarized_light.toml+1

This diff is too big to show here.

runtime/themes/spacebones_light.toml+1

This diff is too big to show here.

runtime/themes/starlight.tomlnew file+113

This diff is too big to show here.

runtime/themes/tokyonight.toml+1

This diff is too big to show here.

runtime/themes/varua.toml+2

This diff is too big to show here.

runtime/themes/vim_dark_high_contrast.tomlnew file+72

This diff is too big to show here.

runtime/themes/yellowed.tomlnew file+135

This diff is too big to show here.

runtime/themes/zed_onedark.tomlnew file+110

This diff is too big to show here.

runtime/themes/zed_onelight.tomlnew file+55

This diff is too big to show here.

runtime/themes/zenburn.toml+3−1

This diff is too big to show here.

runtime/tutor+165−11

This diff is too big to show here.

rust-toolchain.toml+2−2

This diff is too big to show here.

theme.toml+3−1

This diff is too big to show here.

xtask/Cargo.toml+12−6

This diff is too big to show here.

xtask/src/docgen.rs+6−5

This diff is too big to show here.

xtask/src/themelint.rs+2

This diff is too big to show here.