on cdec933 help sign in
492 files changed+11873−28986
since splitsnapshots
unifiedsplit
.envrc−1 .github/ISSUE_TEMPLATE/bug_report.yaml−10 .github/workflows/build.yml+7−15 .github/workflows/cachix.yml+3−3 .github/workflows/gh-pages.yml+5−5 .github/workflows/release.yml+16−27 .ignore+3 CHANGELOG.md+1−651 Cargo.lock+699−879 Cargo.toml+2−15 README.md+2−2 VERSION+1 book/book.toml+1−5 book/custom.css−231 book/src/SUMMARY.md−1 book/src/configuration.md+13−55 book/src/from-vim.md+3−3 book/src/generated/lang-support.md+22−59 book/src/generated/typable-cmd.md+7−16 book/src/guides/adding_languages.md−3 book/src/guides/indent.md+43−319 book/src/guides/injection.md−57 book/src/install.md+35−116 book/src/keymap.md+19−29 book/src/languages.md+28−105 book/src/themes.md+53−72 book/src/usage.md+10−26 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+51−87 contrib/Helix.appdata.xml−21 contrib/Helix.desktop+1−3 docs/CONTRIBUTING.md+4−17 docs/releases.md+6−13 docs/vision.md+1−1 flake.lock+173−39 flake.nix+142−171 grammars.nix+21−24 helix-core/Cargo.toml+16−22 helix-core/src/diagnostic.rs+1−6 helix-core/src/doc_formatter/test.rs+48−8 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+145−618 helix-core/src/lib.rs+49−8 helix-core/src/line_ending.rs+2−2 helix-core/src/match_brackets.rs+29−232 helix-core/src/movement.rs+15−195 helix-core/src/path.rs+8−27 helix-core/src/position.rs+16−41 helix-core/src/register.rs+81 helix-core/src/rope_reader.rs−37 helix-core/src/selection.rs+44−77 helix-core/src/shellwords.rs+2−2 helix-core/src/surround.rs+6−1 helix-core/src/syntax.rs+169−415 helix-core/src/test.rs+18−139 helix-core/src/text_annotations.rs+26−26 helix-core/src/textobject.rs+3−3 helix-core/src/transaction.rs+51−309 helix-core/src/wrap.rs+1−3 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+26−187 helix-dap/Cargo.toml+9−11 helix-dap/src/client.rs+6−10 helix-dap/src/transport.rs+18−28 helix-event/Cargo.toml−16 helix-event/src/lib.rs−8 helix-event/src/redraw.rs−49 helix-loader/Cargo.toml+12−16 helix-loader/build.rs+5−56 helix-loader/src/config.rs+31−32 helix-loader/src/grammar.rs+46−121 helix-loader/src/lib.rs+42−100 helix-lsp/Cargo.toml+14−17 helix-lsp/src/client.rs+54−439 helix-lsp/src/file_event.rs−193 helix-lsp/src/lib.rs+153−429 helix-lsp/src/snippet.rs+89−574 helix-lsp/src/transport.rs+21−52 helix-parsec/Cargo.toml+7−8 helix-parsec/src/lib.rs−13 helix-term/Cargo.toml+24−33 helix-term/src/application.rs+196−350 helix-term/src/args.rs−29 helix-term/src/commands.rs+661−1140 helix-term/src/commands/dap.rs+57−60 helix-term/src/commands/lsp.rs+481−753 helix-term/src/commands/typed.rs+741−1192 helix-term/src/compositor.rs−12 helix-term/src/config.rs+30−110 helix-term/src/health.rs+12−48 helix-term/src/keymap.rs+166−119 helix-term/src/keymap/default.rs+7−14 helix-term/src/keymap/macros.rs+4−3 helix-term/src/main.rs+31−36 helix-term/src/ui/completion.rs+108−165 helix-term/src/ui/document.rs+31−79 helix-term/src/ui/editor.rs+131−218 helix-term/src/ui/fuzzy_match.rs+239 helix-term/src/ui/fuzzy_match/test.rs+47 helix-term/src/ui/lsp.rs+3−5 helix-term/src/ui/markdown.rs+14−23 helix-term/src/ui/menu.rs+40−74 helix-term/src/ui/mod.rs+179−108 helix-term/src/ui/overlay.rs+1−1 helix-term/src/ui/picker.rs+587−630 helix-term/src/ui/popup.rs+18−44 helix-term/src/ui/prompt.rs+52−69 helix-term/src/ui/statusline.rs+7−44 helix-term/tests/integration.rs+5−3 helix-term/tests/test/auto_indent.rs+9−3 helix-term/tests/test/auto_pairs.rs+11−5 helix-term/tests/test/commands.rs+162−212 helix-term/tests/test/commands/movement.rs−452 helix-term/tests/test/helpers.rs+26−53 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+43−54 helix-term/tests/test/splits.rs+6−8 helix-term/tests/test/commands/write.rs → helix-term/tests/test/write.rs+7−254 helix-tui/Cargo.toml+16−16 helix-tui/src/backend/crossterm.rs+50−87 helix-tui/src/backend/mod.rs−1 helix-tui/src/backend/test.rs−4 helix-tui/src/buffer.rs+2−43 helix-tui/src/lib.rs+3−9 helix-tui/src/terminal.rs+14−4 helix-tui/src/text.rs+1−3 helix-tui/src/widgets/block.rs+7−2 helix-tui/src/widgets/mod.rs+2−2 helix-tui/src/widgets/table.rs+7−19 helix-vcs/Cargo.toml+10−14 helix-vcs/src/diff.rs+19−6 helix-vcs/src/diff/line_cache.rs+9−9 helix-vcs/src/diff/worker.rs+9−3 helix-vcs/src/diff/worker/test.rs+5−1 helix-vcs/src/git.rs+29−64 helix-vcs/src/git/test.rs+6−6 helix-vcs/src/lib.rs+5−32 helix-view/Cargo.toml+18−22 helix-view/src/clipboard.rs+3−8 helix-view/src/document.rs+153−673 helix-view/src/editor.rs+104−326 helix-view/src/graphics.rs−1 helix-view/src/gutter.rs+42−63 helix-view/src/handlers/dap.rs+3−2 helix-view/src/info.rs+25−5 helix-view/src/input.rs+3−67 helix-view/src/keyboard.rs−1 helix-view/src/lib.rs−1 helix-view/src/register.rs−333 helix-view/src/theme.rs+5−26 helix-view/src/tree.rs+8−6 helix-view/src/view.rs+40−87 languages.toml+304−1055 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+1−19 runtime/queries/cairo/highlights.scm+94−1 runtime/queries/cairo/indents.scm−1 runtime/queries/cairo/injections.scm+4−2 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+8−8 runtime/queries/common-lisp/indents.scm−1 runtime/queries/cpp/highlights.scm+1−1 runtime/queries/dart/highlights.scm+1−3 runtime/queries/dbml/highlights.scm−44 runtime/queries/dockerfile/highlights.scm+1−4 runtime/queries/dtd/highlights.scm−39 runtime/queries/dtd/injections.scm−2 runtime/queries/ecma/README.md−14 runtime/queries/ecma/highlights.scm+2−9 runtime/queries/ecma/indents.scm−6 runtime/queries/ecma/locals.scm+3−17 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+4−27 runtime/queries/gemini/highlights.scm−26 runtime/queries/git-commit/highlights.scm+1−5 runtime/queries/git-commit/textobjects.scm−2 runtime/queries/gleam/highlights.scm+5−17 runtime/queries/gn/highlights.scm−42 runtime/queries/gn/injections.scm−15 runtime/queries/gn/locals.scm−16 runtime/queries/go/highlights.scm+5−13 runtime/queries/go/indents.scm+4−16 runtime/queries/go/locals.scm+3−11 runtime/queries/hare/highlights.scm+1−4 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+11−24 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+2−81 runtime/queries/java/indents.scm−35 runtime/queries/javascript/highlights.scm+37−2 runtime/queries/javascript/indents.scm+1−3 runtime/queries/javascript/injections.scm+1−3 runtime/queries/javascript/locals.scm+1−3 runtime/queries/javascript/tags.scm+87−2 runtime/queries/javascript/textobjects.scm+1−3 runtime/queries/jinja/highlights.scm−7 runtime/queries/jinja/injections.scm−4 runtime/queries/json5/highlights.scm−11 runtime/queries/jsx/highlights.scm+36−2 runtime/queries/jsx/indents.scm+8−2 runtime/queries/jsx/injections.scm+1−3 runtime/queries/jsx/locals.scm+1−3 runtime/queries/jsx/tags.scm−3 runtime/queries/jsx/textobjects.scm+1−3 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+1−4 runtime/queries/kotlin/locals.scm−15 runtime/queries/log/highlights.scm−10 runtime/queries/lpf/highlights.scm−19 runtime/queries/make/highlights.scm+1−6 runtime/queries/make/injections.scm−3 runtime/queries/markdoc/highlights.scm−16 runtime/queries/markdoc/injections.scm−2 runtime/queries/markdown.inline/injections.scm+1−4 runtime/queries/markdown/highlights.scm−3 runtime/queries/markdown/injections.scm−4 runtime/queries/matlab/context.scm−41 runtime/queries/matlab/folds.scm−11 runtime/queries/matlab/highlights.scm+77−108 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/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+1−6 runtime/queries/nix/injections.scm+3−29 runtime/queries/nu/folds.scm+4 runtime/queries/nu/highlights.scm+44−276 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+133−18 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+155−72 runtime/queries/perl/indents.scm+11−25 runtime/queries/perl/injections.scm+1−3 runtime/queries/perl/textobjects.scm+13−10 runtime/queries/php/highlights.scm−2 runtime/queries/php/injections.scm−19 runtime/queries/pod/highlights.scm−61 runtime/queries/prql/highlights.scm+12−19 runtime/queries/purescript/highlights.scm+1−164 runtime/queries/purescript/injections.scm+1−2 runtime/queries/purescript/locals.scm+1−4 runtime/queries/purescript/textobjects.scm−13 runtime/queries/python/highlights.scm+1−7 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+1−43 runtime/queries/ron/indents.scm+1−12 runtime/queries/ron/injections.scm+1−2 runtime/queries/ruby/highlights.scm+38−82 runtime/queries/ruby/injections.scm−6 runtime/queries/rust/highlights.scm−7 runtime/queries/rust/indents.scm+2−69 runtime/queries/rust/injections.scm+4−10 runtime/queries/rust/locals.scm+1−14 runtime/queries/rust/textobjects.scm+1−4 runtime/queries/scala/locals.scm−29 runtime/queries/scheme/highlights.scm−5 runtime/queries/scheme/indents.scm−43 runtime/queries/slint/highlights.scm+72−118 runtime/queries/slint/indents.scm+5−6 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+176−326 runtime/queries/strace/highlights.scm−8 runtime/queries/svelte/indents.scm−18 runtime/queries/svelte/injections.scm−10 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+2−15 runtime/queries/tsx/highlights.scm+1−3 runtime/queries/tsx/indents.scm+1−3 runtime/queries/tsx/injections.scm+1−3 runtime/queries/tsx/locals.scm−3 runtime/queries/tsx/tags.scm−3 runtime/queries/tsx/textobjects.scm+1−3 runtime/queries/typescript/highlights.scm+76−2 runtime/queries/typescript/indents.scm+6−2 runtime/queries/typescript/injections.scm+1−3 runtime/queries/typescript/locals.scm+2−3 runtime/queries/typescript/tags.scm+22−2 runtime/queries/typescript/textobjects.scm+7−2 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+67−158 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+1−35 runtime/queries/yaml/injections.scm−52 runtime/queries/yuck/highlights.scm+47−88 runtime/queries/yuck/injections.scm+1−1 runtime/queries/zig/highlights.scm+2−5 runtime/queries/zig/textobjects.scm+3−3 runtime/themes/README.md−8 runtime/themes/acme.toml−2 runtime/themes/adwaita-dark.toml−3 runtime/themes/amberwood.toml−138 runtime/themes/autumn.toml+64−72 runtime/themes/autumn_night.toml+11−13 runtime/themes/ayu_dark.toml+2−12 runtime/themes/ayu_light.toml+3−13 runtime/themes/ayu_mirage.toml+2−12 runtime/themes/base16_transparent.toml+1−7 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+10−20 runtime/themes/cyan_light.toml−154 runtime/themes/darcula-solid.toml+4−1 runtime/themes/darcula.toml+4−11 runtime/themes/dark_high_contrast.toml+1−6 runtime/themes/dark_plus.toml−2 runtime/themes/dracula.toml+70−128 runtime/themes/dracula_at_night.toml−2 runtime/themes/emacs.toml−1 runtime/themes/everblush.toml−1 runtime/themes/everforest_dark.toml+54−75 runtime/themes/everforest_light.toml+54−75 runtime/themes/ferra.toml−83 runtime/themes/flatwhite.toml−3 runtime/themes/fleet_dark.toml+6−8 runtime/themes/gruber-darker.toml−114 runtime/themes/gruvbox.toml−2 runtime/themes/gruvbox_dark_hard.toml+96−2 runtime/themes/gruvbox_dark_soft.toml−7 runtime/themes/gruvbox_light.toml+77−1 runtime/themes/horizon-dark.toml−80 runtime/themes/jellybeans.toml+1−1 runtime/themes/kanagawa.toml−3 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+2−7 runtime/themes/naysayer.toml−91 runtime/themes/new_moon.toml−124 runtime/themes/nightfox.toml+4−9 runtime/themes/noctis.toml+32−34 runtime/themes/nord-night.toml−23 runtime/themes/nord.toml+102−162 runtime/themes/onedark.toml−5 runtime/themes/onedarker.toml−3 runtime/themes/onelight.toml+28−34 runtime/themes/papercolor-dark.toml+116−67 runtime/themes/papercolor-light.toml+103−194 runtime/themes/poimandres.toml−113 runtime/themes/poimandres_storm.toml−19 runtime/themes/pop-dark.toml+4−5 runtime/themes/rasmus.toml−1 runtime/themes/rose_pine.toml+32−36 runtime/themes/rose_pine_dawn.toml+1−1 runtime/themes/rose_pine_moon.toml+1−1 runtime/themes/serika-dark.toml+1−2 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+1−3 runtime/tutor+11−165 rust-toolchain.toml+2−2 theme.toml+1−3 xtask/Cargo.toml+6−12 xtask/src/docgen.rs+5−6 xtask/src/themelint.rs−2
.envrc−1
@@ -1,6 +1,5 @@
11watch_file shell.nix
22watch_file flake.lock
3−watch_file rust-toolchain.toml
43
54# try to use flakes, if it fails use normal nix (ie. shell.nix)
65use flake || use nix
.github/ISSUE_TEMPLATE/bug_report.yaml−10
@@ -55,16 +55,6 @@ 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
6858 - type: input
6959 id: helix-version
7060 attributes:
.github/workflows/build.yml+7−15
@@ -14,7 +14,7 @@ jobs:
1414 runs-on: ubuntu-latest
1515 steps:
1616 - name: Checkout sources
17− uses: actions/checkout@v4
17+ uses: actions/checkout@v3
1818 - name: Install stable toolchain
1919 uses: helix-editor/rust-toolchain@v1
2020 with:
@@ -22,8 +22,6 @@ jobs:
2222 override: true
2323
2424 - uses: Swatinem/rust-cache@v2
25− with:
26− shared-key: "build"
2725
2826 - name: Run cargo check
2927 run: cargo check
@@ -36,14 +34,12 @@ jobs:
3634 HELIX_LOG_LEVEL: info
3735 steps:
3836 - name: Checkout sources
39− uses: actions/checkout@v4
37+ uses: actions/checkout@v3
4038
4139 - name: Install stable toolchain
42− uses: dtolnay/rust-toolchain@1.70
40+ uses: dtolnay/rust-toolchain@1.65
4341
4442 - uses: Swatinem/rust-cache@v2
45− with:
46− shared-key: "build"
4743
4844 - name: Cache test tree-sitter grammar
4945 uses: actions/cache@v3
@@ -67,16 +63,14 @@ jobs:
6763 runs-on: ubuntu-latest
6864 steps:
6965 - name: Checkout sources
70− uses: actions/checkout@v4
66+ uses: actions/checkout@v3
7167
7268 - name: Install stable toolchain
73− uses: dtolnay/rust-toolchain@1.70
69+ uses: dtolnay/rust-toolchain@1.65
7470 with:
7571 components: rustfmt, clippy
7672
7773 - uses: Swatinem/rust-cache@v2
78− with:
79− shared-key: "build"
8074
8175 - name: Run cargo fmt
8276 run: cargo fmt --all --check
@@ -94,14 +88,12 @@ jobs:
9488 runs-on: ubuntu-latest
9589 steps:
9690 - name: Checkout sources
97− uses: actions/checkout@v4
91+ uses: actions/checkout@v3
9892
9993 - name: Install stable toolchain
100− uses: dtolnay/rust-toolchain@1.70
94+ uses: dtolnay/rust-toolchain@1.65
10195
10296 - uses: Swatinem/rust-cache@v2
103− with:
104− shared-key: "build"
10597
10698 - name: Validate queries
10799 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@v4
14+ uses: actions/checkout@v3
1515
1616 - name: Install nix
17− uses: cachix/install-nix-action@v24
17+ uses: cachix/install-nix-action@v20
1818
1919 - name: Authenticate with Cachix
20− uses: cachix/cachix-action@v13
20+ uses: cachix/cachix-action@v12
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@v4
14+ - uses: actions/checkout@v3
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 stable
29+ - name: Deploy
3030 uses: peaceiris/actions-gh-pages@v3
31− if: startswith(github.ref, 'refs/tags/')
3231 with:
3332 github_token: ${{ secrets.GITHUB_TOKEN }}
3433 publish_dir: ./book/book
34+ destination_dir: ./${{ env.OUTDIR }}
3535
36− - name: Deploy
36+ - name: Deploy stable
3737 uses: peaceiris/actions-gh-pages@v3
38+ if: startswith(github.ref, 'refs/tags/')
3839 with:
3940 github_token: ${{ secrets.GITHUB_TOKEN }}
4041 publish_dir: ./book/book
41− destination_dir: ./${{ env.OUTDIR }}
.github/workflows/release.yml+16−27
@@ -23,7 +23,7 @@ jobs:
2323 runs-on: ubuntu-latest
2424 steps:
2525 - name: Checkout sources
26− uses: actions/checkout@v4
26+ uses: actions/checkout@v3
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@v4
39+ - uses: actions/upload-artifact@v3
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,7 +85,6 @@ jobs:
8585 rust: stable
8686 target: x86_64-pc-windows-msvc
8787 cross: false
88− # 23.03: build issues
8988 - build: aarch64-macos
9089 os: macos-latest
9190 rust: stable
@@ -103,10 +102,10 @@ jobs:
103102
104103 steps:
105104 - name: Checkout sources
106− uses: actions/checkout@v4
105+ uses: actions/checkout@v3
107106
108107 - name: Download grammars
109− uses: actions/download-artifact@v4
108+ uses: actions/download-artifact@v3
110109
111110 - name: Move grammars under runtime
112111 if: "!startsWith(matrix.os, 'windows')"
@@ -114,12 +113,6 @@ jobs:
114113 mkdir -p runtime/grammars/sources
115114 tar xJf grammars/grammars.tar.xz -C runtime/grammars/sources
116115
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−
123116 - name: Install ${{ matrix.rust }} toolchain
124117 uses: dtolnay/rust-toolchain@master
125118 with:
@@ -160,12 +153,8 @@ jobs:
160153
161154 - name: Build AppImage
162155 shell: bash
163− if: matrix.build == 'x86_64-linux'
156+ if: matrix.build == 'aarch64-linux' || matrix.build == 'x86_64-linux'
164157 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−
169158 mkdir dist
170159
171160 name=dev
@@ -220,7 +209,7 @@ jobs:
220209 fi
221210 cp -r runtime dist
222211
223− - uses: actions/upload-artifact@v4
212+ - uses: actions/upload-artifact@v3
224213 with:
225214 name: bins-${{ matrix.build }}
226215 path: dist
@@ -231,9 +220,9 @@ jobs:
231220 runs-on: ubuntu-latest
232221 steps:
233222 - name: Checkout sources
234− uses: actions/checkout@v4
223+ uses: actions/checkout@v3
235224
236− - uses: actions/download-artifact@v4
225+ - uses: actions/download-artifact@v3
237226
238227 - name: Build archive
239228 shell: bash
@@ -255,7 +244,7 @@ jobs:
255244 exe=".exe"
256245 fi
257246 pkgname=helix-$GITHUB_REF_NAME-$platform
258− mkdir -p $pkgname
247+ mkdir $pkgname
259248 cp $source/LICENSE $source/README.md $pkgname
260249 mkdir $pkgname/contrib
261250 cp -r $source/contrib/completion $pkgname/contrib
@@ -263,7 +252,7 @@ jobs:
263252 mv bins-$platform/hx$exe $pkgname
264253 chmod +x $pkgname/hx$exe
265254
266− if [[ "$platform" = "x86_64-linux" ]]; then
255+ if [[ "$platform" = "aarch64-linux" || "$platform" = "x86_64-linux" ]]; then
267256 mv bins-$platform/helix-*.AppImage* dist/
268257 fi
269258
@@ -288,7 +277,7 @@ jobs:
288277 overwrite: true
289278
290279 - name: Upload binaries as artifact
291− uses: actions/upload-artifact@v4
280+ uses: actions/upload-artifact@v3
292281 if: env.preview == 'true'
293282 with:
294283 name: release
.ignore+3
@@ -1,2 +1,5 @@
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+1−651
@@ -1,653 +1,3 @@
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−
6511# 22.12 (2022-12-06)
6522
6533This is a great big release filled with changes from a 99 contributors. A big _thank you_ to you all!
@@ -1856,7 +1206,7 @@ to distinguish it in bug reports..
18561206
18571207- The `runtime/` directory is now properly detected on binary releases and
18581208 on cargo run. `~/.config/helix/runtime` can also be used.
1859−- Registers can now be selected via " (for example, `"ay`)
1209+- Registers can now be selected via " (for example `"ay`)
18601210- Support for Nix files was added
18611211- Movement is now fully tested and matches Kakoune implementation
18621212- A per-file LSP symbol picker was added to space+s
Cargo.lock+699−879
@@ -2,15 +2,6 @@
22# It is not intended for manual editing.
33version = 3
44
5−[[package]]
6−name = "addr2line"
7−version = "0.20.0"
8−source = "registry+https://github.com/rust-lang/crates.io-index"
9−checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
10−dependencies = [
11− "gimli",
12−]
13−
145[[package]]
156name = "adler"
167version = "1.0.2"
@@ -19,37 +10,35 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
1910
2011[[package]]
2112name = "ahash"
22−version = "0.8.6"
13+version = "0.7.6"
2314source = "registry+https://github.com/rust-lang/crates.io-index"
24−checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
15+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
2516dependencies = [
26− "cfg-if",
2717 "getrandom",
2818 "once_cell",
2919 "version_check",
30− "zerocopy",
3120]
3221
3322[[package]]
34−name = "aho-corasick"
35−version = "1.1.2"
23+name = "ahash"
24+version = "0.8.3"
3625source = "registry+https://github.com/rust-lang/crates.io-index"
37−checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
26+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
3827dependencies = [
39− "memchr",
28+ "cfg-if",
29+ "getrandom",
30+ "once_cell",
31+ "version_check",
4032]
4133
4234[[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"
35+name = "aho-corasick"
36+version = "0.7.20"
5137source = "registry+https://github.com/rust-lang/crates.io-index"
52−checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
38+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
39+dependencies = [
40+ "memchr",
41+]
5342
5443[[package]]
5544name = "android_system_properties"
@@ -62,9 +51,9 @@ dependencies = [
6251
6352[[package]]
6453name = "anyhow"
65−version = "1.0.76"
54+version = "1.0.69"
6655source = "registry+https://github.com/rust-lang/crates.io-index"
67−checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
56+checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
6857
6958[[package]]
7059name = "arc-swap"
@@ -78,40 +67,20 @@ version = "1.1.0"
7867source = "registry+https://github.com/rust-lang/crates.io-index"
7968checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
8069
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−
9670[[package]]
9771name = "bitflags"
9872version = "1.3.2"
9973source = "registry+https://github.com/rust-lang/crates.io-index"
10074checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
10175
102−[[package]]
103−name = "bitflags"
104−version = "2.4.1"
105−source = "registry+https://github.com/rust-lang/crates.io-index"
106−checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
107−
10876[[package]]
10977name = "bstr"
110−version = "1.8.0"
78+version = "1.3.0"
11179source = "registry+https://github.com/rust-lang/crates.io-index"
112−checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
80+checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1"
11381dependencies = [
11482 "memchr",
83+ "once_cell",
11584 "regex-automata",
11685 "serde",
11786]
@@ -127,15 +96,21 @@ dependencies = [
12796
12897[[package]]
12998name = "bumpalo"
130−version = "3.12.0"
99+version = "3.11.1"
100+source = "registry+https://github.com/rust-lang/crates.io-index"
101+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
102+
103+[[package]]
104+name = "bytecount"
105+version = "0.6.3"
131106source = "registry+https://github.com/rust-lang/crates.io-index"
132−checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
107+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
133108
134109[[package]]
135110name = "bytes"
136−version = "1.4.0"
111+version = "1.3.0"
137112source = "registry+https://github.com/rust-lang/crates.io-index"
138−checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
113+checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c"
139114
140115[[package]]
141116name = "cassowary"
@@ -145,12 +120,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
145120
146121[[package]]
147122name = "cc"
148−version = "1.0.84"
123+version = "1.0.79"
149124source = "registry+https://github.com/rust-lang/crates.io-index"
150−checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
151−dependencies = [
152− "libc",
153−]
125+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
154126
155127[[package]]
156128name = "cfg-if"
@@ -171,23 +143,25 @@ dependencies = [
171143
172144[[package]]
173145name = "chrono"
174−version = "0.4.31"
146+version = "0.4.23"
175147source = "registry+https://github.com/rust-lang/crates.io-index"
176−checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
148+checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
177149dependencies = [
178− "android-tzdata",
179150 "iana-time-zone",
151+ "num-integer",
180152 "num-traits",
181− "windows-targets 0.48.0",
153+ "winapi",
182154]
183155
184156[[package]]
185157name = "clipboard-win"
186−version = "5.0.0"
158+version = "4.5.0"
187159source = "registry+https://github.com/rust-lang/crates.io-index"
188−checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
160+checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
189161dependencies = [
190162 "error-code",
163+ "str-buf",
164+ "winapi",
191165]
192166
193167[[package]]
@@ -217,15 +191,9 @@ dependencies = [
217191
218192[[package]]
219193name = "core-foundation-sys"
220−version = "0.8.4"
221−source = "registry+https://github.com/rust-lang/crates.io-index"
222−checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
223−
224−[[package]]
225−name = "cov-mark"
226−version = "1.1.0"
194+version = "0.8.3"
227195source = "registry+https://github.com/rust-lang/crates.io-index"
228−checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3"
196+checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
229197
230198[[package]]
231199name = "crc32fast"
@@ -236,58 +204,14 @@ dependencies = [
236204 "cfg-if",
237205]
238206
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−
273−[[package]]
274−name = "crossbeam-utils"
275−version = "0.8.16"
276−source = "registry+https://github.com/rust-lang/crates.io-index"
277−checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
278−dependencies = [
279− "cfg-if",
280−]
281−
282207[[package]]
283208name = "crossterm"
284−version = "0.27.0"
209+version = "0.26.1"
285210source = "registry+https://github.com/rust-lang/crates.io-index"
286−checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
211+checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
287212dependencies = [
288− "bitflags 2.4.1",
213+ "bitflags",
289214 "crossterm_winapi",
290− "filedescriptor",
291215 "futures-core",
292216 "libc",
293217 "mio",
@@ -299,18 +223,18 @@ dependencies = [
299223
300224[[package]]
301225name = "crossterm_winapi"
302−version = "0.9.1"
226+version = "0.9.0"
303227source = "registry+https://github.com/rust-lang/crates.io-index"
304−checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
228+checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
305229dependencies = [
306230 "winapi",
307231]
308232
309233[[package]]
310234name = "cxx"
311−version = "1.0.94"
235+version = "1.0.82"
312236source = "registry+https://github.com/rust-lang/crates.io-index"
313−checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93"
237+checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453"
314238dependencies = [
315239 "cc",
316240 "cxxbridge-flags",
@@ -320,9 +244,9 @@ dependencies = [
320244
321245[[package]]
322246name = "cxx-build"
323−version = "1.0.94"
247+version = "1.0.82"
324248source = "registry+https://github.com/rust-lang/crates.io-index"
325−checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b"
249+checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0"
326250dependencies = [
327251 "cc",
328252 "codespan-reporting",
@@ -330,43 +254,84 @@ dependencies = [
330254 "proc-macro2",
331255 "quote",
332256 "scratch",
333− "syn 2.0.38",
257+ "syn",
334258]
335259
336260[[package]]
337261name = "cxxbridge-flags"
338−version = "1.0.94"
262+version = "1.0.82"
339263source = "registry+https://github.com/rust-lang/crates.io-index"
340−checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb"
264+checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71"
341265
342266[[package]]
343267name = "cxxbridge-macro"
344−version = "1.0.94"
268+version = "1.0.82"
345269source = "registry+https://github.com/rust-lang/crates.io-index"
346−checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
270+checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470"
347271dependencies = [
348272 "proc-macro2",
349273 "quote",
350− "syn 2.0.38",
274+ "syn",
275+]
276+
277+[[package]]
278+name = "dirs"
279+version = "4.0.0"
280+source = "registry+https://github.com/rust-lang/crates.io-index"
281+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
282+dependencies = [
283+ "dirs-sys",
284+]
285+
286+[[package]]
287+name = "dirs-next"
288+version = "2.0.0"
289+source = "registry+https://github.com/rust-lang/crates.io-index"
290+checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
291+dependencies = [
292+ "cfg-if",
293+ "dirs-sys-next",
294+]
295+
296+[[package]]
297+name = "dirs-sys"
298+version = "0.3.7"
299+source = "registry+https://github.com/rust-lang/crates.io-index"
300+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
301+dependencies = [
302+ "libc",
303+ "redox_users",
304+ "winapi",
305+]
306+
307+[[package]]
308+name = "dirs-sys-next"
309+version = "0.1.2"
310+source = "registry+https://github.com/rust-lang/crates.io-index"
311+checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
312+dependencies = [
313+ "libc",
314+ "redox_users",
315+ "winapi",
351316]
352317
353318[[package]]
354319name = "dunce"
355−version = "1.0.4"
320+version = "1.0.3"
356321source = "registry+https://github.com/rust-lang/crates.io-index"
357−checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
322+checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c"
358323
359324[[package]]
360325name = "either"
361−version = "1.8.1"
326+version = "1.8.0"
362327source = "registry+https://github.com/rust-lang/crates.io-index"
363−checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
328+checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
364329
365330[[package]]
366331name = "encoding_rs"
367−version = "0.8.33"
332+version = "0.8.32"
368333source = "registry+https://github.com/rust-lang/crates.io-index"
369−checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
334+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
370335dependencies = [
371336 "cfg-if",
372337]
@@ -381,103 +346,113 @@ dependencies = [
381346]
382347
383348[[package]]
384−name = "equivalent"
385−version = "1.0.0"
349+name = "errno"
350+version = "0.2.8"
386351source = "registry+https://github.com/rust-lang/crates.io-index"
387−checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
352+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
353+dependencies = [
354+ "errno-dragonfly",
355+ "libc",
356+ "winapi",
357+]
388358
389359[[package]]
390−name = "errno"
391−version = "0.3.8"
360+name = "errno-dragonfly"
361+version = "0.1.2"
392362source = "registry+https://github.com/rust-lang/crates.io-index"
393−checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
363+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
394364dependencies = [
365+ "cc",
395366 "libc",
396− "windows-sys 0.52.0",
397367]
398368
399369[[package]]
400370name = "error-code"
401−version = "3.0.0"
371+version = "2.3.1"
402372source = "registry+https://github.com/rust-lang/crates.io-index"
403−checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
373+checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
374+dependencies = [
375+ "libc",
376+ "str-buf",
377+]
404378
405379[[package]]
406380name = "etcetera"
407−version = "0.8.0"
381+version = "0.4.0"
408382source = "registry+https://github.com/rust-lang/crates.io-index"
409−checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
383+checksum = "d017fce18e4e9bfa75e1db51f49f4487bd3f8a7df509b24a46474a956ee962fd"
410384dependencies = [
411385 "cfg-if",
412− "home",
413− "windows-sys 0.48.0",
386+ "dirs-next",
387+ "thiserror",
414388]
415389
416390[[package]]
417−name = "faster-hex"
418−version = "0.9.0"
391+name = "fastrand"
392+version = "1.8.0"
419393source = "registry+https://github.com/rust-lang/crates.io-index"
420−checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
394+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
421395dependencies = [
422− "serde",
396+ "instant",
423397]
424398
425−[[package]]
426−name = "fastrand"
427−version = "2.0.0"
428−source = "registry+https://github.com/rust-lang/crates.io-index"
429−checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
430−
431399[[package]]
432400name = "fern"
433−version = "0.6.2"
401+version = "0.6.1"
434402source = "registry+https://github.com/rust-lang/crates.io-index"
435−checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee"
403+checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a"
436404dependencies = [
437405 "log",
438406]
439407
440408[[package]]
441−name = "filedescriptor"
442−version = "0.8.2"
409+name = "filetime"
410+version = "0.2.18"
443411source = "registry+https://github.com/rust-lang/crates.io-index"
444−checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
412+checksum = "4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3"
445413dependencies = [
414+ "cfg-if",
446415 "libc",
447− "thiserror",
448− "winapi",
416+ "redox_syscall",
417+ "windows-sys 0.42.0",
449418]
450419
451420[[package]]
452421name = "flate2"
453−version = "1.0.27"
422+version = "1.0.25"
454423source = "registry+https://github.com/rust-lang/crates.io-index"
455−checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
424+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
456425dependencies = [
457426 "crc32fast",
458427 "miniz_oxide",
459428]
460429
430+[[package]]
431+name = "fnv"
432+version = "1.0.7"
433+source = "registry+https://github.com/rust-lang/crates.io-index"
434+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
435+
461436[[package]]
462437name = "form_urlencoded"
463−version = "1.2.1"
438+version = "1.1.0"
464439source = "registry+https://github.com/rust-lang/crates.io-index"
465−checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
440+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
466441dependencies = [
467442 "percent-encoding",
468443]
469444
470445[[package]]
471446name = "futures-core"
472−version = "0.3.30"
447+version = "0.3.26"
473448source = "registry+https://github.com/rust-lang/crates.io-index"
474−checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
449+checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
475450
476451[[package]]
477452name = "futures-executor"
478−version = "0.3.29"
453+version = "0.3.26"
479454source = "registry+https://github.com/rust-lang/crates.io-index"
480−checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
455+checksum = "e8de0a35a6ab97ec8869e32a2473f4b1324459e14c29275d14b10cb1fd19b50e"
481456dependencies = [
482457 "futures-core",
483458 "futures-task",
@@ -486,15 +461,15 @@ dependencies = [
486461
487462[[package]]
488463name = "futures-task"
489−version = "0.3.30"
464+version = "0.3.26"
490465source = "registry+https://github.com/rust-lang/crates.io-index"
491−checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
466+checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
492467
493468[[package]]
494469name = "futures-util"
495−version = "0.3.30"
470+version = "0.3.26"
496471source = "registry+https://github.com/rust-lang/crates.io-index"
497−checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
472+checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
498473dependencies = [
499474 "futures-core",
500475 "futures-task",
@@ -503,59 +478,63 @@ dependencies = [
503478 "slab",
504479]
505480
481+[[package]]
482+name = "fuzzy-matcher"
483+version = "0.3.7"
484+source = "registry+https://github.com/rust-lang/crates.io-index"
485+checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
486+dependencies = [
487+ "thread_local",
488+]
489+
506490[[package]]
507491name = "getrandom"
508−version = "0.2.9"
492+version = "0.2.8"
509493source = "registry+https://github.com/rust-lang/crates.io-index"
510−checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
494+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
511495dependencies = [
512496 "cfg-if",
513497 "libc",
514498 "wasi",
515499]
516500
517−[[package]]
518−name = "gimli"
519−version = "0.27.3"
520−source = "registry+https://github.com/rust-lang/crates.io-index"
521−checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
522−
523501[[package]]
524502name = "gix"
525−version = "0.57.0"
503+version = "0.39.0"
526504source = "registry+https://github.com/rust-lang/crates.io-index"
527−checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
505+checksum = "dabfac58aecb4a38cdd2568de66eb1f0d968fd6726f5a80cb8bea7944ef10cc0"
528506dependencies = [
529507 "gix-actor",
530− "gix-commitgraph",
508+ "gix-attributes",
531509 "gix-config",
510+ "gix-credentials",
532511 "gix-date",
533512 "gix-diff",
534513 "gix-discover",
535514 "gix-features",
536− "gix-fs",
537515 "gix-glob",
538516 "gix-hash",
539517 "gix-hashtable",
518+ "gix-index",
540519 "gix-lock",
541− "gix-macros",
520+ "gix-mailmap",
542521 "gix-object",
543522 "gix-odb",
544523 "gix-pack",
545524 "gix-path",
525+ "gix-prompt",
546526 "gix-ref",
547527 "gix-refspec",
548528 "gix-revision",
549− "gix-revwalk",
550529 "gix-sec",
551530 "gix-tempfile",
552− "gix-trace",
553531 "gix-traverse",
554532 "gix-url",
555− "gix-utils",
556533 "gix-validate",
534+ "gix-worktree",
535+ "log",
557536 "once_cell",
558− "parking_lot",
537+ "signal-hook",
559538 "smallvec",
560539 "thiserror",
561540 "unicode-normalization",
@@ -563,46 +542,65 @@ dependencies = [
563542
564543[[package]]
565544name = "gix-actor"
566−version = "0.29.0"
545+version = "0.19.0"
567546source = "registry+https://github.com/rust-lang/crates.io-index"
568−checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
547+checksum = "dc22b0cdc52237667c301dd7cdc6ead8f8f73c9f824e9942c8ebd6b764f6c0bf"
569548dependencies = [
570549 "bstr",
571550 "btoi",
572551 "gix-date",
573552 "itoa",
553+ "nom",
554+ "thiserror",
555+]
556+
557+[[package]]
558+name = "gix-attributes"
559+version = "0.10.0"
560+source = "registry+https://github.com/rust-lang/crates.io-index"
561+checksum = "2231a25934a240d0a4b6f4478401c73ee81d8be52de0293eedbc172334abf3e1"
562+dependencies = [
563+ "bstr",
564+ "gix-features",
565+ "gix-glob",
566+ "gix-path",
567+ "gix-quote",
568+ "thiserror",
569+ "unicode-bom",
570+]
571+
572+[[package]]
573+name = "gix-bitmap"
574+version = "0.2.2"
575+source = "registry+https://github.com/rust-lang/crates.io-index"
576+checksum = "024bca0c7187517bda5ea24ab148c9ca8208dd0c3e2bea88cdb2008f91791a6d"
577+dependencies = [
574578 "thiserror",
575− "winnow 0.5.28",
576579]
577580
578581[[package]]
579582name = "gix-chunk"
580−version = "0.4.6"
583+version = "0.4.1"
581584source = "registry+https://github.com/rust-lang/crates.io-index"
582−checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
585+checksum = "b0d39583cab06464b8bf73b3f1707458270f0e7383cb24c3c9c1a16e6f792978"
583586dependencies = [
584587 "thiserror",
585588]
586589
587590[[package]]
588−name = "gix-commitgraph"
589−version = "0.23.0"
591+name = "gix-command"
592+version = "0.2.4"
590593source = "registry+https://github.com/rust-lang/crates.io-index"
591−checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
594+checksum = "b2c6f75c1e0f924de39e750880a6e21307194bb1ab773efe3c7d2d787277f8ab"
592595dependencies = [
593596 "bstr",
594− "gix-chunk",
595− "gix-features",
596− "gix-hash",
597− "memmap2",
598− "thiserror",
599597]
600598
601599[[package]]
602600name = "gix-config"
603−version = "0.33.0"
601+version = "0.18.0"
604602source = "registry+https://github.com/rust-lang/crates.io-index"
605−checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
603+checksum = "52c62e26ce11f607712e4f49a0a192ed87675d30187fd61be070abbd607d12f1"
606604dependencies = [
607605 "bstr",
608606 "gix-config-value",
@@ -612,31 +610,47 @@ dependencies = [
612610 "gix-ref",
613611 "gix-sec",
614612 "memchr",
613+ "nom",
615614 "once_cell",
616615 "smallvec",
617616 "thiserror",
618617 "unicode-bom",
619− "winnow 0.5.28",
620618]
621619
622620[[package]]
623621name = "gix-config-value"
624−version = "0.14.2"
622+version = "0.10.1"
625623source = "registry+https://github.com/rust-lang/crates.io-index"
626−checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
624+checksum = "693d4a4ba0531e46fe558459557a5b29fb86c3e4b2666c1c0861d93c7c678331"
627625dependencies = [
628− "bitflags 2.4.1",
626+ "bitflags",
629627 "bstr",
630628 "gix-path",
631629 "libc",
632630 "thiserror",
633631]
634632
633+[[package]]
634+name = "gix-credentials"
635+version = "0.11.0"
636+source = "registry+https://github.com/rust-lang/crates.io-index"
637+checksum = "5be32b5fe339a31b8e53fa854081dc914c45020dcb64637f3c21baf69c96fc1b"
638+dependencies = [
639+ "bstr",
640+ "gix-command",
641+ "gix-config-value",
642+ "gix-path",
643+ "gix-prompt",
644+ "gix-sec",
645+ "gix-url",
646+ "thiserror",
647+]
648+
635649[[package]]
636650name = "gix-date"
637−version = "0.8.2"
651+version = "0.4.3"
638652source = "registry+https://github.com/rust-lang/crates.io-index"
639−checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
653+checksum = "b96271912ce39822501616f177dea7218784e6c63be90d5f36322ff3a722aae2"
640654dependencies = [
641655 "bstr",
642656 "itoa",
@@ -646,21 +660,21 @@ dependencies = [
646660
647661[[package]]
648662name = "gix-diff"
649−version = "0.39.0"
663+version = "0.28.0"
650664source = "registry+https://github.com/rust-lang/crates.io-index"
651−checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
665+checksum = "585b0834d4b6791a848637c4e109545fda9b0f29b591ba55edb33ceda6e7856b"
652666dependencies = [
653− "bstr",
654667 "gix-hash",
655668 "gix-object",
669+ "imara-diff",
656670 "thiserror",
657671]
658672
659673[[package]]
660674name = "gix-discover"
661−version = "0.28.0"
675+version = "0.15.0"
662676source = "registry+https://github.com/rust-lang/crates.io-index"
663−checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
677+checksum = "91c204adba5ebd211c74735cbb65817d277e154486bac0dffa3701f163b80350"
664678dependencies = [
665679 "bstr",
666680 "dunce",
@@ -673,14 +687,13 @@ dependencies = [
673687
674688[[package]]
675689name = "gix-features"
676−version = "0.37.0"
690+version = "0.28.0"
677691source = "registry+https://github.com/rust-lang/crates.io-index"
678−checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
692+checksum = "5e6a9dfa7b3c1a99315203e8b97f8f99f3bd95731590607abeaa5ca31bc41fe3"
679693dependencies = [
680694 "crc32fast",
681695 "flate2",
682696 "gix-hash",
683− "gix-trace",
684697 "libc",
685698 "once_cell",
686699 "prodash",
@@ -689,97 +702,107 @@ dependencies = [
689702 "walkdir",
690703]
691704
692−[[package]]
693−name = "gix-fs"
694−version = "0.9.0"
695−source = "registry+https://github.com/rust-lang/crates.io-index"
696−checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
697−dependencies = [
698− "gix-features",
699−]
700−
701705[[package]]
702706name = "gix-glob"
703−version = "0.15.0"
707+version = "0.5.5"
704708source = "registry+https://github.com/rust-lang/crates.io-index"
705−checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
709+checksum = "93e43efd776bc543f46f0fd0ca3d920c37af71a764a16f2aebd89765e9ff2993"
706710dependencies = [
707− "bitflags 2.4.1",
711+ "bitflags",
708712 "bstr",
709− "gix-features",
710− "gix-path",
711713]
712714
713715[[package]]
714716name = "gix-hash"
715−version = "0.14.0"
717+version = "0.10.3"
716718source = "registry+https://github.com/rust-lang/crates.io-index"
717−checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
719+checksum = "0c0c5a9f4d621d4f4ea046bb331df5c746ca735b8cae5b234cc2be70ee4dbef0"
718720dependencies = [
719− "faster-hex",
721+ "hex",
720722 "thiserror",
721723]
722724
723725[[package]]
724726name = "gix-hashtable"
725−version = "0.5.0"
727+version = "0.1.2"
726728source = "registry+https://github.com/rust-lang/crates.io-index"
727−checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
729+checksum = "9609c1b8f36f12968e6a6098f7cdb52004f7d42d570f47a2d6d7c16612f19acb"
728730dependencies = [
729731 "gix-hash",
730− "hashbrown 0.14.3",
732+ "hashbrown 0.13.2",
731733 "parking_lot",
732734]
733735
736+[[package]]
737+name = "gix-index"
738+version = "0.14.0"
739+source = "registry+https://github.com/rust-lang/crates.io-index"
740+checksum = "c12caf7886c7ba06f2b28835cdc2be1dca86bd047d00299d2d49e707ce1c2616"
741+dependencies = [
742+ "bitflags",
743+ "bstr",
744+ "btoi",
745+ "filetime",
746+ "gix-bitmap",
747+ "gix-features",
748+ "gix-hash",
749+ "gix-lock",
750+ "gix-object",
751+ "gix-traverse",
752+ "itoa",
753+ "memmap2",
754+ "smallvec",
755+ "thiserror",
756+]
757+
734758[[package]]
735759name = "gix-lock"
736−version = "12.0.0"
760+version = "4.0.0"
737761source = "registry+https://github.com/rust-lang/crates.io-index"
738−checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
762+checksum = "66119ff8a4a395d0ea033fef718bc85f8b4f0855874f4ce1e005fc16cfe1f66e"
739763dependencies = [
764+ "fastrand",
740765 "gix-tempfile",
741− "gix-utils",
742766 "thiserror",
743767]
744768
745769[[package]]
746−name = "gix-macros"
747−version = "0.1.2"
770+name = "gix-mailmap"
771+version = "0.11.0"
748772source = "registry+https://github.com/rust-lang/crates.io-index"
749−checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
773+checksum = "2b66aea5e52875cd4915f4957a6f4b75831a36981e2ec3f5fad9e370e444fe1a"
750774dependencies = [
751− "proc-macro2",
752− "quote",
753− "syn 2.0.38",
775+ "bstr",
776+ "gix-actor",
777+ "thiserror",
754778]
755779
756780[[package]]
757781name = "gix-object"
758−version = "0.40.0"
782+version = "0.28.0"
759783source = "registry+https://github.com/rust-lang/crates.io-index"
760−checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
784+checksum = "8df068db9180ee935fbb70504848369e270bdcb576b05c0faa8b9fd3b86fc017"
761785dependencies = [
762786 "bstr",
763787 "btoi",
764788 "gix-actor",
765− "gix-date",
766789 "gix-features",
767790 "gix-hash",
768791 "gix-validate",
792+ "hex",
769793 "itoa",
794+ "nom",
770795 "smallvec",
771796 "thiserror",
772− "winnow 0.5.28",
773797]
774798
775799[[package]]
776800name = "gix-odb"
777−version = "0.56.0"
801+version = "0.42.0"
778802source = "registry+https://github.com/rust-lang/crates.io-index"
779−checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
803+checksum = "e9a5f9e1afbd509761977a2ea02869cedaaba500b4e783deb2e4de5179a55a80"
780804dependencies = [
781805 "arc-swap",
782− "gix-date",
783806 "gix-features",
784807 "gix-hash",
785808 "gix-object",
@@ -793,18 +816,20 @@ dependencies = [
793816
794817[[package]]
795818name = "gix-pack"
796−version = "0.46.0"
819+version = "0.32.0"
797820source = "registry+https://github.com/rust-lang/crates.io-index"
798−checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
821+checksum = "e51db84e1459a8022e518d40a8778028d793dbb28e4d35c9a5eaf92658fb0775"
799822dependencies = [
800823 "clru",
801824 "gix-chunk",
825+ "gix-diff",
802826 "gix-features",
803827 "gix-hash",
804828 "gix-hashtable",
805829 "gix-object",
806830 "gix-path",
807831 "gix-tempfile",
832+ "gix-traverse",
808833 "memmap2",
809834 "parking_lot",
810835 "smallvec",
@@ -813,22 +838,32 @@ dependencies = [
813838
814839[[package]]
815840name = "gix-path"
816−version = "0.10.2"
841+version = "0.7.2"
817842source = "registry+https://github.com/rust-lang/crates.io-index"
818−checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
843+checksum = "f6c104a66dec149cb8f7aaafc6ab797654cf82d67f050fd0cb7e7294e328354b"
819844dependencies = [
820845 "bstr",
821− "gix-trace",
822− "home",
823− "once_cell",
846+ "thiserror",
847+]
848+
849+[[package]]
850+name = "gix-prompt"
851+version = "0.3.2"
852+source = "registry+https://github.com/rust-lang/crates.io-index"
853+checksum = "a20cebf73229debaa82574c4fd20dcaf00fa8d4bfce823a862c4e990d7a0b5b4"
854+dependencies = [
855+ "gix-command",
856+ "gix-config-value",
857+ "nix",
858+ "parking_lot",
824859 "thiserror",
825860]
826861
827862[[package]]
828863name = "gix-quote"
829−version = "0.4.9"
864+version = "0.4.3"
830865source = "registry+https://github.com/rust-lang/crates.io-index"
831−checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
866+checksum = "a282f5a8d9ee0b09ec47390ac727350c48f2f5c76d803cd8da6b3e7ad56e0bcb"
832867dependencies = [
833868 "bstr",
834869 "btoi",
@@ -837,14 +872,12 @@ dependencies = [
837872
838873[[package]]
839874name = "gix-ref"
840−version = "0.40.0"
875+version = "0.26.0"
841876source = "registry+https://github.com/rust-lang/crates.io-index"
842−checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
877+checksum = "90a0ed29e581f04b904ecd0c32b11f33b8209b5a0af9c43f415249a4f2fba632"
843878dependencies = [
844879 "gix-actor",
845− "gix-date",
846880 "gix-features",
847− "gix-fs",
848881 "gix-hash",
849882 "gix-lock",
850883 "gix-object",
@@ -852,15 +885,15 @@ dependencies = [
852885 "gix-tempfile",
853886 "gix-validate",
854887 "memmap2",
888+ "nom",
855889 "thiserror",
856− "winnow 0.5.28",
857890]
858891
859892[[package]]
860893name = "gix-refspec"
861−version = "0.21.0"
894+version = "0.9.0"
862895source = "registry+https://github.com/rust-lang/crates.io-index"
863−checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
896+checksum = "aba332462bda2e8efeae4302b39a6ed01ad56ef772fd5b7ef197cf2798294d65"
864897dependencies = [
865898 "bstr",
866899 "gix-hash",
@@ -872,87 +905,62 @@ dependencies = [
872905
873906[[package]]
874907name = "gix-revision"
875−version = "0.25.0"
908+version = "0.12.0"
876909source = "registry+https://github.com/rust-lang/crates.io-index"
877−checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
910+checksum = "ed98e4a0254953c64bc913bd23146a1de662067d5cf974cbdde396958b39e5b0"
878911dependencies = [
879912 "bstr",
880913 "gix-date",
881914 "gix-hash",
882915 "gix-hashtable",
883916 "gix-object",
884− "gix-revwalk",
885− "gix-trace",
886− "thiserror",
887−]
888−
889−[[package]]
890−name = "gix-revwalk"
891−version = "0.11.0"
892−source = "registry+https://github.com/rust-lang/crates.io-index"
893−checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
894−dependencies = [
895− "gix-commitgraph",
896− "gix-date",
897− "gix-hash",
898− "gix-hashtable",
899− "gix-object",
900− "smallvec",
901917 "thiserror",
902918]
903919
904920[[package]]
905921name = "gix-sec"
906−version = "0.10.2"
922+version = "0.6.2"
907923source = "registry+https://github.com/rust-lang/crates.io-index"
908−checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
924+checksum = "e8ffa5bf0772f9b01de501c035b6b084cf9b8bb07dec41e3afc6a17336a65f47"
909925dependencies = [
910− "bitflags 2.4.1",
926+ "bitflags",
927+ "dirs",
911928 "gix-path",
912929 "libc",
913− "windows 0.52.0",
930+ "windows",
914931]
915932
916933[[package]]
917934name = "gix-tempfile"
918−version = "12.0.0"
935+version = "4.1.0"
919936source = "registry+https://github.com/rust-lang/crates.io-index"
920−checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
937+checksum = "a8e0227bd284cd16105e8479602bb8af6bddcb800427e881c1feee4806310a31"
921938dependencies = [
922− "gix-fs",
923939 "libc",
924940 "once_cell",
925941 "parking_lot",
942+ "signal-hook",
943+ "signal-hook-registry",
926944 "tempfile",
927945]
928946
929−[[package]]
930−name = "gix-trace"
931−version = "0.1.5"
932−source = "registry+https://github.com/rust-lang/crates.io-index"
933−checksum = "bda62acb44dd86a40c7c3762a5403cfc1ac789ea559df54085cedf79864f809e"
934−
935947[[package]]
936948name = "gix-traverse"
937−version = "0.36.0"
949+version = "0.24.0"
938950source = "registry+https://github.com/rust-lang/crates.io-index"
939−checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
951+checksum = "dd9a4a07bb22168dc79c60e1a6a41919d198187ca83d8a5940ad8d7122a45df3"
940952dependencies = [
941− "gix-commitgraph",
942− "gix-date",
943953 "gix-hash",
944954 "gix-hashtable",
945955 "gix-object",
946− "gix-revwalk",
947− "smallvec",
948956 "thiserror",
949957]
950958
951959[[package]]
952960name = "gix-url"
953−version = "0.26.0"
961+version = "0.15.0"
954962source = "registry+https://github.com/rust-lang/crates.io-index"
955−checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
963+checksum = "044072b7ce8601b62dcec841b92129f5cc677072823324121b395d766ac5f528"
956964dependencies = [
957965 "bstr",
958966 "gix-features",
@@ -963,71 +971,82 @@ dependencies = [
963971]
964972
965973[[package]]
966−name = "gix-utils"
967−version = "0.1.7"
974+name = "gix-validate"
975+version = "0.7.3"
968976source = "registry+https://github.com/rust-lang/crates.io-index"
969−checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
977+checksum = "b69ddb780ea1465255e66818d75b7098371c58dbc9560da4488a44b9f5c7e443"
970978dependencies = [
971− "fastrand",
979+ "bstr",
980+ "thiserror",
972981]
973982
974983[[package]]
975−name = "gix-validate"
976−version = "0.8.2"
984+name = "gix-worktree"
985+version = "0.14.0"
977986source = "registry+https://github.com/rust-lang/crates.io-index"
978−checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
987+checksum = "b7cb9af6e56152953d8fe113c4f9d7cf60cf7a982362711e9200a255579b49cb"
979988dependencies = [
980989 "bstr",
990+ "gix-attributes",
991+ "gix-features",
992+ "gix-glob",
993+ "gix-hash",
994+ "gix-index",
995+ "gix-object",
996+ "gix-path",
997+ "io-close",
981998 "thiserror",
982999]
9831000
9841001[[package]]
9851002name = "globset"
986−version = "0.4.14"
1003+version = "0.4.10"
9871004source = "registry+https://github.com/rust-lang/crates.io-index"
988−checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
1005+checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
9891006dependencies = [
9901007 "aho-corasick",
9911008 "bstr",
1009+ "fnv",
9921010 "log",
993− "regex-automata",
994− "regex-syntax",
1011+ "regex",
9951012]
9961013
9971014[[package]]
9981015name = "grep-matcher"
999−version = "0.1.7"
1016+version = "0.1.6"
10001017source = "registry+https://github.com/rust-lang/crates.io-index"
1001−checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"
1018+checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319"
10021019dependencies = [
10031020 "memchr",
10041021]
10051022
10061023[[package]]
10071024name = "grep-regex"
1008−version = "0.1.12"
1025+version = "0.1.11"
10091026source = "registry+https://github.com/rust-lang/crates.io-index"
1010−checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"
1027+checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
10111028dependencies = [
1029+ "aho-corasick",
10121030 "bstr",
10131031 "grep-matcher",
10141032 "log",
1015− "regex-automata",
1033+ "regex",
10161034 "regex-syntax",
1035+ "thread_local",
10171036]
10181037
10191038[[package]]
10201039name = "grep-searcher"
1021−version = "0.1.13"
1040+version = "0.1.11"
10221041source = "registry+https://github.com/rust-lang/crates.io-index"
1023−checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"
1042+checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f"
10241043dependencies = [
10251044 "bstr",
1045+ "bytecount",
10261046 "encoding_rs",
10271047 "encoding_rs_io",
10281048 "grep-matcher",
10291049 "log",
1030− "memchr",
10311050 "memmap2",
10321051]
10331052
@@ -1036,36 +1055,34 @@ name = "hashbrown"
10361055version = "0.12.3"
10371056source = "registry+https://github.com/rust-lang/crates.io-index"
10381057checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1058+dependencies = [
1059+ "ahash 0.7.6",
1060+]
10391061
10401062[[package]]
10411063name = "hashbrown"
1042−version = "0.14.3"
1064+version = "0.13.2"
10431065source = "registry+https://github.com/rust-lang/crates.io-index"
1044−checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
1066+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
10451067dependencies = [
1046− "ahash",
1047− "allocator-api2",
1068+ "ahash 0.8.3",
10481069]
10491070
10501071[[package]]
10511072name = "helix-core"
1052−version = "23.10.0"
1073+version = "0.6.0"
10531074dependencies = [
1054− "ahash",
1075+ "ahash 0.8.3",
10551076 "arc-swap",
1056− "bitflags 2.4.1",
1077+ "bitflags",
10571078 "chrono",
1058− "dunce",
10591079 "encoding_rs",
10601080 "etcetera",
1061− "hashbrown 0.14.3",
1081+ "hashbrown 0.13.2",
10621082 "helix-loader",
10631083 "imara-diff",
1064− "indoc",
10651084 "log",
1066− "nucleo",
10671085 "once_cell",
1068− "parking_lot",
10691086 "quickcheck",
10701087 "regex",
10711088 "ropey",
@@ -1084,7 +1101,7 @@ dependencies = [
10841101
10851102[[package]]
10861103name = "helix-dap"
1087−version = "23.10.0"
1104+version = "0.6.0"
10881105dependencies = [
10891106 "anyhow",
10901107 "fern",
@@ -1097,47 +1114,34 @@ dependencies = [
10971114 "which",
10981115]
10991116
1100−[[package]]
1101−name = "helix-event"
1102−version = "23.10.0"
1103−dependencies = [
1104− "parking_lot",
1105− "tokio",
1106−]
1107−
11081117[[package]]
11091118name = "helix-loader"
1110−version = "23.10.0"
1119+version = "0.6.0"
11111120dependencies = [
11121121 "anyhow",
11131122 "cc",
1114− "dunce",
11151123 "etcetera",
11161124 "libloading",
11171125 "log",
11181126 "once_cell",
11191127 "serde",
1120− "tempfile",
11211128 "threadpool",
11221129 "toml",
11231130 "tree-sitter",
1124− "which",
11251131]
11261132
11271133[[package]]
11281134name = "helix-lsp"
1129−version = "23.10.0"
1135+version = "0.6.0"
11301136dependencies = [
11311137 "anyhow",
11321138 "futures-executor",
11331139 "futures-util",
1134− "globset",
11351140 "helix-core",
11361141 "helix-loader",
11371142 "helix-parsec",
11381143 "log",
11391144 "lsp-types",
1140− "parking_lot",
11411145 "serde",
11421146 "serde_json",
11431147 "thiserror",
@@ -1148,11 +1152,11 @@ dependencies = [
11481152
11491153[[package]]
11501154name = "helix-parsec"
1151−version = "23.10.0"
1155+version = "0.6.0"
11521156
11531157[[package]]
11541158name = "helix-term"
1155−version = "23.10.0"
1159+version = "0.6.0"
11561160dependencies = [
11571161 "anyhow",
11581162 "arc-swap",
@@ -1161,11 +1165,11 @@ dependencies = [
11611165 "crossterm",
11621166 "fern",
11631167 "futures-util",
1168+ "fuzzy-matcher",
11641169 "grep-regex",
11651170 "grep-searcher",
11661171 "helix-core",
11671172 "helix-dap",
1168− "helix-event",
11691173 "helix-loader",
11701174 "helix-lsp",
11711175 "helix-tui",
@@ -1173,11 +1177,8 @@ dependencies = [
11731177 "helix-view",
11741178 "ignore",
11751179 "indoc",
1176− "libc",
11771180 "log",
1178− "nucleo",
11791181 "once_cell",
1180− "open",
11811182 "pulldown-cmark",
11821183 "serde",
11831184 "serde_json",
@@ -1188,15 +1189,14 @@ dependencies = [
11881189 "tokio",
11891190 "tokio-stream",
11901191 "toml",
1191− "url",
11921192 "which",
11931193]
11941194
11951195[[package]]
11961196name = "helix-tui"
1197−version = "23.10.0"
1197+version = "0.6.0"
11981198dependencies = [
1199− "bitflags 2.4.1",
1199+ "bitflags",
12001200 "cassowary",
12011201 "crossterm",
12021202 "helix-core",
@@ -1210,13 +1210,10 @@ dependencies = [
12101210
12111211[[package]]
12121212name = "helix-vcs"
1213−version = "23.10.0"
1213+version = "0.6.0"
12141214dependencies = [
1215− "anyhow",
1216− "arc-swap",
12171215 "gix",
12181216 "helix-core",
1219− "helix-event",
12201217 "imara-diff",
12211218 "log",
12221219 "parking_lot",
@@ -1226,18 +1223,17 @@ dependencies = [
12261223
12271224[[package]]
12281225name = "helix-view"
1229−version = "23.10.0"
1226+version = "0.6.0"
12301227dependencies = [
12311228 "anyhow",
12321229 "arc-swap",
1233− "bitflags 2.4.1",
1230+ "bitflags",
12341231 "chardetng",
12351232 "clipboard-win",
12361233 "crossterm",
12371234 "futures-util",
12381235 "helix-core",
12391236 "helix-dap",
1240− "helix-event",
12411237 "helix-loader",
12421238 "helix-lsp",
12431239 "helix-tui",
@@ -1246,7 +1242,6 @@ dependencies = [
12461242 "log",
12471243 "once_cell",
12481244 "parking_lot",
1249− "rustix",
12501245 "serde",
12511246 "serde_json",
12521247 "slotmap",
@@ -1259,34 +1254,40 @@ dependencies = [
12591254
12601255[[package]]
12611256name = "hermit-abi"
1262−version = "0.2.6"
1257+version = "0.1.19"
12631258source = "registry+https://github.com/rust-lang/crates.io-index"
1264−checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
1259+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
12651260dependencies = [
12661261 "libc",
12671262]
12681263
1264+[[package]]
1265+name = "hex"
1266+version = "0.4.3"
1267+source = "registry+https://github.com/rust-lang/crates.io-index"
1268+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
1269+
12691270[[package]]
12701271name = "home"
1271−version = "0.5.5"
1272+version = "0.5.4"
12721273source = "registry+https://github.com/rust-lang/crates.io-index"
1273−checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
1274+checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
12741275dependencies = [
1275− "windows-sys 0.48.0",
1276+ "winapi",
12761277]
12771278
12781279[[package]]
12791280name = "iana-time-zone"
1280−version = "0.1.56"
1281+version = "0.1.53"
12811282source = "registry+https://github.com/rust-lang/crates.io-index"
1282−checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
1283+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
12831284dependencies = [
12841285 "android_system_properties",
12851286 "core-foundation-sys",
12861287 "iana-time-zone-haiku",
12871288 "js-sys",
12881289 "wasm-bindgen",
1289− "windows 0.48.0",
1290+ "winapi",
12901291]
12911292
12921293[[package]]
@@ -1301,9 +1302,9 @@ dependencies = [
13011302
13021303[[package]]
13031304name = "idna"
1304−version = "0.5.0"
1305+version = "0.3.0"
13051306source = "registry+https://github.com/rust-lang/crates.io-index"
1306−checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
1307+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
13071308dependencies = [
13081309 "unicode-bidi",
13091310 "unicode-normalization",
@@ -1311,16 +1312,17 @@ dependencies = [
13111312
13121313[[package]]
13131314name = "ignore"
1314−version = "0.4.21"
1315+version = "0.4.20"
13151316source = "registry+https://github.com/rust-lang/crates.io-index"
1316−checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
1317+checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
13171318dependencies = [
1318− "crossbeam-deque",
13191319 "globset",
1320+ "lazy_static",
13201321 "log",
13211322 "memchr",
1322− "regex-automata",
1323+ "regex",
13231324 "same-file",
1325+ "thread_local",
13241326 "walkdir",
13251327 "winapi-util",
13261328]
@@ -1331,90 +1333,106 @@ version = "0.1.5"
13311333source = "registry+https://github.com/rust-lang/crates.io-index"
13321334checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
13331335dependencies = [
1334− "ahash",
1336+ "ahash 0.8.3",
13351337 "hashbrown 0.12.3",
13361338]
13371339
13381340[[package]]
13391341name = "indexmap"
1340−version = "2.0.0"
1342+version = "1.9.2"
13411343source = "registry+https://github.com/rust-lang/crates.io-index"
1342−checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
1344+checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
13431345dependencies = [
1344− "equivalent",
1345− "hashbrown 0.14.3",
1346+ "autocfg",
1347+ "hashbrown 0.12.3",
13461348]
13471349
13481350[[package]]
13491351name = "indoc"
1350−version = "2.0.4"
1352+version = "2.0.0"
13511353source = "registry+https://github.com/rust-lang/crates.io-index"
1352−checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
1354+checksum = "6fe2b9d82064e8a0226fddb3547f37f28eaa46d0fc210e275d835f08cf3b76a7"
13531355
13541356[[package]]
1355−name = "is-docker"
1356−version = "0.2.0"
1357+name = "instant"
1358+version = "0.1.12"
13571359source = "registry+https://github.com/rust-lang/crates.io-index"
1358−checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
1360+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
13591361dependencies = [
1360− "once_cell",
1362+ "cfg-if",
13611363]
13621364
13631365[[package]]
1364−name = "is-wsl"
1365−version = "0.4.0"
1366+name = "io-close"
1367+version = "0.3.7"
13661368source = "registry+https://github.com/rust-lang/crates.io-index"
1367−checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
1369+checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
13681370dependencies = [
1369− "is-docker",
1370− "once_cell",
1371+ "libc",
1372+ "winapi",
1373+]
1374+
1375+[[package]]
1376+name = "io-lifetimes"
1377+version = "1.0.4"
1378+source = "registry+https://github.com/rust-lang/crates.io-index"
1379+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
1380+dependencies = [
1381+ "libc",
1382+ "windows-sys 0.42.0",
13711383]
13721384
13731385[[package]]
13741386name = "itoa"
1375−version = "1.0.6"
1387+version = "1.0.4"
13761388source = "registry+https://github.com/rust-lang/crates.io-index"
1377−checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
1389+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
13781390
13791391[[package]]
13801392name = "js-sys"
1381−version = "0.3.61"
1393+version = "0.3.60"
13821394source = "registry+https://github.com/rust-lang/crates.io-index"
1383−checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
1395+checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47"
13841396dependencies = [
13851397 "wasm-bindgen",
13861398]
13871399
1400+[[package]]
1401+name = "lazy_static"
1402+version = "1.4.0"
1403+source = "registry+https://github.com/rust-lang/crates.io-index"
1404+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
1405+
13881406[[package]]
13891407name = "libc"
1390−version = "0.2.151"
1408+version = "0.2.139"
13911409source = "registry+https://github.com/rust-lang/crates.io-index"
1392−checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
1410+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
13931411
13941412[[package]]
13951413name = "libloading"
1396−version = "0.8.1"
1414+version = "0.7.4"
13971415source = "registry+https://github.com/rust-lang/crates.io-index"
1398−checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
1416+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
13991417dependencies = [
14001418 "cfg-if",
1401− "windows-sys 0.48.0",
1419+ "winapi",
14021420]
14031421
14041422[[package]]
14051423name = "link-cplusplus"
1406−version = "1.0.8"
1424+version = "1.0.7"
14071425source = "registry+https://github.com/rust-lang/crates.io-index"
1408−checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
1426+checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369"
14091427dependencies = [
14101428 "cc",
14111429]
14121430
14131431[[package]]
14141432name = "linux-raw-sys"
1415−version = "0.4.11"
1433+version = "0.1.4"
14161434source = "registry+https://github.com/rust-lang/crates.io-index"
1417−checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
1435+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
14181436
14191437[[package]]
14201438name = "lock_api"
@@ -1428,17 +1446,20 @@ dependencies = [
14281446
14291447[[package]]
14301448name = "log"
1431−version = "0.4.20"
1449+version = "0.4.17"
14321450source = "registry+https://github.com/rust-lang/crates.io-index"
1433−checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
1451+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
1452+dependencies = [
1453+ "cfg-if",
1454+]
14341455
14351456[[package]]
14361457name = "lsp-types"
1437−version = "0.95.0"
1458+version = "0.94.0"
14381459source = "registry+https://github.com/rust-lang/crates.io-index"
1439−checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
1460+checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
14401461dependencies = [
1441− "bitflags 1.3.2",
1462+ "bitflags",
14421463 "serde",
14431464 "serde_json",
14441465 "serde_repr",
@@ -1447,69 +1468,85 @@ dependencies = [
14471468
14481469[[package]]
14491470name = "memchr"
1450−version = "2.6.3"
1471+version = "2.5.0"
14511472source = "registry+https://github.com/rust-lang/crates.io-index"
1452−checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
1473+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
14531474
14541475[[package]]
14551476name = "memmap2"
1456−version = "0.9.0"
1477+version = "0.5.8"
14571478source = "registry+https://github.com/rust-lang/crates.io-index"
1458−checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
1479+checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
14591480dependencies = [
14601481 "libc",
14611482]
14621483
14631484[[package]]
1464−name = "memoffset"
1465−version = "0.9.0"
1485+name = "minimal-lexical"
1486+version = "0.2.1"
14661487source = "registry+https://github.com/rust-lang/crates.io-index"
1467−checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
1468−dependencies = [
1469− "autocfg",
1470−]
1488+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
14711489
14721490[[package]]
14731491name = "miniz_oxide"
1474−version = "0.7.1"
1492+version = "0.6.2"
14751493source = "registry+https://github.com/rust-lang/crates.io-index"
1476−checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
1494+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
14771495dependencies = [
14781496 "adler",
14791497]
14801498
14811499[[package]]
14821500name = "mio"
1483−version = "0.8.9"
1501+version = "0.8.5"
14841502source = "registry+https://github.com/rust-lang/crates.io-index"
1485−checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
1503+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
14861504dependencies = [
14871505 "libc",
14881506 "log",
14891507 "wasi",
1490− "windows-sys 0.48.0",
1508+ "windows-sys 0.42.0",
14911509]
14921510
14931511[[package]]
1494−name = "nucleo"
1495−version = "0.2.1"
1512+name = "nix"
1513+version = "0.26.1"
14961514source = "registry+https://github.com/rust-lang/crates.io-index"
1497−checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"
1515+checksum = "46a58d1d356c6597d08cde02c2f09d785b09e28711837b1ed667dc652c08a694"
14981516dependencies = [
1499− "nucleo-matcher",
1500− "parking_lot",
1501− "rayon",
1517+ "bitflags",
1518+ "cfg-if",
1519+ "libc",
1520+ "static_assertions",
1521+]
1522+
1523+[[package]]
1524+name = "nom"
1525+version = "7.1.1"
1526+source = "registry+https://github.com/rust-lang/crates.io-index"
1527+checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36"
1528+dependencies = [
1529+ "memchr",
1530+ "minimal-lexical",
15021531]
15031532
15041533[[package]]
1505−name = "nucleo-matcher"
1534+name = "nom8"
15061535version = "0.2.0"
15071536source = "registry+https://github.com/rust-lang/crates.io-index"
1508−checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57"
1537+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
15091538dependencies = [
1510− "cov-mark",
15111539 "memchr",
1512− "unicode-segmentation",
1540+]
1541+
1542+[[package]]
1543+name = "num-integer"
1544+version = "0.1.45"
1545+source = "registry+https://github.com/rust-lang/crates.io-index"
1546+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
1547+dependencies = [
1548+ "autocfg",
1549+ "num-traits",
15131550]
15141551
15151552[[package]]
@@ -1523,9 +1560,9 @@ dependencies = [
15231560
15241561[[package]]
15251562name = "num_cpus"
1526−version = "1.15.0"
1563+version = "1.14.0"
15271564source = "registry+https://github.com/rust-lang/crates.io-index"
1528−checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
1565+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
15291566dependencies = [
15301567 "hermit-abi",
15311568 "libc",
@@ -1540,31 +1577,11 @@ dependencies = [
15401577 "libc",
15411578]
15421579
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−
15521580[[package]]
15531581name = "once_cell"
1554−version = "1.19.0"
1582+version = "1.17.1"
15551583source = "registry+https://github.com/rust-lang/crates.io-index"
1556−checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
1557−
1558−[[package]]
1559−name = "open"
1560−version = "5.0.1"
1561−source = "registry+https://github.com/rust-lang/crates.io-index"
1562−checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
1563−dependencies = [
1564− "is-wsl",
1565− "libc",
1566− "pathdiff",
1567−]
1584+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
15681585
15691586[[package]]
15701587name = "parking_lot"
@@ -1578,34 +1595,28 @@ dependencies = [
15781595
15791596[[package]]
15801597name = "parking_lot_core"
1581−version = "0.9.7"
1598+version = "0.9.4"
15821599source = "registry+https://github.com/rust-lang/crates.io-index"
1583−checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
1600+checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
15841601dependencies = [
15851602 "cfg-if",
15861603 "libc",
1587− "redox_syscall 0.2.16",
1604+ "redox_syscall",
15881605 "smallvec",
1589− "windows-sys 0.45.0",
1606+ "windows-sys 0.42.0",
15901607]
15911608
1592−[[package]]
1593−name = "pathdiff"
1594−version = "0.2.1"
1595−source = "registry+https://github.com/rust-lang/crates.io-index"
1596−checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
1597−
15981609[[package]]
15991610name = "percent-encoding"
1600−version = "2.3.1"
1611+version = "2.2.0"
16011612source = "registry+https://github.com/rust-lang/crates.io-index"
1602−checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
1613+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
16031614
16041615[[package]]
16051616name = "pin-project-lite"
1606−version = "0.2.12"
1617+version = "0.2.9"
16071618source = "registry+https://github.com/rust-lang/crates.io-index"
1608−checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
1619+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
16091620
16101621[[package]]
16111622name = "pin-utils"
@@ -1615,26 +1626,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
16151626
16161627[[package]]
16171628name = "proc-macro2"
1618−version = "1.0.69"
1629+version = "1.0.47"
16191630source = "registry+https://github.com/rust-lang/crates.io-index"
1620−checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
1631+checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
16211632dependencies = [
16221633 "unicode-ident",
16231634]
16241635
16251636[[package]]
16261637name = "prodash"
1627−version = "28.0.0"
1638+version = "23.1.1"
16281639source = "registry+https://github.com/rust-lang/crates.io-index"
1629−checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
1640+checksum = "d73c6b64cb5b99eb63ca97d378685712617ec0172ff5c04cd47a489d3e2c51f8"
16301641
16311642[[package]]
16321643name = "pulldown-cmark"
1633−version = "0.9.3"
1644+version = "0.9.2"
16341645source = "registry+https://github.com/rust-lang/crates.io-index"
1635−checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998"
1646+checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63"
16361647dependencies = [
1637− "bitflags 1.3.2",
1648+ "bitflags",
16381649 "memchr",
16391650 "unicase",
16401651]
@@ -1650,9 +1661,9 @@ dependencies = [
16501661
16511662[[package]]
16521663name = "quote"
1653−version = "1.0.29"
1664+version = "1.0.21"
16541665source = "registry+https://github.com/rust-lang/crates.io-index"
1655−checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
1666+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
16561667dependencies = [
16571668 "proc-macro2",
16581669]
@@ -1675,109 +1686,78 @@ dependencies = [
16751686 "getrandom",
16761687]
16771688
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−
17001689[[package]]
17011690name = "redox_syscall"
17021691version = "0.2.16"
17031692source = "registry+https://github.com/rust-lang/crates.io-index"
17041693checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
17051694dependencies = [
1706− "bitflags 1.3.2",
1695+ "bitflags",
17071696]
17081697
17091698[[package]]
1710−name = "redox_syscall"
1711−version = "0.4.1"
1699+name = "redox_users"
1700+version = "0.4.3"
17121701source = "registry+https://github.com/rust-lang/crates.io-index"
1713−checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
1702+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
17141703dependencies = [
1715− "bitflags 1.3.2",
1704+ "getrandom",
1705+ "redox_syscall",
1706+ "thiserror",
17161707]
17171708
17181709[[package]]
17191710name = "regex"
1720−version = "1.10.2"
1711+version = "1.7.1"
17211712source = "registry+https://github.com/rust-lang/crates.io-index"
1722−checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
1713+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
17231714dependencies = [
17241715 "aho-corasick",
17251716 "memchr",
1726− "regex-automata",
17271717 "regex-syntax",
17281718]
17291719
17301720[[package]]
17311721name = "regex-automata"
1732−version = "0.4.3"
1722+version = "0.1.10"
17331723source = "registry+https://github.com/rust-lang/crates.io-index"
1734−checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
1735−dependencies = [
1736− "aho-corasick",
1737− "memchr",
1738− "regex-syntax",
1739−]
1724+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
17401725
17411726[[package]]
17421727name = "regex-syntax"
1743−version = "0.8.2"
1728+version = "0.6.28"
17441729source = "registry+https://github.com/rust-lang/crates.io-index"
1745−checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
1730+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
17461731
17471732[[package]]
17481733name = "ropey"
1749−version = "1.6.1"
1734+version = "1.6.0"
17501735source = "registry+https://github.com/rust-lang/crates.io-index"
1751−checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
1736+checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
17521737dependencies = [
17531738 "smallvec",
17541739 "str_indices",
17551740]
17561741
1757−[[package]]
1758−name = "rustc-demangle"
1759−version = "0.1.23"
1760−source = "registry+https://github.com/rust-lang/crates.io-index"
1761−checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
1762−
17631742[[package]]
17641743name = "rustix"
1765−version = "0.38.28"
1744+version = "0.36.7"
17661745source = "registry+https://github.com/rust-lang/crates.io-index"
1767−checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
1746+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
17681747dependencies = [
1769− "bitflags 2.4.1",
1748+ "bitflags",
17701749 "errno",
1750+ "io-lifetimes",
17711751 "libc",
17721752 "linux-raw-sys",
1773− "windows-sys 0.52.0",
1753+ "windows-sys 0.42.0",
17741754]
17751755
17761756[[package]]
17771757name = "ryu"
1778−version = "1.0.13"
1758+version = "1.0.11"
17791759source = "registry+https://github.com/rust-lang/crates.io-index"
1780−checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
1760+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
17811761
17821762[[package]]
17831763name = "same-file"
@@ -1796,35 +1776,35 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
17961776
17971777[[package]]
17981778name = "scratch"
1799−version = "1.0.5"
1779+version = "1.0.2"
18001780source = "registry+https://github.com/rust-lang/crates.io-index"
1801−checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
1781+checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898"
18021782
18031783[[package]]
18041784name = "serde"
1805−version = "1.0.193"
1785+version = "1.0.152"
18061786source = "registry+https://github.com/rust-lang/crates.io-index"
1807−checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
1787+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
18081788dependencies = [
18091789 "serde_derive",
18101790]
18111791
18121792[[package]]
18131793name = "serde_derive"
1814−version = "1.0.193"
1794+version = "1.0.152"
18151795source = "registry+https://github.com/rust-lang/crates.io-index"
1816−checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
1796+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
18171797dependencies = [
18181798 "proc-macro2",
18191799 "quote",
1820− "syn 2.0.38",
1800+ "syn",
18211801]
18221802
18231803[[package]]
18241804name = "serde_json"
1825−version = "1.0.108"
1805+version = "1.0.94"
18261806source = "registry+https://github.com/rust-lang/crates.io-index"
1827−checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
1807+checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea"
18281808dependencies = [
18291809 "itoa",
18301810 "ryu",
@@ -1833,20 +1813,20 @@ dependencies = [
18331813
18341814[[package]]
18351815name = "serde_repr"
1836−version = "0.1.12"
1816+version = "0.1.9"
18371817source = "registry+https://github.com/rust-lang/crates.io-index"
1838−checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
1818+checksum = "1fe39d9fbb0ebf5eb2c7cb7e2a47e4f462fad1379f1166b8ae49ad9eae89a7ca"
18391819dependencies = [
18401820 "proc-macro2",
18411821 "quote",
1842− "syn 2.0.38",
1822+ "syn",
18431823]
18441824
18451825[[package]]
18461826name = "serde_spanned"
1847−version = "0.6.3"
1827+version = "0.6.1"
18481828source = "registry+https://github.com/rust-lang/crates.io-index"
1849−checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
1829+checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
18501830dependencies = [
18511831 "serde",
18521832]
@@ -1859,9 +1839,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
18591839
18601840[[package]]
18611841name = "signal-hook"
1862−version = "0.3.17"
1842+version = "0.3.15"
18631843source = "registry+https://github.com/rust-lang/crates.io-index"
1864−checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
1844+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
18651845dependencies = [
18661846 "libc",
18671847 "signal-hook-registry",
@@ -1880,9 +1860,9 @@ dependencies = [
18801860
18811861[[package]]
18821862name = "signal-hook-registry"
1883−version = "1.4.1"
1863+version = "1.4.0"
18841864source = "registry+https://github.com/rust-lang/crates.io-index"
1885−checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
1865+checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
18861866dependencies = [
18871867 "libc",
18881868]
@@ -1901,27 +1881,27 @@ dependencies = [
19011881
19021882[[package]]
19031883name = "slab"
1904−version = "0.4.8"
1884+version = "0.4.7"
19051885source = "registry+https://github.com/rust-lang/crates.io-index"
1906−checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
1886+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
19071887dependencies = [
19081888 "autocfg",
19091889]
19101890
19111891[[package]]
19121892name = "slotmap"
1913−version = "1.0.7"
1893+version = "1.0.6"
19141894source = "registry+https://github.com/rust-lang/crates.io-index"
1915−checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
1895+checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
19161896dependencies = [
19171897 "version_check",
19181898]
19191899
19201900[[package]]
19211901name = "smallvec"
1922−version = "1.11.2"
1902+version = "1.10.0"
19231903source = "registry+https://github.com/rust-lang/crates.io-index"
1924−checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
1904+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
19251905
19261906[[package]]
19271907name = "smartstring"
@@ -1942,12 +1922,12 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
19421922
19431923[[package]]
19441924name = "socket2"
1945−version = "0.5.5"
1925+version = "0.4.7"
19461926source = "registry+https://github.com/rust-lang/crates.io-index"
1947−checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
1927+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
19481928dependencies = [
19491929 "libc",
1950− "windows-sys 0.48.0",
1930+ "winapi",
19511931]
19521932
19531933[[package]]
@@ -1957,27 +1937,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
19571937checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
19581938
19591939[[package]]
1960−name = "str_indices"
1961−version = "0.4.1"
1940+name = "str-buf"
1941+version = "1.0.6"
19621942source = "registry+https://github.com/rust-lang/crates.io-index"
1963−checksum = "5f026164926842ec52deb1938fae44f83dfdb82d0a5b0270c5bd5935ab74d6dd"
1943+checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
19641944
19651945[[package]]
1966−name = "syn"
1967−version = "1.0.109"
1946+name = "str_indices"
1947+version = "0.4.0"
19681948source = "registry+https://github.com/rust-lang/crates.io-index"
1969−checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
1970−dependencies = [
1971− "proc-macro2",
1972− "quote",
1973− "unicode-ident",
1974−]
1949+checksum = "9d9199fa80c817e074620be84374a520062ebac833f358d74b37060ce4a0f2c0"
19751950
19761951[[package]]
19771952name = "syn"
1978−version = "2.0.38"
1953+version = "1.0.104"
19791954source = "registry+https://github.com/rust-lang/crates.io-index"
1980−checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
1955+checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce"
19811956dependencies = [
19821957 "proc-macro2",
19831958 "quote",
@@ -1986,33 +1961,33 @@ dependencies = [
19861961
19871962[[package]]
19881963name = "tempfile"
1989−version = "3.8.1"
1964+version = "3.4.0"
19901965source = "registry+https://github.com/rust-lang/crates.io-index"
1991−checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
1966+checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
19921967dependencies = [
19931968 "cfg-if",
19941969 "fastrand",
1995− "redox_syscall 0.4.1",
1970+ "redox_syscall",
19961971 "rustix",
1997− "windows-sys 0.48.0",
1972+ "windows-sys 0.42.0",
19981973]
19991974
20001975[[package]]
20011976name = "termcolor"
2002−version = "1.2.0"
1977+version = "1.1.3"
20031978source = "registry+https://github.com/rust-lang/crates.io-index"
2004−checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
1979+checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
20051980dependencies = [
20061981 "winapi-util",
20071982]
20081983
20091984[[package]]
20101985name = "termini"
2011−version = "1.0.0"
1986+version = "0.1.4"
20121987source = "registry+https://github.com/rust-lang/crates.io-index"
2013−checksum = "2ad441d87dd98bc5eeb31cf2fb7e4839968763006b478efb38668a3bf9da0d59"
1988+checksum = "8c0f7ecb9c2a380d2686a747e4fc574043712326e8d39fbd220ab3bd29768a12"
20141989dependencies = [
2015− "home",
1990+ "dirs-next",
20161991]
20171992
20181993[[package]]
@@ -2028,22 +2003,31 @@ dependencies = [
20282003
20292004[[package]]
20302005name = "thiserror"
2031−version = "1.0.52"
2006+version = "1.0.39"
20322007source = "registry+https://github.com/rust-lang/crates.io-index"
2033−checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
2008+checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
20342009dependencies = [
20352010 "thiserror-impl",
20362011]
20372012
20382013[[package]]
20392014name = "thiserror-impl"
2040−version = "1.0.52"
2015+version = "1.0.39"
20412016source = "registry+https://github.com/rust-lang/crates.io-index"
2042−checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
2017+checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
20432018dependencies = [
20442019 "proc-macro2",
20452020 "quote",
2046− "syn 2.0.38",
2021+ "syn",
2022+]
2023+
2024+[[package]]
2025+name = "thread_local"
2026+version = "1.1.4"
2027+source = "registry+https://github.com/rust-lang/crates.io-index"
2028+checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
2029+dependencies = [
2030+ "once_cell",
20472031]
20482032
20492033[[package]]
@@ -2057,9 +2041,9 @@ dependencies = [
20572041
20582042[[package]]
20592043name = "time"
2060−version = "0.3.23"
2044+version = "0.3.17"
20612045source = "registry+https://github.com/rust-lang/crates.io-index"
2062−checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
2046+checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
20632047dependencies = [
20642048 "itoa",
20652049 "libc",
@@ -2071,15 +2055,15 @@ dependencies = [
20712055
20722056[[package]]
20732057name = "time-core"
2074−version = "0.1.1"
2058+version = "0.1.0"
20752059source = "registry+https://github.com/rust-lang/crates.io-index"
2076−checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
2060+checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
20772061
20782062[[package]]
20792063name = "time-macros"
2080−version = "0.2.10"
2064+version = "0.2.6"
20812065source = "registry+https://github.com/rust-lang/crates.io-index"
2082−checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
2066+checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
20832067dependencies = [
20842068 "time-core",
20852069]
@@ -2095,19 +2079,20 @@ dependencies = [
20952079
20962080[[package]]
20972081name = "tinyvec_macros"
2098−version = "0.1.1"
2082+version = "0.1.0"
20992083source = "registry+https://github.com/rust-lang/crates.io-index"
2100−checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
2084+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
21012085
21022086[[package]]
21032087name = "tokio"
2104−version = "1.35.1"
2088+version = "1.26.0"
21052089source = "registry+https://github.com/rust-lang/crates.io-index"
2106−checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
2090+checksum = "03201d01c3c27a29c8a5cee5b55a93ddae1ccf6f08f65365c2c918f8c1b76f64"
21072091dependencies = [
2108− "backtrace",
2092+ "autocfg",
21092093 "bytes",
21102094 "libc",
2095+ "memchr",
21112096 "mio",
21122097 "num_cpus",
21132098 "parking_lot",
@@ -2115,25 +2100,25 @@ dependencies = [
21152100 "signal-hook-registry",
21162101 "socket2",
21172102 "tokio-macros",
2118− "windows-sys 0.48.0",
2103+ "windows-sys 0.45.0",
21192104]
21202105
21212106[[package]]
21222107name = "tokio-macros"
2123−version = "2.2.0"
2108+version = "1.8.0"
21242109source = "registry+https://github.com/rust-lang/crates.io-index"
2125−checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
2110+checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
21262111dependencies = [
21272112 "proc-macro2",
21282113 "quote",
2129− "syn 2.0.38",
2114+ "syn",
21302115]
21312116
21322117[[package]]
21332118name = "tokio-stream"
2134−version = "0.1.14"
2119+version = "0.1.12"
21352120source = "registry+https://github.com/rust-lang/crates.io-index"
2136−checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
2121+checksum = "8fb52b74f05dbf495a8fba459fdc331812b96aa086d9eb78101fa0d4569c3313"
21372122dependencies = [
21382123 "futures-core",
21392124 "pin-project-lite",
@@ -2142,9 +2127,9 @@ dependencies = [
21422127
21432128[[package]]
21442129name = "toml"
2145−version = "0.7.6"
2130+version = "0.7.2"
21462131source = "registry+https://github.com/rust-lang/crates.io-index"
2147−checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
2132+checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6"
21482133dependencies = [
21492134 "serde",
21502135 "serde_spanned",
@@ -2154,30 +2139,30 @@ dependencies = [
21542139
21552140[[package]]
21562141name = "toml_datetime"
2157−version = "0.6.3"
2142+version = "0.6.1"
21582143source = "registry+https://github.com/rust-lang/crates.io-index"
2159−checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
2144+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
21602145dependencies = [
21612146 "serde",
21622147]
21632148
21642149[[package]]
21652150name = "toml_edit"
2166−version = "0.19.12"
2151+version = "0.19.3"
21672152source = "registry+https://github.com/rust-lang/crates.io-index"
2168−checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
2153+checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5"
21692154dependencies = [
21702155 "indexmap",
2156+ "nom8",
21712157 "serde",
21722158 "serde_spanned",
21732159 "toml_datetime",
2174− "winnow 0.4.6",
21752160]
21762161
21772162[[package]]
21782163name = "tree-sitter"
2179−version = "0.20.10"
2180−source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
2164+version = "0.20.9"
2165+source = "git+https://github.com/tree-sitter/tree-sitter?rev=c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14#c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14"
21812166dependencies = [
21822167 "cc",
21832168 "regex",
@@ -2194,15 +2179,15 @@ dependencies = [
21942179
21952180[[package]]
21962181name = "unicode-bidi"
2197−version = "0.3.13"
2182+version = "0.3.8"
21982183source = "registry+https://github.com/rust-lang/crates.io-index"
2199−checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
2184+checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
22002185
22012186[[package]]
22022187name = "unicode-bom"
2203−version = "2.0.2"
2188+version = "1.1.4"
22042189source = "registry+https://github.com/rust-lang/crates.io-index"
2205−checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552"
2190+checksum = "63ec69f541d875b783ca40184d655f2927c95f0bffd486faa83cd3ac3529ec32"
22062191
22072192[[package]]
22082193name = "unicode-general-category"
@@ -2212,15 +2197,19 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7"
22122197
22132198[[package]]
22142199name = "unicode-ident"
2215−version = "1.0.8"
2200+version = "1.0.5"
22162201source = "registry+https://github.com/rust-lang/crates.io-index"
2217−checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
2202+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
22182203
22192204[[package]]
22202205name = "unicode-linebreak"
2221−version = "0.1.5"
2206+version = "0.1.4"
22222207source = "registry+https://github.com/rust-lang/crates.io-index"
2223−checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
2208+checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
2209+dependencies = [
2210+ "hashbrown 0.12.3",
2211+ "regex",
2212+]
22242213
22252214[[package]]
22262215name = "unicode-normalization"
@@ -2239,15 +2228,15 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
22392228
22402229[[package]]
22412230name = "unicode-width"
2242−version = "0.1.11"
2231+version = "0.1.10"
22432232source = "registry+https://github.com/rust-lang/crates.io-index"
2244−checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
2233+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
22452234
22462235[[package]]
22472236name = "url"
2248−version = "2.5.0"
2237+version = "2.3.1"
22492238source = "registry+https://github.com/rust-lang/crates.io-index"
2250−checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
2239+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
22512240dependencies = [
22522241 "form_urlencoded",
22532242 "idna",
@@ -2263,11 +2252,12 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
22632252
22642253[[package]]
22652254name = "walkdir"
2266−version = "2.4.0"
2255+version = "2.3.2"
22672256source = "registry+https://github.com/rust-lang/crates.io-index"
2268−checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
2257+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
22692258dependencies = [
22702259 "same-file",
2260+ "winapi",
22712261 "winapi-util",
22722262]
22732263
@@ -2279,9 +2269,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
22792269
22802270[[package]]
22812271name = "wasm-bindgen"
2282−version = "0.2.84"
2272+version = "0.2.83"
22832273source = "registry+https://github.com/rust-lang/crates.io-index"
2284−checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
2274+checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268"
22852275dependencies = [
22862276 "cfg-if",
22872277 "wasm-bindgen-macro",
@@ -2289,24 +2279,24 @@ dependencies = [
22892279
22902280[[package]]
22912281name = "wasm-bindgen-backend"
2292−version = "0.2.84"
2282+version = "0.2.83"
22932283source = "registry+https://github.com/rust-lang/crates.io-index"
2294−checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
2284+checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142"
22952285dependencies = [
22962286 "bumpalo",
22972287 "log",
22982288 "once_cell",
22992289 "proc-macro2",
23002290 "quote",
2301− "syn 1.0.109",
2291+ "syn",
23022292 "wasm-bindgen-shared",
23032293]
23042294
23052295[[package]]
23062296name = "wasm-bindgen-macro"
2307−version = "0.2.84"
2297+version = "0.2.83"
23082298source = "registry+https://github.com/rust-lang/crates.io-index"
2309−checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
2299+checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810"
23102300dependencies = [
23112301 "quote",
23122302 "wasm-bindgen-macro-support",
@@ -2314,34 +2304,32 @@ dependencies = [
23142304
23152305[[package]]
23162306name = "wasm-bindgen-macro-support"
2317−version = "0.2.84"
2307+version = "0.2.83"
23182308source = "registry+https://github.com/rust-lang/crates.io-index"
2319−checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
2309+checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c"
23202310dependencies = [
23212311 "proc-macro2",
23222312 "quote",
2323− "syn 1.0.109",
2313+ "syn",
23242314 "wasm-bindgen-backend",
23252315 "wasm-bindgen-shared",
23262316]
23272317
23282318[[package]]
23292319name = "wasm-bindgen-shared"
2330−version = "0.2.84"
2320+version = "0.2.83"
23312321source = "registry+https://github.com/rust-lang/crates.io-index"
2332−checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
2322+checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f"
23332323
23342324[[package]]
23352325name = "which"
2336−version = "5.0.0"
2326+version = "4.4.0"
23372327source = "registry+https://github.com/rust-lang/crates.io-index"
2338−checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
2328+checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
23392329dependencies = [
23402330 "either",
2341− "home",
2331+ "libc",
23422332 "once_cell",
2343− "rustix",
2344− "windows-sys 0.48.0",
23452333]
23462334
23472335[[package]]
@@ -2377,30 +2365,32 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
23772365
23782366[[package]]
23792367name = "windows"
2380−version = "0.48.0"
2368+version = "0.43.0"
23812369source = "registry+https://github.com/rust-lang/crates.io-index"
2382−checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
2370+checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
23832371dependencies = [
2384− "windows-targets 0.48.0",
2372+ "windows_aarch64_gnullvm",
2373+ "windows_aarch64_msvc",
2374+ "windows_i686_gnu",
2375+ "windows_i686_msvc",
2376+ "windows_x86_64_gnu",
2377+ "windows_x86_64_gnullvm",
2378+ "windows_x86_64_msvc",
23852379]
23862380
23872381[[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"
2382+name = "windows-sys"
2383+version = "0.42.0"
24002384source = "registry+https://github.com/rust-lang/crates.io-index"
2401−checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
2385+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
24022386dependencies = [
2403− "windows-targets 0.52.0",
2387+ "windows_aarch64_gnullvm",
2388+ "windows_aarch64_msvc",
2389+ "windows_i686_gnu",
2390+ "windows_i686_msvc",
2391+ "windows_x86_64_gnu",
2392+ "windows_x86_64_gnullvm",
2393+ "windows_x86_64_msvc",
24042394]
24052395
24062396[[package]]
@@ -2409,219 +2399,69 @@ version = "0.45.0"
24092399source = "registry+https://github.com/rust-lang/crates.io-index"
24102400checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
24112401dependencies = [
2412− "windows-targets 0.42.2",
2413−]
2414−
2415−[[package]]
2416−name = "windows-sys"
2417−version = "0.48.0"
2418−source = "registry+https://github.com/rust-lang/crates.io-index"
2419−checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
2420−dependencies = [
2421− "windows-targets 0.48.0",
2422−]
2423−
2424−[[package]]
2425−name = "windows-sys"
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",
2402+ "windows-targets",
24612403]
24622404
24632405[[package]]
24642406name = "windows-targets"
2465−version = "0.52.0"
2407+version = "0.42.1"
24662408source = "registry+https://github.com/rust-lang/crates.io-index"
2467−checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
2409+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
24682410dependencies = [
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",
2411+ "windows_aarch64_gnullvm",
2412+ "windows_aarch64_msvc",
2413+ "windows_i686_gnu",
2414+ "windows_i686_msvc",
2415+ "windows_x86_64_gnu",
2416+ "windows_x86_64_gnullvm",
2417+ "windows_x86_64_msvc",
24762418]
24772419
24782420[[package]]
24792421name = "windows_aarch64_gnullvm"
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"
2487−source = "registry+https://github.com/rust-lang/crates.io-index"
2488−checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
2489−
2490−[[package]]
2491−name = "windows_aarch64_gnullvm"
2492−version = "0.52.0"
2493−source = "registry+https://github.com/rust-lang/crates.io-index"
2494−checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
2495−
2496−[[package]]
2497−name = "windows_aarch64_msvc"
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"
2422+version = "0.42.1"
25052423source = "registry+https://github.com/rust-lang/crates.io-index"
2506−checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
2424+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
25072425
25082426[[package]]
25092427name = "windows_aarch64_msvc"
2510−version = "0.52.0"
2511−source = "registry+https://github.com/rust-lang/crates.io-index"
2512−checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
2513−
2514−[[package]]
2515−name = "windows_i686_gnu"
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"
2428+version = "0.42.1"
25232429source = "registry+https://github.com/rust-lang/crates.io-index"
2524−checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
2430+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
25252431
25262432[[package]]
25272433name = "windows_i686_gnu"
2528−version = "0.52.0"
2529−source = "registry+https://github.com/rust-lang/crates.io-index"
2530−checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
2531−
2532−[[package]]
2533−name = "windows_i686_msvc"
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"
2434+version = "0.42.1"
25412435source = "registry+https://github.com/rust-lang/crates.io-index"
2542−checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
2436+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
25432437
25442438[[package]]
25452439name = "windows_i686_msvc"
2546−version = "0.52.0"
2547−source = "registry+https://github.com/rust-lang/crates.io-index"
2548−checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
2549−
2550−[[package]]
2551−name = "windows_x86_64_gnu"
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"
2440+version = "0.42.1"
25592441source = "registry+https://github.com/rust-lang/crates.io-index"
2560−checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
2442+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
25612443
25622444[[package]]
25632445name = "windows_x86_64_gnu"
2564−version = "0.52.0"
2565−source = "registry+https://github.com/rust-lang/crates.io-index"
2566−checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
2567−
2568−[[package]]
2569−name = "windows_x86_64_gnullvm"
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"
2446+version = "0.42.1"
25772447source = "registry+https://github.com/rust-lang/crates.io-index"
2578−checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
2448+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
25792449
25802450[[package]]
25812451name = "windows_x86_64_gnullvm"
2582−version = "0.52.0"
2583−source = "registry+https://github.com/rust-lang/crates.io-index"
2584−checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
2585−
2586−[[package]]
2587−name = "windows_x86_64_msvc"
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"
2452+version = "0.42.1"
25952453source = "registry+https://github.com/rust-lang/crates.io-index"
2596−checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
2454+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
25972455
25982456[[package]]
25992457name = "windows_x86_64_msvc"
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"
2458+version = "0.42.1"
26162459source = "registry+https://github.com/rust-lang/crates.io-index"
2617−checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
2618−dependencies = [
2619− "memchr",
2620−]
2460+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
26212461
26222462[[package]]
26232463name = "xtask"
2624−version = "23.10.0"
2464+version = "0.6.0"
26252465dependencies = [
26262466 "helix-core",
26272467 "helix-loader",
@@ -2629,23 +2469,3 @@ dependencies = [
26292469 "helix-view",
26302470 "toml",
26312471]
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+2−15
@@ -1,12 +1,10 @@
11[workspace]
2−resolver = "2"
32members = [
43 "helix-core",
54 "helix-view",
65 "helix-term",
76 "helix-tui",
87 "helix-lsp",
9− "helix-event",
108 "helix-dap",
119 "helix-loader",
1210 "helix-vcs",
@@ -35,16 +33,5 @@ package.helix-core.opt-level = 2
3533package.helix-tui.opt-level = 2
3634package.helix-term.opt-level = 2
3735
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"
36+[patch.crates-io]
37+tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "c51896d32dcc11a38e41f36e3deb1a6a9c4f4b14" }
README.md+2−2
@@ -18,7 +18,7 @@
1818
1919![Screenshot](./screenshot.png)
2020
21−A [Kakoune](https://github.com/mawww/kakoune) / [Neovim](https://github.com/neovim/neovim) inspired editor, written in Rust.
21+A Kakoune / 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.
@@ -61,4 +61,4 @@ Discuss the project on the community [Matrix Space](https://matrix.to/#/#helix-c
6161
6262# Credits
6363
64−Thanks to [@jakenvac](https://github.com/jakenvac) for designing the logo!
64+Thanks to [@JakeHL](https://github.com/JakeHL) for designing the logo!
VERSIONnew file+1
@@ -0,0 +1 @@
1+22.12
book/book.toml+1−5
@@ -3,14 +3,10 @@ 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"
67
78[output.html]
89cname = "docs.helix-editor.com"
910default-theme = "colibri"
1011preferred-dark-theme = "colibri"
1112git-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.cssdeleted−231
@@ -1,231 +0,0 @@
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−1
@@ -16,4 +16,3 @@
1616 - [Adding languages](./guides/adding_languages.md)
1717 - [Adding textobject queries](./guides/textobject.md)
1818 - [Adding indent queries](./guides/indent.md)
19− - [Adding injection queries](./guides/injection.md)
book/src/configuration.md+13−55
@@ -30,9 +30,6 @@ You can use a custom configuration file by specifying it with the `-c` or
3030Additionally, you can reload the configuration file by sending the USR1
3131signal to the Helix process on Unix operating systems, such as by using the command `pkill -USR1 hx`.
3232
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.
35−
3633## Editor
3734
3835### `[editor]` Section
@@ -51,22 +48,14 @@ Its settings will be merged with the configuration directory `config.toml` and t
5148| `auto-completion` | Enable automatic pop up of auto-completion | `true` |
5249| `auto-format` | Enable automatic formatting on save | `true` |
5350| `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` |
51+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `400` |
5652| `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
57−| `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |
5853| `auto-info` | Whether to display info boxes | `true` |
5954| `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` |
6155| `rulers` | List of column positions at which to display the rulers. Can be overridden by language specific `rulers` in `languages.toml` file | `[]` |
6256| `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` |
6357| `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`
58+| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap_at_text_width` is set | `80` |
7059
7160### `[editor.statusline]` Section
7261
@@ -92,9 +81,9 @@ The `[editor.statusline]` key takes the following sub-keys:
9281
9382| Key | Description | Default |
9483| --- | --- | --- |
95−| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "file-modification-indicator"]` |
84+| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
9685| `center` | A list of elements aligned to the middle of the statusline | `[]` |
97−| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "register", "position", "file-encoding"]` |
86+| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
9887| `separator` | The character used to separate elements in the statusline | `"│"` |
9988| `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
10089| `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
@@ -111,7 +100,6 @@ The following statusline elements can be configured:
111100| `file-modification-indicator` | The indicator to show whether the file is modified (a `[+]` appears when there are unsaved changes) |
112101| `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
113102| `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 |
115103| `total-line-numbers` | The total line numbers of the opened file |
116104| `file-type` | The type of the opened file |
117105| `diagnostics` | The number of warnings and/or errors |
@@ -122,8 +110,6 @@ The following statusline elements can be configured:
122110| `position-percentage` | The cursor position as a percentage of the total number of lines |
123111| `separator` | The string defined in `editor.statusline.separator` (defaults to `"│"`) |
124112| `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 |
127113
128114### `[editor.lsp]` Section
129115
@@ -132,15 +118,10 @@ The following statusline elements can be configured:
132118| `enable` | Enables LSP integration. Setting to false will completely disable language servers regardless of language settings.| `true` |
133119| `display-messages` | Display LSP progress messages below statusline[^1] | `false` |
134120| `auto-signature-help` | Enable automatic popup of signature help (parameter hints) | `true` |
135−| `display-inlay-hints` | Display inlay hints[^2] | `false` |
136121| `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` |
139122
140123[^1]: By default, a progress spinner is shown in the statusline beside the file path.
141124
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−
144125### `[editor.cursor-shape]` Section
145126
146127Defines the shape of cursor in each mode.
@@ -168,31 +149,16 @@ All git related options are only enabled in a git repository.
168149
169150| Key | Description | Default |
170151|--|--|---------|
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`
152+|`hidden` | Enables ignoring hidden files | true
153+|`follow-links` | Follow symlinks instead of ignoring them | true
154+|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
155+|`parents` | Enables reading ignore files from parent directories | true
156+|`ignore` | Enables reading `.ignore` files | true
157+|`git-ignore` | Enables reading `.gitignore` files | true
158+|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` option | true
159+|`git-exclude` | Enables reading `.git/info/exclude` files | true
179160|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
180161
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−```
195−
196162### `[editor.auto-pairs]` Section
197163
198164Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a
@@ -333,7 +299,7 @@ Example:
333299min-width = 1
334300```
335301
336−#### `[editor.gutters.diagnostics]` Section
302+#### `[editor.gutters.diagnotics]` Section
337303
338304Currently unused
339305
@@ -366,11 +332,3 @@ max-wrap = 25 # increase value to reduce forced mid-word wrapping
366332max-indent-retain = 0
367333wrap-indicator = "" # set wrap-indicator to "" to hide it
368334```
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 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 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
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+22−59
@@ -1,37 +1,31 @@
11| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
22| --- | --- | --- | --- | --- |
3−| agda | ✓ | | | |
43| astro | ✓ | | | |
54| awk | ✓ | ✓ | | `awk-language-server` |
6−| bash | ✓ | ✓ | ✓ | `bash-language-server` |
5+| bash | ✓ | | ✓ | `bash-language-server` |
76| bass | ✓ | | | `bass` |
87| beancount | ✓ | | | |
98| bibtex | ✓ | | | `texlab` |
109| bicep | ✓ | | | `bicep-langserver` |
11−| blueprint | ✓ | | | `blueprint-compiler` |
1210| c | ✓ | ✓ | ✓ | `clangd` |
1311| c-sharp | ✓ | ✓ | | `OmniSharp` |
14−| cabal | | | | `haskell-language-server-wrapper` |
15−| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
16−| capnp | ✓ | | ✓ | |
12+| cairo | ✓ | | | |
1713| clojure | ✓ | | | `clojure-lsp` |
1814| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
1915| comment | ✓ | | | |
20−| common-lisp | ✓ | | ✓ | `cl-lsp` |
16+| common-lisp | ✓ | | | `cl-lsp` |
2117| cpon | ✓ | | ✓ | |
2218| cpp | ✓ | ✓ | ✓ | `clangd` |
23−| crystal | ✓ | ✓ | | `crystalline` |
19+| crystal | ✓ | ✓ | | |
2420| css | ✓ | | | `vscode-css-language-server` |
2521| cue | ✓ | | | `cuelsp` |
2622| d | ✓ | ✓ | ✓ | `serve-d` |
2723| dart | ✓ | | ✓ | `dart` |
28−| dbml | ✓ | | | |
2924| devicetree | ✓ | | | |
3025| dhall | ✓ | ✓ | | `dhall-lsp-server` |
3126| diff | ✓ | | | |
3227| dockerfile | ✓ | | | `docker-langserver` |
3328| dot | ✓ | | | `dot-language-server` |
34−| dtd | ✓ | | | |
3529| edoc | ✓ | | | |
3630| eex | ✓ | | | |
3731| ejs | ✓ | | | |
@@ -43,49 +37,38 @@
4337| erlang | ✓ | ✓ | | `erlang_ls` |
4438| esdl | ✓ | | | |
4539| fish | ✓ | ✓ | ✓ | |
46−| forth | ✓ | | | `forth-lsp` |
4740| fortran | ✓ | | ✓ | `fortls` |
48−| fsharp | ✓ | | | `fsautocomplete` |
49−| gas | ✓ | ✓ | | |
5041| gdscript | ✓ | ✓ | ✓ | |
51−| gemini | ✓ | | | |
5242| git-attributes | ✓ | | | |
53−| git-commit | ✓ | ✓ | | |
43+| git-commit | ✓ | | | |
5444| git-config | ✓ | | | |
5545| git-ignore | ✓ | | | |
5646| git-rebase | ✓ | | | |
5747| gleam | ✓ | ✓ | | `gleam` |
5848| glsl | ✓ | ✓ | ✓ | |
59−| gn | ✓ | | | |
60−| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
49+| go | ✓ | ✓ | ✓ | `gopls` |
6150| godot-resource | ✓ | | | |
6251| gomod | ✓ | | | `gopls` |
6352| gotmpl | ✓ | | | `gopls` |
6453| gowork | ✓ | | | `gopls` |
65−| graphql | ✓ | | | `graphql-lsp` |
54+| graphql | ✓ | | | |
6655| hare | ✓ | | | |
6756| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
68−| haskell-persistent | ✓ | | | |
6957| hcl | ✓ | | ✓ | `terraform-ls` |
7058| heex | ✓ | ✓ | | `elixir-ls` |
7159| hosts | ✓ | | | |
7260| html | ✓ | | | `vscode-html-language-server` |
73−| hurl | ✓ | | ✓ | |
7461| idris | | | | `idris2-lsp` |
7562| iex | ✓ | | | |
7663| ini | ✓ | | | |
77−| janet | ✓ | | | |
78−| java | ✓ | ✓ | ✓ | `jdtls` |
64+| java | ✓ | ✓ | | `jdtls` |
7965| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
80−| jinja | ✓ | | | |
8166| jsdoc | ✓ | | | |
8267| json | ✓ | | ✓ | `vscode-json-language-server` |
83−| json5 | ✓ | | | |
8468| jsonnet | ✓ | | | `jsonnet-language-server` |
8569| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
86−| julia | ✓ | ✓ | ✓ | `julia` |
87−| just | ✓ | ✓ | ✓ | |
88−| kdl | ✓ | ✓ | ✓ | |
70+| julia | ✓ | | | `julia` |
71+| kdl | ✓ | | | |
8972| kotlin | ✓ | | | `kotlin-language-server` |
9073| latex | ✓ | ✓ | | `texlab` |
9174| lean | ✓ | | | `lean` |
@@ -93,101 +76,81 @@
9376| llvm | ✓ | ✓ | ✓ | |
9477| llvm-mir | ✓ | ✓ | ✓ | |
9578| llvm-mir-yaml | ✓ | | ✓ | |
96−| log | ✓ | | | |
97−| lpf | ✓ | | | |
9879| lua | ✓ | ✓ | ✓ | `lua-language-server` |
9980| make | ✓ | | | |
100−| markdoc | ✓ | | | `markdoc-ls` |
10181| markdown | ✓ | | | `marksman` |
10282| markdown.inline | ✓ | | | |
103−| matlab | ✓ | ✓ | ✓ | |
83+| matlab | ✓ | | | |
10484| mermaid | ✓ | | | |
10585| meson | ✓ | | ✓ | |
10686| mint | | | | `mint` |
10787| msbuild | ✓ | | ✓ | |
10888| nasm | ✓ | ✓ | | |
10989| nickel | ✓ | | ✓ | `nls` |
110−| nim | ✓ | ✓ | ✓ | `nimlangserver` |
11190| nix | ✓ | | | `nil` |
112−| nu | ✓ | | | `nu` |
113−| nunjucks | ✓ | | | |
91+| nu | ✓ | | | |
11492| ocaml | ✓ | | ✓ | `ocamllsp` |
11593| ocaml-interface | ✓ | | | `ocamllsp` |
116−| odin | ✓ | | ✓ | `ols` |
117−| opencl | ✓ | ✓ | ✓ | `clangd` |
94+| odin | ✓ | | | `ols` |
11895| openscad | ✓ | | | `openscad-lsp` |
11996| org | ✓ | | | |
12097| pascal | ✓ | ✓ | | `pasls` |
12198| passwd | ✓ | | | |
12299| pem | ✓ | | | |
123−| perl | ✓ | ✓ | ✓ | `perlnavigator` |
100+| perl | ✓ | ✓ | ✓ | |
124101| php | ✓ | ✓ | ✓ | `intelephense` |
125102| po | ✓ | ✓ | | |
126−| pod | ✓ | | | |
127103| ponylang | ✓ | ✓ | ✓ | |
128104| prisma | ✓ | | | `prisma-language-server` |
129105| prolog | | | | `swipl` |
130−| protobuf | ✓ | | ✓ | `bufls`, `pb` |
106+| protobuf | ✓ | | ✓ | |
131107| prql | ✓ | | | |
132−| purescript | ✓ | ✓ | | `purescript-language-server` |
108+| purescript | ✓ | | | `purescript-language-server` |
133109| python | ✓ | ✓ | ✓ | `pylsp` |
134110| qml | ✓ | | ✓ | `qmlls` |
135111| r | ✓ | | | `R` |
136−| racket | ✓ | | ✓ | `racket` |
112+| racket | ✓ | | | `racket` |
137113| regex | ✓ | | | |
138−| rego | ✓ | | | `regols` |
139114| rescript | ✓ | ✓ | | `rescript-language-server` |
140115| rmarkdown | ✓ | | ✓ | `R` |
141−| robot | ✓ | | | `robotframework_ls` |
142116| ron | ✓ | | ✓ | |
143117| rst | ✓ | | | |
144118| ruby | ✓ | ✓ | ✓ | `solargraph` |
145119| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
146120| sage | ✓ | ✓ | | |
147121| scala | ✓ | | ✓ | `metals` |
148−| scheme | ✓ | | ✓ | |
122+| scheme | ✓ | | | |
149123| scss | ✓ | | | `vscode-css-language-server` |
150124| slint | ✓ | | ✓ | `slint-lsp` |
151−| smali | ✓ | | ✓ | |
152−| smithy | ✓ | | | `cs` |
153125| sml | ✓ | | | |
154126| solidity | ✓ | | | `solc` |
155127| sql | ✓ | | | |
156128| sshclientconfig | ✓ | | | |
157129| starlark | ✓ | ✓ | | |
158−| strace | ✓ | | | |
159−| svelte | ✓ | | ✓ | `svelteserver` |
130+| svelte | ✓ | | | `svelteserver` |
160131| sway | ✓ | ✓ | ✓ | `forc` |
161132| swift | ✓ | | | `sourcekit-lsp` |
162−| t32 | ✓ | | | |
163133| tablegen | ✓ | ✓ | ✓ | |
164134| task | ✓ | | | |
165−| templ | ✓ | | | `templ` |
166135| tfvars | ✓ | | ✓ | `terraform-ls` |
167−| todotxt | ✓ | | | |
168136| toml | ✓ | | | `taplo` |
169137| tsq | ✓ | | | |
170138| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
171139| twig | ✓ | | | |
172140| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
173−| typst | ✓ | | | `typst-lsp` |
174141| ungrammar | ✓ | | | |
175−| unison | ✓ | | | |
176142| uxntal | ✓ | | | |
177−| v | ✓ | ✓ | ✓ | `v-analyzer` |
143+| v | ✓ | | | `v` |
178144| vala | ✓ | | | `vala-language-server` |
179145| verilog | ✓ | ✓ | | `svlangserver` |
180−| vhdl | ✓ | | | `vhdl_ls` |
181146| vhs | ✓ | | | |
182−| vue | ✓ | | | `vue-language-server` |
147+| vue | ✓ | | | `vls` |
183148| wast | ✓ | | | |
184149| wat | ✓ | | | |
185−| webc | ✓ | | | |
186150| wgsl | ✓ | | | `wgsl_analyzer` |
187151| wit | ✓ | | ✓ | |
188−| wren | ✓ | ✓ | ✓ | |
189152| xit | ✓ | | | |
190153| xml | ✓ | | ✓ | |
191−| yaml | ✓ | | ✓ | `yaml-language-server`, `ansible-language-server` |
154+| yaml | ✓ | | ✓ | `yaml-language-server` |
192155| yuck | ✓ | | | |
193156| zig | ✓ | ✓ | ✓ | `zls` |
book/src/generated/typable-cmd.md+7−16
@@ -12,19 +12,16 @@
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) |
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) |
15+| `:write!`, `:w!` | Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write some/path.txt) |
1816| `:new`, `:n` | Create a new scratch buffer. |
1917| `:format`, `:fmt` | Format the file using the LSP formatter. |
20−| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.) |
18+| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.) |
2119| `:line-ending` | Set the document's default line ending. Options: crlf, lf. |
2220| `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. |
2321| `:later`, `:lat` | Jump to a later point in edit history. Accepts a number of steps or a time span. |
2422| `:write-quit`, `:wq`, `:x` | Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt) |
2523| `:write-quit!`, `:wq!`, `:x!` | Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt) |
2624| `: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. |
2825| `:write-quit-all`, `:wqa`, `:xa` | Write changes from all buffers to disk and close all views. |
2926| `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes). |
3027| `:quit-all`, `:qa` | Close all views. |
@@ -32,7 +29,6 @@
3229| `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |
3330| `:cquit!`, `:cq!` | Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2). |
3431| `: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. |
3632| `:clipboard-yank` | Yank main selection into system clipboard. |
3733| `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |
3834| `:primary-clipboard-yank` | Yank main selection into system primary clipboard. |
@@ -48,14 +44,13 @@
4844| `:show-directory`, `:pwd` | Show the current working directory. |
4945| `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
5046| `:character-info`, `:char` | Get info about the character under the primary cursor. |
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. |
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. |
5450| `:lsp-workspace-command` | Open workspace command picker |
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 |
51+| `:lsp-restart` | Restarts the Language Server that is in use by the current doc |
52+| `:lsp-stop` | Stops the Language Server that is in use by the current doc |
5753| `: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. |
5954| `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
6055| `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
6156| `:debug-eval` | Evaluate expression in current debug context. |
@@ -75,7 +70,6 @@
7570| `:tree-sitter-subtree`, `:ts-subtree` | Display tree sitter subtree under cursor, primarily for debugging queries. |
7671| `:config-reload` | Refresh user config. |
7772| `:config-open` | Open the user config.toml file. |
78−| `:config-open-workspace` | Open the workspace config.toml file. |
7973| `:log-open` | Open the helix log file. |
8074| `:insert-output` | Run shell command, inserting output before each selection. |
8175| `:append-output` | Run shell command, appending output after each selection. |
@@ -83,6 +77,3 @@
8377| `:pipe-to` | Pipe each selection to the shell command, ignoring output. |
8478| `:run-shell-command`, `:sh` | Run a shell command |
8579| `: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/adding_languages.md−3
@@ -9,7 +9,6 @@ below.
99 necessary configuration for the new language. For more information on
1010 language configuration, refer to the
1111 [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.
13122. If you are adding a new language or updating an existing language server
1413 configuration, run the command `cargo xtask docgen` to update the
1514 [Language Support](../lang-support.md) documentation.
@@ -36,7 +35,6 @@ below.
36353. Refer to the
3736 [tree-sitter website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)
3837 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).
4038
4139> 💡 In Helix, the first matching query takes precedence when evaluating
4240> queries, which is different from other editors such as Neovim where the last
@@ -52,4 +50,3 @@ below.
5250 grammars.
5351- If a parser is causing a segfault, or you want to remove it, make sure to
5452 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+43−319
@@ -1,308 +1,76 @@
11# Adding indent queries
22
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.
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).
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. See [Capture types](#capture-types).
13+the total indent level by 1.
1414
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.
15+## Scopes
2316
24−## Indent queries
25−
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.
30−
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.
33−
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−}
46−```
47−
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.
50−
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−```
62−
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.
67−
68−### Capture types
69−
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.
94−- `@extend.prevent-once`:
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−```
208−
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−```
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):
23121
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.
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.
23825
239−To help, we need to signal an end to the extension. We can do this with
240−`@extend.prevent-once`.
26+- `tail`:
27+This scope applies to everything except for the first line of the
28+captured node.
24129
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:
24233```scm
243−(parenthesized_expression) @indent
244−
245−]
246− (function_definition)
247− (class_definition)
248−] @indent @extend
249−
250−(return_statement) @extend.prevent-once
34+(assignment_expression
35+ right: (_) @indent
36+ (#set! "scope" "all"))
25137```
25238
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.
39+## Capture types
25740
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.
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.
26145
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−```
46+- `@outdent` (default scope `all`):
47+Decrease the indent level by 1. The same rules as for `@indent` apply.
27548
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.
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.
28054
281−```scm
282−((block_sequence_item) @item @indent.always @extend
283− (#not-one-line? @item))
55+- `@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).
28461
285−((block_mapping_pair
286− key: (_) @key
287− value: (_) @val
288− (#not-same-line? @key @val)
289− ) @indent.always @extend
290−)
291−```
29262
29363## Predicates
29464
29565In some cases, an S-expression cannot express exactly what pattern should be matched.
29666For that, tree-sitter allows for predicates to appear anywhere within a pattern,
29767similar to how `#set!` declarations work:
298−
29968```scm
30069(some_kind
30170 (child_kind) @indent
30271 (#predicate? arg1 arg2 ...)
30372)
30473```
305−
30674The number of arguments depends on the predicate that's used.
30775Each argument is either a capture (`@name`) or a string (`"some string"`).
30876The following predicates are supported by tree-sitter:
@@ -323,47 +91,3 @@ argument (a string).
32391
32492- `#same-line?`/`#not-same-line?`:
32593The 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.mddeleted−57
@@ -1,57 +0,0 @@
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/install.md+35−116
@@ -6,24 +6,16 @@
66- [Linux](#linux)
77 - [Ubuntu](#ubuntu)
88 - [Fedora/RHEL](#fedorarhel)
9− - [Arch Linux extra](#arch-linux-extra)
9+ - [Arch Linux community](#arch-linux-community)
1010 - [NixOS](#nixos)
11− - [Flatpak](#flatpak)
12− - [Snap](#snap)
13− - [AppImage](#appimage)
1411- [macOS](#macos)
1512 - [Homebrew Core](#homebrew-core)
16− - [MacPorts](#macports)
1713- [Windows](#windows)
18− - [Winget](#winget)
1914 - [Scoop](#scoop)
2015 - [Chocolatey](#chocolatey)
2116 - [MSYS2](#msys2)
2217- [Building from source](#building-from-source)
2318 - [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)
2719 - [Validating the installation](#validating-the-installation)
2820 - [Configure the desktop shortcut](#configure-the-desktop-shortcut)
2921<!--toc:end-->
@@ -47,6 +39,8 @@ line.
4739
4840## Linux, macOS, Windows and OpenBSD packaging status
4941
42+Helix is available for Linux, macOS and Windows via the official repositories listed below.
43+
5044[![Packaging status](https://repology.org/badge/vertical-allrepos/helix.svg)](https://repology.org/project/helix/versions)
5145
5246## Linux
@@ -55,7 +49,7 @@ The following third party repositories are available:
5549
5650### Ubuntu
5751
58−Add the `PPA` for Helix:
52+Helix is available via [Maveonair's PPA](https://launchpad.net/~maveonair/+archive/ubuntu/helix-editor):
5953
6054```sh
6155sudo add-apt-repository ppa:maveonair/helix-editor
@@ -65,13 +59,16 @@ sudo apt install helix
6559
6660### Fedora/RHEL
6761
62+Helix is available via `copr`:
63+
6864```sh
65+sudo dnf copr enable varlad/helix
6966sudo dnf install helix
7067```
7168
72−### Arch Linux extra
69+### Arch Linux community
7370
74−Releases are available in the `extra` repository:
71+Releases are available in the `community` repository:
7572
7673```sh
7774sudo pacman -S helix
@@ -81,10 +78,7 @@ in the AUR, which builds the master branch.
8178
8279### NixOS
8380
84−Helix is available in [nixpkgs](https://github.com/nixos/nixpkgs) through the `helix` attribute,
85−the unstable channel usually carries the latest release.
86−
87−Helix is also available as a [flake](https://nixos.wiki/wiki/Flakes) in the project
81+Helix is available as a [flake](https://nixos.wiki/wiki/Flakes) in the project
8882root. Use `nix develop` to spin up a reproducible development shell. Outputs are
8983cached for each push to master using [Cachix](https://www.cachix.org/). The
9084flake is configured to automatically make use of this cache assuming the user
@@ -93,35 +87,6 @@ accepts the new settings on first use.
9387If you are using a version of Nix without flakes enabled,
9488[install Cachix CLI](https://docs.cachix.org/installation) and use
9589`cachix use helix` to configure Nix to use cached outputs when possible.
96−
97−### Flatpak
98−
99−Helix is available on [Flathub](https://flathub.org/en-GB/apps/com.helix_editor.Helix):
100−
101−```sh
102−flatpak install flathub com.helix_editor.Helix
103−flatpak run com.helix_editor.Helix
104−```
105−
106−### Snap
107−
108−Helix is available on [Snapcraft](https://snapcraft.io/helix) and can be installed with:
109−
110−```sh
111−snap install --classic helix
112−```
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
124−```
12590
12691## macOS
12792
@@ -131,25 +96,11 @@ chmod +x helix-*.AppImage # change permission for executable mode
13196brew install helix
13297```
13398
134−### MacPorts
135−
136−```sh
137−port install helix
138−```
139−
14099## Windows
141100
142−Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
101+Install on Windows using [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
143102or [MSYS2](https://msys2.org/).
144103
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.
148−
149−```sh
150−winget install Helix.Helix
151−```
152−
153104### Scoop
154105
155106```sh
@@ -172,41 +123,33 @@ pacman -S mingw-w64-ucrt-x86_64-helix
172123
173124## Building from source
174125
175−Requirements:
176−
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.
180−
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
184−
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:
126+Clone the repository:
186127
187128```sh
188−RUSTFLAGS="-C target-feature=-crt-static"
129+git clone https://github.com/helix-editor/helix
130+cd helix
189131```
190132
191−1. Clone the repository:
192−
193− ```sh
194− git clone https://github.com/helix-editor/helix
195− cd helix
196− ```
133+Compile from source:
197134
198−2. Compile from source:
135+```sh
136+cargo install --path helix-term --locked
137+```
199138
200− ```sh
201− cargo install --path helix-term --locked
202− ```
139+This command will create the `hx` executable and construct the tree-sitter
140+grammars in the local `runtime` folder. To build the tree-sitter grammars requires
141+a c++ compiler to be installed, for example `gcc-c++`.
203142
204− This command will create the `hx` executable and construct the tree-sitter
205− grammars in the local `runtime` folder.
143+> 💡 If you are using the musl-libc instead of glibc the following environment variable must be set during the build
144+> to ensure tree-sitter grammars can be loaded correctly:
145+>
146+> ```sh
147+> RUSTFLAGS="-C target-feature=-crt-static"
148+> ```
206149
207150> 💡 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
151+> grammars with `hx --grammar fetch` (requires `git`) and compile them with
152+> `hx --grammar build` (requires a C++ compiler). This will install them in
210153> the `runtime` directory within the user's helix config directory (more
211154> [details below](#multiple-runtime-directories)).
212155
@@ -214,22 +157,18 @@ RUSTFLAGS="-C target-feature=-crt-static"
214157
215158#### Linux and macOS
216159
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:
160+Either set the `HELIX_RUNTIME` environment variable to point to the runtime files and add it to your `~/.bashrc` or equivalent:
220161
221162```sh
222−HELIX_RUNTIME=~/src/helix/runtime
163+HELIX_RUNTIME=/home/user-name/src/helix/runtime
223164```
224165
225−Or, create a symbolic link:
166+Or, create a symlink in `~/.config/helix` that links to the source code directory:
226167
227168```sh
228−ln -Ts $PWD/runtime ~/.config/helix/runtime
169+ln -s $PWD/runtime ~/.config/helix/runtime
229170```
230171
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.
232−
233172#### Windows
234173
235174Either set the `HELIX_RUNTIME` environment variable to point to the runtime files using the Windows setting (search for
@@ -261,32 +200,12 @@ following order:
2612001. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
262201 developing and testing helix only).
2632022. `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.
203+3. `$HELIX_RUNTIME`.
204+4. `runtime/` subdirectory of path to Helix executable.
268205
269206This order also sets the priority for selecting which file will be used if multiple runtime
270207directories have files with the same name.
271208
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−
290209### Validating the installation
291210
292211To make sure everything is set up as expected you should run the Helix health
book/src/keymap.md+19−29
@@ -15,7 +15,7 @@
1515 - [Popup](#popup)
1616 - [Unimpaired](#unimpaired)
1717- [Insert mode](#insert-mode)
18−- [Select / extend mode](#select--extend-mode)
18+- [Select / extend mode](#select-extend-mode)
1919- [Picker](#picker)
2020- [Prompt](#prompt)
2121
@@ -25,8 +25,6 @@
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−
3028### Movement
3129
3230> NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line.
@@ -34,8 +32,8 @@ Normal mode is the default mode when you launch helix. You can return to it from
3432| Key | Description | Command |
3533| ----- | ----------- | ------- |
3634| `h`, `Left` | Move left | `move_char_left` |
37−| `j`, `Down` | Move down | `move_visual_line_down` |
38−| `k`, `Up` | Move up | `move_visual_line_up` |
35+| `j`, `Down` | Move down | `move_line_down` |
36+| `k`, `Up` | Move up | `move_line_up` |
3937| `l`, `Right` | Move right | `move_char_right` |
4038| `w` | Move next word start | `move_next_word_start` |
4139| `b` | Move previous word start | `move_prev_word_start` |
@@ -113,8 +111,7 @@ Normal mode is the default mode when you launch helix. You can return to it from
113111| `s` | Select all regex matches inside selections | `select_regex` |
114112| `S` | Split selection into sub selections on regex matches | `split_selection` |
115113| `Alt-s` | Split selection on newlines | `split_selection_on_newline` |
116−| `Alt-minus` | Merge selections | `merge_selections` |
117−| `Alt-_` | Merge consecutive selections | `merge_consecutive_selections` |
114+| `Alt-_ ` | Merge consecutive selections | `merge_consecutive_selections` |
118115| `&` | Align selection in columns | `align_selections` |
119116| `_` | Trim whitespace from the selection | `trim_selections` |
120117| `;` | Collapse selection onto a single cursor | `collapse_selection` |
@@ -221,8 +218,6 @@ Jumps to various locations.
221218| `n` | Go to next buffer | `goto_next_buffer` |
222219| `p` | Go to previous buffer | `goto_previous_buffer` |
223220| `.` | 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` |
226221
227222#### Match mode
228223
@@ -291,7 +286,7 @@ This layer is a kludge of mappings, mostly pickers.
291286| `w` | Enter [window mode](#window-mode) | N/A |
292287| `p` | Paste system clipboard after selections | `paste_clipboard_after` |
293288| `P` | Paste system clipboard before selections | `paste_clipboard_before` |
294−| `y` | Yank selections to clipboard | `yank_to_clipboard` |
289+| `y` | Join and yank selections to clipboard | `yank_joined_to_clipboard` |
295290| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |
296291| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |
297292| `/` | Global search in workspace folder | `global_search` |
@@ -339,8 +334,6 @@ These mappings are in the style of [vim-unimpaired](https://github.com/tpope/vim
339334
340335## Insert mode
341336
342−Accessed by typing `i` in [normal mode](#normal-mode).
343−
344337Insert mode bindings are minimal by default. Helix is designed to
345338be a modal editor, and this is reflected in the user experience and internal
346339mechanics. Changes to the text are only saved for undos when
@@ -394,11 +387,9 @@ end = "no_op"
394387
395388## Select / extend mode
396389
397−Accessed by typing `v` in [normal mode](#normal-mode).
398−
399390Select mode echoes Normal mode, but changes any movements to extend
400391selections rather than replace them. Goto motions are also changed to
401−extend, so that `vgl`, for example, extends the selection to the end of
392+extend, so that `vgl` for example extends the selection to the end of
402393the line.
403394
404395Search is also affected. By default, `n` and `N` will remove the current
@@ -411,20 +402,19 @@ you to selectively add search terms to your selections.
411402
412403Keys to use within picker. Remapping currently not supported.
413404
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 |
405+| Key | Description |
406+| ----- | ------------- |
407+| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
408+| `Tab`, `Down`, `Ctrl-n` | Next entry |
409+| `PageUp`, `Ctrl-u` | Page up |
410+| `PageDown`, `Ctrl-d` | Page down |
411+| `Home` | Go to first entry |
412+| `End` | Go to last entry |
413+| `Enter` | Open selected |
414+| `Ctrl-s` | Open horizontally |
415+| `Ctrl-v` | Open vertically |
416+| `Ctrl-t` | Toggle preview |
417+| `Escape`, `Ctrl-c` | Close picker |
428418
429419## Prompt
430420
book/src/languages.md+28−105
@@ -7,24 +7,21 @@ in `languages.toml` files.
77
88There are three possible locations for a `languages.toml` file:
99
10−1. In the Helix source code, which lives in the
10+1. In the Helix source code, this lives in the
1111 [Helix repository](https://github.com/helix-editor/helix/blob/master/languages.toml).
1212 It provides the default configurations for languages and language servers.
1313
14142. In your [configuration directory](./configuration.md). This overrides values
15− from the built-in language configuration. For example, to disable
15+ from the built-in language configuration. For example to disable
1616 auto-LSP-formatting in Rust:
1717
18− ```toml
19− # in <config_dir>/helix/languages.toml
20−
21− [language-server.mylang-lsp]
22− command = "mylang-lsp"
18+```toml
19+# in <config_dir>/helix/languages.toml
2320
24− [[language]]
25− name = "rust"
26− auto-format = false
27− ```
21+[[language]]
22+name = "rust"
23+auto-format = false
24+```
2825
29263. In a `.helix` folder in your project. Language configuration may also be
3027 overridden local to a project by creating a `languages.toml` file in a
@@ -44,8 +41,8 @@ injection-regex = "mylang"
4441file-types = ["mylang", "myl"]
4542comment-token = "#"
4643indent = { tab-width = 2, unit = " " }
44+language-server = { command = "mylang-lsp", args = ["--stdio"], environment = { "ENV1" = "value1", "ENV2" = "value2" } }
4745formatter = { command = "mylang-formatter" , args = ["--stdin"] }
48−language-servers = [ "mylang-lsp" ]
4946```
5047
5148These configuration keys are available:
@@ -53,7 +50,6 @@ These configuration keys are available:
5350| Key | Description |
5451| ---- | ----------- |
5552| `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 |
5753| `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 |
5854| `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. |
5955| `file-types` | The filetypes of the language, for example `["yml", "yaml"]`. See the file-type detection section below. |
@@ -63,13 +59,11 @@ These configuration keys are available:
6359| `diagnostic-severity` | Minimal severity of diagnostic for it to be displayed. (Allowed values: `Error`, `Warning`, `Info`, `Hint`) |
6460| `comment-token` | The token to use as a comment-token |
6561| `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) |
62+| `language-server` | The Language Server to run. See the Language Server configuration section below. |
63+| `config` | Language Server configuration |
6764| `grammar` | The tree-sitter grammar to use (defaults to the value of `name`) |
6865| `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 |
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.
66+| `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` |
7367
7468### File-type detection and the `file-types` key
7569
@@ -97,102 +91,31 @@ with the following priorities:
9791 replaced at runtime with the appropriate path separator for the operating
9892 system, so this rule would match against `.git\config` files on Windows.
9993
100−## Language Server configuration
94+### Language Server configuration
10195
102−Language servers are configured separately in the table `language-server` in the same file as the languages `languages.toml`
103−
104−For example:
105−
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−```
96+The `language-server` field takes the following keys:
12097
121−These are the available options for a language server.
98+| Key | Description |
99+| --- | ----------- |
100+| `command` | The name of the language server binary to execute. Binaries must be in `$PATH` |
101+| `args` | A list of arguments to pass to the language server binary |
102+| `timeout` | The maximum time a request to the language server may take, in seconds. Defaults to `20` |
103+| `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 |
104+| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
122105
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:
134−
135−```toml
136−[language-server.typescript-language-server]
137−# pass format options according to https://github.com/typescript-language-server/typescript-language-server#workspacedidchangeconfiguration omitting the "[language].format." prefix.
138−config = { format = { "semicolons" = "insert", "insertSpaceBeforeFunctionParenthesis" = true } }
139−```
140−
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:
106+The top-level `config` field is used to configure the LSP initialization options. A `format`
107+sub-table within `config` can be used to pass extra formatting options to
108+[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).
109+For example with typescript:
163110
164111```toml
165112[[language]]
166113name = "typescript"
167−language-servers = [ { name = "typescript-language-server", except-features = [ "format" ] }, "efm-lsp-prettier" ]
114+auto-format = true
115+# pass format options according to https://github.com/typescript-language-server/typescript-language-server#workspacedidchangeconfiguration omitting the "[language].format." prefix.
116+config = { format = { "semicolons" = "insert", "insertSpaceBeforeFunctionParenthesis" = true } }
168117```
169118
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−
196119## Tree-sitter grammar configuration
197120
198121The source for a language's tree-sitter grammar is specified in a `[[grammar]]`
book/src/themes.md+53−72
@@ -70,7 +70,6 @@ over it and is merged into the default palette.
7070
7171| Color Name |
7272| --- |
73−| `default` |
7473| `black` |
7574| `red` |
7675| `green` |
@@ -155,7 +154,6 @@ We use a similar set of scopes as
155154
156155- `type` - Types
157156 - `builtin` - Primitive types provided by the language (`int`, `usize`)
158− - `parameter` - Generic type parameters (`T`)
159157 - `enum`
160158 - `variant`
161159- `constructor`
@@ -217,7 +215,6 @@ We use a similar set of scopes as
217215 - `special` (preprocessor in C)
218216
219217- `tag` - Tags (e.g. `<body>` in HTML)
220− - `builtin`
221218
222219- `namespace`
223220
@@ -230,11 +227,8 @@ We use a similar set of scopes as
230227 - `list`
231228 - `unnumbered`
232229 - `numbered`
233− - `checked`
234− - `unchecked`
235230 - `bold`
236231 - `italic`
237− - `strikethrough`
238232 - `link`
239233 - `url` - URLs pointed to by links
240234 - `label` - non-URL link references
@@ -246,12 +240,9 @@ We use a similar set of scopes as
246240
247241- `diff` - version control changes
248242 - `plus` - additions
249− - `gutter` - gutter indicator
250243 - `minus` - deletions
251− - `gutter` - gutter indicator
252244 - `delta` - modifications
253245 - `moved` - renamed or moved files/changes
254− - `gutter` - gutter indicator
255246
256247#### Interface
257248
@@ -270,68 +261,58 @@ These scopes are used for theming the editor interface:
270261 - `hover` - for hover popup UI
271262
272263
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) |
264+| Key | Notes |
265+| --- | --- |
266+| `ui.background` | |
267+| `ui.background.separator` | Picker separator below input line |
268+| `ui.cursor` | |
269+| `ui.cursor.normal` | |
270+| `ui.cursor.insert` | |
271+| `ui.cursor.select` | |
272+| `ui.cursor.match` | Matching bracket etc. |
273+| `ui.cursor.primary` | Cursor with primary selection |
274+| `ui.cursor.primary.normal` | |
275+| `ui.cursor.primary.insert` | |
276+| `ui.cursor.primary.select` | |
277+| `ui.gutter` | Gutter |
278+| `ui.gutter.selected` | Gutter for the line the cursor is on |
279+| `ui.linenr` | Line numbers |
280+| `ui.linenr.selected` | Line number for the line the cursor is on |
281+| `ui.statusline` | Statusline |
282+| `ui.statusline.inactive` | Statusline (unfocused document) |
283+| `ui.statusline.normal` | Statusline mode during normal mode ([only if `editor.color-modes` is enabled][editor-section]) |
284+| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
285+| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
286+| `ui.statusline.separator` | Separator character in statusline |
287+| `ui.popup` | Documentation popups (e.g. Space + k) |
288+| `ui.popup.info` | Prompt for multiple key options |
289+| `ui.window` | Borderlines separating splits |
290+| `ui.help` | Description box for commands |
291+| `ui.text` | Command prompts, popup text, etc. |
292+| `ui.text.focus` | |
293+| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
294+| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
295+| `ui.virtual.ruler` | Ruler columns (see the [`editor.rulers` config][editor-section]) |
296+| `ui.virtual.whitespace` | Visible whitespace characters |
297+| `ui.virtual.indent-guide` | Vertical indent width guides |
298+| `ui.virtual.wrap` | Soft-wrap indicator (see the [`editor.soft-wrap` config][editor-section]) |
299+| `ui.menu` | Code and command completion menus |
300+| `ui.menu.selected` | Selected autocomplete item |
301+| `ui.menu.scroll` | `fg` sets thumb color, `bg` sets track color of scrollbar |
302+| `ui.selection` | For selections in the editing area |
303+| `ui.selection.primary` | |
304+| `ui.cursorline.primary` | The line of the primary cursor ([if cursorline is enabled][editor-section]) |
305+| `ui.cursorline.secondary` | The lines of any other cursors ([if cursorline is enabled][editor-section]) |
306+| `ui.cursorcolumn.primary` | The column of the primary cursor ([if cursorcolumn is enabled][editor-section]) |
307+| `ui.cursorcolumn.secondary` | The columns of any other cursors ([if cursorcolumn is enabled][editor-section]) |
308+| `warning` | Diagnostics warning (gutter) |
309+| `error` | Diagnostics error (gutter) |
310+| `info` | Diagnostics info (gutter) |
311+| `hint` | Diagnostics hint (gutter) |
312+| `diagnostic` | Diagnostics fallback style (editing area) |
313+| `diagnostic.hint` | Diagnostics hint (editing area) |
314+| `diagnostic.info` | Diagnostics info (editing area) |
315+| `diagnostic.warning` | Diagnostics warning (editing area) |
316+| `diagnostic.error` | Diagnostics error (editing area) |
336317
337318[editor-section]: ./configuration.md#editor-section
book/src/usage.md+10−26
@@ -37,35 +37,19 @@ If a register is selected before invoking a change or delete command, the select
3737- `"hc` - Store the selection in register `h` and then change it (delete and enter insert mode).
3838- `"md` - Store the selection in register `m` and delete it.
3939
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:
40+### Special registers
4441
4542| Register character | Contains |
4643| --- | --- |
4744| `/` | Last search |
4845| `:` | Last executed command |
4946| `"` | Last yanked text |
50−| `@` | Last recorded macro |
51−
52−### Special registers
53−
54−Some registers have special behavior when read from and written to.
47+| `_` | Black hole |
5548
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 |
49+The system clipboard is not directly supported by a special register. Instead, special commands and keybindings are provided. Refer to the
50+[key map](keymap.md#space-mode) for more details.
6451
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.
52+The black hole register is a no-op register, meaning that no data will be read or written to it.
6953
7054## Surround
7155
@@ -112,13 +96,13 @@ function or block of code.
11296| `(`, `[`, `'`, etc. | Specified surround pairs |
11397| `m` | The closest surround pair |
11498| `f` | Function |
115−| `t` | Type (or Class) |
99+| `c` | Class |
116100| `a` | Argument/parameter |
117−| `c` | Comment |
118−| `T` | Test |
101+| `o` | Comment |
102+| `t` | Test |
119103| `g` | Change |
120104
121−> 💡 `f`, `t`, etc. need a tree-sitter grammar active for the current
105+> 💡 `f`, `c`, etc. need a tree-sitter grammar active for the current
122106document and a special tree-sitter query file to work properly. [Only
123107some grammars][lang-support] currently have the query file implemented.
124108Contributions are welcome!
@@ -128,7 +112,7 @@ Contributions are welcome!
128112Navigating between functions, classes, parameters, and other elements is
129113possible using tree-sitter and textobject queries. For
130114example to move to the next function use `]f`, to move to previous
131−type use `[t`, and so on.
115+class use `[c`, and so on.
132116
133117![Tree-sitter-nav-demo][tree-sitter-nav-demo]
134118
book/theme/book.jsnew file+660
@@ -0,0 +1,660 @@
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.cssnew file+499
@@ -0,0 +1,499 @@
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.cssnew file+233
@@ -0,0 +1,233 @@
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.cssnew file+54
@@ -0,0 +1,54 @@
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.cssnew file+411
@@ -0,0 +1,411 @@
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.cssnew file+56
@@ -0,0 +1,56 @@
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.jsnew file+6
@@ -0,0 +1,6 @@
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+51−87
@@ -1,11 +1,11 @@
11<!DOCTYPE HTML>
2−<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
2+<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
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,9 +15,10 @@
1515 <!-- Custom HTML head -->
1616 {{> head}}
1717
18+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
1819 <meta name="description" content="{{ description }}">
1920 <meta name="viewport" content="width=device-width, initial-scale=1">
20− <meta name="theme-color" content="#ffffff">
21+ <meta name="theme-color" content="#ffffff" />
2122
2223 {{#if favicon_svg}}
2324 <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -34,6 +35,8 @@
3435
3536 <!-- Fonts -->
3637 <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">
3740 {{#if copy_fonts}}
3841 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
3942 {{/if}}
@@ -50,19 +53,18 @@
5053
5154 {{#if mathjax_support}}
5255 <!-- MathJax -->
53− <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
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>
5457 {{/if}}
5558 </head>
56− <body class="sidebar-visible no-js">
57− <div id="body-container">
59+ <body>
5860 <!-- Provide site root to javascript -->
59− <script>
61+ <script type="text/javascript">
6062 var path_to_root = "{{ path_to_root }}";
6163 var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
6264 </script>
6365
6466 <!-- Work around some values being stored in localStorage wrapped in quotes -->
65− <script>
67+ <script type="text/javascript">
6668 try {
6769 var theme = localStorage.getItem('mdbook-theme');
6870 var sidebar = localStorage.getItem('mdbook-sidebar');
@@ -78,34 +80,27 @@
7880 </script>
7981
8082 <!-- Set the theme before any content is loaded, prevents flash -->
81− <script>
83+ <script type="text/javascript">
8284 var theme;
8385 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
8486 if (theme === null || theme === undefined) { theme = default_theme; }
8587 var html = document.querySelector('html');
88+ html.classList.remove('no-js')
8689 html.classList.remove('{{ default_theme }}')
8790 html.classList.add(theme);
88− var body = document.querySelector('body');
89− body.classList.remove('no-js')
90− body.classList.add('js');
91+ html.classList.add('js');
9192 </script>
9293
93− <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
94−
9594 <!-- Hide / unhide sidebar before it is displayed -->
96− <script>
97− var body = document.querySelector('body');
98− var sidebar = null;
99− var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
95+ <script type="text/javascript">
96+ var html = document.querySelector('html');
97+ var sidebar = 'hidden';
10098 if (document.body.clientWidth >= 1080) {
10199 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
102100 sidebar = sidebar || 'visible';
103− } else {
104− sidebar = 'hidden';
105101 }
106− sidebar_toggle.checked = sidebar === 'visible';
107− body.classList.remove('sidebar-visible');
108− body.classList.add("sidebar-" + sidebar);
102+ html.classList.remove('sidebar-visible');
103+ html.classList.add("sidebar-" + sidebar);
109104 </script>
110105
111106 <nav id="sidebar" class="sidebar" aria-label="Table of contents">
@@ -115,48 +110,26 @@
115110 <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
116111 </nav>
117112
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−
140113 <div id="page-wrapper" class="page-wrapper">
141114
142115 <div class="page">
143116 {{> header}}
144117 <div id="menu-bar-hover-placeholder"></div>
145− <div id="menu-bar" class="menu-bar sticky">
118+ <div id="menu-bar" class="menu-bar sticky bordered">
146119 <div class="left-buttons">
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">
120+ <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
148121 <i class="fa fa-bars"></i>
149− </label>
122+ </button>
150123 <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">
151124 <i class="fa fa-paint-brush"></i>
152125 </button>
153126 <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
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>
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>
160133 </ul>
161134 {{#if search_enabled}}
162135 <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">
@@ -178,19 +151,13 @@
178151 <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
179152 </a>
180153 {{/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−
187154 </div>
188155 </div>
189156
190157 {{#if search_enabled}}
191158 <div id="search-wrapper" class="hidden">
192159 <form id="searchbar-outer" class="searchbar-outer">
193− <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
160+ <input type="search" name="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
194161 </form>
195162 <div id="searchresults-outer" class="searchresults-outer hidden">
196163 <div id="searchresults-header" class="searchresults-header"></div>
@@ -201,7 +168,7 @@
201168 {{/if}}
202169
203170 <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
204− <script>
171+ <script type="text/javascript">
205172 document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
206173 document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
207174 Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
@@ -223,7 +190,7 @@
223190 {{/previous}}
224191
225192 {{#next}}
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">
193+ <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
227194 <i class="fa fa-angle-right"></i>
228195 </a>
229196 {{/next}}
@@ -241,7 +208,7 @@
241208 {{/previous}}
242209
243210 {{#next}}
244− <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
211+ <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
245212 <i class="fa fa-angle-right"></i>
246213 </a>
247214 {{/next}}
@@ -249,12 +216,10 @@
249216
250217 </div>
251218
252− {{#if live_reload_endpoint}}
219+ {{#if livereload}}
253220 <!-- Livereload script (if served using the cli tool) -->
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);
221+ <script type="text/javascript">
222+ var socket = new WebSocket("{{{livereload}}}");
258223 socket.onmessage = function (event) {
259224 if (event.data === "reload") {
260225 socket.close();
@@ -270,7 +235,7 @@
270235
271236 {{#if google_analytics}}
272237 <!-- Google Analytics Tag -->
273− <script>
238+ <script type="text/javascript">
274239 var localAddrs = ["localhost", "127.0.0.1", ""];
275240
276241 // make sure we don't activate google analytics if the developer is
@@ -288,43 +253,43 @@
288253 {{/if}}
289254
290255 {{#if playground_line_numbers}}
291− <script>
256+ <script type="text/javascript">
292257 window.playground_line_numbers = true;
293258 </script>
294259 {{/if}}
295260
296261 {{#if playground_copyable}}
297− <script>
262+ <script type="text/javascript">
298263 window.playground_copyable = true;
299264 </script>
300265 {{/if}}
301266
302267 {{#if playground_js}}
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>
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>
308273 {{/if}}
309274
310275 {{#if search_js}}
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>
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>
314279 {{/if}}
315280
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>
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>
319284
320285 <!-- Custom JS scripts -->
321286 {{#each additional_js}}
322− <script src="{{ ../path_to_root }}{{this}}"></script>
287+ <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>
323288 {{/each}}
324289
325290 {{#if is_print}}
326291 {{#if mathjax_support}}
327− <script>
292+ <script type="text/javascript">
328293 window.addEventListener('load', function() {
329294 MathJax.Hub.Register.StartupHook('End', function() {
330295 window.setTimeout(window.print, 100);
@@ -332,7 +297,7 @@
332297 });
333298 </script>
334299 {{else}}
335− <script>
300+ <script type="text/javascript">
336301 window.addEventListener('load', function() {
337302 window.setTimeout(window.print, 100);
338303 });
@@ -340,6 +305,5 @@
340305 {{/if}}
341306 {{/if}}
342307
343− </div>
344308 </body>
345309</html>
contrib/Helix.appdata.xml−21
@@ -5,7 +5,6 @@
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>
98
109 <description>
1110 <p>
@@ -18,17 +17,6 @@
1817 <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
1918 </ul>
2019 </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>
3220
3321 <launchable type="desktop-id">Helix.desktop</launchable>
3422
@@ -48,15 +36,6 @@
4836 <content_rating type="oars-1.1" />
4937
5038 <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>
6039 <release version="22.12" date="2022-12-6">
6140 <url>https://helix-editor.com/news/release-22-12-highlights/</url>
6241 </release>
contrib/Helix.desktop+1−3
@@ -1,7 +1,6 @@
11[Desktop Entry]
22Name=Helix
33GenericName=Text Editor
4−GenericName[ar]=مُحَرِّرُ نُصُوص
54GenericName[de]=Texteditor
65GenericName[fr]=Éditeur de texte
76GenericName[ru]=Текстовый редактор
@@ -10,7 +9,7 @@ GenericName[tr]=Metin Düzenleyici
109Comment=Edit text files
1110Comment[af]=Redigeer tekslêers
1211Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
13−Comment[ar]=مُحَرِّرُ مِلَفَّاتٍ نَصِّيَّة
12+Comment[ar]=حرّر ملفات نصية
1413Comment[az]=Mətn fayllarını redaktə edin
1514Comment[be]=Рэдагаваньне тэкставых файлаў
1615Comment[bg]=Редактиране на текстови файлове
@@ -80,7 +79,6 @@ Exec=hx %F
8079Terminal=true
8180Type=Application
8281Keywords=Text;editor;
83−Keywords[ar]=نص;نصوص;محرر;
8482Keywords[fr]=Texte;éditeur;
8583Keywords[ru]=текст;текстовый редактор;
8684Keywords[sr]=Текст;едитор;
docs/CONTRIBUTING.md+4−17
@@ -29,23 +29,11 @@ files, run
2929cargo xtask docgen
3030```
3131
32−inside the project. We use [xtask][xtask] as an ad-hoc task runner.
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).
3335
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
36+# Integration tests
4937
5038Integration tests for helix-term can be run with `cargo integration-test`. Code
5139contributors are strongly encouraged to write integration tests for their code.
@@ -64,5 +52,4 @@ The current MSRV and future changes to the MSRV are listed in the [Firefox docum
6452[architecture.md]: ./architecture.md
6553[docs]: https://docs.helix-editor.com/
6654[xtask]: https://github.com/matklad/cargo-xtask
67−[mdbook]: https://rust-lang.github.io/mdBook/guide/installation.html
6855[helpers.rs]: ../helix-term/tests/test/helpers.rs
docs/releases.md+6−13
@@ -1,23 +1,16 @@
11## Checklist
22
33Helix releases are versioned in the Calendar Versioning scheme:
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.
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.
76
87* Merge the changelog PR
98* 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)
109* Tag and push
1110 * `git tag -s -m "<tag>" -a <tag> && git push`
1211 * Make sure to switch to master and pull first
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`
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`
2114* Wait for the Release CI to finish
2215 * It will automatically turn the git tag into a GitHub release when it uploads artifacts
2316* Edit the new release
@@ -37,7 +30,7 @@ being published.
3730
3831The changelog is currently created manually by reading through commits in the
3932log since the last release. GitHub's compare view is a nice way to approach
40−this. For example, when creating the 22.07 release notes, this compare link
33+this. For example when creating the 22.07 release notes, this compare link
4134may be used
4235
4336```
@@ -64,4 +57,4 @@ versions for convenience:
6457> release. For the full log, check out the git log.
6558
6659Typically, small changes like dependencies or documentation updates, refactors,
67−or meta changes like GitHub Actions work are left out.
60+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.
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.
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+173−39
@@ -1,17 +1,13 @@
11{
22 "nodes": {
33 "crane": {
4− "inputs": {
5− "nixpkgs": [
6− "nixpkgs"
7− ]
8− },
4+ "flake": false,
95 "locked": {
10− "lastModified": 1701025348,
11− "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
6+ "lastModified": 1670900067,
7+ "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=",
128 "owner": "ipetkov",
139 "repo": "crane",
14− "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
10+ "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b",
1511 "type": "github"
1612 },
1713 "original": {
@@ -20,16 +16,72 @@
2016 "type": "github"
2117 }
2218 },
23− "flake-utils": {
19+ "dream2nix": {
2420 "inputs": {
25− "systems": "systems"
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+ ],
50+ "nixpkgs": [
51+ "nci",
52+ "nixpkgs"
53+ ],
54+ "poetry2nix": [
55+ "nci"
56+ ],
57+ "pre-commit-hooks": [
58+ "nci"
59+ ],
60+ "pruned-racket-catalog": [
61+ "nci"
62+ ]
63+ },
64+ "locked": {
65+ "lastModified": 1677289985,
66+ "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=",
67+ "owner": "nix-community",
68+ "repo": "dream2nix",
69+ "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889",
70+ "type": "github"
2671 },
72+ "original": {
73+ "owner": "nix-community",
74+ "repo": "dream2nix",
75+ "type": "github"
76+ }
77+ },
78+ "flake-utils": {
2779 "locked": {
28− "lastModified": 1694529238,
29− "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
80+ "lastModified": 1659877975,
81+ "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
3082 "owner": "numtide",
3183 "repo": "flake-utils",
32− "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
84+ "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
3385 "type": "github"
3486 },
3587 "original": {
@@ -38,13 +90,55 @@
3890 "type": "github"
3991 }
4092 },
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+ },
41135 "nixpkgs": {
42136 "locked": {
43− "lastModified": 1700794826,
44− "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
137+ "lastModified": 1677063315,
138+ "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=",
45139 "owner": "nixos",
46140 "repo": "nixpkgs",
47− "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
141+ "rev": "988cc958c57ce4350ec248d2d53087777f9e1949",
48142 "type": "github"
49143 },
50144 "original": {
@@ -54,29 +148,84 @@
54148 "type": "github"
55149 }
56150 },
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+ },
57208 "root": {
58209 "inputs": {
59− "crane": "crane",
60− "flake-utils": "flake-utils",
210+ "nci": "nci",
61211 "nixpkgs": "nixpkgs",
212+ "parts": "parts_2",
62213 "rust-overlay": "rust-overlay"
63214 }
64215 },
65216 "rust-overlay": {
66217 "inputs": {
67− "flake-utils": [
68− "flake-utils"
69− ],
218+ "flake-utils": "flake-utils",
70219 "nixpkgs": [
71220 "nixpkgs"
72221 ]
73222 },
74223 "locked": {
75− "lastModified": 1701137803,
76− "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
224+ "lastModified": 1677292251,
225+ "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=",
77226 "owner": "oxalica",
78227 "repo": "rust-overlay",
79− "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
228+ "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc",
80229 "type": "github"
81230 },
82231 "original": {
@@ -84,21 +233,6 @@
84233 "repo": "rust-overlay",
85234 "type": "github"
86235 }
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− }
102236 }
103237 },
104238 "root": "root",
flake.nix+142−171
@@ -3,193 +3,164 @@
33
44 inputs = {
55 nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
6− flake-utils.url = "github:numtide/flake-utils";
76 rust-overlay = {
87 url = "github:oxalica/rust-overlay";
9− inputs = {
10− nixpkgs.follows = "nixpkgs";
11− flake-utils.follows = "flake-utils";
12− };
8+ inputs.nixpkgs.follows = "nixpkgs";
139 };
14− crane = {
15− url = "github:ipetkov/crane";
10+ nci = {
11+ url = "github:yusdacra/nix-cargo-integration";
1612 inputs.nixpkgs.follows = "nixpkgs";
13+ inputs.rust-overlay.follows = "rust-overlay";
1714 };
15+ parts.url = "github:hercules-ci/flake-parts";
1816 };
1917
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)];
18+ outputs = inp: let
19+ mkRootPath = rel:
20+ builtins.path {
21+ path = "${toString ./.}/${rel}";
22+ name = rel;
3223 };
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;
68− in
69− lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
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;
7056 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 {};
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;
64+ };
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+ '';
107+ in
108+ helix-wrapped
109+ // {
110+ override = makeOverridableHelix old;
91111 passthru =
92− (old.passthru or {})
112+ helix-wrapped.passthru
93113 // {
94− unwrapped = old;
114+ wrapper = old: makeOverridableHelix old config;
95115 };
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;
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";
111138 };
139+ disable-tests = {checkPhase = ":";};
140+ set-stdenv.override = _: {inherit stdenv;};
141+ set-filtered-src.override = _: {src = filteredSource;};
142+ };
112143 };
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− };
152144
153− checks = {
154− # Build the crate itself
155− inherit (self.packages.${system}) helix;
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;
156150
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;
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+ });
193164 };
194165 };
195166
grammars.nix+21−24
@@ -5,7 +5,6 @@
55 runCommand,
66 yj,
77 includeGrammarIf ? _: true,
8− grammarOverlays ? [],
98 ...
109}: let
1110 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
@@ -49,22 +48,22 @@
4948 then sourceGitHub
5049 else sourceGit;
5150 in
52− stdenv.mkDerivation {
51+ stdenv.mkDerivation rec {
5352 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
5453
5554 pname = "helix-tree-sitter-${grammar.name}";
5655 version = grammar.source.rev;
5756
58− src = source;
59− sourceRoot = if builtins.hasAttr "subpath" grammar.source then
60− "source/${grammar.source.subpath}"
61− else
62− "source";
57+ src =
58+ if builtins.hasAttr "subpath" grammar.source
59+ then "${source}/${grammar.source.subpath}"
60+ else source;
6361
62+ dontUnpack = true;
6463 dontConfigure = true;
6564
6665 FLAGS = [
67− "-Isrc"
66+ "-I${src}/src"
6867 "-g"
6968 "-O3"
7069 "-fPIC"
@@ -77,13 +76,13 @@
7776 buildPhase = ''
7877 runHook preBuild
7978
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
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
8483 fi
8584
86− $CC -c src/parser.c -o parser.o $FLAGS
85+ $CC -c "$src/src/parser.c" -o parser.o $FLAGS
8786 $CXX -shared -o $NAME.so *.o
8887
8988 ls -al
@@ -106,17 +105,15 @@
106105 '';
107106 };
108107 grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
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);
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;
120117in
121118 runCommand "consolidated-helix-grammars" {} ''
122119 mkdir -p $out
helix-core/Cargo.toml+16−22
@@ -1,39 +1,37 @@
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"
37description = "Helix editor core editing primitives"
8+categories = ["editor"]
9+repository = "https://github.com/helix-editor/helix"
10+homepage = "https://helix-editor.com"
411include = ["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
1312
1413[features]
1514unicode-lines = ["ropey/unicode_lines"]
1615integration = []
1716
1817[dependencies]
19−helix-loader = { path = "../helix-loader" }
18+helix-loader = { version = "0.6", path = "../helix-loader" }
2019
21−ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
22−smallvec = "1.11"
20+ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
21+smallvec = "1.10"
2322smartstring = "1.0.1"
2423unicode-segmentation = "1.10"
2524unicode-width = "0.1"
2625unicode-general-category = "0.6"
2726# slab = "0.4.2"
2827slotmap = "1.0"
29−tree-sitter.workspace = true
30−once_cell = "1.19"
28+tree-sitter = "0.20"
29+once_cell = "1.17"
3130arc-swap = "1"
3231regex = "1"
33−bitflags = "2.4"
34−ahash = "0.8.6"
35−hashbrown = { version = "0.14.3", features = ["raw"] }
36−dunce = "1.0"
32+bitflags = "1.3"
33+ahash = "0.8.3"
34+hashbrown = { version = "0.13.2", features = ["raw"] }
3735
3836log = "0.4"
3937serde = { version = "1.0", features = ["derive"] }
@@ -46,12 +44,8 @@ encoding_rs = "0.8"
4644
4745chrono = { version = "0.4", default-features = false, features = ["alloc", "std"] }
4846
49−etcetera = "0.8"
47+etcetera = "0.4"
5048textwrap = "0.16.0"
5149
52−nucleo.workspace = true
53−parking_lot = "0.12"
54−
5550[dev-dependencies]
5651quickcheck = { version = "1", default-features = false }
57−indoc = "2.0.4"
helix-core/src/diagnostic.rs+1−6
@@ -35,19 +35,14 @@ pub enum DiagnosticTag {
3535 Deprecated,
3636}
3737
38−/// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.94.0/lsp_types/struct.Diagnostic.html)
38+/// Corresponds to [`lsp_types::Diagnostic`](https://docs.rs/lsp-types/0.91.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,
4642 pub line: usize,
4743 pub message: String,
4844 pub severity: Option<Severity>,
4945 pub code: Option<NumberOrString>,
50− pub language_server_id: usize,
5146 pub tags: Vec<DiagnosticTag>,
5247 pub source: Option<String>,
5348 pub data: Option<serde_json::Value>,
helix-core/src/doc_formatter/test.rs+48−8
@@ -119,7 +119,16 @@ fn overlay() {
119119 "foobar",
120120 0,
121121 false,
122− &[Overlay::new(0, "X"), Overlay::new(2, "\t")],
122+ &[
123+ Overlay {
124+ char_idx: 0,
125+ grapheme: "X".into(),
126+ },
127+ Overlay {
128+ char_idx: 2,
129+ grapheme: "\t".into(),
130+ },
131+ ]
123132 ),
124133 "Xo bar "
125134 );
@@ -129,9 +138,18 @@ fn overlay() {
129138 0,
130139 true,
131140 &[
132− Overlay::new(2, "\t"),
133− Overlay::new(5, "\t"),
134− Overlay::new(16, "X"),
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+ },
135153 ]
136154 ),
137155 "fo f o foo \n.foo Xoo foo foo \n.foo foo foo "
@@ -152,14 +170,24 @@ fn annotate_text(text: &str, softwrap: bool, annotations: &[InlineAnnotation]) -
152170#[test]
153171fn annotation() {
154172 assert_eq!(
155− annotate_text("bar", false, &[InlineAnnotation::new(0, "foo")]),
173+ annotate_text(
174+ "bar",
175+ false,
176+ &[InlineAnnotation {
177+ char_idx: 0,
178+ text: "foo".into(),
179+ }]
180+ ),
156181 "foobar "
157182 );
158183 assert_eq!(
159184 annotate_text(
160185 &"foo ".repeat(10),
161186 true,
162− &[InlineAnnotation::new(0, "foo ")]
187+ &[InlineAnnotation {
188+ char_idx: 0,
189+ text: "foo ".into(),
190+ }]
163191 ),
164192 "foo foo foo foo \n.foo foo foo foo \n.foo foo foo "
165193 );
@@ -171,8 +199,20 @@ fn annotation_and_overlay() {
171199 "bbar".into(),
172200 &TextFormat::new_test(false),
173201 TextAnnotations::default()
174− .add_inline_annotations(Rc::new([InlineAnnotation::new(0, "fooo")]), None)
175− .add_overlay(Rc::new([Overlay::new(0, "\t")]), None),
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+ ),
176216 0,
177217 )
178218 .0
helix-core/src/fuzzy.rsdeleted−43
@@ -1,43 +0,0 @@
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) | Self::MASK_OWNED,
484+ len: i32::try_from(len).unwrap() as u32,
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("".into())),
76− inversion: Transaction::from(ChangeSet::new("".into())),
75+ transaction: Transaction::from(ChangeSet::new(&Rope::new())),
76+ inversion: Transaction::from(ChangeSet::new(&Rope::new())),
7777 timestamp: Instant::now(),
7878 }],
7979 current: 0,
helix-core/src/indent.rs+145−618
@@ -1,14 +1,12 @@
1−use std::{borrow::Cow, collections::HashMap};
1+use std::collections::HashMap;
22
33use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
44
55use crate::{
66 chars::{char_is_line_ending, char_is_whitespace},
7− find_first_non_whitespace_char,
8− graphemes::{grapheme_width, tab_width_at},
9− syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
7+ syntax::{LanguageConfiguration, RopeProvider, Syntax},
108 tree_sitter::Node,
11− Position, Rope, RopeGraphemes, RopeSlice,
9+ Rope, RopeSlice,
1210};
1311
1412/// Enum representing indentation style.
@@ -20,10 +18,6 @@ pub enum IndentStyle {
2018 Spaces(u8),
2119}
2220
23−// 16 spaces
24−const INDENTS: &str = " ";
25−pub const MAX_INDENT: u8 = 16;
26−
2721impl IndentStyle {
2822 /// Creates an `IndentStyle` from an indentation string.
2923 ///
@@ -32,10 +26,10 @@ impl IndentStyle {
3226 #[inline]
3327 pub fn from_str(indent: &str) -> Self {
3428 // XXX: do we care about validating the input more than this? Probably not...?
35− debug_assert!(!indent.is_empty() && indent.len() <= MAX_INDENT as usize);
29+ debug_assert!(!indent.is_empty() && indent.len() <= 8);
3630
3731 if indent.starts_with(' ') {
38− IndentStyle::Spaces(indent.len().clamp(1, MAX_INDENT as usize) as u8)
32+ IndentStyle::Spaces(indent.len() as u8)
3933 } else {
4034 IndentStyle::Tabs
4135 }
@@ -45,13 +39,20 @@ impl IndentStyle {
4539 pub fn as_str(&self) -> &'static str {
4640 match *self {
4741 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.
4853 IndentStyle::Spaces(n) => {
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]
54+ debug_assert!(n > 0 && n <= 8); // Always triggers. `debug_panic!()` wanted.
55+ " "
5556 }
5657 }
5758 }
@@ -73,9 +74,9 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
7374 // Build a histogram of the indentation *increases* between
7475 // subsequent lines, ignoring lines that are all whitespace.
7576 //
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];
77+ // Index 0 is for tabs, the rest are 1-8 spaces.
78+ let histogram: [usize; 9] = {
79+ let mut histogram = [0; 9];
7980 let mut prev_line_is_tabs = false;
8081 let mut prev_line_leading_count = 0usize;
8182
@@ -134,7 +135,7 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
134135 histogram[0] += 1;
135136 } else {
136137 let amount = leading_count - prev_line_leading_count;
137− if amount <= MAX_INDENT as usize {
138+ if amount <= 8 {
138139 histogram[amount] += 1;
139140 }
140141 }
@@ -188,7 +189,7 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
188189 let mut len = 0;
189190 for ch in line.chars() {
190191 match ch {
191− '\t' => len += tab_width_at(len, tab_width as u16),
192+ '\t' => len += tab_width,
192193 ' ' => len += 1,
193194 _ => break,
194195 }
@@ -197,56 +198,6 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
197198 len / indent_width
198199}
199200
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−
250201/// Computes for node and all ancestors whether they are the first node on their line.
251202/// The first entry in the return value represents the root node, the last one the node itself
252203fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
@@ -288,140 +239,68 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
288239/// This is usually constructed in one of 2 ways:
289240/// - Successively add indent captures to get the (added) indent from a single line
290241/// - Successively add the indent results for each line
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> {
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.)
296246 indent: usize,
297− indent_always: usize,
298247 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>>,
303248}
304−
305−impl<'a> Indentation<'a> {
249+impl Indentation {
306250 /// Add some other [Indentation] to this.
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;
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;
313257 }
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;
322258 }
323−
324259 /// Add an indent capture to this indent.
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>) {
260+ /// All the captures that are added in this way should be on the same line.
261+ fn add_capture(&mut self, added: IndentCaptureType) {
329262 match added {
330263 IndentCaptureType::Indent => {
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;
264+ self.indent = 1;
340265 }
341266 IndentCaptureType::Outdent => {
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− }
267+ self.outdent = 1;
354268 }
355269 }
356270 }
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− ))
271+ fn as_string(&self, indent_style: &IndentStyle) -> String {
272+ let indent_level = if self.indent >= self.outdent {
273+ self.indent - self.outdent
380274 } else {
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− )
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)
393279 }
394280}
395281
396282/// An indent definition which corresponds to a capture from the indent query
397−#[derive(Debug)]
398−struct IndentCapture<'a> {
399− capture_type: IndentCaptureType<'a>,
283+struct IndentCapture {
284+ capture_type: IndentCaptureType,
400285 scope: IndentScope,
401286}
402−#[derive(Debug, Clone, PartialEq)]
403−enum IndentCaptureType<'a> {
287+#[derive(Clone, Copy)]
288+enum IndentCaptureType {
404289 Indent,
405− IndentAlways,
406290 Outdent,
407− OutdentAlways,
408− /// Alignment given as a string of whitespace
409− Align(RopeSlice<'a>),
410291}
411−
412−impl<'a> IndentCaptureType<'a> {
292+impl IndentCaptureType {
413293 fn default_scope(&self) -> IndentScope {
414294 match self {
415− IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
416− IndentCaptureType::Outdent | IndentCaptureType::OutdentAlways => IndentScope::All,
417− IndentCaptureType::Align(_) => IndentScope::All,
295+ IndentCaptureType::Indent => IndentScope::Tail,
296+ IndentCaptureType::Outdent => IndentScope::All,
418297 }
419298 }
420299}
421300/// This defines which part of a node an [IndentCapture] applies to.
422301/// Each [IndentCaptureType] has a default scope, but the scope can be changed
423302/// with `#set!` property declarations.
424−#[derive(Debug, Clone, Copy)]
303+#[derive(Clone, Copy)]
425304enum IndentScope {
426305 /// The indent applies to the whole node
427306 All,
@@ -431,7 +310,6 @@ enum IndentScope {
431310
432311/// A capture from the indent query which does not define an indent but extends
433312/// the range of a node. This is used before the indent is calculated.
434−#[derive(Debug)]
435313enum ExtendCapture {
436314 Extend,
437315 PreventOnce,
@@ -440,41 +318,24 @@ enum ExtendCapture {
440318/// The result of running a tree-sitter indent query. This stores for
441319/// each node (identified by its ID) the relevant captures (already filtered
442320/// by predicates).
443−#[derive(Debug)]
444−struct IndentQueryResult<'a> {
445− indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,
321+struct IndentQueryResult {
322+ indent_captures: HashMap<usize, Vec<IndentCapture>>,
446323 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
447324}
448325
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>(
326+fn query_indents(
467327 query: &Query,
468328 syntax: &Syntax,
469329 cursor: &mut QueryCursor,
470− text: RopeSlice<'a>,
330+ text: RopeSlice,
471331 range: std::ops::Range<usize>,
472− new_line_byte_pos: Option<usize>,
473−) -> IndentQueryResult<'a> {
332+ // Position of the (optional) newly inserted line break.
333+ // Given as (line, byte_pos)
334+ new_line_break: Option<(usize, usize)>,
335+) -> IndentQueryResult {
474336 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
475337 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
476338 cursor.set_byte_range(range);
477−
478339 // Iterate over all captures from the query
479340 for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
480341 // Skip matches where not all custom predicates are fulfilled
@@ -501,13 +362,21 @@ fn query_indents<'a>(
501362 Some(QueryPredicateArg::Capture(capt1)),
502363 Some(QueryPredicateArg::Capture(capt2))
503364 ) => {
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+ };
504375 let n1 = m.nodes_for_capture_index(*capt1).next();
505376 let n2 = m.nodes_for_capture_index(*capt2).next();
506377 match (n1, n2) {
507378 (Some(n1), Some(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;
379+ let same_line = get_line_num(n1)==get_line_num(n2);
511380 same_line==(pred.operator.as_ref()=="same-line?")
512381 }
513382 _ => true,
@@ -518,23 +387,6 @@ fn query_indents<'a>(
518387 }
519388 }
520389 }
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− },
538390 _ => {
539391 panic!(
540392 "Invalid indent query: Unknown predicate (\"{}\")",
@@ -545,28 +397,11 @@ fn query_indents<'a>(
545397 }) {
546398 continue;
547399 }
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;
553400 for capture in m.captures {
554401 let capture_name = query.capture_names()[capture.index as usize].as_str();
555402 let capture_type = match capture_name {
556403 "indent" => IndentCaptureType::Indent,
557− "indent.always" => IndentCaptureType::IndentAlways,
558404 "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− }
570405 "extend" => {
571406 extend_captures
572407 .entry(capture.node.id())
@@ -616,40 +451,17 @@ fn query_indents<'a>(
616451 }
617452 }
618453 }
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− }
638454 indent_captures
639− .entry(node_id)
455+ .entry(capture.node.id())
456+ // Most entries only need to contain a single IndentCapture
640457 .or_insert_with(|| Vec::with_capacity(1))
641− .push(capture);
458+ .push(indent_capture);
642459 }
643460 }
644−
645− let result = IndentQueryResult {
461+ IndentQueryResult {
646462 indent_captures,
647463 extend_captures,
648− };
649−
650− log::trace!("indent result = {:?}", result);
651−
652− result
464+ }
653465}
654466
655467/// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.
@@ -719,27 +531,61 @@ fn extend_nodes<'a>(
719531 }
720532}
721533
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.
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+/// ```
725570#[allow(clippy::too_many_arguments)]
726−fn init_indent_query<'a, 'b>(
571+pub fn treesitter_indent_for_pos(
727572 query: &Query,
728− syntax: &'a Syntax,
729− text: RopeSlice<'b>,
573+ syntax: &Syntax,
574+ indent_style: &IndentStyle,
730575 tab_width: usize,
731576 indent_width: usize,
577+ text: RopeSlice,
732578 line: usize,
733− byte_pos: usize,
734− new_line_byte_pos: Option<usize>,
735−) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {
579+ pos: usize,
580+ new_line: bool,
581+) -> Option<String> {
582+ let byte_pos = text.char_to_byte(pos);
736583 // The innermost tree-sitter node which is considered for the indent
737584 // computation. It may change if some predeceding node is extended
738585 let mut node = syntax
739586 .tree()
740587 .root_node()
741588 .descendant_for_byte_range(byte_pos, byte_pos)?;
742−
743589 let (query_result, deepest_preceding) = {
744590 // The query range should intersect with all nodes directly preceding
745591 // the position of the indent query in case one of them is extended.
@@ -770,12 +616,13 @@ fn init_indent_query<'a, 'b>(
770616 &mut cursor,
771617 text,
772618 query_range,
773− new_line_byte_pos,
619+ new_line.then_some((line, byte_pos)),
774620 );
775621 ts_parser.cursors.push(cursor);
776622 (query_result, deepest_preceding)
777623 })
778624 };
625+ let indent_captures = query_result.indent_captures;
779626 let extend_captures = query_result.extend_captures;
780627
781628 // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -790,68 +637,6 @@ fn init_indent_query<'a, 'b>(
790637 indent_width,
791638 );
792639 }
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− )?;
855640 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
856641
857642 let mut result = Indentation::default();
@@ -859,16 +644,12 @@ pub fn treesitter_indent_for_pos<'a>(
859644 // even if there are multiple "indent" nodes on the same line
860645 let mut indent_for_line = Indentation::default();
861646 let mut indent_for_line_below = Indentation::default();
862−
863647 loop {
864648 // This can safely be unwrapped because `first_in_line` contains
865649 // one entry for each ancestor of the node (which is what we iterate over)
866650 let is_first = *first_in_line.last().unwrap();
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()) {
651+ // Apply all indent definitions for this node
652+ if let Some(definitions) = indent_captures.get(&node.id()) {
872653 for definition in definitions {
873654 match definition.scope {
874655 IndentScope::All => {
@@ -886,22 +667,28 @@ pub fn treesitter_indent_for_pos<'a>(
886667 }
887668
888669 if let Some(parent) = node.parent() {
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−
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+ };
892681 if node_line != parent_line {
893− // Don't add indent for the line below the line of the query
894682 if node_line < line + (new_line as usize) {
895− result.add_line(indent_for_line_below);
683+ // Don't add indent for the line below the line of the query
684+ result.add_line(&indent_for_line_below);
896685 }
897−
898686 if node_line == parent_line + 1 {
899687 indent_for_line_below = indent_for_line;
900688 } else {
901− result.add_line(indent_for_line);
689+ result.add_line(&indent_for_line);
902690 indent_for_line_below = Indentation::default();
903691 }
904−
905692 indent_for_line = Indentation::default();
906693 }
907694
@@ -913,13 +700,13 @@ pub fn treesitter_indent_for_pos<'a>(
913700 if (node.start_position().row < line)
914701 || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)
915702 {
916− result.add_line(indent_for_line_below);
703+ result.add_line(&indent_for_line_below);
917704 }
918− result.add_line(indent_for_line);
705+ result.add_line(&indent_for_line);
919706 break;
920707 }
921708 }
922− Some(result)
709+ Some(result.as_string(indent_style))
923710}
924711
925712/// Returns the indentation for a new line.
@@ -928,7 +715,6 @@ pub fn treesitter_indent_for_pos<'a>(
928715pub fn indent_for_newline(
929716 language_config: Option<&LanguageConfiguration>,
930717 syntax: Option<&Syntax>,
931− indent_heuristic: &IndentationHeuristic,
932718 indent_style: &IndentStyle,
933719 tab_width: usize,
934720 text: RopeSlice,
@@ -937,18 +723,14 @@ pub fn indent_for_newline(
937723 current_line: usize,
938724) -> String {
939725 let indent_width = indent_style.indent_width(tab_width);
940− if let (
941− IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,
942− Some(query),
943− Some(syntax),
944− ) = (
945− indent_heuristic,
726+ if let (Some(query), Some(syntax)) = (
946727 language_config.and_then(|config| config.indent_query()),
947728 syntax,
948729 ) {
949730 if let Some(indent) = treesitter_indent_for_pos(
950731 query,
951732 syntax,
733+ indent_style,
952734 tab_width,
953735 indent_width,
954736 text,
@@ -956,57 +738,9 @@ pub fn indent_for_newline(
956738 line_before_end_pos,
957739 true,
958740 ) {
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);
741+ return indent;
1007742 };
1008743 }
1009− // Fallback in case we either don't have indent queries or they failed for some reason
1010744 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
1011745 indent_style.as_str().repeat(indent_level)
1012746}
@@ -1062,211 +796,4 @@ mod test {
1062796 3
1063797 );
1064798 }
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− }
1272799}
helix-core/src/lib.rs+49−8
@@ -7,7 +7,6 @@ pub mod config;
77pub mod diagnostic;
88pub mod diff;
99pub mod doc_formatter;
10−pub mod fuzzy;
1110pub mod graphemes;
1211pub mod history;
1312pub mod increment;
@@ -19,6 +18,7 @@ pub mod movement;
1918pub mod object;
2019pub mod path;
2120mod position;
21+pub mod register;
2222pub mod search;
2323pub mod selection;
2424pub mod shellwords;
@@ -36,14 +36,55 @@ pub mod unicode {
3636 pub use unicode_width as width;
3737}
3838
39−pub use helix_loader::find_workspace;
40−
4139pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
4240 line.chars().position(|ch| !ch.is_whitespace())
4341}
44−mod rope_reader;
4542
46−pub use rope_reader::RopeReader;
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+
4788pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
4889
4990// pub use tendril::StrTendril as Tendril;
@@ -57,7 +98,7 @@ pub use {regex, tree_sitter};
5798pub use graphemes::RopeGraphemes;
5899pub use position::{
59100 char_idx_at_visual_offset, coords_at_pos, pos_at_coords, visual_offset_from_anchor,
60− visual_offset_from_block, Position, VisualOffsetError,
101+ visual_offset_from_block, Position,
61102};
62103#[allow(deprecated)]
63104pub use position::{pos_at_visual_coords, visual_coords_at_pos};
@@ -68,5 +109,5 @@ pub use syntax::Syntax;
68109
69110pub use diagnostic::Diagnostic;
70111
71−pub use line_ending::{LineEnding, NATIVE_LINE_ENDING};
72−pub use transaction::{Assoc, Change, ChangeSet, Deletion, Operation, Transaction};
112+pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};
113+pub use transaction::{Assoc, Change, ChangeSet, 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 NATIVE_LINE_ENDING: LineEnding = LineEnding::Crlf;
4+pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;
55#[cfg(not(target_os = "windows"))]
6−pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::LF;
6+pub const DEFAULT_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+29−232
@@ -1,15 +1,7 @@
1−use std::iter;
2−
3−use ropey::RopeSlice;
41use tree_sitter::Node;
52
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;
3+use crate::{Rope, Syntax};
114
12−// Limit matching pairs to only ( ) { } [ ] < > ' ' " "
135const PAIRS: &[(char, char)] = &[
146 ('(', ')'),
157 ('{', '}'),
@@ -19,17 +11,17 @@ const PAIRS: &[(char, char)] = &[
1911 ('\"', '\"'),
2012];
2113
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.
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.
3123#[must_use]
32−pub fn find_matching_bracket(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
24+pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
3325 if pos >= doc.len_chars() || !is_valid_bracket(doc.char(pos)) {
3426 return None;
3527 }
@@ -47,159 +39,46 @@ pub fn find_matching_bracket(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Opt
4739//
4840// If no surrounding scope is found, the function returns `None`.
4941#[must_use]
50−pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
42+pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
5143 find_pair(syntax, doc, pos, true)
5244}
5345
54−fn find_pair(
55− syntax: &Syntax,
56− doc: RopeSlice,
57− pos_: usize,
58− traverse_parents: bool,
59−) -> Option<usize> {
46+fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) -> Option<usize> {
6047 let tree = syntax.tree();
61− let pos = doc.char_to_byte(pos_);
48+ let pos = doc.char_to_byte(pos);
6249
63− let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;
50+ let mut node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
6451
6552 loop {
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− }
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));
7455
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− }
56+ if is_valid_pair(doc, start_char, end_char) {
57+ if end_byte == pos {
58+ return Some(start_char);
8059 }
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);
8163 }
82− // this node itselt wasn't a pair but maybe its siblings are
8364
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− }
65+ if traverse_parents {
66+ node = node.parent()?;
67+ } else {
68+ return None;
9069 }
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;
12470 }
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
18871}
18972
19073fn is_valid_bracket(c: char) -> bool {
19174 PAIRS.iter().any(|(l, r)| *l == c || *r == c)
19275}
19376
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 {
77+fn is_valid_pair(doc: &Rope, start_char: usize, end_char: usize) -> bool {
19978 PAIRS.contains(&(doc.char(start_char), doc.char(end_char)))
20079}
20180
202−fn surrounding_bytes(doc: RopeSlice, node: &Node) -> Option<(usize, usize)> {
81+fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
20382 let len = doc.len_bytes();
20483
20584 let start_byte = node.start_byte();
@@ -211,85 +90,3 @@ fn surrounding_bytes(doc: RopeSlice, node: &Node) -> Option<(usize, usize)> {
21190
21291 Some((start_byte, end_byte))
21392}
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+15−195
@@ -1,4 +1,4 @@
1−use std::{cmp::Reverse, iter};
1+use std::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, Selection, Syntax,
19+ visual_offset_from_block, Range, RopeSlice,
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− return move_vertically(slice, range, dir, count, behaviour, text_fmt, annotations);
65+ move_vertically(slice, range, dir, count, behaviour, text_fmt, annotations);
6666 }
6767 annotations.clear_line_annotations();
6868 let pos = range.cursor(slice);
@@ -177,10 +177,6 @@ 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−
184180pub fn move_next_long_word_start(slice: RopeSlice, range: Range, count: usize) -> Range {
185181 word_move(slice, range, count, WordMotionTarget::NextLongWordStart)
186182}
@@ -193,8 +189,8 @@ pub fn move_prev_long_word_start(slice: RopeSlice, range: Range, count: usize) -
193189 word_move(slice, range, count, WordMotionTarget::PrevLongWordStart)
194190}
195191
196−pub fn move_prev_long_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
197− word_move(slice, range, count, WordMotionTarget::PrevLongWordEnd)
192+pub fn move_prev_word_end(slice: RopeSlice, range: Range, count: usize) -> Range {
193+ word_move(slice, range, count, WordMotionTarget::PrevWordEnd)
198194}
199195
200196fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTarget) -> Range {
@@ -203,7 +199,6 @@ fn word_move(slice: RopeSlice, range: Range, count: usize, target: WordMotionTar
203199 WordMotionTarget::PrevWordStart
204200 | WordMotionTarget::PrevLongWordStart
205201 | WordMotionTarget::PrevWordEnd
206− | WordMotionTarget::PrevLongWordEnd
207202 );
208203
209204 // Special-case early-out.
@@ -382,7 +377,6 @@ pub enum WordMotionTarget {
382377 NextLongWordStart,
383378 NextLongWordEnd,
384379 PrevLongWordStart,
385− PrevLongWordEnd,
386380}
387381
388382pub trait CharHelpers {
@@ -399,7 +393,6 @@ impl CharHelpers for Chars<'_> {
399393 WordMotionTarget::PrevWordStart
400394 | WordMotionTarget::PrevLongWordStart
401395 | WordMotionTarget::PrevWordEnd
402− | WordMotionTarget::PrevLongWordEnd
403396 );
404397
405398 // Reverse the iterator if needed for the motion direction.
@@ -486,7 +479,7 @@ fn reached_target(target: WordMotionTarget, prev_ch: char, next_ch: char) -> boo
486479 is_word_boundary(prev_ch, next_ch)
487480 && (!prev_ch.is_whitespace() || char_is_line_ending(next_ch))
488481 }
489− WordMotionTarget::NextLongWordStart | WordMotionTarget::PrevLongWordEnd => {
482+ WordMotionTarget::NextLongWordStart => {
490483 is_long_word_boundary(prev_ch, next_ch)
491484 && (char_is_line_ending(next_ch) || !next_ch.is_whitespace())
492485 }
@@ -527,10 +520,10 @@ pub fn goto_treesitter_object(
527520 let node = match dir {
528521 Direction::Forward => nodes
529522 .filter(|n| n.start_byte() > byte_pos)
530− .min_by_key(|n| (n.start_byte(), Reverse(n.end_byte())))?,
523+ .min_by_key(|n| n.start_byte())?,
531524 Direction::Backward => nodes
532525 .filter(|n| n.end_byte() < byte_pos)
533− .max_by_key(|n| (n.end_byte(), Reverse(n.start_byte())))?,
526+ .max_by_key(|n| n.end_byte())?,
534527 };
535528
536529 let len = slice.len_bytes();
@@ -556,85 +549,6 @@ pub fn goto_treesitter_object(
556549 last_range
557550}
558551
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−
638552#[cfg(test)]
639553mod test {
640554 use ropey::Rope;
@@ -1531,100 +1445,6 @@ mod test {
15311445 }
15321446 }
15331447
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−
16281448 #[test]
16291449 fn test_behaviour_when_moving_to_prev_paragraph_single() {
16301450 let tests = [
@@ -1654,7 +1474,7 @@ mod test {
16541474 let text = Rope::from(s.as_str());
16551475 let selection =
16561476 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Move));
1657− let actual = crate::test::plain(s.as_ref(), &selection);
1477+ let actual = crate::test::plain(&s, selection);
16581478 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
16591479 }
16601480 }
@@ -1677,7 +1497,7 @@ mod test {
16771497 let text = Rope::from(s.as_str());
16781498 let selection =
16791499 selection.transform(|r| move_prev_paragraph(text.slice(..), r, 2, Movement::Move));
1680− let actual = crate::test::plain(s.as_ref(), &selection);
1500+ let actual = crate::test::plain(&s, selection);
16811501 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
16821502 }
16831503 }
@@ -1700,7 +1520,7 @@ mod test {
17001520 let text = Rope::from(s.as_str());
17011521 let selection = selection
17021522 .transform(|r| move_prev_paragraph(text.slice(..), r, 1, Movement::Extend));
1703− let actual = crate::test::plain(s.as_ref(), &selection);
1523+ let actual = crate::test::plain(&s, selection);
17041524 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
17051525 }
17061526 }
@@ -1720,7 +1540,7 @@ mod test {
17201540 "a\nb\n\n#[goto\nthird\n\n|]#paragraph",
17211541 ),
17221542 (
1723− "a\nb#[\n|]#\n\ngoto\nsecond\n\nparagraph",
1543+ "a\nb#[\n|]#\ngoto\nsecond\n\nparagraph",
17241544 "a\nb#[\n\n|]#goto\nsecond\n\nparagraph",
17251545 ),
17261546 (
@@ -1742,7 +1562,7 @@ mod test {
17421562 let text = Rope::from(s.as_str());
17431563 let selection =
17441564 selection.transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Move));
1745− let actual = crate::test::plain(s.as_ref(), &selection);
1565+ let actual = crate::test::plain(&s, selection);
17461566 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
17471567 }
17481568 }
@@ -1765,7 +1585,7 @@ mod test {
17651585 let text = Rope::from(s.as_str());
17661586 let selection =
17671587 selection.transform(|r| move_next_paragraph(text.slice(..), r, 2, Movement::Move));
1768− let actual = crate::test::plain(s.as_ref(), &selection);
1588+ let actual = crate::test::plain(&s, selection);
17691589 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
17701590 }
17711591 }
@@ -1788,7 +1608,7 @@ mod test {
17881608 let text = Rope::from(s.as_str());
17891609 let selection = selection
17901610 .transform(|r| move_next_paragraph(text.slice(..), r, 1, Movement::Extend));
1791− let actual = crate::test::plain(s.as_ref(), &selection);
1611+ let actual = crate::test::plain(&s, selection);
17921612 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
17931613 }
17941614 }
helix-core/src/path.rs+8−27
@@ -40,21 +40,6 @@ 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−
5843 let mut components = path.components().peekable();
5944 let mut ret = if let Some(c @ Component::Prefix(..)) = components.peek().cloned() {
6045 components.next();
@@ -78,36 +63,32 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
7863 }
7964 }
8065 }
81− base.join(ret)
66+ ret
8267}
8368
8469/// Returns the canonical, absolute form of a path with all intermediate components normalized.
8570///
8671/// This function is used instead of `std::fs::canonicalize` because we don't want to verify
8772/// here if the path exists, just normalize it's components.
88−pub fn get_canonicalized_path(path: &Path) -> PathBuf {
73+pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
8974 let path = expand_tilde(path);
9075 let path = if path.is_relative() {
91− helix_loader::current_working_dir().join(path)
76+ std::env::current_dir().map(|current_dir| current_dir.join(path))?
9277 } else {
9378 path
9479 };
9580
96− get_normalized_path(path.as_path())
81+ Ok(get_normalized_path(path.as_path()))
9782}
9883
9984pub fn get_relative_path(path: &Path) -> PathBuf {
100− let path = PathBuf::from(path);
10185 let path = if path.is_absolute() {
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)
86+ let cwdir = std::env::current_dir().expect("couldn't determine current directory");
87+ path.strip_prefix(cwdir).unwrap_or(path)
10788 } else {
10889 path
10990 };
110− fold_home_dir(&path)
91+ fold_home_dir(path)
11192}
11293
11394/// Returns a truncated filepath where the basepart of the path is reduced to the first
@@ -140,7 +121,7 @@ pub fn get_relative_path(path: &Path) -> PathBuf {
140121/// ```
141122///
142123pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {
143− let cwd = helix_loader::current_working_dir();
124+ let cwd = std::env::current_dir().unwrap_or_default();
144125 let path = path
145126 .as_ref()
146127 .strip_prefix(cwd)
helix-core/src/position.rs+16−41
@@ -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−/// Usually you want to use `visual_offset_from_anchor` instead but this function
112+/// Usualy 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,12 +137,6 @@ 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−
146140/// Returns the visual offset from the start of the visual line
147141/// that contains anchor.
148142pub fn visual_offset_from_anchor(
@@ -152,46 +146,28 @@ pub fn visual_offset_from_anchor(
152146 text_fmt: &TextFormat,
153147 annotations: &TextAnnotations,
154148 max_rows: usize,
155−) -> Result<(Position, usize), VisualOffsetError> {
149+) -> Option<(Position, usize)> {
156150 let (formatter, block_start) =
157151 DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, annotations, anchor);
158152 let mut char_pos = block_start;
159153 let mut anchor_line = None;
160− let mut found_pos = None;
161154 let mut last_pos = Position::default();
162155
163− if pos < block_start {
164− return Err(VisualOffsetError::PosBeforeAnchorRow);
165− }
166−
167156 for (grapheme, vpos) in formatter {
168157 last_pos = vpos;
169158 char_pos += grapheme.doc_chars();
170159
171− if char_pos > pos {
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− }
179160 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− }
161+ anchor_line = Some(last_pos.row);
162+ }
163+ if char_pos > pos {
164+ last_pos.row -= anchor_line.unwrap();
165+ return Some((last_pos, block_start));
190166 }
191167
192168 if let Some(anchor_line) = anchor_line {
193169 if vpos.row >= anchor_line + max_rows {
194− return Err(VisualOffsetError::PosAfterMaxRow);
170+ return None;
195171 }
196172 }
197173 }
@@ -199,7 +175,7 @@ pub fn visual_offset_from_anchor(
199175 let anchor_line = anchor_line.unwrap_or(last_pos.row);
200176 last_pos.row -= anchor_line;
201177
202− Ok((last_pos, block_start))
178+ Some((last_pos, block_start))
203179}
204180
205181/// Convert (line, column) coordinates to a character index.
@@ -291,7 +267,7 @@ pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize)
291267///
292268/// If no (text) grapheme starts at exactly at the specified column the
293269/// start of the grapheme to the left is returned. If there is no grapheme
294−/// to the left (for example if the line starts with virtual text) then the positioning
270+/// to the left (for example if the line starts with virtual text) then the positiong
295271/// of the next grapheme to the right is returned.
296272///
297273/// If the `line` coordinate is beyond the end of the file, the EOF
@@ -309,19 +285,18 @@ pub fn pos_at_visual_coords(text: RopeSlice, coords: Position, tab_width: usize)
309285/// on the visual line is returned if the visual line contains any text:
310286/// If the visual line at the specified offset is a virtual line generated by a `LineAnnotation`
311287/// the previous char_index is returned, together with the remaining vertical offset (`virtual_lines`)
312−pub fn char_idx_at_visual_offset(
313− text: RopeSlice,
288+pub fn char_idx_at_visual_offset<'a>(
289+ text: RopeSlice<'a>,
314290 mut anchor: usize,
315291 mut row_offset: isize,
316292 column: usize,
317293 text_fmt: &TextFormat,
318294 annotations: &TextAnnotations,
319295) -> (usize, usize) {
320− let mut pos = anchor;
321296 // convert row relative to visual line containing anchor to row relative to a block containing anchor (anchor may change)
322297 loop {
323298 let (visual_pos_in_block, block_char_offset) =
324− visual_offset_from_block(text, anchor, pos, text_fmt, annotations);
299+ visual_offset_from_block(text, anchor, anchor, text_fmt, annotations);
325300 row_offset += visual_pos_in_block.row as isize;
326301 anchor = block_char_offset;
327302 if row_offset >= 0 {
@@ -333,10 +308,10 @@ pub fn char_idx_at_visual_offset(
333308 break;
334309 }
335310 // the row_offset is negative so we need to look at the previous block
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;
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
339313 anchor -= 1;
314+ row_offset += 1;
340315 }
341316
342317 char_idx_at_visual_block_offset(
helix-core/src/register.rsnew file+81
@@ -0,0 +1,81 @@
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.rsdeleted−37
@@ -1,37 +0,0 @@
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+44−77
@@ -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 adjacent, sharing an edge, do not overlap.
41+/// are directly adjecent, 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,35 +161,34 @@ 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
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 {
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 {
171167 use std::cmp::Ordering;
172− if changes.is_empty() {
173− return self;
174− }
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− ],
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+ ),
189181 };
190− changes.update_positions(positions_to_map.into_iter());
191− self.old_visual_position = None;
192− self
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,
191+ }
193192 }
194193
195194 /// Extend the range to cover at least `from` `to`.
@@ -452,36 +451,17 @@ impl Selection {
452451 /// Map selections over a set of changes. Useful for adjusting the selection position after
453452 /// applying changes to a document.
454453 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 {
461454 if changes.is_empty() {
462455 return self;
463456 }
464457
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
458+ Self::new(
459+ self.ranges
460+ .into_iter()
461+ .map(|range| range.map(changes))
462+ .collect(),
463+ self.primary_index,
464+ )
485465 }
486466
487467 pub fn ranges(&self) -> &[Range] {
@@ -517,9 +497,6 @@ impl Selection {
517497
518498 /// Normalizes a `Selection`.
519499 fn normalize(mut self) -> Self {
520− if self.len() < 2 {
521− return self;
522− }
523500 let mut primary = self.ranges[self.primary_index];
524501 self.ranges.sort_unstable_by_key(Range::from);
525502
@@ -545,14 +522,7 @@ impl Selection {
545522 self
546523 }
547524
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.
525+ // Merges all ranges that are consecutive
556526 pub fn merge_consecutive_ranges(mut self) -> Self {
557527 let mut primary = self.ranges[self.primary_index];
558528
@@ -584,12 +554,17 @@ impl Selection {
584554 assert!(!ranges.is_empty());
585555 debug_assert!(primary_index < ranges.len());
586556
587− let selection = Self {
557+ let mut selection = Self {
588558 ranges,
589559 primary_index,
590560 };
591561
592− selection.normalize()
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
593568 }
594569
595570 /// Takes a closure and maps each `Range` over the closure.
@@ -630,19 +605,11 @@ impl Selection {
630605 self.transform(|range| Range::point(range.cursor(text)))
631606 }
632607
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− {
608+ pub fn fragments<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = Cow<str>> + 'a {
638609 self.ranges.iter().map(move |range| range.fragment(text))
639610 }
640611
641− pub fn slices<'a>(
642− &'a self,
643− text: RopeSlice<'a>,
644− ) -> impl DoubleEndedIterator<Item = RopeSlice<'a>> + ExactSizeIterator<Item = RopeSlice<'a>> + 'a
645− {
612+ pub fn slices<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = RopeSlice> + 'a {
646613 self.ranges.iter().map(move |range| range.slice(text))
647614 }
648615
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", "quotes"]'"#;
297+ r#":set statusline.center ["file-type","file-encoding"] '["list", "in", "qoutes"]'"#;
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", "quotes"]"#),
304+ Cow::from(r#"["list", "in", "qoutes"]"#),
305305 ];
306306 assert_eq!(expected, result);
307307 }
helix-core/src/surround.rs+6−1
@@ -397,10 +397,15 @@ mod test {
397397
398398 let selections: SmallVec<[Range; 1]> = spec
399399 .match_indices('^')
400+ .into_iter()
400401 .map(|(i, _)| Range::point(i))
401402 .collect();
402403
403− let expectations: Vec<usize> = spec.match_indices('_').map(|(i, _)| i).collect();
404+ let expectations: Vec<usize> = spec
405+ .match_indices('_')
406+ .into_iter()
407+ .map(|(i, _)| i)
408+ .collect();
404409
405410 (rope, Selection::new(selections, 0), expectations)
406411 }
helix-core/src/syntax.rs+169−415
@@ -4,7 +4,7 @@ use crate::{
44 diagnostic::Severity,
55 regex::Regex,
66 transaction::{ChangeSet, Operation},
7− RopeSlice, Tendril,
7+ Rope, 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, HashSet, VecDeque},
20− fmt::{self, Display},
19+ collections::{HashMap, VecDeque},
20+ fmt,
2121 hash::{Hash, Hasher},
2222 mem::{replace, transmute},
23− path::{Path, PathBuf},
23+ path::Path,
2424 str::FromStr,
2525 sync::Arc,
2626};
2727
2828use once_cell::sync::{Lazy, OnceCell};
29−use serde::{ser::SerializeSeq, Deserialize, Serialize};
29+use serde::{Deserialize, Serialize};
3030
3131use helix_loader::grammar::{get_language, load_runtime_file};
3232
@@ -48,21 +48,6 @@ 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−
6651pub fn deserialize_auto_pairs<'de, D>(deserializer: D) -> Result<Option<AutoPairs>, D::Error>
6752where
6853 D: serde::Deserializer<'de>,
@@ -75,11 +60,8 @@ fn default_timeout() -> u64 {
7560}
7661
7762#[derive(Debug, Serialize, Deserialize)]
78−#[serde(rename_all = "kebab-case")]
7963pub struct Configuration {
8064 pub language: Vec<LanguageConfiguration>,
81− #[serde(default)]
82− pub language_server: HashMap<String, LanguageServerConfiguration>,
8365}
8466
8567impl Default for Configuration {
@@ -93,20 +75,19 @@ impl Default for Configuration {
9375#[serde(rename_all = "kebab-case", deny_unknown_fields)]
9476pub struct LanguageConfiguration {
9577 #[serde(rename = "name")]
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
78+ pub language_id: String, // c-sharp, rust
10079 pub scope: String, // source.rust
10180 pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
10281 #[serde(default)]
10382 pub shebangs: Vec<String>, // interpreter(s) associated with language
104− #[serde(default)]
105− pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
83+ pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
10684 pub comment_token: Option<String>,
10785 pub text_width: Option<usize>,
10886 pub soft_wrap: Option<SoftWrap>,
10987
88+ #[serde(default, skip_serializing, deserialize_with = "deserialize_lsp_config")]
89+ pub config: Option<serde_json::Value>,
90+
11091 #[serde(default)]
11192 pub auto_format: bool,
11293
@@ -126,13 +107,8 @@ pub struct LanguageConfiguration {
126107 #[serde(skip)]
127108 pub(crate) highlight_config: OnceCell<Option<Arc<HighlightConfiguration>>>,
128109 // tags_config OnceCell<> https://github.com/tree-sitter/tree-sitter/pull/583
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>,
110+ #[serde(skip_serializing_if = "Option::is_none")]
111+ pub language_server: Option<LanguageServerConfiguration>,
136112 #[serde(skip_serializing_if = "Option::is_none")]
137113 pub indent: Option<IndentationConfiguration>,
138114
@@ -151,12 +127,6 @@ pub struct LanguageConfiguration {
151127 pub auto_pairs: Option<AutoPairs>,
152128
153129 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>,
160130}
161131
162132#[derive(Debug, PartialEq, Eq, Hash)]
@@ -213,9 +183,9 @@ impl<'de> Deserialize<'de> for FileType {
213183 M: serde::de::MapAccess<'de>,
214184 {
215185 match map.next_entry::<String, String>()? {
216− Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
217− suffix.replace('/', std::path::MAIN_SEPARATOR_STR)
218− })),
186+ Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix(
187+ suffix.replace('/', &std::path::MAIN_SEPARATOR.to_string()),
188+ )),
219189 Some((key, _value)) => Err(serde::de::Error::custom(format!(
220190 "unknown key in `file-types` list: {}",
221191 key
@@ -231,133 +201,6 @@ impl<'de> Deserialize<'de> for FileType {
231201 }
232202}
233203
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−
361204#[derive(Debug, Serialize, Deserialize)]
362205#[serde(rename_all = "kebab-case")]
363206pub struct LanguageServerConfiguration {
@@ -367,10 +210,9 @@ pub struct LanguageServerConfiguration {
367210 pub args: Vec<String>,
368211 #[serde(default, skip_serializing_if = "HashMap::is_empty")]
369212 pub environment: HashMap<String, String>,
370− #[serde(default, skip_serializing, deserialize_with = "deserialize_lsp_config")]
371− pub config: Option<serde_json::Value>,
372213 #[serde(default = "default_timeout")]
373214 pub timeout: u64,
215+ pub language_id: Option<String>,
374216}
375217
376218#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -439,27 +281,10 @@ pub struct DebuggerQuirks {
439281#[derive(Debug, Serialize, Deserialize)]
440282#[serde(rename_all = "kebab-case")]
441283pub struct IndentationConfiguration {
442− #[serde(deserialize_with = "deserialize_tab_width")]
443284 pub tab_width: usize,
444285 pub unit: String,
445286}
446287
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−
463288/// Configuration for auto pairs
464289#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
465290#[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
@@ -726,8 +551,6 @@ impl LanguageConfiguration {
726551#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
727552pub struct SoftWrap {
728553 /// 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.
731554 pub enable: Option<bool>,
732555 /// Maximum space left free at the end of the line.
733556 /// This space is used to wrap text at word boundaries. If that is not possible within this limit
@@ -762,8 +585,6 @@ pub struct Loader {
762585 language_config_ids_by_suffix: HashMap<String, usize>,
763586 language_config_ids_by_shebang: HashMap<String, usize>,
764587
765− language_server_configs: HashMap<String, LanguageServerConfiguration>,
766−
767588 scopes: ArcSwap<Vec<String>>,
768589}
769590
@@ -771,7 +592,6 @@ impl Loader {
771592 pub fn new(config: Configuration) -> Self {
772593 let mut loader = Self {
773594 language_configs: Vec::new(),
774− language_server_configs: config.language_server,
775595 language_config_ids_by_extension: HashMap::new(),
776596 language_config_ids_by_suffix: HashMap::new(),
777597 language_config_ids_by_shebang: HashMap::new(),
@@ -834,13 +654,11 @@ impl Loader {
834654 // TODO: content_regex handling conflict resolution
835655 }
836656
837− pub fn language_config_for_shebang(
838− &self,
839− source: RopeSlice,
840− ) -> Option<Arc<LanguageConfiguration>> {
657+ pub fn language_config_for_shebang(&self, source: &Rope) -> Option<Arc<LanguageConfiguration>> {
841658 let line = Cow::from(source.line(0));
842− static SHEBANG_REGEX: Lazy<Regex> =
843− Lazy::new(|| Regex::new(&["^", SHEBANG].concat()).unwrap());
659+ static SHEBANG_REGEX: Lazy<Regex> = Lazy::new(|| {
660+ Regex::new(r"^#!\s*(?:\S*[/\\](?:env\s+(?:\-\S+\s+)*)?)?([^\s\.\d]+)").unwrap()
661+ });
844662 let configuration_id = SHEBANG_REGEX
845663 .captures(&line)
846664 .and_then(|cap| self.language_config_ids_by_shebang.get(&cap[1]));
@@ -862,14 +680,15 @@ impl Loader {
862680 .cloned()
863681 }
864682
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>> {
683+ pub fn language_configuration_for_injection_string(
684+ &self,
685+ string: &str,
686+ ) -> Option<Arc<LanguageConfiguration>> {
868687 let mut best_match_length = 0;
869688 let mut best_match_position = None;
870689 for (i, configuration) in self.language_configs.iter().enumerate() {
871690 if let Some(injection_regex) = &configuration.injection_regex {
872− if let Some(mat) = injection_regex.find(name) {
691+ if let Some(mat) = injection_regex.find(string) {
873692 let length = mat.end() - mat.start();
874693 if length > best_match_length {
875694 best_match_position = Some(i);
@@ -879,30 +698,17 @@ impl Loader {
879698 }
880699 }
881700
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− }
701+ if let Some(i) = best_match_position {
702+ let configuration = &self.language_configs[i];
703+ return Some(configuration.clone());
895704 }
705+ None
896706 }
897707
898708 pub fn language_configs(&self) -> impl Iterator<Item = &Arc<LanguageConfiguration>> {
899709 self.language_configs.iter()
900710 }
901711
902− pub fn language_server_configs(&self) -> &HashMap<String, LanguageServerConfiguration> {
903− &self.language_server_configs
904− }
905−
906712 pub fn set_scopes(&self, scopes: Vec<String>) {
907713 self.scopes.store(Arc::new(scopes));
908714
@@ -946,11 +752,7 @@ fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<st
946752}
947753
948754impl Syntax {
949− pub fn new(
950− source: RopeSlice,
951− config: Arc<HighlightConfiguration>,
952− loader: Arc<Loader>,
953− ) -> Option<Self> {
755+ pub fn new(source: &Rope, config: Arc<HighlightConfiguration>, loader: Arc<Loader>) -> Self {
954756 let root_layer = LanguageLayer {
955757 tree: None,
956758 config,
@@ -975,26 +777,24 @@ impl Syntax {
975777 loader,
976778 };
977779
978− let res = syntax.update(source, source, &ChangeSet::new(source));
780+ syntax
781+ .update(source, source, &ChangeSet::new(source))
782+ .unwrap();
979783
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)
784+ syntax
985785 }
986786
987787 pub fn update(
988788 &mut self,
989− old_source: RopeSlice,
990− source: RopeSlice,
789+ old_source: &Rope,
790+ source: &Rope,
991791 changeset: &ChangeSet,
992792 ) -> Result<(), Error> {
993793 let mut queue = VecDeque::new();
994794 queue.push_back(self.root);
995795
996796 let scopes = self.loader.scopes.load();
997− let injection_callback = |language: &InjectionLanguageMarker| {
797+ let injection_callback = |language: &str| {
998798 self.loader
999799 .language_configuration_for_injection_string(language)
1000800 .and_then(|language_config| language_config.highlight_config(&scopes))
@@ -1109,7 +909,6 @@ impl Syntax {
1109909
1110910 PARSER.with(|ts_parser| {
1111911 let ts_parser = &mut ts_parser.borrow_mut();
1112− ts_parser.parser.set_timeout_micros(1000 * 500); // half a second is pretty generours
1113912 let mut cursor = ts_parser.cursors.pop().unwrap_or_else(QueryCursor::new);
1114913 // TODO: might need to set cursor range
1115914 cursor.set_byte_range(0..usize::MAX);
@@ -1154,37 +953,14 @@ impl Syntax {
1154953 layer.tree().root_node(),
1155954 RopeProvider(source_slice),
1156955 );
1157− let mut combined_injections = vec![
1158− (None, Vec::new(), IncludedChildren::default());
1159− layer.config.combined_injections_patterns.len()
1160− ];
1161956 let mut injections = Vec::new();
1162− let mut last_injection_end = 0;
1163957 for mat in matches {
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− }
958+ let (language_name, content_node, included_children) = injection_for_match(
959+ &layer.config,
960+ &layer.config.injections_query,
961+ &mat,
962+ source_slice,
963+ );
1188964
1189965 // Explicitly remove this match so that none of its other captures will remain
1190966 // in the stream of captures.
@@ -1192,31 +968,59 @@ impl Syntax {
1192968
1193969 // If a language is found with the given name, then add a new language layer
1194970 // to the highlighted document.
1195− if let (Some(injection_capture), Some(content_node)) =
1196− (injection_capture, content_node)
971+ if let (Some(language_name), Some(content_node)) = (language_name, content_node)
1197972 {
1198− if let Some(config) = (injection_callback)(&injection_capture) {
973+ if let Some(config) = (injection_callback)(&language_name) {
1199974 let ranges =
1200975 intersect_ranges(&layer.ranges, &[content_node], included_children);
1201976
1202977 if !ranges.is_empty() {
1203− if content_node.start_byte() < last_injection_end {
1204− continue;
1205− }
1206− last_injection_end = content_node.end_byte();
1207978 injections.push((config, ranges));
1208979 }
1209980 }
1210981 }
1211982 }
1212983
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));
984+ // Process combined injections.
985+ if let Some(combined_injections_query) = &layer.config.combined_injections_query {
986+ let mut injections_by_pattern_index =
987+ vec![
988+ (None, Vec::new(), IncludedChildren::default());
989+ combined_injections_query.pattern_count()
990+ ];
991+ let matches = cursor.matches(
992+ combined_injections_query,
993+ layer.tree().root_node(),
994+ RopeProvider(source_slice),
995+ );
996+ for mat in matches {
997+ let entry = &mut injections_by_pattern_index[mat.pattern_index];
998+ let (language_name, content_node, included_children) = injection_for_match(
999+ &layer.config,
1000+ combined_injections_query,
1001+ &mat,
1002+ source_slice,
1003+ );
1004+ if language_name.is_some() {
1005+ entry.0 = language_name;
1006+ }
1007+ if let Some(content_node) = content_node {
1008+ entry.1.push(content_node);
1009+ }
1010+ entry.2 = included_children;
1011+ }
1012+ for (lang_name, content_nodes, included_children) in injections_by_pattern_index
1013+ {
1014+ if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
1015+ if let Some(config) = (injection_callback)(&lang_name) {
1016+ let ranges = intersect_ranges(
1017+ &layer.ranges,
1018+ &content_nodes,
1019+ included_children,
1020+ );
1021+ if !ranges.is_empty() {
1022+ injections.push((config, ranges));
1023+ }
12201024 }
12211025 }
12221026 }
@@ -1353,7 +1157,6 @@ impl Syntax {
13531157bitflags! {
13541158 /// Flags that track the status of a layer
13551159 /// in the `Sytaxn::update` function
1356− #[derive(Debug)]
13571160 struct LayerUpdateFlags : u32{
13581161 const MODIFIED = 0b001;
13591162 const MOVED = 0b010;
@@ -1406,7 +1209,7 @@ impl LanguageLayer {
14061209 self.tree.as_ref().unwrap()
14071210 }
14081211
1409− fn parse(&mut self, parser: &mut Parser, source: RopeSlice) -> Result<(), Error> {
1212+ fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {
14101213 parser
14111214 .set_included_ranges(&self.ranges)
14121215 .map_err(|_| Error::InvalidRanges)?;
@@ -1421,7 +1224,7 @@ impl LanguageLayer {
14211224 &mut |byte, _| {
14221225 if byte <= source.len_bytes() {
14231226 let (chunk, start_byte, _, _) = source.chunk_at_byte(byte);
1424− &chunk.as_bytes()[byte - start_byte..]
1227+ chunk[byte - start_byte..].as_bytes()
14251228 } else {
14261229 // out of range
14271230 &[]
@@ -1437,7 +1240,7 @@ impl LanguageLayer {
14371240}
14381241
14391242pub(crate) fn generate_edits(
1440− old_text: RopeSlice,
1243+ old_text: &Rope,
14411244 changeset: &ChangeSet,
14421245) -> Vec<tree_sitter::InputEdit> {
14431246 use Operation::*;
@@ -1453,7 +1256,7 @@ pub(crate) fn generate_edits(
14531256
14541257 // TODO; this is a lot easier with Change instead of Operation.
14551258
1456− fn point_at_pos(text: RopeSlice, pos: usize) -> (usize, Point) {
1259+ fn point_at_pos(text: &Rope, pos: usize) -> (usize, Point) {
14571260 let byte = text.char_to_byte(pos); // <- attempted to index past end
14581261 let line = text.char_to_line(pos);
14591262 let line_start_byte = text.line_to_byte(line);
@@ -1579,14 +1382,12 @@ pub struct HighlightConfiguration {
15791382 pub language: Grammar,
15801383 pub query: Query,
15811384 injections_query: Query,
1582− combined_injections_patterns: Vec<usize>,
1385+ combined_injections_query: Option<Query>,
15831386 highlights_pattern_index: usize,
15841387 highlight_indices: ArcSwap<Vec<Option<Highlight>>>,
15851388 non_local_variable_patterns: Vec<bool>,
15861389 injection_content_capture_index: Option<u32>,
15871390 injection_language_capture_index: Option<u32>,
1588− injection_filename_capture_index: Option<u32>,
1589− injection_shebang_capture_index: Option<u32>,
15901391 local_scope_capture_index: Option<u32>,
15911392 local_def_capture_index: Option<u32>,
15921393 local_def_value_capture_index: Option<u32>,
@@ -1630,7 +1431,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
16301431}
16311432
16321433pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1633−impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
1434+impl<'a> TextProvider<'a> for RopeProvider<'a> {
16341435 type I = ChunksBytes<'a>;
16351436
16361437 fn text(&mut self, node: Node) -> Self::I {
@@ -1644,7 +1445,7 @@ impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
16441445struct HighlightIterLayer<'a> {
16451446 _tree: Option<Tree>,
16461447 cursor: QueryCursor,
1647− captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
1448+ captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
16481449 config: &'a HighlightConfiguration,
16491450 highlight_end_stack: Vec<usize>,
16501451 scope_stack: Vec<LocalScope<'a>>,
@@ -1695,15 +1496,26 @@ impl HighlightConfiguration {
16951496 }
16961497 }
16971498
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();
1499+ let mut injections_query = Query::new(language, injection_query)?;
1500+
1501+ // Construct a separate query just for dealing with the 'combined injections'.
1502+ // Disable the combined injection patterns in the main query.
1503+ let mut combined_injections_query = Query::new(language, injection_query)?;
1504+ let mut has_combined_queries = false;
1505+ for pattern_index in 0..injections_query.pattern_count() {
1506+ let settings = injections_query.property_settings(pattern_index);
1507+ if settings.iter().any(|s| &*s.key == "injection.combined") {
1508+ has_combined_queries = true;
1509+ injections_query.disable_pattern(pattern_index);
1510+ } else {
1511+ combined_injections_query.disable_pattern(pattern_index);
1512+ }
1513+ }
1514+ let combined_injections_query = if has_combined_queries {
1515+ Some(combined_injections_query)
1516+ } else {
1517+ None
1518+ };
17071519
17081520 // Find all of the highlighting patterns that are disabled for nodes that
17091521 // have been identified as local variables.
@@ -1719,8 +1531,6 @@ impl HighlightConfiguration {
17191531 // Store the numeric ids for all of the special captures.
17201532 let mut injection_content_capture_index = None;
17211533 let mut injection_language_capture_index = None;
1722− let mut injection_filename_capture_index = None;
1723− let mut injection_shebang_capture_index = None;
17241534 let mut local_def_capture_index = None;
17251535 let mut local_def_value_capture_index = None;
17261536 let mut local_ref_capture_index = None;
@@ -1741,8 +1551,6 @@ impl HighlightConfiguration {
17411551 match name.as_str() {
17421552 "injection.content" => injection_content_capture_index = i,
17431553 "injection.language" => injection_language_capture_index = i,
1744− "injection.filename" => injection_filename_capture_index = i,
1745− "injection.shebang" => injection_shebang_capture_index = i,
17461554 _ => {}
17471555 }
17481556 }
@@ -1752,14 +1560,12 @@ impl HighlightConfiguration {
17521560 language,
17531561 query,
17541562 injections_query,
1755− combined_injections_patterns,
1563+ combined_injections_query,
17561564 highlights_pattern_index,
17571565 highlight_indices,
17581566 non_local_variable_patterns,
17591567 injection_content_capture_index,
17601568 injection_language_capture_index,
1761− injection_filename_capture_index,
1762− injection_shebang_capture_index,
17631569 local_scope_capture_index,
17641570 local_def_capture_index,
17651571 local_def_value_capture_index,
@@ -1818,90 +1624,6 @@ impl HighlightConfiguration {
18181624
18191625 self.highlight_indices.store(Arc::new(indices));
18201626 }
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− }
19051627}
19061628
19071629impl<'a> HighlightIterLayer<'a> {
@@ -2313,14 +2035,55 @@ impl<'a> Iterator for HighlightIter<'a> {
23132035 }
23142036}
23152037
2316−#[derive(Debug, Clone)]
2317−pub enum InjectionLanguageMarker<'a> {
2318− Name(Cow<'a, str>),
2319− Filename(Cow<'a, Path>),
2320− Shebang(String),
2321−}
2038+fn injection_for_match<'a>(
2039+ config: &HighlightConfiguration,
2040+ query: &'a Query,
2041+ query_match: &QueryMatch<'a, 'a>,
2042+ source: RopeSlice<'a>,
2043+) -> (Option<Cow<'a, str>>, Option<Node<'a>>, IncludedChildren) {
2044+ let content_capture_index = config.injection_content_capture_index;
2045+ let language_capture_index = config.injection_language_capture_index;
2046+
2047+ let mut language_name = None;
2048+ let mut content_node = None;
2049+ for capture in query_match.captures {
2050+ let index = Some(capture.index);
2051+ if index == language_capture_index {
2052+ let name = byte_range_to_str(capture.node.byte_range(), source);
2053+ language_name = Some(name);
2054+ } else if index == content_capture_index {
2055+ content_node = Some(capture.node);
2056+ }
2057+ }
2058+
2059+ let mut included_children = IncludedChildren::default();
2060+ for prop in query.property_settings(query_match.pattern_index) {
2061+ match prop.key.as_ref() {
2062+ // In addition to specifying the language name via the text of a
2063+ // captured node, it can also be hard-coded via a `#set!` predicate
2064+ // that sets the injection.language key.
2065+ "injection.language" => {
2066+ if language_name.is_none() {
2067+ language_name = prop.value.as_ref().map(|s| s.as_ref().into())
2068+ }
2069+ }
2070+
2071+ // By default, injections do not include the *children* of an
2072+ // `injection.content` node - only the ranges that belong to the
2073+ // node itself. This can be changed using a `#set!` predicate that
2074+ // sets the `injection.include-children` key.
2075+ "injection.include-children" => included_children = IncludedChildren::All,
2076+
2077+ // Some queries might only exclude named children but include unnamed
2078+ // children in their `injection.content` node. This can be enabled using
2079+ // a `#set!` predicate that sets the `injection.include-unnamed-children` key.
2080+ "injection.include-unnamed-children" => included_children = IncludedChildren::Unnamed,
2081+ _ => {}
2082+ }
2083+ }
23222084
2323−const SHEBANG: &str = r"#!\s*(?:\S*[/\\](?:env\s+(?:\-\S+\s+)*)?)?([^\s\.\d]+)";
2085+ (language_name, content_node, included_children)
2086+}
23242087
23252088pub struct Merge<I> {
23262089 iter: I,
@@ -2537,10 +2300,7 @@ mod test {
25372300 "#,
25382301 );
25392302
2540− let loader = Loader::new(Configuration {
2541− language: vec![],
2542− language_server: HashMap::new(),
2543− });
2303+ let loader = Loader::new(Configuration { language: vec![] });
25442304 let language = get_language("rust").unwrap();
25452305
25462306 let query = Query::new(language, query_str).unwrap();
@@ -2548,7 +2308,7 @@ mod test {
25482308 let mut cursor = QueryCursor::new();
25492309
25502310 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2551− let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
2311+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
25522312
25532313 let root = syntax.tree().root_node();
25542314 let mut test = |capture, range| {
@@ -2599,10 +2359,7 @@ mod test {
25992359 .map(String::from)
26002360 .collect();
26012361
2602− let loader = Loader::new(Configuration {
2603− language: vec![],
2604− language_server: HashMap::new(),
2605− });
2362+ let loader = Loader::new(Configuration { language: vec![] });
26062363
26072364 let language = get_language("rust").unwrap();
26082365 let config = HighlightConfiguration::new(
@@ -2622,7 +2379,7 @@ mod test {
26222379 fn main() {}
26232380 ",
26242381 );
2625− let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
2382+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
26262383 let tree = syntax.tree();
26272384 let root = tree.root_node();
26282385 assert_eq!(root.kind(), "source_file");
@@ -2649,7 +2406,7 @@ mod test {
26492406 &doc,
26502407 vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
26512408 );
2652− let edits = generate_edits(doc.slice(..), transaction.changes());
2409+ let edits = generate_edits(&doc, transaction.changes());
26532410 // transaction.apply(&mut state);
26542411
26552412 assert_eq!(
@@ -2678,7 +2435,7 @@ mod test {
26782435 let mut doc = Rope::from("fn test() {}");
26792436 let transaction =
26802437 Transaction::change(&doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
2681− let edits = generate_edits(doc.slice(..), transaction.changes());
2438+ let edits = generate_edits(&doc, transaction.changes());
26822439 transaction.apply(&mut doc);
26832440
26842441 assert_eq!(doc, "fn test(a: u32) {}");
@@ -2705,14 +2462,11 @@ mod test {
27052462 ) {
27062463 let source = Rope::from_str(source);
27072464
2708− let loader = Loader::new(Configuration {
2709− language: vec![],
2710− language_server: HashMap::new(),
2711− });
2465+ let loader = Loader::new(Configuration { language: vec![] });
27122466 let language = get_language(language_name).unwrap();
27132467
27142468 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2715− let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
2469+ let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader));
27162470
27172471 let root = syntax
27182472 .tree()
helix-core/src/test.rs+18−139
@@ -1,9 +1,7 @@
11//! Test helpers.
22use crate::{Range, Selection};
3−use ropey::Rope;
43use smallvec::SmallVec;
54use std::cmp::Reverse;
6−use unicode_segmentation::UnicodeSegmentation;
75
86/// Convert annotated test string to test string and selection.
97///
@@ -12,10 +10,6 @@ use unicode_segmentation::UnicodeSegmentation;
1210/// `#[` for primary selection with head after anchor followed by `|]#`.
1311/// `#(` for secondary selection with head after anchor followed by `|)#`.
1412///
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−///
1913/// # Examples
2014///
2115/// ```
@@ -36,23 +30,23 @@ use unicode_segmentation::UnicodeSegmentation;
3630pub fn print(s: &str) -> (String, Selection) {
3731 let mut primary_idx = None;
3832 let mut ranges = SmallVec::new();
39− let mut iter = UnicodeSegmentation::graphemes(s, true).peekable();
33+ let mut iter = s.chars().peekable();
4034 let mut left = String::with_capacity(s.len());
4135
4236 'outer: while let Some(c) = iter.next() {
4337 let start = left.chars().count();
4438
45− if c != "#" {
46− left.push_str(c);
39+ if c != '#' {
40+ left.push(c);
4741 continue;
4842 }
4943
5044 let (is_primary, close_pair) = match iter.next() {
51− Some("[") => (true, "]"),
52− Some("(") => (false, ")"),
45+ Some('[') => (true, ']'),
46+ Some('(') => (false, ')'),
5347 Some(ch) => {
5448 left.push('#');
55− left.push_str(ch);
49+ left.push(ch);
5650 continue;
5751 }
5852 None => break,
@@ -62,45 +56,24 @@ pub fn print(s: &str) -> (String, Selection) {
6256 panic!("primary `#[` already appeared {:?} {:?}", left, s);
6357 }
6458
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− };
59+ let head_at_beg = iter.next_if_eq(&'|').is_some();
7160
7261 while let Some(c) = iter.next() {
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);
62+ if !(c == close_pair && iter.peek() == Some(&'#')) {
63+ left.push(c);
7864 continue;
7965 }
8066
8167 if !head_at_beg {
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− _ => (),
68+ let prev = left.pop().unwrap();
69+ if prev != '|' {
70+ left.push(prev);
71+ left.push(c);
72+ continue;
9273 }
9374 }
9475
9576 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− }
10477
10578 if is_primary {
10679 primary_idx = Some(ranges.len());
@@ -145,16 +118,14 @@ pub fn print(s: &str) -> (String, Selection) {
145118/// use smallvec::smallvec;
146119///
147120/// assert_eq!(
148−/// plain("abc", &Selection::new(smallvec![Range::new(0, 1), Range::new(3, 2)], 0)),
121+/// plain("abc", Selection::new(smallvec![Range::new(0, 1), Range::new(3, 2)], 0)),
149122/// "#[a|]#b#(|c)#".to_owned()
150123/// );
151124/// ```
152−pub fn plain<R: Into<Rope>>(s: R, selection: &Selection) -> String {
153− let s = s.into();
125+pub fn plain(s: &str, selection: Selection) -> String {
154126 let primary = selection.primary_index();
155− let mut out = String::with_capacity(s.len_bytes() + 5 * selection.len());
156− out.push_str(&s.to_string());
157−
127+ let mut out = String::with_capacity(s.len() + 5 * selection.len());
128+ out.push_str(s);
158129 let mut insertion: Vec<_> = selection
159130 .iter()
160131 .enumerate()
@@ -167,9 +138,7 @@ pub fn plain<R: Into<Rope>>(s: R, selection: &Selection) -> String {
167138 (false, false) => [(range.anchor, ")#"), (range.head, "#(|")],
168139 }
169140 })
170− .map(|(char_idx, marker)| (s.char_to_byte(char_idx), marker))
171141 .collect();
172−
173142 // insert in reverse order
174143 insertion.sort_unstable_by_key(|k| Reverse(k.0));
175144 for (i, s) in insertion {
@@ -293,94 +262,4 @@ mod test {
293262 print("hello #[|👨‍👩‍👧‍👦]# goodbye")
294263 );
295264 }
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− }
386265}
helix-core/src/text_annotations.rs+26−26
@@ -1,4 +1,5 @@
11use std::cell::Cell;
2+use std::convert::identity;
23use std::ops::Range;
34use std::rc::Rc;
45
@@ -14,15 +15,6 @@ pub struct InlineAnnotation {
1415 pub char_idx: usize,
1516}
1617
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−
2618/// Represents a **single Grapheme** that is part of the document
2719/// that start at `char_idx` that will be replaced with
2820/// a different `grapheme`.
@@ -41,13 +33,22 @@ impl InlineAnnotation {
4133/// use helix_core::text_annotations::Overlay;
4234///
4335/// // replaces a
44−/// Overlay::new(0, "X");
36+/// Overlay {
37+/// char_idx: 0,
38+/// grapheme: "X".into(),
39+/// };
4540///
4641/// // replaces X͎̊͢͜͝͡
47−/// Overlay::new(1, "\t");
42+/// Overlay{
43+/// char_idx: 1,
44+/// grapheme: "\t".into(),
45+/// };
4846///
4947/// // replaces b
50−/// Overlay::new(6, "X̢̢̟͖̲͌̋̇͑͝");
48+/// Overlay{
49+/// char_idx: 6,
50+/// grapheme: "X̢̢̟͖̲͌̋̇͑͝".into(),
51+/// };
5152/// ```
5253///
5354/// The following examples are invalid uses
@@ -56,10 +57,16 @@ impl InlineAnnotation {
5657/// use helix_core::text_annotations::Overlay;
5758///
5859/// // overlay is not aligned at grapheme boundary
59−/// Overlay::new(3, "x");
60+/// Overlay{
61+/// char_idx: 3,
62+/// grapheme: "x".into(),
63+/// };
6064///
6165/// // overlay contains multiple graphemes
62−/// Overlay::new(0, "xy");
66+/// Overlay{
67+/// char_idx: 0,
68+/// grapheme: "xy".into(),
69+/// };
6370/// ```
6471#[derive(Debug, Clone)]
6572pub struct Overlay {
@@ -67,15 +74,6 @@ pub struct Overlay {
6774 pub grapheme: Tendril,
6875}
6976
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−
7977/// Line annotations allow for virtual text between normal
8078/// text lines. They cause `height` empty lines to be inserted
8179/// below the document line that contains `anchor_char_idx`.
@@ -112,7 +110,9 @@ impl<A, M> Layer<A, M> {
112110 pub fn reset_pos(&self, char_idx: usize, get_char_idx: impl Fn(&A) -> usize) {
113111 let new_index = self
114112 .annotations
115− .partition_point(|annot| get_char_idx(annot) < char_idx);
113+ .binary_search_by_key(&char_idx, get_char_idx)
114+ .unwrap_or_else(identity);
115+
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 boundaries are automatically
175+ // however it doesn't matter as highlight bounderies 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 overlaid grapheme will be rendered with `highlight`
206+ /// The overlayed 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.as_ref(), &selection);
440+ let actual = crate::test::plain(&s, 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.as_ref(), &selection);
463+ let actual = crate::test::plain(&s, 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.as_ref(), &selection);
494+ let actual = crate::test::plain(&s, selection);
495495 assert_eq!(actual, expected, "\nbefore: `{:?}`", before);
496496 }
497497 }
helix-core/src/transaction.rs+51−309
@@ -1,12 +1,8 @@
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};
1+use crate::{Range, Rope, Selection, Tendril};
2+use std::borrow::Cow;
63
74/// (from, to, replacement)
85pub type Change = (usize, usize, Option<Tendril>);
9−pub type Deletion = (usize, usize);
106
117// TODO: pub(crate)
128#[derive(Debug, Clone, PartialEq, Eq)]
@@ -23,30 +19,6 @@ pub enum Operation {
2319pub enum Assoc {
2420 Before,
2521 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− }
5022}
5123
5224#[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -67,7 +39,7 @@ impl ChangeSet {
6739 }
6840
6941 #[must_use]
70− pub fn new(doc: RopeSlice) -> Self {
42+ pub fn new(doc: &Rope) -> Self {
7143 let len = doc.len_chars();
7244 Self {
7345 changes: Vec::new(),
@@ -351,75 +323,20 @@ impl ChangeSet {
351323 self.changes.is_empty() || self.changes == [Operation::Retain(self.len)]
352324 }
353325
354− /// Map a (mostly) *sorted* list of positions through the changes.
355− ///
356− /// This is equivalent to updating each position with `map_pos`:
326+ /// Map a position through the changes.
357327 ///
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)>) {
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 {
369333 use Operation::*;
370−
371− let mut positions = positions.peekable();
372−
373334 let mut old_pos = 0;
374335 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− }
414336
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− };
337+ let mut iter = self.changes.iter().peekable();
422338
339+ while let Some(change) = iter.next() {
423340 let len = match change {
424341 Delete(i) | Retain(i) => *i,
425342 Insert(_) => 0,
@@ -428,65 +345,61 @@ impl ChangeSet {
428345
429346 match change {
430347 Retain(_) => {
431− map!(
432− |pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)),
433− i
434− );
348+ if old_end > pos {
349+ return new_pos + (pos - old_pos);
350+ }
435351 new_pos += len;
436352 }
437353 Delete(_) => {
438354 // in range
439− map!(|pos, _| (old_end > pos).then_some(new_pos), i);
355+ if old_end > pos {
356+ return new_pos;
357+ }
440358 }
441359 Insert(s) => {
360+ let ins = s.chars().count();
361+
442362 // a subsequent delete means a replace, consume it
443− if let Some((_, Delete(len))) = iter.peek() {
363+ if let Some(Delete(len)) = iter.peek() {
444364 iter.next();
445365
446366 old_end = old_pos + len;
447367 // in range of replaced text
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− );
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+ }
460377 } else {
461378 // at insert point
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− );
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+ }
469388 }
470389
471− new_pos += s.chars().count();
390+ new_pos += ins;
472391 }
473392 }
474393 old_pos = old_end;
475394 }
476− let out_of_bounds: Vec<_> = positions.collect();
477−
478− panic!("Positions {out_of_bounds:?} are out of range for changeset len {old_pos}!",)
479− }
480395
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
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
490403 }
491404
492405 pub fn changes_iter(&self) -> ChangeIterator {
@@ -506,7 +419,7 @@ impl Transaction {
506419 /// Create a new, empty transaction.
507420 pub fn new(doc: &Rope) -> Self {
508421 Self {
509− changes: ChangeSet::new(doc.slice(..)),
422+ changes: ChangeSet::new(doc),
510423 selection: None,
511424 }
512425 }
@@ -553,33 +466,6 @@ impl Transaction {
553466 self
554467 }
555468
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−
583469 /// Generate a transaction from a set of changes.
584470 pub fn change<I>(doc: &Rope, changes: I) -> Self
585471 where
@@ -619,46 +505,6 @@ impl Transaction {
619505 Self::from(changeset)
620506 }
621507
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−
662508 /// Generate a transaction with a change per selection range.
663509 pub fn change_by_selection<F>(doc: &Rope, selection: &Selection, f: F) -> Self
664510 where
@@ -667,54 +513,6 @@ impl Transaction {
667513 Self::change(doc, selection.iter().map(f))
668514 }
669515
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−
718516 /// Insert text at each selection head.
719517 pub fn insert(doc: &Rope, selection: &Selection, text: Tendril) -> Self {
720518 Self::change_by_selection(doc, selection, |range| {
@@ -887,62 +685,6 @@ mod test {
887685 };
888686 assert_eq!(cs.map_pos(2, Assoc::Before), 2);
889687 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);
946688 }
947689
948690 #[test]
@@ -1009,9 +751,9 @@ mod test {
1009751 #[test]
1010752 fn combine_with_empty() {
1011753 let empty = Rope::from("");
1012− let a = ChangeSet::new(empty.slice(..));
754+ let a = ChangeSet::new(&empty);
1013755
1014− let mut b = ChangeSet::new(empty.slice(..));
756+ let mut b = ChangeSet::new(&empty);
1015757 b.insert("a".into());
1016758
1017759 let changes = a.compose(b);
@@ -1025,9 +767,9 @@ mod test {
1025767 const TEST_CASE: &str = "Hello, これはヘリックスエディターです!";
1026768
1027769 let empty = Rope::from("");
1028− let a = ChangeSet::new(empty.slice(..));
770+ let a = ChangeSet::new(&empty);
1029771
1030− let mut b = ChangeSet::new(empty.slice(..));
772+ let mut b = ChangeSet::new(&empty);
1031773 b.insert(TEST_CASE.into());
1032774
1033775 let changes = a.compose(b);
helix-core/src/wrap.rs+1−3
@@ -1,9 +1,7 @@
11use smartstring::{LazyCompact, SmartString};
2−use textwrap::{Options, WordSplitter::NoHyphenation};
32
43/// Given a slice of text, return the text re-wrapped to fit it
54/// within the given width.
65pub 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()
6+ textwrap::refill(text, text_width).into()
97}
helix-core/tests/data/indent/cpp.cppdeleted−48
@@ -1,48 +0,0 @@
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.rsnew file+1
@@ -0,0 +1 @@
1+../../../src/indent.rs
helix-core/tests/data/indent/languages.toml−13
@@ -11,16 +11,3 @@ 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+26−187
@@ -1,192 +1,36 @@
11use helix_core::{
2− indent::{indent_level_for_line, treesitter_indent_for_pos, IndentStyle},
3− syntax::{Configuration, Loader},
2+ indent::{treesitter_indent_for_pos, IndentStyle},
3+ syntax::Loader,
44 Syntax,
55};
6−use ropey::Rope;
7−use std::{ops::Range, path::PathBuf, process::Command};
6+use std::path::PathBuf;
87
98#[test]
109fn test_treesitter_indent_rust() {
11− standard_treesitter_test("rust.rs", "source.rust");
10+ test_treesitter_indent("rust.rs", "source.rust");
1211}
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−
12212#[test]
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)
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");
13118}
13219
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 {
20+fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
15621 let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
15722 test_dir.push("tests/data/indent");
158− test_dir
159−}
16023
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();
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();
17727 let doc = ropey::Rope::from_reader(test_file).unwrap();
178− test_treesitter_indent(file_name, doc, lang_scope, Vec::new())
179−}
18028
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());
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);
19034
19135 // set runtime path so we can find the queries
19236 let mut runtime = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -194,35 +38,30 @@ fn test_treesitter_indent(
19438 std::env::set_var("HELIX_RUNTIME", runtime.to_str().unwrap());
19539
19640 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);
19841 let highlight_config = language_config.highlight_config(&[]).unwrap();
199− let text = doc.slice(..);
200− let syntax = Syntax::new(text, highlight_config, std::sync::Arc::new(loader)).unwrap();
42+ let syntax = Syntax::new(&doc, highlight_config, std::sync::Arc::new(loader));
20143 let indent_query = language_config.indent_query().unwrap();
44+ let text = doc.slice(..);
20245
20346 for i in 0..doc.len_lines() {
20447 let line = text.line(i);
205− if ignored_lines.iter().any(|range| range.contains(&(i + 1))) {
206− continue;
207− }
20848 if let Some(pos) = helix_core::find_first_non_whitespace_char(line) {
209− let tab_width: usize = 4;
49+ let tab_and_indent_width: usize = 4;
21050 let suggested_indent = treesitter_indent_for_pos(
21151 indent_query,
21252 &syntax,
213− tab_width,
214− indent_style.indent_width(tab_width),
53+ &IndentStyle::Spaces(tab_and_indent_width as u8),
54+ tab_and_indent_width,
55+ tab_and_indent_width,
21556 text,
21657 i,
21758 text.line_to_char(i) + pos,
21859 false,
21960 )
220− .unwrap()
221− .to_string(&indent_style, tab_width);
61+ .unwrap();
22262 assert!(
22363 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
224− "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
225− test_name,
64+ "Wrong indentation on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
22665 i+1,
22766 line.slice(..line.len_chars()-1),
22867 suggested_indent,
helix-dap/Cargo.toml+9−11
@@ -1,27 +1,25 @@
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"
37description = "DAP client implementation for Helix project"
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
8+categories = ["editor"]
9+repository = "https://github.com/helix-editor/helix"
10+homepage = "https://helix-editor.com"
1211
1312# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1413
1514[dependencies]
16−helix-core = { path = "../helix-core" }
17−
15+helix-core = { version = "0.6", path = "../helix-core" }
1816anyhow = "1.0"
1917log = "0.4"
2018serde = { version = "1.0", features = ["derive"] }
2119serde_json = "1.0"
2220thiserror = "1.0"
2321tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
24−which = "5.0.0"
22+which = "4.4"
2523
2624[dev-dependencies]
2725fern = "0.6"
helix-dap/src/client.rs+6−10
@@ -62,10 +62,12 @@ impl Client {
6262 if command.is_empty() {
6363 return Result::Err(Error::Other(anyhow!("Command not provided")));
6464 }
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))),
65+ if transport == "tcp" && port_arg.is_some() {
66+ Self::tcp_process(command, args, port_arg.unwrap(), id).await
67+ } else if transport == "stdio" {
68+ Self::stdio(command, args, id)
69+ } else {
70+ Result::Err(Error::Other(anyhow!("Incorrect transport {}", transport)))
6971 }
7072 }
7173
@@ -510,10 +512,4 @@ impl Client {
510512
511513 self.call::<requests::SetExceptionBreakpoints>(args)
512514 }
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− }
519515}
helix-dap/src/transport.rs+18−28
@@ -230,48 +230,38 @@ impl Transport {
230230 }
231231 }
232232
233− async fn recv_inner(
233+ async fn recv(
234234 transport: Arc<Self>,
235235 mut server_stdout: Box<dyn AsyncBufRead + Unpin + Send>,
236236 client_tx: UnboundedSender<Payload>,
237− ) -> Result<()> {
237+ ) {
238238 let mut recv_buffer = String::new();
239239 loop {
240− let msg = Self::recv_server_message(&mut server_stdout, &mut recv_buffer).await?;
241− transport.process_server_message(&client_tx, msg).await?;
242− }
243− }
244−
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);
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+ }
252252 }
253253 }
254254
255− async fn send_inner(
255+ async fn send(
256256 transport: Arc<Self>,
257257 mut server_stdin: Box<dyn AsyncWrite + Unpin + Send>,
258258 mut client_rx: UnboundedReceiver<Payload>,
259− ) -> Result<()> {
259+ ) {
260260 while let Some(payload) = client_rx.recv().await {
261261 transport
262262 .send_payload_to_server(&mut server_stdin, payload)
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);
263+ .await
264+ .unwrap()
275265 }
276266 }
277267
helix-event/Cargo.tomldeleted−16
@@ -1,16 +0,0 @@
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.rsdeleted−8
@@ -1,8 +0,0 @@
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.rsdeleted−49
@@ -1,49 +0,0 @@
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+12−16
@@ -1,14 +1,13 @@
11[package]
22name = "helix-loader"
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
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"
1211
1312[[bin]]
1413name = "hx-loader"
@@ -18,19 +17,16 @@ path = "src/main.rs"
1817anyhow = "1"
1918serde = { version = "1.0", features = ["derive"] }
2019toml = "0.7"
21−etcetera = "0.8"
22−tree-sitter.workspace = true
23−once_cell = "1.19"
20+etcetera = "0.4"
21+tree-sitter = "0.20"
22+once_cell = "1.17"
2423log = "0.4"
25−which = "5.0.0"
2624
2725# TODO: these two should be on !wasm32 only
2826
2927# cloning/compiling tree-sitter grammars
3028cc = { version = "1" }
3129threadpool = { version = "1.0" }
32−tempfile = "3.8.1"
33−dunce = "1.0.4"
3430
3531[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
36−libloading = "0.8"
32+libloading = "0.7"
helix-loader/build.rs+5−56
@@ -1,18 +1,7 @@
11use std::borrow::Cow;
2−use std::path::Path;
32use std::process::Command;
43
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−}
4+const VERSION: &str = include_str!("../VERSION");
165
176fn main() {
187 let git_hash = Command::new("git")
@@ -22,10 +11,9 @@ fn main() {
2211 .filter(|output| output.status.success())
2312 .and_then(|x| String::from_utf8(x.stdout).ok());
2413
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(),
14+ let version: Cow<_> = match git_hash {
15+ Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
16+ None => VERSION.into(),
2917 };
3018
3119 println!(
@@ -33,45 +21,6 @@ fn main() {
3321 std::env::var("TARGET").unwrap()
3422 );
3523
24+ println!("cargo:rerun-if-changed=../VERSION");
3625 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− }
7726}
helix-loader/src/config.rs+31−32
@@ -9,38 +9,37 @@ 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 = [
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− });
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+ });
4443
4544 Ok(config)
4645}
helix-loader/src/grammar.rs+46−121
@@ -1,4 +1,4 @@
1−use anyhow::{anyhow, bail, Context, Result};
1+use anyhow::{anyhow, Context, Result};
22use serde::{Deserialize, Serialize};
33use std::fs;
44use std::time::SystemTime;
@@ -8,7 +8,6 @@ use std::{
88 process::Command,
99 sync::mpsc::channel,
1010};
11−use tempfile::TempPath;
1211use tree_sitter::Language;
1312
1413#[cfg(unix)]
@@ -85,16 +84,7 @@ pub fn get_language(name: &str) -> Result<Language> {
8584 Ok(language)
8685}
8786
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−
9587pub fn fetch_grammars() -> Result<()> {
96− ensure_git_is_available()?;
97−
9888 // We do not need to fetch local grammars.
9989 let mut grammars = get_grammar_configs()?;
10090 grammars.retain(|grammar| !matches!(grammar.source, GrammarSource::Local { .. }));
@@ -107,12 +97,15 @@ pub fn fetch_grammars() -> Result<()> {
10797 let mut git_up_to_date = 0;
10898 let mut non_git = Vec::new();
10999
110− for (grammar_id, res) in results {
100+ for res in results {
111101 match res {
112102 Ok(FetchStatus::GitUpToDate) => git_up_to_date += 1,
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)),
103+ Ok(FetchStatus::GitUpdated {
104+ grammar_id,
105+ revision,
106+ }) => git_updated.push((grammar_id, revision)),
107+ Ok(FetchStatus::NonGit { grammar_id }) => non_git.push(grammar_id),
108+ Err(e) => errors.push(e),
116109 }
117110 }
118111
@@ -144,18 +137,16 @@ pub fn fetch_grammars() -> Result<()> {
144137
145138 if !errors.is_empty() {
146139 let len = errors.len();
147− for (i, (grammar, error)) in errors.into_iter().enumerate() {
148− println!("Failure {}/{len}: {grammar} {error}", i + 1);
140+ println!("{} grammars failed to fetch", len);
141+ for (i, error) in errors.into_iter().enumerate() {
142+ println!("\tFailure {}/{}: {}", i + 1, len, error);
149143 }
150− bail!("{len} grammars failed to fetch");
151144 }
152145
153146 Ok(())
154147}
155148
156149pub fn build_grammars(target: Option<String>) -> Result<()> {
157− ensure_git_is_available()?;
158−
159150 let grammars = get_grammar_configs()?;
160151 println!("Building {} grammars", grammars.len());
161152 let results = run_parallel(grammars, move |grammar| {
@@ -166,11 +157,11 @@ pub fn build_grammars(target: Option<String>) -> Result<()> {
166157 let mut already_built = 0;
167158 let mut built = Vec::new();
168159
169− for (grammar_id, res) in results {
160+ for res in results {
170161 match res {
171162 Ok(BuildStatus::AlreadyBuilt) => already_built += 1,
172− Ok(BuildStatus::Built) => built.push(grammar_id),
173− Err(e) => errors.push((grammar_id, e)),
163+ Ok(BuildStatus::Built { grammar_id }) => built.push(grammar_id),
164+ Err(e) => errors.push(e),
174165 }
175166 }
176167
@@ -187,10 +178,10 @@ pub fn build_grammars(target: Option<String>) -> Result<()> {
187178
188179 if !errors.is_empty() {
189180 let len = errors.len();
190− for (i, (grammar_id, error)) in errors.into_iter().enumerate() {
191− println!("Failure {}/{len}: {grammar_id} {error}", i + 1);
181+ println!("{} grammars failed to build", len);
182+ for (i, error) in errors.into_iter().enumerate() {
183+ println!("\tFailure {}/{}: {}", i, len, error);
192184 }
193− bail!("{len} grammars failed to build");
194185 }
195186
196187 Ok(())
@@ -222,7 +213,7 @@ fn get_grammar_configs() -> Result<Vec<GrammarConfiguration>> {
222213 Ok(grammars)
223214}
224215
225−fn run_parallel<F, Res>(grammars: Vec<GrammarConfiguration>, job: F) -> Vec<(String, Result<Res>)>
216+fn run_parallel<F, Res>(grammars: Vec<GrammarConfiguration>, job: F) -> Vec<Result<Res>>
226217where
227218 F: Fn(GrammarConfiguration) -> Result<Res> + Send + 'static + Clone,
228219 Res: Send + 'static,
@@ -237,7 +228,7 @@ where
237228 pool.execute(move || {
238229 // Ignore any SendErrors, if any job in another thread has encountered an
239230 // error the Receiver will be closed causing this send to fail.
240− let _ = tx.send((grammar.grammar_id.clone(), job(grammar)));
231+ let _ = tx.send(job(grammar));
241232 });
242233 }
243234
@@ -248,8 +239,13 @@ where
248239
249240enum FetchStatus {
250241 GitUpToDate,
251− GitUpdated { revision: String },
252− NonGit,
242+ GitUpdated {
243+ grammar_id: String,
244+ revision: String,
245+ },
246+ NonGit {
247+ grammar_id: String,
248+ },
253249}
254250
255251fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
@@ -290,12 +286,17 @@ fn fetch_grammar(grammar: GrammarConfiguration) -> Result<FetchStatus> {
290286 )?;
291287 git(&grammar_dir, ["checkout", &revision])?;
292288
293− Ok(FetchStatus::GitUpdated { revision })
289+ Ok(FetchStatus::GitUpdated {
290+ grammar_id: grammar.grammar_id,
291+ revision,
292+ })
294293 } else {
295294 Ok(FetchStatus::GitUpToDate)
296295 }
297296 } else {
298− Ok(FetchStatus::NonGit)
297+ Ok(FetchStatus::NonGit {
298+ grammar_id: grammar.grammar_id,
299+ })
299300 }
300301}
301302
@@ -345,7 +346,7 @@ where
345346
346347enum BuildStatus {
347348 AlreadyBuilt,
348− Built,
349+ Built { grammar_id: String },
349350}
350351
351352fn build_grammar(grammar: GrammarConfiguration, target: Option<&str>) -> Result<BuildStatus> {
@@ -412,18 +413,6 @@ fn build_tree_sitter_library(
412413 let mut library_path = parser_lib_path.join(&grammar.grammar_id);
413414 library_path.set_extension(DYLIB_EXTENSION);
414415
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−
427416 let recompile = needs_recompile(&library_path, &parser_path, &scanner_path)
428417 .context("Failed to compare source and binary timestamps")?;
429418
@@ -444,53 +433,16 @@ fn build_tree_sitter_library(
444433 for (key, value) in compiler.env() {
445434 command.env(key, value);
446435 }
447−
448436 command.args(compiler.args());
449− // used to delay dropping the temporary object file until after the compilation is complete
450− let _path_guard;
451437
452− if compiler.is_like_msvc() {
438+ if cfg!(all(windows, target_env = "msvc")) {
453439 command
454440 .args(["/nologo", "/LD", "/I"])
455441 .arg(header_path)
456442 .arg("/Od")
457− .arg("/utf-8")
458− .arg("/std:c11");
443+ .arg("/utf-8");
459444 if let Some(scanner_path) = scanner_path.as_ref() {
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− }
445+ command.arg(scanner_path);
494446 }
495447
496448 command
@@ -502,49 +454,20 @@ fn build_tree_sitter_library(
502454 .arg("-shared")
503455 .arg("-fPIC")
504456 .arg("-fno-exceptions")
457+ .arg("-g")
505458 .arg("-I")
506459 .arg(header_path)
507460 .arg("-o")
508− .arg(&library_path);
509−
461+ .arg(&library_path)
462+ .arg("-O3");
510463 if let Some(scanner_path) = scanner_path.as_ref() {
511464 if scanner_path.extension() == Some("c".as_ref()) {
512− command.arg("-xc").arg("-std=c11").arg(scanner_path);
465+ command.arg("-xc").arg("-std=c99").arg(scanner_path);
513466 } else {
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);
467+ command.arg(scanner_path);
545468 }
546469 }
547− command.arg("-xc").arg("-std=c11").arg(parser_path);
470+ command.arg("-xc").arg(parser_path);
548471 if cfg!(all(
549472 unix,
550473 not(any(target_os = "macos", target_os = "illumos"))
@@ -564,7 +487,9 @@ fn build_tree_sitter_library(
564487 ));
565488 }
566489
567− Ok(BuildStatus::Built)
490+ Ok(BuildStatus::Built {
491+ grammar_id: grammar.grammar_id,
492+ })
568493}
569494
570495fn needs_recompile(
helix-loader/src/lib.rs+42−100
@@ -3,56 +3,29 @@ pub mod grammar;
33
44use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
55use std::path::{Path, PathBuf};
6−use std::sync::RwLock;
76
87pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
98
10−static CWD: RwLock<Option<PathBuf>> = RwLock::new(None);
11−
129static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
1310 once_cell::sync::Lazy::new(prioritize_runtime_dirs);
1411
1512static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
1613
17−static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
18−
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());
14+pub fn initialize_config_file(specified_file: Option<PathBuf>) {
15+ let config_file = specified_file.unwrap_or_else(|| {
16+ let config_dir = config_dir();
3217
33− path
34−}
18+ if !config_dir.exists() {
19+ std::fs::create_dir_all(&config_dir).ok();
20+ }
3521
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−}
22+ config_dir.join("config.toml")
23+ });
4324
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);
25+ // We should only initialize this value once.
4726 CONFIG_FILE.set(config_file).ok();
4827}
4928
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−}
55−
5629/// A list of runtime directories from highest to lowest priority
5730///
5831/// The priority is:
@@ -60,8 +33,7 @@ pub fn initialize_log_file(specified_file: Option<PathBuf>) {
6033/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
6134/// 2. subdirectory of user config directory (always included)
6235/// 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)
36+/// 4. subdirectory of path to helix executable (always included)
6537///
6638/// Postcondition: returns at least two paths (they might not exist).
6739fn prioritize_runtime_dirs() -> Vec<PathBuf> {
@@ -70,7 +42,7 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
7042 let mut rt_dirs = Vec::new();
7143 if let Ok(dir) = std::env::var("CARGO_MANIFEST_DIR") {
7244 // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent
73− let path = PathBuf::from(dir).parent().unwrap().join(RT_DIR);
45+ let path = std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR);
7446 log::debug!("runtime dir: {}", path.to_string_lossy());
7547 rt_dirs.push(path);
7648 }
@@ -82,14 +54,6 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
8254 rt_dirs.push(dir.into());
8355 }
8456
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());
91− }
92−
9357 // fallback to location of the executable being run
9458 // canonicalize the path in case the executable is symlinked
9559 let exe_rt_dir = std::env::current_exe()
@@ -149,6 +113,15 @@ pub fn config_dir() -> PathBuf {
149113 path
150114}
151115
116+pub fn local_config_dirs() -> Vec<PathBuf> {
117+ let directories = find_local_config_dirs()
118+ .into_iter()
119+ .map(|path| path.join(".helix"))
120+ .collect();
121+ log::debug!("Located configuration folders: {:?}", directories);
122+ directories
123+}
124+
152125pub fn cache_dir() -> PathBuf {
153126 // TODO: allow env var override
154127 let strategy = choose_base_strategy().expect("Unable to find the config directory!");
@@ -158,25 +131,36 @@ pub fn cache_dir() -> PathBuf {
158131}
159132
160133pub fn config_file() -> PathBuf {
161− CONFIG_FILE.get().map(|path| path.to_path_buf()).unwrap()
162−}
163−
164−pub fn log_file() -> PathBuf {
165− LOG_FILE.get().map(|path| path.to_path_buf()).unwrap()
166−}
167−
168−pub fn workspace_config_file() -> PathBuf {
169− find_workspace().0.join(".helix").join("config.toml")
134+ CONFIG_FILE
135+ .get()
136+ .map(|path| path.to_path_buf())
137+ .unwrap_or_else(|| config_dir().join("config.toml"))
170138}
171139
172140pub fn lang_config_file() -> PathBuf {
173141 config_dir().join("languages.toml")
174142}
175143
176−pub fn default_log_file() -> PathBuf {
144+pub fn log_file() -> PathBuf {
177145 cache_dir().join("helix.log")
178146}
179147
148+pub fn find_local_config_dirs() -> Vec<PathBuf> {
149+ let current_dir = std::env::current_dir().expect("unable to determine current directory");
150+ let mut directories = Vec::new();
151+
152+ for ancestor in current_dir.ancestors() {
153+ if ancestor.join(".git").exists() {
154+ directories.push(ancestor.to_path_buf());
155+ // Don't go higher than repo if we're in one
156+ break;
157+ } else if ancestor.join(".helix").is_dir() {
158+ directories.push(ancestor.to_path_buf());
159+ }
160+ }
161+ directories
162+}
163+
180164/// Merge two TOML documents, merging values from `right` onto `left`
181165///
182166/// When an array exists in both `left` and `right`, `right`'s array is
@@ -246,55 +230,13 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
246230 }
247231}
248232
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−
279233#[cfg(test)]
280234mod merge_toml_tests {
281235 use std::str;
282236
283− use super::{current_working_dir, merge_toml_values, set_current_working_dir};
237+ use super::merge_toml_values;
284238 use toml::Value;
285239
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−
298240 #[test]
299241 fn language_toml_map_merges() {
300242 const USER: &str = r#"
helix-lsp/Cargo.toml+14−17
@@ -1,32 +1,29 @@
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"
37description = "LSP client implementation for Helix project"
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
8+categories = ["editor"]
9+repository = "https://github.com/helix-editor/helix"
10+homepage = "https://helix-editor.com"
1211
1312# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1413
1514[dependencies]
16−helix-core = { path = "../helix-core" }
17−helix-loader = { path = "../helix-loader" }
18−helix-parsec = { path = "../helix-parsec" }
15+helix-core = { version = "0.6", path = "../helix-core" }
16+helix-loader = { version = "0.6", path = "../helix-loader" }
17+helix-parsec = { version = "0.6", path = "../helix-parsec" }
1918
2019anyhow = "1.0"
2120futures-executor = "0.3"
2221futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
23−globset = "0.4.14"
2422log = "0.4"
25−lsp-types = { version = "0.95" }
23+lsp-types = { version = "0.94" }
2624serde = { version = "1.0", features = ["derive"] }
2725serde_json = "1.0"
2826thiserror = "1.0"
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"
27+tokio = { version = "1.26", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
28+tokio-stream = "0.1.12"
29+which = "4.4"
helix-lsp/src/client.rs+54−439
@@ -1,27 +1,22 @@
11use crate::{
2− find_lsp_workspace, jsonrpc,
2+ jsonrpc,
33 transport::{Payload, Transport},
44 Call, Error, OffsetEncoding, Result,
55};
66
7−use helix_core::{find_workspace, path, syntax::LanguageServerFeature, ChangeSet, Rope};
7+use helix_core::{find_root, ChangeSet, Rope};
88use helix_loader::{self, VERSION_AND_GIT_HASH};
9−use lsp::{
10− notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
11− DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, WorkspaceFolder,
12− WorkspaceFoldersChangeEvent,
13−};
9+use lsp::PositionEncodingKind;
1410use lsp_types as lsp;
15−use parking_lot::Mutex;
1611use serde::Deserialize;
1712use serde_json::Value;
13+use std::collections::HashMap;
1814use std::future::Future;
1915use std::process::Stdio;
2016use std::sync::{
2117 atomic::{AtomicU64, Ordering},
2218 Arc,
2319};
24−use std::{collections::HashMap, path::PathBuf};
2520use tokio::{
2621 io::{BufReader, BufWriter},
2722 process::{Child, Command},
@@ -31,21 +26,9 @@ use tokio::{
3126 },
3227};
3328
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−
4529#[derive(Debug)]
4630pub struct Client {
4731 id: usize,
48− name: String,
4932 _process: Child,
5033 server_tx: UnboundedSender<Payload>,
5134 request_counter: AtomicU64,
@@ -53,131 +36,20 @@ pub struct Client {
5336 config: Option<Value>,
5437 root_path: std::path::PathBuf,
5538 root_uri: Option<lsp::Url>,
56− workspace_folders: Mutex<Vec<lsp::WorkspaceFolder>>,
57− initialize_notify: Arc<Notify>,
58− /// workspace folders added while the server is still initializing
39+ workspace_folders: Vec<lsp::WorkspaceFolder>,
5940 req_timeout: u64,
6041}
6142
6243impl Client {
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)]
44+ #[allow(clippy::type_complexity)]
45+ #[allow(clippy::too_many_arguments)]
17246 pub fn start(
17347 cmd: &str,
17448 args: &[String],
17549 config: Option<Value>,
17650 server_environment: HashMap<String, String>,
17751 root_markers: &[String],
178− manual_roots: &[PathBuf],
17952 id: usize,
180− name: String,
18153 req_timeout: u64,
18254 doc_path: Option<&std::path::PathBuf>,
18355 ) -> Result<(Self, UnboundedReceiver<(usize, Call)>, Arc<Notify>)> {
@@ -202,51 +74,47 @@ impl Client {
20274 let stderr = BufReader::new(process.stderr.take().expect("Failed to open stderr"));
20375
20476 let (server_rx, server_tx, initialize_notify) =
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("."),
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())),
21281 root_markers,
213− manual_roots,
214− &workspace,
215− workspace_is_cwd,
21682 );
21783
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());
84+ let root_uri = lsp::Url::from_file_path(root_path.clone()).ok();
22285
86+ // TODO: support multiple workspace folders
22387 let workspace_folders = root_uri
22488 .clone()
225− .map(|root| vec![workspace_for_uri(root)])
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+ })
22699 .unwrap_or_default();
227100
228101 let client = Self {
229102 id,
230− name,
231103 _process: process,
232104 server_tx,
233105 request_counter: AtomicU64::new(0),
234106 capabilities: OnceCell::new(),
235107 config,
236108 req_timeout,
109+
237110 root_path,
238111 root_uri,
239− workspace_folders: Mutex::new(workspace_folders),
240− initialize_notify: initialize_notify.clone(),
112+ workspace_folders,
241113 };
242114
243115 Ok((client, server_rx, initialize_notify))
244116 }
245117
246− pub fn name(&self) -> &str {
247− &self.name
248− }
249−
250118 pub fn id(&self) -> usize {
251119 self.id
252120 }
@@ -277,87 +145,6 @@ impl Client {
277145 .expect("language server not yet initialized!")
278146 }
279147
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−
361148 pub fn offset_encoding(&self) -> OffsetEncoding {
362149 self.capabilities()
363150 .position_encoding
@@ -367,7 +154,7 @@ impl Client {
367154 "utf-16" => Some(OffsetEncoding::Utf16),
368155 "utf-32" => Some(OffsetEncoding::Utf32),
369156 encoding => {
370− log::error!("Server provided invalid position encoding {encoding}, defaulting to utf-16");
157+ log::error!("Server provided invalid position encording {encoding}, defaulting to utf-16");
371158 None
372159 },
373160 })
@@ -378,10 +165,8 @@ impl Client {
378165 self.config.as_ref()
379166 }
380167
381− pub async fn workspace_folders(
382− &self,
383− ) -> parking_lot::MutexGuard<'_, Vec<lsp::WorkspaceFolder>> {
384− self.workspace_folders.lock()
168+ pub fn workspace_folders(&self) -> &[lsp::WorkspaceFolder] {
169+ &self.workspace_folders
385170 }
386171
387172 /// Execute a RPC request on the language server.
@@ -401,22 +186,12 @@ impl Client {
401186 &self,
402187 params: R::Params,
403188 ) -> 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>>
415189 where
416190 R::Params: serde::Serialize,
417191 {
418192 let server_tx = self.server_tx.clone();
419193 let id = self.next_request_id();
194+ let timeout_secs = self.req_timeout;
420195
421196 async move {
422197 use std::time::Duration;
@@ -511,7 +286,7 @@ impl Client {
511286 // General messages
512287 // -------------------------------------------------------------------------------------------
513288
514− pub(crate) async fn initialize(&self, enable_snippets: bool) -> Result<lsp::InitializeResult> {
289+ pub(crate) async fn initialize(&self) -> Result<lsp::InitializeResult> {
515290 if let Some(config) = &self.config {
516291 log::info!("Using custom LSP config: {}", config);
517292 }
@@ -519,7 +294,7 @@ impl Client {
519294 #[allow(deprecated)]
520295 let params = lsp::InitializeParams {
521296 process_id: Some(std::process::id()),
522− workspace_folders: Some(self.workspace_folders.lock().clone()),
297+ workspace_folders: Some(self.workspace_folders.clone()),
523298 // root_path is obsolete, but some clients like pyright still use it so we specify both.
524299 // clients will prefer _uri if possible
525300 root_path: self.root_path.to_str().map(|path| path.to_owned()),
@@ -540,35 +315,12 @@ impl Client {
540315 execute_command: Some(lsp::DynamicRegistrationClientCapabilities {
541316 dynamic_registration: Some(false),
542317 }),
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− }),
566318 ..Default::default()
567319 }),
568320 text_document: Some(lsp::TextDocumentClientCapabilities {
569321 completion: Some(lsp::CompletionClientCapabilities {
570322 completion_item: Some(lsp::CompletionItemCapability {
571− snippet_support: Some(enable_snippets),
323+ snippet_support: Some(true),
572324 resolve_support: Some(lsp::CompletionItemCapabilityResolveSupport {
573325 properties: vec![
574326 String::from("documentation"),
@@ -629,22 +381,11 @@ impl Client {
629381 .collect(),
630382 },
631383 }),
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− }),
638384 ..Default::default()
639385 }),
640386 publish_diagnostics: Some(lsp::PublishDiagnosticsClientCapabilities {
641− version_support: Some(true),
642387 ..Default::default()
643388 }),
644− inlay_hint: Some(lsp::InlayHintClientCapabilities {
645− dynamic_registration: Some(false),
646− resolve_support: None,
647− }),
648389 ..Default::default()
649390 }),
650391 window: Some(lsp::WindowClientCapabilities {
@@ -653,8 +394,8 @@ impl Client {
653394 }),
654395 general: Some(lsp::GeneralClientCapabilities {
655396 position_encodings: Some(vec![
656− PositionEncodingKind::UTF8,
657397 PositionEncodingKind::UTF32,
398+ PositionEncodingKind::UTF8,
658399 PositionEncodingKind::UTF16,
659400 ]),
660401 ..Default::default()
@@ -667,7 +408,6 @@ impl Client {
667408 version: Some(String::from(VERSION_AND_GIT_HASH)),
668409 }),
669410 locale: None, // TODO
670− work_done_progress_params: lsp::WorkDoneProgressParams::default(),
671411 };
672412
673413 self.request::<lsp::request::Initialize>(params).await
@@ -706,75 +446,6 @@ impl Client {
706446 )
707447 }
708448
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−
778449 // -------------------------------------------------------------------------------------------
779450 // Text document
780451 // -------------------------------------------------------------------------------------------
@@ -818,11 +489,7 @@ impl Client {
818489 // Calculation is therefore a bunch trickier.
819490
820491 use helix_core::RopeSlice;
821− fn traverse(
822− pos: lsp::Position,
823− text: RopeSlice,
824− offset_encoding: OffsetEncoding,
825− ) -> lsp::Position {
492+ fn traverse(pos: lsp::Position, text: RopeSlice) -> lsp::Position {
826493 let lsp::Position {
827494 mut line,
828495 mut character,
@@ -839,11 +506,7 @@ impl Client {
839506 line += 1;
840507 character = 0;
841508 } else {
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− };
509+ character += ch.len_utf16() as u32;
847510 }
848511 }
849512 lsp::Position { line, character }
@@ -864,7 +527,7 @@ impl Client {
864527 }
865528 Delete(_) => {
866529 let start = pos_to_lsp_pos(new_text, new_pos, offset_encoding);
867− let end = traverse(start, old_text.slice(old_pos..old_end), offset_encoding);
530+ let end = traverse(start, old_text.slice(old_pos..old_end));
868531
869532 // deletion
870533 changes.push(lsp::TextDocumentContentChangeEvent {
@@ -881,8 +544,7 @@ impl Client {
881544 // a subsequent delete means a replace, consume it
882545 let end = if let Some(Delete(len)) = iter.peek() {
883546 old_end = old_pos + len;
884− let end =
885− traverse(start, old_text.slice(old_pos..old_end), offset_encoding);
547+ let end = traverse(start, old_text.slice(old_pos..old_end));
886548
887549 iter.next();
888550
@@ -970,19 +632,20 @@ impl Client {
970632 ) -> Option<impl Future<Output = Result<()>>> {
971633 let capabilities = self.capabilities.get().unwrap();
972634
973− let include_text = match &capabilities.text_document_sync.as_ref()? {
974− lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
975− save: options,
635+ let include_text = match &capabilities.text_document_sync {
636+ Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
637+ save: Some(options),
976638 ..
977− }) => match options.as_ref()? {
639+ })) => match options {
978640 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
979641 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
980642 include_text,
981643 }) => include_text.unwrap_or(false),
982− lsp::TextDocumentSyncSaveOptions::Supported(false) => return None,
644+ // Supported(false)
645+ _ => return None,
983646 },
984− // see: https://github.com/microsoft/language-server-protocol/issues/288
985− lsp::TextDocumentSyncCapability::Kind(..) => false,
647+ // unsupported
648+ _ => return None,
986649 };
987650
988651 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
@@ -1039,24 +702,6 @@ impl Client {
1039702 Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
1040703 }
1041704
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−
1060705 pub fn text_document_signature_help(
1061706 &self,
1062707 text_document: lsp::TextDocumentIdentifier,
@@ -1081,31 +726,6 @@ impl Client {
1081726 Some(self.call::<lsp::request::SignatureHelpRequest>(params))
1082727 }
1083728
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−
1109729 pub fn text_document_hover(
1110730 &self,
1111731 text_document: lsp::TextDocumentIdentifier,
@@ -1366,7 +986,6 @@ impl Client {
1366986 &self,
1367987 text_document: lsp::TextDocumentIdentifier,
1368988 position: lsp::Position,
1369− include_declaration: bool,
1370989 work_done_token: Option<lsp::ProgressToken>,
1371990 ) -> Option<impl Future<Output = Result<Value>>> {
1372991 let capabilities = self.capabilities.get().unwrap();
@@ -1383,7 +1002,7 @@ impl Client {
13831002 position,
13841003 },
13851004 context: lsp::ReferenceContext {
1386− include_declaration,
1005+ include_declaration: true,
13871006 },
13881007 work_done_progress_params: lsp::WorkDoneProgressParams { work_done_token },
13891008 partial_result_params: lsp::PartialResultParams {
@@ -1491,9 +1110,14 @@ impl Client {
14911110 position: lsp::Position,
14921111 new_name: String,
14931112 ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
1494− if !self.supports_feature(LanguageServerFeature::RenameSymbol) {
1495− return None;
1496− }
1113+ let capabilities = self.capabilities.get().unwrap();
1114+
1115+ // Return early if the language server does not support renaming.
1116+ match capabilities.rename_provider {
1117+ Some(lsp::OneOf::Left(true)) | Some(lsp::OneOf::Right(_)) => (),
1118+ // None | Some(false)
1119+ _ => return None,
1120+ };
14971121
14981122 let params = lsp::RenameParams {
14991123 text_document_position: lsp::TextDocumentPositionParams {
@@ -1531,13 +1155,4 @@ impl Client {
15311155
15321156 Some(self.call::<lsp::request::ExecuteCommand>(params))
15331157 }
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− }
15431158}
helix-lsp/src/file_event.rsdeleted−193
@@ -1,193 +0,0 @@
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+153−429
@@ -1,5 +1,4 @@
11mod client;
2−pub mod file_event;
32pub mod jsonrpc;
43pub mod snippet;
54mod transport;
@@ -11,23 +10,22 @@ pub use lsp::{Position, Url};
1110pub use lsp_types as lsp;
1211
1312use futures_util::stream::select_all::SelectAll;
14−use helix_core::{
15− path,
16− syntax::{LanguageConfiguration, LanguageServerConfiguration, LanguageServerFeatures},
17−};
13+use helix_core::syntax::{LanguageConfiguration, LanguageServerConfiguration};
1814use tokio::sync::mpsc::UnboundedReceiver;
1915
2016use std::{
21− collections::HashMap,
22− path::{Path, PathBuf},
23− sync::Arc,
17+ collections::{hash_map::Entry, HashMap},
18+ sync::{
19+ atomic::{AtomicUsize, Ordering},
20+ Arc,
21+ },
2422};
2523
2624use thiserror::Error;
2725use tokio_stream::wrappers::UnboundedReceiverStream;
2826
2927pub type Result<T> = core::result::Result<T, Error>;
30−pub type LanguageServerName = String;
28+type LanguageId = String;
3129
3230#[derive(Error, Debug)]
3331pub enum Error {
@@ -47,7 +45,7 @@ pub enum Error {
4745 Other(#[from] anyhow::Error),
4846}
4947
50−#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
48+#[derive(Clone, Copy, Debug, Default)]
5149pub enum OffsetEncoding {
5250 /// UTF-8 code units aka bytes
5351 Utf8,
@@ -61,8 +59,8 @@ pub enum OffsetEncoding {
6159pub mod util {
6260 use super::*;
6361 use helix_core::line_ending::{line_end_byte_index, line_end_char_index};
64− use helix_core::{chars, RopeSlice, SmallVec};
6562 use helix_core::{diagnostic::NumberOrString, Range, Rope, Selection, Tendril, Transaction};
63+ use helix_core::{smallvec, SmallVec};
6664
6765 /// Converts a diagnostic in the document to [`lsp::Diagnostic`].
6866 ///
@@ -130,11 +128,7 @@ pub mod util {
130128 ) -> Option<usize> {
131129 let pos_line = pos.line as usize;
132130 if pos_line > doc.len_lines() - 1 {
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());
131+ return None;
138132 }
139133
140134 // We need to be careful here to fully comply ith the LSP spec.
@@ -150,10 +144,10 @@ pub mod util {
150144 // > ‘\n’, ‘\r\n’ and ‘\r’. Positions are line end character agnostic.
151145 // > So you can not specify a position that denotes \r|\n or \n| where | represents the character offset.
152146 //
153− // This means that while the line must be in bounds the `character`
147+ // This means that while the line must be in bounds the `charater`
154148 // must be capped to the end of the line.
155149 // Note that the end of the line here is **before** the line terminator
156− // so we must use `line_end_char_index` instead of `doc.line_to_char(pos_line + 1)`
150+ // so we must use `line_end_char_index` istead of `doc.line_to_char(pos_line + 1)`
157151 //
158152 // FIXME: Helix does not fully comply with the LSP spec for line terminators.
159153 // The LSP standard requires that line terminators are ['\n', '\r\n', '\r'].
@@ -244,76 +238,22 @@ pub mod util {
244238
245239 pub fn lsp_range_to_range(
246240 doc: &Rope,
247− mut range: lsp::Range,
241+ range: lsp::Range,
248242 offset_encoding: OffsetEncoding,
249243 ) -> 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− }
261244 let start = lsp_pos_to_pos(doc, range.start, offset_encoding)?;
262245 let end = lsp_pos_to_pos(doc, range.end, offset_encoding)?;
263246
264247 Some(Range::new(start, end))
265248 }
266249
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−
310250 /// Creates a [Transaction] from the [lsp::TextEdit] in a completion response.
311251 /// The transaction applies the edit to all cursors.
312252 pub fn generate_transaction_from_completion_edit(
313253 doc: &Rope,
314254 selection: &Selection,
315− edit_offset: Option<(i128, i128)>,
316− replace_mode: bool,
255+ start_offset: i128,
256+ end_offset: i128,
317257 new_text: String,
318258 ) -> Transaction {
319259 let replacement: Option<Tendril> = if new_text.is_empty() {
@@ -323,172 +263,83 @@ pub mod util {
323263 };
324264
325265 let text = doc.slice(..);
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);
334266
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)
267+ Transaction::change_by_selection(doc, selection, |range| {
268+ let cursor = range.cursor(text);
269+ (
270+ (cursor as i128 + start_offset) as usize,
271+ (cursor as i128 + end_offset) as usize,
272+ replacement.clone(),
273+ )
274+ })
351275 }
352276
353277 /// Creates a [Transaction] from the [snippet::Snippet] in a completion response.
354278 /// The transaction applies the edit to all cursors.
355− #[allow(clippy::too_many_arguments)]
356279 pub fn generate_transaction_from_snippet(
357280 doc: &Rope,
358281 selection: &Selection,
359− edit_offset: Option<(i128, i128)>,
360− replace_mode: bool,
282+ start_offset: i128,
283+ end_offset: i128,
361284 snippet: snippet::Snippet,
362285 line_ending: &str,
363286 include_placeholder: bool,
364− tab_width: usize,
365− indent_width: usize,
366287 ) -> Transaction {
367288 let text = doc.slice(..);
368289
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− }
423−
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− }
290+ // For each cursor store offsets for the first tabstop
291+ let mut cursor_tabstop_offsets = Vec::<SmallVec<[(i128, i128); 1]>>::new();
292+ let transaction = Transaction::change_by_selection(doc, selection, |range| {
293+ let cursor = range.cursor(text);
294+ let replacement_start = (cursor as i128 + start_offset) as usize;
295+ let replacement_end = (cursor as i128 + end_offset) as usize;
296+ let newline_with_offset = format!(
297+ "{line_ending}{blank:width$}",
298+ line_ending = line_ending,
299+ width = replacement_start - doc.line_to_char(doc.char_to_line(replacement_start)),
300+ blank = ""
301+ );
436302
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− };
303+ let (replacement, tabstops) =
304+ snippet::render(&snippet, newline_with_offset, include_placeholder);
305+
306+ let replacement_len = replacement.chars().count();
307+ cursor_tabstop_offsets.push(
308+ tabstops
309+ .first()
310+ .unwrap_or(&smallvec![(replacement_len, replacement_len)])
311+ .iter()
312+ .map(|(from, to)| -> (i128, i128) {
313+ (
314+ *from as i128 - replacement_len as i128,
315+ *to as i128 - replacement_len as i128,
316+ )
317+ })
318+ .collect(),
319+ );
443320
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− };
321+ (replacement_start, replacement_end, Some(replacement.into()))
322+ });
484323
485− let tabstops = tabstops
486− .iter()
487− .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
488− mapped_selection.extend(tabstops);
489− }
324+ // Create new selection based on the cursor tabstop from above
325+ let mut cursor_tabstop_offsets_iter = cursor_tabstop_offsets.iter();
326+ let selection = selection
327+ .clone()
328+ .map(transaction.changes())
329+ .transform_iter(|range| {
330+ cursor_tabstop_offsets_iter
331+ .next()
332+ .unwrap()
333+ .iter()
334+ .map(move |(from, to)| {
335+ Range::new(
336+ (range.anchor as i128 + *from) as usize,
337+ (range.anchor as i128 + *to) as usize,
338+ )
339+ })
340+ });
490341
491− transaction.with_selection(Selection::new(mapped_selection, mapped_primary_idx))
342+ transaction.with_selection(selection)
492343 }
493344
494345 pub fn generate_transaction_from_edits(
@@ -547,8 +398,6 @@ pub enum MethodCall {
547398 ApplyWorkspaceEdit(lsp::ApplyWorkspaceEditParams),
548399 WorkspaceFolders,
549400 WorkspaceConfiguration(lsp::ConfigurationParams),
550− RegisterCapability(lsp::RegistrationParams),
551− UnregisterCapability(lsp::UnregistrationParams),
552401}
553402
554403impl MethodCall {
@@ -568,14 +417,6 @@ impl MethodCall {
568417 let params: lsp::ConfigurationParams = params.parse()?;
569418 Self::WorkspaceConfiguration(params)
570419 }
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− }
579420 _ => {
580421 return Err(Error::Unhandled);
581422 }
@@ -631,162 +472,109 @@ impl Notification {
631472
632473#[derive(Debug)]
633474pub struct Registry {
634− inner: HashMap<LanguageServerName, Vec<Arc<Client>>>,
635− syn_loader: Arc<helix_core::syntax::Loader>,
636− counter: usize,
475+ inner: HashMap<LanguageId, (usize, Arc<Client>)>,
476+
477+ counter: AtomicUsize,
637478 pub incoming: SelectAll<UnboundedReceiverStream<(usize, Call)>>,
638− pub file_event_handler: file_event::Handler,
479+}
480+
481+impl Default for Registry {
482+ fn default() -> Self {
483+ Self::new()
484+ }
639485}
640486
641487impl Registry {
642− pub fn new(syn_loader: Arc<helix_core::syntax::Loader>) -> Self {
488+ pub fn new() -> Self {
643489 Self {
644490 inner: HashMap::new(),
645− syn_loader,
646− counter: 0,
491+ counter: AtomicUsize::new(0),
647492 incoming: SelectAll::new(),
648− file_event_handler: file_event::Handler::new(),
649493 }
650494 }
651495
652496 pub fn get_by_id(&self, id: usize) -> Option<&Client> {
653497 self.inner
654498 .values()
655− .flatten()
656− .find(|client| client.id() == id)
657− .map(|client| &**client)
499+ .find(|(client_id, _)| client_id == &id)
500+ .map(|(_, client)| client.as_ref())
658501 }
659502
660503 pub fn remove_by_id(&mut self, id: usize) {
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)
504+ self.inner.retain(|_, (client_id, _)| client_id != &id)
694505 }
695506
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
699507 pub fn restart(
700508 &mut self,
701509 language_config: &LanguageConfiguration,
702510 doc_path: Option<&std::path::PathBuf>,
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− }
511+ ) -> Result<Option<Arc<Client>>> {
512+ let config = match &language_config.language_server {
513+ Some(config) => config,
514+ None => return Ok(None),
515+ };
516+
517+ let scope = language_config.scope.clone();
518+
519+ match self.inner.entry(scope) {
520+ Entry::Vacant(_) => Ok(None),
521+ Entry::Occupied(mut entry) => {
522+ // initialize a new client
523+ let id = self.counter.fetch_add(1, Ordering::Relaxed);
524+
525+ let NewClientResult(client, incoming) =
526+ start_client(id, language_config, config, doc_path)?;
527+ self.incoming.push(UnboundedReceiverStream::new(incoming));
528+
529+ let (_, old_client) = entry.insert((id, client.clone()));
740530
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());
745531 tokio::spawn(async move {
746− let _ = client.force_shutdown().await;
532+ let _ = old_client.force_shutdown().await;
747533 });
534+
535+ Ok(Some(client))
748536 }
749537 }
750538 }
751539
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− )
540+ pub fn stop(&mut self, language_config: &LanguageConfiguration) {
541+ let scope = language_config.scope.clone();
542+
543+ if let Some((_, client)) = self.inner.remove(&scope) {
544+ tokio::spawn(async move {
545+ let _ = client.force_shutdown().await;
546+ });
547+ }
548+ }
549+
550+ pub fn get(
551+ &mut self,
552+ language_config: &LanguageConfiguration,
553+ doc_path: Option<&std::path::PathBuf>,
554+ ) -> Result<Option<Arc<Client>>> {
555+ let config = match &language_config.language_server {
556+ Some(config) => config,
557+ None => return Ok(None),
558+ };
559+
560+ match self.inner.entry(language_config.scope.clone()) {
561+ Entry::Occupied(entry) => Ok(Some(entry.get().1.clone())),
562+ Entry::Vacant(entry) => {
563+ // initialize a new client
564+ let id = self.counter.fetch_add(1, Ordering::Relaxed);
565+
566+ let NewClientResult(client, incoming) =
567+ start_client(id, language_config, config, doc_path)?;
568+ self.incoming.push(UnboundedReceiverStream::new(incoming));
569+
570+ entry.insert((id, client.clone()));
571+ Ok(Some(client))
572+ }
573+ }
786574 }
787575
788576 pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
789− self.inner.values().flatten()
577+ self.inner.values().map(|(_, client)| client)
790578 }
791579}
792580
@@ -868,28 +656,23 @@ impl LspProgressMap {
868656 }
869657}
870658
871−struct NewClient(Arc<Client>, UnboundedReceiver<(usize, Call)>);
659+struct NewClientResult(Arc<Client>, UnboundedReceiver<(usize, Call)>);
872660
873661/// start_client takes both a LanguageConfiguration and a LanguageServerConfiguration to ensure that
874662/// it is only called when it makes sense.
875663fn start_client(
876664 id: usize,
877− name: String,
878665 config: &LanguageConfiguration,
879666 ls_config: &LanguageServerConfiguration,
880667 doc_path: Option<&std::path::PathBuf>,
881− root_dirs: &[PathBuf],
882− enable_snippets: bool,
883−) -> Result<NewClient> {
668+) -> Result<NewClientResult> {
884669 let (client, incoming, initialize_notify) = Client::start(
885670 &ls_config.command,
886671 &ls_config.args,
887− ls_config.config.clone(),
672+ config.config.clone(),
888673 ls_config.environment.clone(),
889674 &config.roots,
890− config.workspace_lsp_roots.as_deref().unwrap_or(root_dirs),
891675 id,
892− name,
893676 ls_config.timeout,
894677 doc_path,
895678 )?;
@@ -904,7 +687,7 @@ fn start_client(
904687 .capabilities
905688 .get_or_try_init(|| {
906689 _client
907− .initialize(enable_snippets)
690+ .initialize()
908691 .map_ok(|response| response.capabilities)
909692 })
910693 .await;
@@ -923,66 +706,7 @@ fn start_client(
923706 initialize_notify.notify_one();
924707 });
925708
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
709+ Ok(NewClientResult(client, incoming))
986710}
987711
988712#[cfg(test)]
@@ -1003,16 +727,16 @@ mod tests {
1003727
1004728 test_case!("", (0, 0) => Some(0));
1005729 test_case!("", (0, 1) => Some(0));
1006− test_case!("", (1, 0) => Some(0));
730+ test_case!("", (1, 0) => None);
1007731 test_case!("\n\n", (0, 0) => Some(0));
1008732 test_case!("\n\n", (1, 0) => Some(1));
1009733 test_case!("\n\n", (1, 1) => Some(1));
1010734 test_case!("\n\n", (2, 0) => Some(2));
1011− test_case!("\n\n", (3, 0) => Some(2));
735+ test_case!("\n\n", (3, 0) => None);
1012736 test_case!("test\n\n\n\ncase", (4, 3) => Some(11));
1013737 test_case!("test\n\n\n\ncase", (4, 4) => Some(12));
1014738 test_case!("test\n\n\n\ncase", (4, 5) => Some(12));
1015− test_case!("", (u32::MAX, u32::MAX) => Some(0));
739+ test_case!("", (u32::MAX, u32::MAX) => None);
1016740 }
1017741
1018742 #[test]
helix-lsp/src/snippet.rs+89−574
@@ -11,18 +11,18 @@ pub enum CaseChange {
1111}
1212
1313#[derive(Debug, PartialEq, Eq)]
14−pub enum FormatItem {
15− Text(Tendril),
14+pub enum FormatItem<'a> {
15+ Text(&'a str),
1616 Capture(usize),
1717 CaseChange(usize, CaseChange),
18− Conditional(usize, Option<Tendril>, Option<Tendril>),
18+ Conditional(usize, Option<&'a str>, Option<&'a str>),
1919}
2020
2121#[derive(Debug, PartialEq, Eq)]
22−pub struct Regex {
23− value: Tendril,
24− replacement: Vec<FormatItem>,
25− options: Tendril,
22+pub struct Regex<'a> {
23+ value: &'a str,
24+ replacement: Vec<FormatItem<'a>>,
25+ options: Option<&'a str>,
2626}
2727
2828#[derive(Debug, PartialEq, Eq)]
@@ -36,14 +36,14 @@ pub enum SnippetElement<'a> {
3636 },
3737 Choice {
3838 tabstop: usize,
39− choices: Vec<Tendril>,
39+ choices: Vec<&'a str>,
4040 },
4141 Variable {
4242 name: &'a str,
43− default: Option<Vec<SnippetElement<'a>>>,
44− regex: Option<Regex>,
43+ default: Option<&'a str>,
44+ regex: Option<Regex<'a>>,
4545 },
46− Text(Tendril),
46+ Text(&'a str),
4747}
4848
4949#[derive(Debug, PartialEq, Eq)]
@@ -61,36 +61,31 @@ fn render_elements(
6161 offset: &mut usize,
6262 tabstops: &mut Vec<(usize, (usize, usize))>,
6363 newline_with_offset: &str,
64− include_placeholder: bool,
64+ include_placeholer: bool,
6565) {
6666 use SnippetElement::*;
6767
6868 for element in snippet_elements {
6969 match element {
70− Text(text) => {
70+ &Text(text) => {
7171 // small optimization to avoid calling replace when it's unnecessary
7272 let text = if text.contains('\n') {
7373 Cow::Owned(text.replace('\n', newline_with_offset))
7474 } else {
75− Cow::Borrowed(text.as_str())
75+ Cow::Borrowed(text)
7676 };
7777 *offset += text.chars().count();
7878 insert.push_str(&text);
7979 }
80− Variable {
80+ &Variable {
8181 name: _,
8282 regex: _,
8383 r#default,
8484 } => {
8585 // 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− );
86+ let text = r#default.unwrap_or_default();
87+ *offset += text.chars().count();
88+ insert.push_str(text);
9489 }
9590 &Tabstop { tabstop } => {
9691 tabstops.push((tabstop, (*offset, *offset)));
@@ -100,14 +95,14 @@ fn render_elements(
10095 value: inner_snippet_elements,
10196 } => {
10297 let start_offset = *offset;
103− if include_placeholder {
98+ if include_placeholer {
10499 render_elements(
105100 inner_snippet_elements,
106101 insert,
107102 offset,
108103 tabstops,
109104 newline_with_offset,
110− include_placeholder,
105+ include_placeholer,
111106 );
112107 }
113108 tabstops.push((*tabstop, (start_offset, *offset)));
@@ -127,7 +122,7 @@ fn render_elements(
127122pub fn render(
128123 snippet: &Snippet<'_>,
129124 newline_with_offset: &str,
130− include_placeholder: bool,
125+ include_placeholer: bool,
131126) -> (Tendril, Vec<SmallVec<[(usize, usize); 1]>>) {
132127 let mut insert = Tendril::new();
133128 let mut tabstops = Vec::new();
@@ -139,7 +134,7 @@ pub fn render(
139134 &mut offset,
140135 &mut tabstops,
141136 newline_with_offset,
142− include_placeholder,
137+ include_placeholer,
143138 );
144139
145140 // sort in ascending order (except for 0, which should always be the last one (per lsp doc))
@@ -165,7 +160,6 @@ pub fn render(
165160}
166161
167162mod parser {
168− use helix_core::Tendril;
169163 use helix_parsec::*;
170164
171165 use super::{CaseChange, FormatItem, Regex, Snippet, SnippetElement};
@@ -196,57 +190,30 @@ mod parser {
196190
197191 fn var<'a>() -> impl Parser<'a, Output = &'a str> {
198192 // 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('\\');
193+ move |input: &'a str| match input
194+ .char_indices()
195+ .take_while(|(p, c)| {
196+ *c == '_'
197+ || if *p == 0 {
198+ c.is_ascii_alphabetic()
199+ } else {
200+ c.is_ascii_alphanumeric()
240201 }
241− c if term_chars.contains(&c) => return Ok((&input[i..], res)),
242− c => res.push(c),
243− }
202+ })
203+ .last()
204+ {
205+ Some((index, c)) if index >= 1 => {
206+ let index = index + c.len_utf8();
207+ Ok((&input[index..], &input[0..index]))
244208 }
245−
246− Ok(("", res))
209+ _ => Err(input),
247210 }
248211 }
249212
213+ fn text<'a, const SIZE: usize>(cs: [char; SIZE]) -> impl Parser<'a, Output = &'a str> {
214+ take_while(move |c| cs.into_iter().all(|c1| c != c1))
215+ }
216+
250217 fn digit<'a>() -> impl Parser<'a, Output = usize> {
251218 filter_map(take_while(|c| c.is_ascii_digit()), |s| s.parse().ok())
252219 }
@@ -261,7 +228,7 @@ mod parser {
261228 )
262229 }
263230
264− fn format<'a>() -> impl Parser<'a, Output = FormatItem> {
231+ fn format<'a>() -> impl Parser<'a, Output = FormatItem<'a>> {
265232 use FormatItem::*;
266233
267234 choice!(
@@ -275,7 +242,7 @@ mod parser {
275242 }),
276243 // '${' int ':+' if '}'
277244 map(
278− seq!("${", digit(), ":+", text(TEXT_ESCAPE_CHARS, &['}']), "}"),
245+ seq!("${", digit(), ":+", take_until(|c| c == '}'), "}"),
279246 |seq| { Conditional(seq.1, Some(seq.3), None) }
280247 ),
281248 // '${' int ':?' if ':' else '}'
@@ -284,9 +251,9 @@ mod parser {
284251 "${",
285252 digit(),
286253 ":?",
287− text(TEXT_ESCAPE_CHARS, &[':']),
254+ take_until(|c| c == ':'),
288255 ":",
289− text(TEXT_ESCAPE_CHARS, &['}']),
256+ take_until(|c| c == '}'),
290257 "}"
291258 ),
292259 |seq| { Conditional(seq.1, Some(seq.3), Some(seq.5)) }
@@ -298,7 +265,7 @@ mod parser {
298265 digit(),
299266 ":",
300267 optional("-"),
301− text(TEXT_ESCAPE_CHARS, &['}']),
268+ take_until(|c| c == '}'),
302269 "}"
303270 ),
304271 |seq| { Conditional(seq.1, None, Some(seq.4)) }
@@ -306,24 +273,21 @@ mod parser {
306273 )
307274 }
308275
309− fn regex<'a>() -> impl Parser<'a, Output = Regex> {
276+ fn regex<'a>() -> impl Parser<'a, Output = Regex<'a>> {
277+ let text = map(text(['$', '/']), FormatItem::Text);
278+ let replacement = reparse_as(
279+ take_until(|c| c == '/'),
280+ one_or_more(choice!(format(), text)),
281+ );
282+
310283 map(
311284 seq!(
312285 "/",
313− // TODO parse as ECMAScript and convert to rust regex
314− text(&['/'], &['/']),
286+ take_until(|c| c == '/'),
315287 "/",
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− )),
288+ replacement,
322289 "/",
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(&[], &['}']),
290+ optional(take_until(|c| c == '}')),
327291 ),
328292 |(_, value, _, replacement, _, options)| Regex {
329293 value,
@@ -344,17 +308,13 @@ mod parser {
344308 }
345309
346310 fn placeholder<'a>() -> impl Parser<'a, Output = SnippetElement<'a>> {
311+ let text = map(text(['$', '}']), SnippetElement::Text);
347312 map(
348313 seq!(
349314 "${",
350315 digit(),
351316 ":",
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)),
317+ one_or_more(choice!(anything(), text)),
358318 "}"
359319 ),
360320 |seq| SnippetElement::Placeholder {
@@ -370,7 +330,7 @@ mod parser {
370330 "${",
371331 digit(),
372332 "|",
373− sep(text(CHOICE_TEXT_ESCAPE_CHARS, &['|', ',']), ","),
333+ sep(take_until(|c| c == ',' || c == '|'), ","),
374334 "|}",
375335 ),
376336 |seq| SnippetElement::Choice {
@@ -388,21 +348,9 @@ mod parser {
388348 default: None,
389349 regex: None,
390350 }),
391− // ${var}
392− map(seq!("${", var(), "}",), |values| SnippetElement::Variable {
393− name: values.1,
394− default: None,
395− regex: None,
396− }),
397351 // ${var:default}
398352 map(
399− seq!(
400− "${",
401− var(),
402− ":",
403− zero_or_more(anything(TEXT_ESCAPE_CHARS, true)),
404− "}",
405− ),
353+ seq!("${", var(), ":", take_until(|c| c == '}'), "}",),
406354 |values| SnippetElement::Variable {
407355 name: values.1,
408356 default: Some(values.3),
@@ -420,38 +368,23 @@ mod parser {
420368 )
421369 }
422370
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− );
371+ fn anything<'a>() -> impl Parser<'a, Output = SnippetElement<'a>> {
372+ // The parser has to be constructed lazily to avoid infinite opaque type recursion
373+ |input: &'a str| {
374+ let parser = choice!(tabstop(), placeholder(), choice(), variable());
437375 parser.parse(input)
438376 }
439377 }
440378
441379 fn snippet<'a>() -> impl Parser<'a, Output = Snippet<'a>> {
442− map(one_or_more(anything(TEXT_ESCAPE_CHARS, false)), |parts| {
443− Snippet { elements: parts }
380+ let text = map(text(['$']), SnippetElement::Text);
381+ map(one_or_more(choice!(anything(), text)), |parts| Snippet {
382+ elements: parts,
444383 })
445384 }
446385
447386 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− })
387+ snippet().parse(s).map(|(_input, elements)| elements)
455388 }
456389
457390 #[cfg(test)]
@@ -469,59 +402,32 @@ mod parser {
469402 assert_eq!(
470403 Ok(Snippet {
471404 elements: vec![
472− Text("match(".into()),
405+ Text("match("),
473406 Placeholder {
474407 tabstop: 1,
475− value: vec!(Text("Arg1".into())),
408+ value: vec!(Text("Arg1")),
476409 },
477− Text(")".into())
410+ Text(")")
478411 ]
479412 }),
480413 parse("match(${1:Arg1})")
481414 )
482415 }
483416
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−
511417 #[test]
512418 fn parse_placeholders_in_statement() {
513419 assert_eq!(
514420 Ok(Snippet {
515421 elements: vec![
516− Text("local ".into()),
422+ Text("local "),
517423 Placeholder {
518424 tabstop: 1,
519− value: vec!(Text("var".into())),
425+ value: vec!(Text("var")),
520426 },
521− Text(" = ".into()),
427+ Text(" = "),
522428 Placeholder {
523429 tabstop: 1,
524− value: vec!(Text("value".into())),
430+ value: vec!(Text("value")),
525431 },
526432 ]
527433 }),
@@ -535,7 +441,7 @@ mod parser {
535441 Ok(Snippet {
536442 elements: vec![Placeholder {
537443 tabstop: 1,
538− value: vec!(Text("var, ".into()), Tabstop { tabstop: 2 },),
444+ value: vec!(Text("var, "), Tabstop { tabstop: 2 },),
539445 },]
540446 }),
541447 parse("${1:var, $2}")
@@ -549,10 +455,10 @@ mod parser {
549455 elements: vec![Placeholder {
550456 tabstop: 1,
551457 value: vec!(
552− Text("foo ".into()),
458+ Text("foo "),
553459 Placeholder {
554460 tabstop: 2,
555− value: vec!(Text("bar".into())),
461+ value: vec!(Text("bar")),
556462 },
557463 ),
558464 },]
@@ -566,27 +472,27 @@ mod parser {
566472 assert_eq!(
567473 Ok(Snippet {
568474 elements: vec![
569− Text("hello ".into()),
475+ Text("hello "),
570476 Tabstop { tabstop: 1 },
571477 Tabstop { tabstop: 2 },
572− Text(" ".into()),
478+ Text(" "),
573479 Choice {
574480 tabstop: 1,
575− choices: vec!["one".into(), "two".into(), "three".into()]
481+ choices: vec!["one", "two", "three"]
576482 },
577− Text(" ".into()),
483+ Text(" "),
578484 Variable {
579485 name: "name",
580− default: Some(vec![Text("foo".into())]),
486+ default: Some("foo"),
581487 regex: None
582488 },
583− Text(" ".into()),
489+ Text(" "),
584490 Variable {
585491 name: "var",
586492 default: None,
587493 regex: None
588494 },
589− Text(" ".into()),
495+ Text(" "),
590496 Variable {
591497 name: "TM",
592498 default: None,
@@ -606,405 +512,14 @@ mod parser {
606512 name: "TM_FILENAME",
607513 default: None,
608514 regex: Some(Regex {
609− value: "(.*).+$".into(),
610− replacement: vec![FormatItem::Capture(1), FormatItem::Text("$".into())],
611− options: Tendril::new(),
515+ value: "(.*).+$",
516+ replacement: vec![FormatItem::Capture(1)],
517+ options: None,
612518 }),
613519 }]
614520 }),
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− }],
521+ parse("${TM_FILENAME/(.*).+$/$1/}")
1006522 );
1007523 }
1008− // TODO port more tests from https://github.com/microsoft/vscode/blob/dce493cb6e36346ef2714e82c42ce14fc461b15c/src/vs/editor/contrib/snippet/test/browser/snippetParser.test.ts
1009524 }
1010525}
helix-lsp/src/transport.rs+21−52
@@ -38,7 +38,6 @@ enum ServerMessage {
3838#[derive(Debug)]
3939pub struct Transport {
4040 id: usize,
41− name: String,
4241 pending_requests: Mutex<HashMap<jsonrpc::Id, Sender<Result<Value>>>>,
4342}
4443
@@ -48,7 +47,6 @@ impl Transport {
4847 server_stdin: BufWriter<ChildStdin>,
4948 server_stderr: BufReader<ChildStderr>,
5049 id: usize,
51− name: String,
5250 ) -> (
5351 UnboundedReceiver<(usize, jsonrpc::Call)>,
5452 UnboundedSender<Payload>,
@@ -60,7 +58,6 @@ impl Transport {
6058
6159 let transport = Self {
6260 id,
63− name,
6461 pending_requests: Mutex::new(HashMap::default()),
6562 };
6663
@@ -86,7 +83,6 @@ impl Transport {
8683 async fn recv_server_message(
8784 reader: &mut (impl AsyncBufRead + Unpin + Send),
8885 buffer: &mut String,
89− language_server_name: &str,
9086 ) -> Result<ServerMessage> {
9187 let mut content_length = None;
9288 loop {
@@ -128,7 +124,7 @@ impl Transport {
128124 reader.read_exact(&mut content).await?;
129125 let msg = std::str::from_utf8(&content).context("invalid utf8 from server")?;
130126
131− info!("{language_server_name} <- {msg}");
127+ info!("<- {}", msg);
132128
133129 // try parsing as output (server response) or call (server request)
134130 let output: serde_json::Result<ServerMessage> = serde_json::from_str(msg);
@@ -139,13 +135,12 @@ impl Transport {
139135 async fn recv_server_error(
140136 err: &mut (impl AsyncBufRead + Unpin + Send),
141137 buffer: &mut String,
142− language_server_name: &str,
143138 ) -> Result<()> {
144139 buffer.truncate(0);
145140 if err.read_line(buffer).await? == 0 {
146141 return Err(Error::StreamClosed);
147142 };
148− error!("{language_server_name} err <- {buffer:?}");
143+ error!("err <- {:?}", buffer);
149144
150145 Ok(())
151146 }
@@ -167,17 +162,15 @@ impl Transport {
167162 Payload::Notification(value) => serde_json::to_string(&value)?,
168163 Payload::Response(error) => serde_json::to_string(&error)?,
169164 };
170− self.send_string_to_server(server_stdin, json, &self.name)
171− .await
165+ self.send_string_to_server(server_stdin, json).await
172166 }
173167
174168 async fn send_string_to_server(
175169 &self,
176170 server_stdin: &mut BufWriter<ChildStdin>,
177171 request: String,
178− language_server_name: &str,
179172 ) -> Result<()> {
180− info!("{language_server_name} -> {request}");
173+ info!("-> {}", request);
181174
182175 // send the headers
183176 server_stdin
@@ -196,13 +189,9 @@ impl Transport {
196189 &self,
197190 client_tx: &UnboundedSender<(usize, jsonrpc::Call)>,
198191 msg: ServerMessage,
199− language_server_name: &str,
200192 ) -> Result<()> {
201193 match msg {
202− ServerMessage::Output(output) => {
203− self.process_request_response(output, language_server_name)
204− .await?
205− }
194+ ServerMessage::Output(output) => self.process_request_response(output).await?,
206195 ServerMessage::Call(call) => {
207196 client_tx
208197 .send((self.id, call))
@@ -213,18 +202,14 @@ impl Transport {
213202 Ok(())
214203 }
215204
216− async fn process_request_response(
217− &self,
218− output: jsonrpc::Output,
219− language_server_name: &str,
220− ) -> Result<()> {
205+ async fn process_request_response(&self, output: jsonrpc::Output) -> Result<()> {
221206 let (id, result) = match output {
222207 jsonrpc::Output::Success(jsonrpc::Success { id, result, .. }) => {
223− info!("{language_server_name} <- {}", result);
208+ info!("<- {}", result);
224209 (id, Ok(result))
225210 }
226211 jsonrpc::Output::Failure(jsonrpc::Failure { id, error, .. }) => {
227− error!("{language_server_name} <- {error}");
212+ error!("<- {}", error);
228213 (id, Err(error.into()))
229214 }
230215 };
@@ -255,17 +240,12 @@ impl Transport {
255240 ) {
256241 let mut recv_buffer = String::new();
257242 loop {
258− match Self::recv_server_message(&mut server_stdout, &mut recv_buffer, &transport.name)
259− .await
260− {
243+ match Self::recv_server_message(&mut server_stdout, &mut recv_buffer).await {
261244 Ok(msg) => {
262− match transport
263− .process_server_message(&client_tx, msg, &transport.name)
264− .await
265− {
245+ match transport.process_server_message(&client_tx, msg).await {
266246 Ok(_) => {}
267247 Err(err) => {
268− error!("{} err: <- {err:?}", transport.name);
248+ error!("err: <- {:?}", err);
269249 break;
270250 }
271251 };
@@ -290,7 +270,7 @@ impl Transport {
290270 params: jsonrpc::Params::None,
291271 }));
292272 match transport
293− .process_server_message(&client_tx, notification, &transport.name)
273+ .process_server_message(&client_tx, notification)
294274 .await
295275 {
296276 Ok(_) => {}
@@ -301,22 +281,20 @@ impl Transport {
301281 break;
302282 }
303283 Err(err) => {
304− error!("{} err: <- {err:?}", transport.name);
284+ error!("err: <- {:?}", err);
305285 break;
306286 }
307287 }
308288 }
309289 }
310290
311− async fn err(transport: Arc<Self>, mut server_stderr: BufReader<ChildStderr>) {
291+ async fn err(_transport: Arc<Self>, mut server_stderr: BufReader<ChildStderr>) {
312292 let mut recv_buffer = String::new();
313293 loop {
314− match Self::recv_server_error(&mut server_stderr, &mut recv_buffer, &transport.name)
315− .await
316− {
294+ match Self::recv_server_error(&mut server_stderr, &mut recv_buffer).await {
317295 Ok(_) => {}
318296 Err(err) => {
319− error!("{} err: <- {err:?}", transport.name);
297+ error!("err: <- {:?}", err);
320298 break;
321299 }
322300 }
@@ -353,11 +331,6 @@ impl Transport {
353331 }
354332 }
355333
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−
361334 // TODO: events that use capabilities need to do the right thing
362335
363336 loop {
@@ -375,11 +348,10 @@ impl Transport {
375348 method: lsp_types::notification::Initialized::METHOD.to_string(),
376349 params: jsonrpc::Params::None,
377350 }));
378− let language_server_name = &transport.name;
379− match transport.process_server_message(&client_tx, notification, language_server_name).await {
351+ match transport.process_server_message(&client_tx, notification).await {
380352 Ok(_) => {}
381353 Err(err) => {
382− error!("{language_server_name} err: <- {err:?}");
354+ error!("err: <- {:?}", err);
383355 }
384356 }
385357
@@ -389,17 +361,14 @@ impl Transport {
389361 match transport.send_payload_to_server(&mut server_stdin, msg).await {
390362 Ok(_) => {}
391363 Err(err) => {
392− error!("{language_server_name} err: <- {err:?}");
364+ error!("err: <- {:?}", err);
393365 }
394366 }
395367 }
396368 }
397369 msg = client_rx.recv() => {
398370 if let Some(msg) = 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) {
371+ if is_pending && !is_initialize(&msg) {
403372 // ignore notifications
404373 if let Payload::Notification(_) = msg {
405374 continue;
@@ -411,7 +380,7 @@ impl Transport {
411380 match transport.send_payload_to_server(&mut server_stdin, msg).await {
412381 Ok(_) => {}
413382 Err(err) => {
414− error!("{} err: <- {err:?}", transport.name);
383+ error!("err: <- {:?}", err);
415384 }
416385 }
417386 }
helix-parsec/Cargo.toml+7−8
@@ -1,14 +1,13 @@
11[package]
22name = "helix-parsec"
3+version = "0.6.0"
4+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5+edition = "2021"
6+license = "MPL-2.0"
37description = "Parser combinators for Helix"
8+categories = ["editor"]
9+repository = "https://github.com/helix-editor/helix"
10+homepage = "https://helix-editor.com"
411include = ["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
1312
1413[dependencies]
helix-parsec/src/lib.rs−13
@@ -459,7 +459,6 @@ pub fn zero_or_more<'a, P, T>(parser: P) -> impl Parser<'a, Output = Vec<T>>
459459where
460460 P: Parser<'a, Output = T>,
461461{
462− let parser = non_empty(parser);
463462 move |mut input| {
464463 let mut values = Vec::new();
465464
@@ -492,7 +491,6 @@ pub fn one_or_more<'a, P, T>(parser: P) -> impl Parser<'a, Output = Vec<T>>
492491where
493492 P: Parser<'a, Output = T>,
494493{
495− let parser = non_empty(parser);
496494 move |mut input| {
497495 let mut values = Vec::new();
498496
@@ -561,14 +559,3 @@ where
561559 Ok((input, values))
562560 }
563561}
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+24−33
@@ -1,16 +1,16 @@
11[package]
22name = "helix-term"
3+version = "0.6.0"
34description = "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"
411include = ["src/**/*", "README.md"]
512default-run = "hx"
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
13+rust-version = "1.65"
1414
1515[features]
1616default = ["git"]
@@ -23,22 +23,21 @@ name = "hx"
2323path = "src/main.rs"
2424
2525[dependencies]
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" }
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" }
3332
3433anyhow = "1"
35−once_cell = "1.19"
34+once_cell = "1.17"
3635
37−which = "5.0.0"
36+which = "4.4"
3837
3938tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
4039tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
41−crossterm = { version = "0.27", features = ["event-stream"] }
40+crossterm = { version = "0.26", features = ["event-stream"] }
4241signal-hook = "0.3"
4342tokio-stream = "0.1"
4443futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
@@ -50,17 +49,13 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
5049log = "0.4"
5150
5251# File picker
53−nucleo.workspace = true
52+fuzzy-matcher = "0.3"
5453ignore = "0.4"
5554# markdown doc rendering
5655pulldown-cmark = { version = "0.9", default-features = false }
5756# file type detection
5857content_inspector = "0.2.4"
5958
60−# opening URLs
61−open = "5.0.1"
62−url = "2.5.0"
63−
6459# config
6560toml = "0.7"
6661
@@ -68,20 +63,16 @@ serde_json = "1.0"
6863serde = { version = "1.0", features = ["derive"] }
6964
7065# ripgrep for global search
71−grep-regex = "0.1.12"
72−grep-searcher = "0.1.13"
66+grep-regex = "0.1.11"
67+grep-searcher = "0.1.11"
7368
7469[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
7570signal-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"] }
8071
8172[build-dependencies]
82−helix-loader = { path = "../helix-loader" }
73+helix-loader = { version = "0.6", path = "../helix-loader" }
8374
8475[dev-dependencies]
85−smallvec = "1.11"
86−indoc = "2.0.4"
87−tempfile = "3.8.1"
76+smallvec = "1.10"
77+indoc = "2.0.0"
78+tempfile = "3.4.0"
helix-term/src/application.rs+196−350
@@ -1,16 +1,11 @@
11use arc_swap::{access::Map, ArcSwap};
22use futures_util::Stream;
33use helix_core::{
4− chars::char_is_word,
54 diagnostic::{DiagnosticTag, NumberOrString},
65 path::get_relative_path,
76 pos_at_coords, syntax, Selection,
87};
9−use helix_lsp::{
10− lsp::{self, notification::Notification},
11− util::lsp_pos_to_pos,
12− LspProgressMap,
13−};
8+use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
149use helix_view::{
1510 align_view,
1611 document::DocumentSavedEventResult,
@@ -30,22 +25,30 @@ use crate::{
3025 config::Config,
3126 job::Jobs,
3227 keymap::Keymaps,
33− ui::{self, overlay::overlaid},
28+ ui::{self, overlay::overlayed},
3429};
3530
3631use log::{debug, error, warn};
37−#[cfg(not(feature = "integration"))]
38−use std::io::stdout;
39−use std::{collections::btree_map::Entry, io::stdin, path::Path, sync::Arc};
32+use std::{
33+ io::{stdin, stdout},
34+ path::Path,
35+ sync::Arc,
36+ time::{Duration, Instant},
37+};
4038
4139use anyhow::{Context, Error};
4240
4341use crossterm::{event::Event as CrosstermEvent, tty::IsTty};
4442#[cfg(not(windows))]
45−use {signal_hook::consts::signal, signal_hook_tokio::Signals};
43+use {
44+ signal_hook::{consts::signal, low_level},
45+ signal_hook_tokio::Signals,
46+};
4647#[cfg(windows)]
4748type Signals = futures_util::stream::Empty<()>;
4849
50+const LSP_DEADLINE: Duration = Duration::from_millis(16);
51+
4952#[cfg(not(feature = "integration"))]
5053use tui::backend::CrosstermBackend;
5154
@@ -75,6 +78,7 @@ pub struct Application {
7578 signals: Signals,
7679 jobs: Jobs,
7780 lsp_progress: LspProgressMap,
81+ last_render: Instant,
7882}
7983
8084#[cfg(feature = "integration")]
@@ -133,7 +137,7 @@ impl Application {
133137 let syn_loader = std::sync::Arc::new(syntax::Loader::new(syn_loader_conf));
134138
135139 #[cfg(not(feature = "integration"))]
136− let backend = CrosstermBackend::new(stdout(), &config.editor);
140+ let backend = CrosstermBackend::new(stdout());
137141
138142 #[cfg(feature = "integration")]
139143 let backend = TestBackend::new(120, 150);
@@ -161,21 +165,17 @@ impl Application {
161165 let path = helix_loader::runtime_file(Path::new("tutor"));
162166 editor.open(&path, Action::VerticalSplit)?;
163167 // Unset path to prevent accidentally saving to the original tutor file.
164− doc_mut!(editor).set_path(None);
168+ doc_mut!(editor).set_path(None)?;
165169 } else if !args.files.is_empty() {
166− let mut files_it = args.files.into_iter().peekable();
167−
168− // If the first file is a directory, skip it and open a picker
169− if let Some((first, _)) = files_it.next_if(|(p, _)| p.is_dir()) {
170− let picker = ui::file_picker(first, &config.load().editor);
171− compositor.push(Box::new(overlaid(picker)));
172− }
173−
174− // If there are any more files specified, open them
175− if files_it.peek().is_some() {
176− let mut nr_of_files = 0;
177− for (file, pos) in files_it {
178− nr_of_files += 1;
170+ let first = &args.files[0].0; // we know it's not empty
171+ if first.is_dir() {
172+ std::env::set_current_dir(first).context("set current dir")?;
173+ editor.new_file(Action::VerticalSplit);
174+ let picker = ui::file_picker(".".into(), &config.load().editor);
175+ compositor.push(Box::new(overlayed(picker)));
176+ } else {
177+ let nr_of_files = args.files.len();
178+ for (i, (file, pos)) in args.files.into_iter().enumerate() {
179179 if file.is_dir() {
180180 return Err(anyhow::anyhow!(
181181 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
@@ -187,7 +187,7 @@ impl Application {
187187 // option. If neither of those two arguments are passed
188188 // in, just load the files normally.
189189 let action = match args.split {
190− _ if nr_of_files == 1 => Action::VerticalSplit,
190+ _ if i == 0 => Action::VerticalSplit,
191191 Some(Layout::Vertical) => Action::VerticalSplit,
192192 Some(Layout::Horizontal) => Action::HorizontalSplit,
193193 None => Action::Load,
@@ -214,11 +214,14 @@ impl Application {
214214 // does not affect views without pos since it is at the top
215215 let (view, doc) = current!(editor);
216216 align_view(doc, view, Align::Center);
217− } else {
218− editor.new_file(Action::VerticalSplit);
219217 }
220218 } else if stdin().is_tty() || cfg!(feature = "integration") {
221219 editor.new_file(Action::VerticalSplit);
220+ } else if cfg!(target_os = "macos") {
221+ // On Linux and Windows, we allow the output of a command to be piped into the new buffer.
222+ // This doesn't currently work on macOS because of the following issue:
223+ // https://github.com/crossterm-rs/crossterm/issues/500
224+ anyhow::bail!("Piping into helix-term is currently not supported on macOS");
222225 } else {
223226 editor
224227 .new_file_from_stdin(Action::VerticalSplit)
@@ -230,14 +233,8 @@ impl Application {
230233 #[cfg(windows)]
231234 let signals = futures_util::stream::empty();
232235 #[cfg(not(windows))]
233− let signals = Signals::new([
234− signal::SIGTSTP,
235− signal::SIGCONT,
236− signal::SIGUSR1,
237− signal::SIGTERM,
238− signal::SIGINT,
239− ])
240− .context("build signal handler")?;
236+ let signals = Signals::new([signal::SIGTSTP, signal::SIGCONT, signal::SIGUSR1])
237+ .context("build signal handler")?;
241238
242239 let app = Self {
243240 compositor,
@@ -252,25 +249,29 @@ impl Application {
252249 signals,
253250 jobs: Jobs::new(),
254251 lsp_progress: LspProgressMap::new(),
252+ last_render: Instant::now(),
255253 };
256254
257255 Ok(app)
258256 }
259257
260258 async fn render(&mut self) {
261− if self.compositor.full_redraw {
262− self.terminal.clear().expect("Cannot clear the terminal");
263− self.compositor.full_redraw = false;
264− }
265−
266259 let mut cx = crate::compositor::Context {
267260 editor: &mut self.editor,
268261 jobs: &mut self.jobs,
269262 scroll: None,
270263 };
271264
272− helix_event::start_frame();
265+ // Acquire mutable access to the redraw_handle lock
266+ // to ensure that there are no tasks running that want to block rendering
267+ drop(cx.editor.redraw_handle.1.write().await);
273268 cx.editor.needs_redraw = false;
269+ {
270+ // exhaust any leftover redraw notifications
271+ let notify = cx.editor.redraw_handle.0.notified();
272+ tokio::pin!(notify);
273+ notify.enable();
274+ }
274275
275276 let area = self
276277 .terminal
@@ -292,9 +293,10 @@ impl Application {
292293
293294 pub async fn event_loop<S>(&mut self, input_stream: &mut S)
294295 where
295− S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
296+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
296297 {
297298 self.render().await;
299+ self.last_render = Instant::now();
298300
299301 loop {
300302 if !self.event_loop_until_idle(input_stream).await {
@@ -305,7 +307,7 @@ impl Application {
305307
306308 pub async fn event_loop_until_idle<S>(&mut self, input_stream: &mut S) -> bool
307309 where
308− S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
310+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
309311 {
310312 loop {
311313 if self.editor.should_close() {
@@ -318,9 +320,7 @@ impl Application {
318320 biased;
319321
320322 Some(signal) = self.signals.next() => {
321− if !self.handle_signals(signal).await {
322− return false;
323− };
323+ self.handle_signals(signal).await;
324324 }
325325 Some(event) = input_stream.next() => {
326326 self.handle_terminal_events(event).await;
@@ -364,9 +364,6 @@ impl Application {
364364 ConfigEvent::Update(editor_config) => {
365365 let mut app_config = (*self.config.load().clone()).clone();
366366 app_config.editor = *editor_config;
367− if let Err(err) = self.terminal.reconfigure(app_config.editor.clone().into()) {
368− self.editor.set_error(err.to_string());
369− };
370367 self.config.store(Arc::new(app_config));
371368 }
372369 }
@@ -399,23 +396,20 @@ impl Application {
399396
400397 /// Refresh theme after config change
401398 fn refresh_theme(&mut self, config: &Config) -> Result<(), Error> {
402− let true_color = config.editor.true_color || crate::true_color();
403− let theme = config
404− .theme
405− .as_ref()
406− .and_then(|theme| {
407− self.theme_loader
408− .load(theme)
409− .map_err(|e| {
410− log::warn!("failed to load theme `{}` - {}", theme, e);
411− e
412− })
413− .ok()
414− .filter(|theme| (true_color || theme.is_16_color()))
415− })
416− .unwrap_or_else(|| self.theme_loader.default_theme(true_color));
399+ if let Some(theme) = config.theme.clone() {
400+ let true_color = self.true_color();
401+ let theme = self
402+ .theme_loader
403+ .load(&theme)
404+ .map_err(|err| anyhow::anyhow!("Failed to load theme `{}`: {}", theme, err))?;
405+
406+ if true_color || theme.is_16_color() {
407+ self.editor.set_theme(theme);
408+ } else {
409+ anyhow::bail!("theme requires truecolor support, which is not available")
410+ }
411+ }
417412
418− self.editor.set_theme(theme);
419413 Ok(())
420414 }
421415
@@ -425,8 +419,6 @@ impl Application {
425419 .map_err(|err| anyhow::anyhow!("Failed to load config: {}", err))?;
426420 self.refresh_language_config()?;
427421 self.refresh_theme(&default_config)?;
428− self.terminal
429− .reconfigure(default_config.editor.clone().into())?;
430422 // Store new config
431423 self.config.store(Arc::new(default_config));
432424 Ok(())
@@ -442,56 +434,23 @@ impl Application {
442434 }
443435 }
444436
437+ fn true_color(&self) -> bool {
438+ self.config.load().editor.true_color || crate::true_color()
439+ }
440+
445441 #[cfg(windows)]
446442 // no signal handling available on windows
447− pub async fn handle_signals(&mut self, _signal: ()) -> bool {
448− true
449− }
443+ pub async fn handle_signals(&mut self, _signal: ()) {}
450444
451445 #[cfg(not(windows))]
452− pub async fn handle_signals(&mut self, signal: i32) -> bool {
446+ pub async fn handle_signals(&mut self, signal: i32) {
453447 match signal {
454448 signal::SIGTSTP => {
455449 self.restore_term().unwrap();
456−
457− // SAFETY:
458− //
459− // - helix must have permissions to send signals to all processes in its signal
460− // group, either by already having the requisite permission, or by having the
461− // user's UID / EUID / SUID match that of the receiving process(es).
462− let res = unsafe {
463− // A pid of 0 sends the signal to the entire process group, allowing the user to
464− // regain control of their terminal if the editor was spawned under another process
465− // (e.g. when running `git commit`).
466− //
467− // We have to send SIGSTOP (not SIGTSTP) to the entire process group, because,
468− // as mentioned above, the terminal will get stuck if `helix` was spawned from
469− // an external process and that process waits for `helix` to complete. This may
470− // be an issue with signal-hook-tokio, but the author of signal-hook believes it
471− // could be a tokio issue instead:
472− // https://github.com/vorner/signal-hook/issues/132
473− libc::kill(0, signal::SIGSTOP)
474− };
475−
476− if res != 0 {
477− let err = std::io::Error::last_os_error();
478− eprintln!("{}", err);
479− let res = err.raw_os_error().unwrap_or(1);
480− std::process::exit(res);
481− }
450+ low_level::emulate_default_handler(signal::SIGTSTP).unwrap();
482451 }
483452 signal::SIGCONT => {
484− // Copy/Paste from same issue from neovim:
485− // https://github.com/neovim/neovim/issues/12322
486− // https://github.com/neovim/neovim/pull/13084
487− for retries in 1..=10 {
488− match self.claim_term().await {
489− Ok(()) => break,
490− Err(err) if retries == 10 => panic!("Failed to claim terminal: {}", err),
491− Err(_) => continue,
492− }
493− }
494−
453+ self.claim_term().await.unwrap();
495454 // redraw the terminal
496455 let area = self.terminal.size().expect("couldn't get terminal size");
497456 self.compositor.resize(area);
@@ -503,14 +462,8 @@ impl Application {
503462 self.refresh_config();
504463 self.render().await;
505464 }
506− signal::SIGTERM | signal::SIGINT => {
507− self.restore_term().unwrap();
508− return false;
509− }
510465 _ => unreachable!(),
511466 }
512−
513− true
514467 }
515468
516469 pub async fn handle_idle_timeout(&mut self) {
@@ -558,7 +511,16 @@ impl Application {
558511 let bytes = doc_save_event.text.len_bytes();
559512
560513 if doc.path() != Some(&doc_save_event.path) {
561− doc.set_path(Some(&doc_save_event.path));
514+ if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
515+ log::error!(
516+ "error setting path for doc '{:?}': {}",
517+ doc.path(),
518+ err.to_string(),
519+ );
520+
521+ self.editor.set_error(err.to_string());
522+ return;
523+ }
562524
563525 let loader = self.editor.syn_loader.clone();
564526
@@ -566,7 +528,7 @@ impl Application {
566528 let doc = doc_mut!(self.editor, &doc_save_event.doc_id);
567529 let id = doc.id();
568530 doc.detect_language(loader);
569− self.editor.refresh_language_servers(id);
531+ let _ = self.editor.refresh_language_server(id);
570532 }
571533
572534 // TODO: fix being overwritten by lsp
@@ -594,7 +556,12 @@ impl Application {
594556 EditorEvent::LanguageServerMessage((id, call)) => {
595557 self.handle_language_server_message(call, id).await;
596558 // limit render calls for fast language server messages
597− helix_event::request_redraw();
559+ let last = self.editor.language_servers.incoming.is_empty();
560+
561+ if last || self.last_render.elapsed() > LSP_DEADLINE {
562+ self.render().await;
563+ self.last_render = Instant::now();
564+ }
598565 }
599566 EditorEvent::DebuggerEvent(payload) => {
600567 let needs_render = self.editor.handle_debugger_message(payload).await;
@@ -602,9 +569,6 @@ impl Application {
602569 self.render().await;
603570 }
604571 }
605− EditorEvent::Redraw => {
606− self.render().await;
607− }
608572 EditorEvent::IdleTimer => {
609573 self.editor.clear_idle_timer();
610574 self.handle_idle_timeout().await;
@@ -619,7 +583,10 @@ impl Application {
619583 false
620584 }
621585
622− pub async fn handle_terminal_events(&mut self, event: std::io::Result<CrosstermEvent>) {
586+ pub async fn handle_terminal_events(
587+ &mut self,
588+ event: Result<CrosstermEvent, crossterm::ErrorKind>,
589+ ) {
623590 let mut cx = crate::compositor::Context {
624591 editor: &mut self.editor,
625592 jobs: &mut self.jobs,
@@ -659,18 +626,6 @@ impl Application {
659626 ) {
660627 use helix_lsp::{Call, MethodCall, Notification};
661628
662− macro_rules! language_server {
663− () => {
664− match self.editor.language_server_by_id(server_id) {
665− Some(language_server) => language_server,
666− None => {
667− warn!("can't find language server with id `{}`", server_id);
668− return;
669− }
670− }
671− };
672− }
673−
674629 match call {
675630 Call::Notification(helix_lsp::jsonrpc::Notification { method, params, .. }) => {
676631 let notification = match Notification::parse(&method, params) {
@@ -686,7 +641,14 @@ impl Application {
686641
687642 match notification {
688643 Notification::Initialized => {
689− let language_server = language_server!();
644+ let language_server =
645+ match self.editor.language_servers.get_by_id(server_id) {
646+ Some(language_server) => language_server,
647+ None => {
648+ warn!("can't find language server with id `{}`", server_id);
649+ return;
650+ }
651+ };
690652
691653 // Trigger a workspace/didChangeConfiguration notification after initialization.
692654 // This might not be required by the spec but Neovim does this as well, so it's
@@ -695,10 +657,9 @@ impl Application {
695657 tokio::spawn(language_server.did_change_configuration(config.clone()));
696658 }
697659
698− let docs = self
699− .editor
700− .documents()
701− .filter(|doc| doc.supports_language_server(server_id));
660+ let docs = self.editor.documents().filter(|doc| {
661+ doc.language_server().map(|server| server.id()) == Some(server_id)
662+ });
702663
703664 // trigger textDocument/didOpen for docs that are already open
704665 for doc in docs {
@@ -726,77 +687,31 @@ impl Application {
726687 return;
727688 }
728689 };
729− let language_server = language_server!();
730− if !language_server.is_initialized() {
731− log::error!("Discarding publishDiagnostic notification sent by an uninitialized server: {}", language_server.name());
732− return;
733− }
734− let offset_encoding = language_server.offset_encoding();
735− // have to inline the function because of borrow checking...
736− let doc = self.editor.documents.values_mut()
737− .find(|doc| doc.path().map(|p| p == &path).unwrap_or(false))
738− .filter(|doc| {
739− if let Some(version) = params.version {
740− if version != doc.version() {
741− log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
742− return false;
743− }
744− }
745− true
746− });
690+ let doc = self.editor.document_by_path_mut(&path);
747691
748692 if let Some(doc) = doc {
749− let lang_conf = doc.language.clone();
750− let text = doc.text().clone();
693+ let lang_conf = doc.language_config();
694+ let text = doc.text();
751695
752− let mut unchaged_diag_sources_ = Vec::new();
753− if let Some(lang_conf) = &lang_conf {
754− if let Some(old_diagnostics) =
755− self.editor.diagnostics.get(&params.uri)
756− {
757− if !lang_conf.persistent_diagnostic_sources.is_empty() {
758− // Sort diagnostics first by severity and then by line numbers.
759− // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
760− params
761− .diagnostics
762− .sort_unstable_by_key(|d| (d.severity, d.range.start));
763− }
764− for source in &lang_conf.persistent_diagnostic_sources {
765− let new_diagnostics = params
766− .diagnostics
767− .iter()
768− .filter(|d| d.source.as_ref() == Some(source));
769− let old_diagnostics = old_diagnostics
770− .iter()
771− .filter(|(d, d_server)| {
772− *d_server == server_id
773− && d.source.as_ref() == Some(source)
774− })
775− .map(|(d, _)| d);
776− if new_diagnostics.eq(old_diagnostics) {
777− unchaged_diag_sources_.push(source.clone())
778− }
779− }
780− }
781− }
782−
783− let unchaged_diag_sources = &unchaged_diag_sources_;
784− let diagnostics =
785− params.diagnostics.iter().filter_map(move |diagnostic| {
696+ let diagnostics = params
697+ .diagnostics
698+ .iter()
699+ .filter_map(|diagnostic| {
786700 use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
787701 use lsp::DiagnosticSeverity;
788702
789− if diagnostic.source.as_ref().map_or(false, |source| {
790− unchaged_diag_sources.contains(source)
791− }) {
703+ let language_server = if let Some(language_server) = doc.language_server() {
704+ language_server
705+ } else {
706+ log::warn!("Discarding diagnostic because language server is not initialized: {:?}", diagnostic);
792707 return None;
793− }
708+ };
794709
795710 // TODO: convert inside server
796711 let start = if let Some(start) = lsp_pos_to_pos(
797− &text,
712+ text,
798713 diagnostic.range.start,
799− offset_encoding,
714+ language_server.offset_encoding(),
800715 ) {
801716 start
802717 } else {
@@ -804,14 +719,17 @@ impl Application {
804719 return None;
805720 };
806721
807− let end = if let Some(end) =
808− lsp_pos_to_pos(&text, diagnostic.range.end, offset_encoding)
809− {
722+ let end = if let Some(end) = lsp_pos_to_pos(
723+ text,
724+ diagnostic.range.end,
725+ language_server.offset_encoding(),
726+ ) {
810727 end
811728 } else {
812729 log::warn!("lsp position out of bounds - {:?}", diagnostic);
813730 return None;
814731 };
732+
815733 let severity =
816734 diagnostic.severity.map(|severity| match severity {
817735 DiagnosticSeverity::ERROR => Error,
@@ -824,7 +742,7 @@ impl Application {
824742 ),
825743 });
826744
827− if let Some(lang_conf) = &lang_conf {
745+ if let Some(lang_conf) = lang_conf {
828746 if let Some(severity) = severity {
829747 if severity < lang_conf.diagnostic_severity {
830748 return None;
@@ -844,36 +762,22 @@ impl Application {
844762 None => None,
845763 };
846764
847− let tags = if let Some(tags) = &diagnostic.tags {
848− let new_tags = tags
849− .iter()
850− .filter_map(|tag| match *tag {
851− lsp::DiagnosticTag::DEPRECATED => {
852− Some(DiagnosticTag::Deprecated)
853− }
854− lsp::DiagnosticTag::UNNECESSARY => {
855− Some(DiagnosticTag::Unnecessary)
856− }
857− _ => None,
858− })
859− .collect();
765+ let tags = if let Some(ref tags) = diagnostic.tags {
766+ let new_tags = tags.iter().filter_map(|tag| {
767+ match *tag {
768+ lsp::DiagnosticTag::DEPRECATED => Some(DiagnosticTag::Deprecated),
769+ lsp::DiagnosticTag::UNNECESSARY => Some(DiagnosticTag::Unnecessary),
770+ _ => None
771+ }
772+ }).collect();
860773
861774 new_tags
862775 } else {
863776 Vec::new()
864777 };
865778
866− let ends_at_word = start != end
867− && end != 0
868− && text.get_char(end - 1).map_or(false, char_is_word);
869− let starts_at_word = start != end
870− && text.get_char(start).map_or(false, char_is_word);
871−
872779 Some(Diagnostic {
873780 range: Range { start, end },
874− ends_at_word,
875− starts_at_word,
876− zero_width: start == end,
877781 line: diagnostic.range.start.line as usize,
878782 message: diagnostic.message.clone(),
879783 severity,
@@ -881,35 +785,25 @@ impl Application {
881785 tags,
882786 source: diagnostic.source.clone(),
883787 data: diagnostic.data.clone(),
884− language_server_id: server_id,
885788 })
886− });
789+ })
790+ .collect();
887791
888− doc.replace_diagnostics(diagnostics, unchaged_diag_sources, server_id);
792+ doc.set_diagnostics(diagnostics);
889793 }
890794
891− let diagnostics = params.diagnostics.into_iter().map(|d| (d, server_id));
795+ // Sort diagnostics first by severity and then by line numbers.
796+ // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
797+ params
798+ .diagnostics
799+ .sort_unstable_by_key(|d| (d.severity, d.range.start));
892800
893801 // Insert the original lsp::Diagnostics here because we may have no open document
894802 // for diagnosic message and so we can't calculate the exact position.
895803 // When using them later in the diagnostics picker, we calculate them on-demand.
896− let diagnostics = match self.editor.diagnostics.entry(params.uri) {
897− Entry::Occupied(o) => {
898− let current_diagnostics = o.into_mut();
899− // there may entries of other language servers, which is why we can't overwrite the whole entry
900− current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
901− current_diagnostics.extend(diagnostics);
902− current_diagnostics
903− // Sort diagnostics first by severity and then by line numbers.
904− }
905− Entry::Vacant(v) => v.insert(diagnostics.collect()),
906− };
907−
908− // Sort diagnostics first by severity and then by line numbers.
909− // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
910− diagnostics.sort_unstable_by_key(|(d, server_id)| {
911− (d.severity, d.range.start, *server_id)
912− });
804+ self.editor
805+ .diagnostics
806+ .insert(params.uri, params.diagnostics);
913807 }
914808 Notification::ShowMessage(params) => {
915809 log::warn!("unhandled window/showMessage: {:?}", params);
@@ -1006,18 +900,24 @@ impl Application {
1006900 Notification::Exit => {
1007901 self.editor.set_status("Language server exited");
1008902
1009− // LSPs may produce diagnostics for files that haven't been opened in helix,
1010− // we need to clear those and remove the entries from the list if this leads to
1011− // an empty diagnostic list for said files
1012− for diags in self.editor.diagnostics.values_mut() {
1013− diags.retain(|(_, lsp_id)| *lsp_id != server_id);
1014− }
1015−
1016− self.editor.diagnostics.retain(|_, diags| !diags.is_empty());
1017−
1018903 // Clear any diagnostics for documents with this server open.
1019− for doc in self.editor.documents_mut() {
1020− doc.clear_diagnostics(server_id);
904+ let urls: Vec<_> = self
905+ .editor
906+ .documents_mut()
907+ .filter_map(|doc| {
908+ if doc.language_server().map(|server| server.id())
909+ == Some(server_id)
910+ {
911+ doc.set_diagnostics(Vec::new());
912+ doc.url()
913+ } else {
914+ None
915+ }
916+ })
917+ .collect();
918+
919+ for url in urls {
920+ self.editor.diagnostics.remove(&url);
1021921 }
1022922
1023923 // Remove the language server from the registry.
@@ -1068,48 +968,45 @@ impl Application {
1068968 Ok(serde_json::Value::Null)
1069969 }
1070970 Ok(MethodCall::ApplyWorkspaceEdit(params)) => {
1071− let language_server = language_server!();
1072− if language_server.is_initialized() {
1073− let offset_encoding = language_server.offset_encoding();
1074− let res = apply_workspace_edit(
1075− &mut self.editor,
1076− offset_encoding,
1077− &params.edit,
1078− );
1079−
1080− Ok(json!(lsp::ApplyWorkspaceEditResponse {
1081− applied: res.is_ok(),
1082− failure_reason: res.as_ref().err().map(|err| err.kind.to_string()),
1083− failed_change: res
1084− .as_ref()
1085− .err()
1086− .map(|err| err.failed_change_idx as u32),
1087− }))
1088− } else {
1089− Err(helix_lsp::jsonrpc::Error {
1090− code: helix_lsp::jsonrpc::ErrorCode::InvalidRequest,
1091− message: "Server must be initialized to request workspace edits"
1092− .to_string(),
1093− data: None,
1094− })
1095− }
971+ apply_workspace_edit(
972+ &mut self.editor,
973+ helix_lsp::OffsetEncoding::Utf8,
974+ &params.edit,
975+ );
976+
977+ Ok(json!(lsp::ApplyWorkspaceEditResponse {
978+ applied: true,
979+ failure_reason: None,
980+ failed_change: None,
981+ }))
1096982 }
1097983 Ok(MethodCall::WorkspaceFolders) => {
1098− Ok(json!(&*language_server!().workspace_folders().await))
984+ let language_server =
985+ self.editor.language_servers.get_by_id(server_id).unwrap();
986+
987+ Ok(json!(language_server.workspace_folders()))
1099988 }
1100989 Ok(MethodCall::WorkspaceConfiguration(params)) => {
1101− let language_server = language_server!();
1102990 let result: Vec<_> = params
1103991 .items
1104992 .iter()
1105993 .map(|item| {
1106− let mut config = language_server.config()?;
994+ let mut config = match &item.scope_uri {
995+ Some(scope) => {
996+ let path = scope.to_file_path().ok()?;
997+ let doc = self.editor.document_by_path(path)?;
998+ doc.language_config()?.config.as_ref()?
999+ }
1000+ None => self
1001+ .editor
1002+ .language_servers
1003+ .get_by_id(server_id)
1004+ .unwrap()
1005+ .config()?,
1006+ };
11071007 if let Some(section) = item.section.as_ref() {
1108− // for some reason some lsps send an empty string (observed in 'vscode-eslint-language-server')
1109− if !section.is_empty() {
1110− for part in section.split('.') {
1111− config = config.get(part)?;
1112− }
1008+ for part in section.split('.') {
1009+ config = config.get(part)?;
11131010 }
11141011 }
11151012 Some(config)
@@ -1117,68 +1014,17 @@ impl Application {
11171014 .collect();
11181015 Ok(json!(result))
11191016 }
1120− Ok(MethodCall::RegisterCapability(params)) => {
1121− if let Some(client) = self
1122− .editor
1123− .language_servers
1124− .iter_clients()
1125− .find(|client| client.id() == server_id)
1126− {
1127− for reg in params.registrations {
1128− match reg.method.as_str() {
1129− lsp::notification::DidChangeWatchedFiles::METHOD => {
1130− let Some(options) = reg.register_options else {
1131− continue;
1132− };
1133− let ops: lsp::DidChangeWatchedFilesRegistrationOptions =
1134− match serde_json::from_value(options) {
1135− Ok(ops) => ops,
1136− Err(err) => {
1137− log::warn!("Failed to deserialize DidChangeWatchedFilesRegistrationOptions: {err}");
1138− continue;
1139− }
1140− };
1141− self.editor.language_servers.file_event_handler.register(
1142− client.id(),
1143− Arc::downgrade(client),
1144− reg.id,
1145− ops,
1146− )
1147− }
1148− _ => {
1149− // Language Servers based on the `vscode-languageserver-node` library often send
1150− // client/registerCapability even though we do not enable dynamic registration
1151− // for most capabilities. We should send a MethodNotFound JSONRPC error in this
1152− // case but that rejects the registration promise in the server which causes an
1153− // exit. So we work around this by ignoring the request and sending back an OK
1154− // response.
1155− log::warn!("Ignoring a client/registerCapability request because dynamic capability registration is not enabled. Please report this upstream to the language server");
1156− }
1157− }
1158− }
1159− }
1017+ };
11601018
1161− Ok(serde_json::Value::Null)
1162− }
1163− Ok(MethodCall::UnregisterCapability(params)) => {
1164− for unreg in params.unregisterations {
1165− match unreg.method.as_str() {
1166− lsp::notification::DidChangeWatchedFiles::METHOD => {
1167− self.editor
1168− .language_servers
1169− .file_event_handler
1170− .unregister(server_id, unreg.id);
1171− }
1172− _ => {
1173− log::warn!("Received unregistration request for unsupported method: {}", unreg.method);
1174− }
1175− }
1176− }
1177− Ok(serde_json::Value::Null)
1019+ let language_server = match self.editor.language_servers.get_by_id(server_id) {
1020+ Some(language_server) => language_server,
1021+ None => {
1022+ warn!("can't find language server with id `{}`", server_id);
1023+ return;
11781024 }
11791025 };
11801026
1181− tokio::spawn(language_server!().reply(id, reply));
1027+ tokio::spawn(language_server.reply(id, reply));
11821028 }
11831029 Call::Invalid { id } => log::error!("LSP invalid method call id={:?}", id),
11841030 }
@@ -1201,7 +1047,7 @@ impl Application {
12011047
12021048 pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
12031049 where
1204− S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
1050+ S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
12051051 {
12061052 self.claim_term().await?;
12071053
helix-term/src/args.rs−29
@@ -17,14 +17,12 @@ pub struct Args {
1717 pub log_file: Option<PathBuf>,
1818 pub config_file: Option<PathBuf>,
1919 pub files: Vec<(PathBuf, Position)>,
20− pub working_directory: Option<PathBuf>,
2120}
2221
2322impl Args {
2423 pub fn parse_args() -> Result<Args> {
2524 let mut args = Args::default();
2625 let mut argv = std::env::args().peekable();
27− let mut line_number = 0;
2826
2927 argv.next(); // skip the program, we don't care about that
3028
@@ -61,20 +59,6 @@ impl Args {
6159 Some(path) => args.log_file = Some(path.into()),
6260 None => anyhow::bail!("--log must specify a path to write"),
6361 },
64− "-w" | "--working-dir" => match argv.next().as_deref() {
65− Some(path) => {
66− args.working_directory = if Path::new(path).is_dir() {
67− Some(PathBuf::from(path))
68− } else {
69− anyhow::bail!(
70− "--working-dir specified does not exist or is not a directory"
71− )
72− }
73− }
74− None => {
75− anyhow::bail!("--working-dir must specify an initial working directory")
76− }
77− },
7862 arg if arg.starts_with("--") => {
7963 anyhow::bail!("unexpected double dash argument: {}", arg)
8064 }
@@ -89,13 +73,6 @@ impl Args {
8973 }
9074 }
9175 }
92− arg if arg.starts_with('+') => {
93− let arg = &arg[1..];
94− line_number = match arg.parse::<usize>() {
95− Ok(n) => n.saturating_sub(1),
96− _ => anyhow::bail!("bad line number after +"),
97− };
98− }
9976 arg => args.files.push(parse_file(arg)),
10077 }
10178 }
@@ -105,12 +82,6 @@ impl Args {
10582 args.files.push(parse_file(&arg));
10683 }
10784
108− if let Some(file) = args.files.first_mut() {
109− if line_number != 0 {
110− file.1.row = line_number;
111− }
112− }
113−
11485 Ok(args)
11586 }
11687}
helix-term/src/commands.rs+661−1140

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/src/commands/lsp.rs+481−753

This diff is too big to show here.

helix-term/src/commands/typed.rs+741−1192

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+30−110

This diff is too big to show here.

helix-term/src/health.rs+12−48

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/src/keymap/default.rs+7−14

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/src/ui/completion.rs+108−165

This diff is too big to show here.

helix-term/src/ui/document.rs+31−79

This diff is too big to show here.

helix-term/src/ui/editor.rs+131−218

This diff is too big to show here.

helix-term/src/ui/fuzzy_match.rsnew file+239

This diff is too big to show here.

helix-term/src/ui/fuzzy_match/test.rsnew file+47

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/src/ui/markdown.rs+14−23

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/src/ui/mod.rs+179−108

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+587−630

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/src/ui/prompt.rs+52−69

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/tests/test/commands/movement.rsdeleted−452

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/tests/test/languages/go.rsdeleted−41

This diff is too big to show here.

helix-term/tests/test/languages/mod.rsdeleted−4

This diff is too big to show here.

helix-term/tests/test/languages/yaml.rsdeleted−819

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

helix-tui/Cargo.toml+16−16

This diff is too big to show here.

helix-tui/src/backend/crossterm.rs+50−87

This diff is too big to show here.

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

This diff is too big to show here.

helix-tui/src/backend/test.rs−4

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

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+7−19

This diff is too big to show here.

helix-vcs/Cargo.toml+10−14

This diff is too big to show here.

helix-vcs/src/diff.rs+19−6

This diff is too big to show here.

helix-vcs/src/diff/line_cache.rs+9−9

This diff is too big to show here.

helix-vcs/src/diff/worker.rs+9−3

This diff is too big to show here.

helix-vcs/src/diff/worker/test.rs+5−1

This diff is too big to show here.

helix-vcs/src/git.rs+29−64

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+5−32

This diff is too big to show here.

helix-view/Cargo.toml+18−22

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/src/document.rs+153−673

This diff is too big to show here.

helix-view/src/editor.rs+104−326

This diff is too big to show here.

helix-view/src/graphics.rs−1

This diff is too big to show here.

helix-view/src/gutter.rs+42−63

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

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.rsdeleted−333

This diff is too big to show here.

helix-view/src/theme.rs+5−26

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/src/view.rs+40−87

This diff is too big to show here.

languages.toml+304−1055

This diff is too big to show here.

logo.svg+1−1

This diff is too big to show here.

runtime/queries/_javascript/highlights.scmdeleted−36

This diff is too big to show here.

runtime/queries/_javascript/locals.scmdeleted−14

This diff is too big to show here.

runtime/queries/_javascript/tags.scmdeleted−88

This diff is too big to show here.

runtime/queries/_jsx/highlights.scmdeleted−43

This diff is too big to show here.

runtime/queries/_jsx/indents.scmdeleted−6

This diff is too big to show here.

runtime/queries/_typescript/highlights.scmdeleted−142

This diff is too big to show here.

runtime/queries/_typescript/indents.scmdeleted−5

This diff is too big to show here.

runtime/queries/_typescript/locals.scmdeleted−33

This diff is too big to show here.

runtime/queries/_typescript/tags.scmdeleted−23

This diff is too big to show here.

runtime/queries/_typescript/textobjects.scmdeleted−6

This diff is too big to show here.

runtime/queries/agda/highlights.scmdeleted−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.scmdeleted−9

This diff is too big to show here.

runtime/queries/blueprint/highlights.scmdeleted−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+1−19

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/cairo/indents.scmdeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/cairo/locals.scmdeleted−1

This diff is too big to show here.

runtime/queries/cairo/textobjects.scmdeleted−1

This diff is too big to show here.

runtime/queries/capnp/folds.scmdeleted−14

This diff is too big to show here.

runtime/queries/capnp/highlights.scmdeleted−141

This diff is too big to show here.

runtime/queries/capnp/indents.scmdeleted−19

This diff is too big to show here.

runtime/queries/capnp/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/capnp/locals.scmdeleted−96

This diff is too big to show here.

runtime/queries/comment/highlights.scm+8−8

This diff is too big to show here.

runtime/queries/common-lisp/indents.scmdeleted−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+1−3

This diff is too big to show here.

runtime/queries/dbml/highlights.scmdeleted−44

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/dtd/highlights.scmdeleted−39

This diff is too big to show here.

runtime/queries/dtd/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/ecma/README.mddeleted−14

This diff is too big to show here.

runtime/queries/ecma/highlights.scm+2−9

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+3−17

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.scmdeleted−7

This diff is too big to show here.

runtime/queries/fortran/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/fsharp/highlights.scmdeleted−196

This diff is too big to show here.

runtime/queries/fsharp/locals.scmdeleted−25

This diff is too big to show here.

runtime/queries/gas/highlights.scmdeleted−21

This diff is too big to show here.

runtime/queries/gas/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/gas/textobjects.scmdeleted−2

This diff is too big to show here.

runtime/queries/gdscript/highlights.scm+4−27

This diff is too big to show here.

runtime/queries/gemini/highlights.scmdeleted−26

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/git-commit/textobjects.scmdeleted−2

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/gn/highlights.scmdeleted−42

This diff is too big to show here.

runtime/queries/gn/injections.scmdeleted−15

This diff is too big to show here.

runtime/queries/gn/locals.scmdeleted−16

This diff is too big to show here.

runtime/queries/go/highlights.scm+5−13

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/haskell-persistent/folds.scmdeleted−3

This diff is too big to show here.

runtime/queries/haskell-persistent/highlights.scmdeleted−37

This diff is too big to show here.

runtime/queries/haskell-persistent/locals.scmdeleted−1

This diff is too big to show here.

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

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.scmdeleted−127

This diff is too big to show here.

runtime/queries/hurl/indents.scmdeleted−11

This diff is too big to show here.

runtime/queries/hurl/injections.scmdeleted−14

This diff is too big to show here.

runtime/queries/janet/highlights.scmdeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/java/indents.scmdeleted−35

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/jinja/highlights.scmdeleted−7

This diff is too big to show here.

runtime/queries/jinja/injections.scmdeleted−4

This diff is too big to show here.

runtime/queries/json5/highlights.scmdeleted−11

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/jsx/tags.scmdeleted−3

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/julia/indents.scmdeleted−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.scmdeleted−46

This diff is too big to show here.

runtime/queries/just/folds.scmdeleted−4

This diff is too big to show here.

runtime/queries/just/highlights.scmdeleted−33

This diff is too big to show here.

runtime/queries/just/indents.scmdeleted−3

This diff is too big to show here.

runtime/queries/just/injections.scmdeleted−16

This diff is too big to show here.

runtime/queries/just/locals.scmdeleted−10

This diff is too big to show here.

runtime/queries/just/textobjects.scmdeleted−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.scmdeleted−3

This diff is too big to show here.

runtime/queries/kdl/textobjects.scmdeleted−27

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/kotlin/locals.scmdeleted−15

This diff is too big to show here.

runtime/queries/log/highlights.scmdeleted−10

This diff is too big to show here.

runtime/queries/lpf/highlights.scmdeleted−19

This diff is too big to show here.

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

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.scmdeleted−16

This diff is too big to show here.

runtime/queries/markdoc/injections.scmdeleted−2

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/markdown/highlights.scm−3

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.scmdeleted−41

This diff is too big to show here.

runtime/queries/matlab/folds.scmdeleted−11

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/matlab/indents.scmdeleted−23

This diff is too big to show here.

runtime/queries/matlab/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/matlab/locals.scmdeleted−19

This diff is too big to show here.

runtime/queries/matlab/textobjects.scmdeleted−9

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.scmdeleted−3

This diff is too big to show here.

runtime/queries/nim/highlights.scmdeleted−315

This diff is too big to show here.

runtime/queries/nim/indents.scmdeleted−54

This diff is too big to show here.

runtime/queries/nim/textobjects.scmdeleted−19

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

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.scmnew file+13

This diff is too big to show here.

runtime/queries/nunjucks/highlights.scmdeleted−1

This diff is too big to show here.

runtime/queries/nunjucks/injections.scmdeleted−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+133−18

This diff is too big to show here.

runtime/queries/odin/indents.scmdeleted−16

This diff is too big to show here.

runtime/queries/odin/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/opencl/highlights.scmdeleted−150

This diff is too big to show here.

runtime/queries/opencl/indents.scmdeleted−1

This diff is too big to show here.

runtime/queries/opencl/injections.scmdeleted−1

This diff is too big to show here.

runtime/queries/opencl/textobjects.scmdeleted−1

This diff is too big to show here.

runtime/queries/perl/fold.scmdeleted−19

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/php/highlights.scm−2

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.scmdeleted−61

This diff is too big to show here.

runtime/queries/prql/highlights.scm+12−19

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/purescript/textobjects.scmdeleted−13

This diff is too big to show here.

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

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.scmdeleted−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.scmdeleted−68

This diff is too big to show here.

runtime/queries/rego/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/robot/highlights.scmdeleted−59

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

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+2−69

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/scala/locals.scmdeleted−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.scmdeleted−43

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/slint/injections.scmdeleted−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.scmdeleted−12

This diff is too big to show here.

runtime/queries/smali/highlights.scmdeleted−216

This diff is too big to show here.

runtime/queries/smali/indents.scmdeleted−31

This diff is too big to show here.

runtime/queries/smali/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/smali/locals.scmdeleted−42

This diff is too big to show here.

runtime/queries/smithy/highlights.scmdeleted−102

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/strace/highlights.scmdeleted−8

This diff is too big to show here.

runtime/queries/svelte/indents.scmdeleted−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/t32/highlights.scmdeleted−227

This diff is too big to show here.

runtime/queries/t32/injections.scmdeleted−2

This diff is too big to show here.

runtime/queries/templ/highlights.scmdeleted−99

This diff is too big to show here.

runtime/queries/templ/injections.scmdeleted−4

This diff is too big to show here.

runtime/queries/todotxt/highlights.scmdeleted−6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/tsx/locals.scmdeleted−3

This diff is too big to show here.

runtime/queries/tsx/tags.scmdeleted−3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/typst/highlights.scmdeleted−77

This diff is too big to show here.

runtime/queries/typst/injections.scmdeleted−6

This diff is too big to show here.

runtime/queries/unison/highlights.scmdeleted−87

This diff is too big to show here.

runtime/queries/unison/injections.scmdeleted−1

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/v/indents.scmdeleted−16

This diff is too big to show here.

runtime/queries/v/injections.scmdeleted−6

This diff is too big to show here.

runtime/queries/v/textobjects.scmdeleted−27

This diff is too big to show here.

runtime/queries/vhdl/highlights.scmdeleted−338

This diff is too big to show here.

runtime/queries/webc/highlights.scmdeleted−1

This diff is too big to show here.

runtime/queries/webc/injections.scmdeleted−1

This diff is too big to show here.

runtime/queries/wren/highlights.scmdeleted−82

This diff is too big to show here.

runtime/queries/wren/indents.scmdeleted−29

This diff is too big to show here.

runtime/queries/wren/injections.scmdeleted−3

This diff is too big to show here.

runtime/queries/wren/locals.scmdeleted−21

This diff is too big to show here.

runtime/queries/wren/textobjects.scmdeleted−16

This diff is too big to show here.

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

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+47−88

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+2−5

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.toml−3

This diff is too big to show here.

runtime/themes/amberwood.tomldeleted−138

This diff is too big to show here.

runtime/themes/autumn.toml+64−72

This diff is too big to show here.

runtime/themes/autumn_night.toml+11−13

This diff is too big to show here.

runtime/themes/ayu_dark.toml+2−12

This diff is too big to show here.

runtime/themes/ayu_light.toml+3−13

This diff is too big to show here.

runtime/themes/ayu_mirage.toml+2−12

This diff is too big to show here.

runtime/themes/base16_transparent.toml+1−7

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+10−20

This diff is too big to show here.

runtime/themes/cyan_light.tomldeleted−154

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/darcula.toml+4−11

This diff is too big to show here.

runtime/themes/dark_high_contrast.toml+1−6

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+70−128

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.toml−1

This diff is too big to show here.

runtime/themes/everforest_dark.toml+54−75

This diff is too big to show here.

runtime/themes/everforest_light.toml+54−75

This diff is too big to show here.

runtime/themes/ferra.tomldeleted−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+6−8

This diff is too big to show here.

runtime/themes/gruber-darker.tomldeleted−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+96−2

This diff is too big to show here.

runtime/themes/gruvbox_dark_soft.tomldeleted−7

This diff is too big to show here.

runtime/themes/gruvbox_light.toml+77−1

This diff is too big to show here.

runtime/themes/horizon-dark.tomldeleted−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−3

This diff is too big to show here.

runtime/themes/kaolin-dark.tomldeleted−108

This diff is too big to show here.

runtime/themes/kaolin-light.tomldeleted−60

This diff is too big to show here.

runtime/themes/kaolin-valley-dark.tomldeleted−73

This diff is too big to show here.

runtime/themes/licenses/everforest.LICENSEdeleted−21

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_tinted.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/modus_vivendi_tritanopia.LICENSEdeleted−5

This diff is too big to show here.

runtime/themes/licenses/poimandres.LICENSEdeleted−21

This diff is too big to show here.

runtime/themes/licenses/serika-syntax.LICENSEdeleted−21

This diff is too big to show here.

runtime/themes/licenses/sonokai.LICENSEdeleted−21

This diff is too big to show here.

runtime/themes/licenses/starlight.LICENSEdeleted−24

This diff is too big to show here.

runtime/themes/material_darker.tomldeleted−20

This diff is too big to show here.

runtime/themes/material_deep_ocean.tomldeleted−123

This diff is too big to show here.

runtime/themes/material_oceanic.tomldeleted−21

This diff is too big to show here.

runtime/themes/material_palenight.tomldeleted−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.tomldeleted−98

This diff is too big to show here.

runtime/themes/modus_operandi.tomldeleted−194

This diff is too big to show here.

runtime/themes/modus_operandi_deuteranopia.tomldeleted−46

This diff is too big to show here.

runtime/themes/modus_operandi_tinted.tomldeleted−45

This diff is too big to show here.

runtime/themes/modus_operandi_tritanopia.tomldeleted−73

This diff is too big to show here.

runtime/themes/modus_vivendi.tomldeleted−242

This diff is too big to show here.

runtime/themes/modus_vivendi_deuteranopia.tomldeleted−158

This diff is too big to show here.

runtime/themes/modus_vivendi_tinted.tomldeleted−144

This diff is too big to show here.

runtime/themes/modus_vivendi_tritanopia.tomldeleted−186

This diff is too big to show here.

runtime/themes/molokai.tomldeleted−48

This diff is too big to show here.

runtime/themes/monokai.toml+2−7

This diff is too big to show here.

runtime/themes/naysayer.tomldeleted−91

This diff is too big to show here.

runtime/themes/new_moon.tomldeleted−124

This diff is too big to show here.

runtime/themes/nightfox.toml+4−9

This diff is too big to show here.

runtime/themes/noctis.toml+32−34

This diff is too big to show here.

runtime/themes/nord-night.tomldeleted−23

This diff is too big to show here.

runtime/themes/nord.toml+102−162

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+28−34

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/poimandres.tomldeleted−113

This diff is too big to show here.

runtime/themes/poimandres_storm.tomldeleted−19

This diff is too big to show here.

runtime/themes/pop-dark.toml+4−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+32−36

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+1−2

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.tomldeleted−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.tomldeleted−72

This diff is too big to show here.

runtime/themes/yellowed.tomldeleted−135

This diff is too big to show here.

runtime/themes/zed_onedark.tomldeleted−110

This diff is too big to show here.

runtime/themes/zed_onelight.tomldeleted−55

This diff is too big to show here.

runtime/themes/zenburn.toml+1−3

This diff is too big to show here.

runtime/tutor+11−165

This diff is too big to show here.

rust-toolchain.toml+2−2

This diff is too big to show here.

theme.toml+1−3

This diff is too big to show here.

xtask/Cargo.toml+6−12

This diff is too big to show here.

xtask/src/docgen.rs+5−6

This diff is too big to show here.

xtask/src/themelint.rs−2

This diff is too big to show here.