on master help sign in
361 files changed+18266−8462
since splitsnapshots
unifiedsplit
.envrc+1 .github/ISSUE_TEMPLATE/bug_report.yaml+10 .github/workflows/build.yml+15−7 .github/workflows/cachix.yml+3−3 .github/workflows/gh-pages.yml+5−5 .github/workflows/release.yml+15−15 .ignore−3 CHANGELOG.md+260 Cargo.lock+624−590 Cargo.toml+16 README.md+2−2 VERSION−1 book/book.toml+4 book/custom.css+231 book/src/configuration.md+39−11 book/src/generated/lang-support.md+39−17 book/src/generated/typable-cmd.md+8−3 book/src/guides/adding_languages.md+2 book/src/guides/indent.md+319−43 book/src/guides/injection.md+1−1 book/src/install.md+62−21 book/src/keymap.md+21−14 book/src/languages.md+3−1 book/src/themes.md+9−1 book/src/usage.md+21−5 book/theme/book.js−660 book/theme/css/chrome.css−499 book/theme/css/general.css−233 book/theme/css/print.css−54 book/theme/css/variables.css−411 book/theme/highlight.css−56 book/theme/highlight.js−6 book/theme/index.hbs+87−51 contrib/Helix.appdata.xml+15 contrib/Helix.desktop+3−1 docs/CONTRIBUTING.md+10−3 docs/releases.md+12−5 docs/vision.md+1−1 flake.lock+21−237 flake.nix+170−143 grammars.nix+24−21 helix-core/Cargo.toml+20−16 helix-core/src/diagnostic.rs+4 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+617−145 helix-core/src/lib.rs+4−2 helix-core/src/line_ending.rs+2−2 helix-core/src/match_brackets.rs+127−27 helix-core/src/movement.rs+83−4 helix-core/src/path.rs+5−7 helix-core/src/register.rs−89 helix-core/src/rope_reader.rs+37 helix-core/src/selection.rs+68−42 helix-core/src/syntax.rs+89−81 helix-core/src/transaction.rs+191−51 helix-core/src/wrap.rs+3−1 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+153−25 helix-dap/Cargo.toml+11−9 helix-event/Cargo.toml+16 helix-event/src/lib.rs+8 helix-event/src/redraw.rs+49 helix-loader/Cargo.toml+14−12 helix-loader/build.rs+20−6 helix-loader/src/lib.rs+78−17 helix-lsp/Cargo.toml+15−13 helix-lsp/src/client.rs+123−11 helix-lsp/src/file_event.rs+193 helix-lsp/src/lib.rs+51−32 helix-lsp/src/transport.rs+9−1 helix-parsec/Cargo.toml+8−7 helix-term/Cargo.toml+33−25 helix-term/src/application.rs+206−121 helix-term/src/args.rs+29 helix-term/src/commands.rs+700−411 helix-term/src/commands/dap.rs+58−55 helix-term/src/commands/lsp.rs+75−85 helix-term/src/commands/typed.rs+946−692 helix-term/src/compositor.rs+12 helix-term/src/config.rs+1 helix-term/src/health.rs+44−16 helix-term/src/keymap.rs+14−14 helix-term/src/keymap/default.rs+8−2 helix-term/src/main.rs+21−17 helix-term/src/ui/completion.rs+32−4 helix-term/src/ui/document.rs+60−24 helix-term/src/ui/editor.rs+105−55 helix-term/src/ui/fuzzy_match.rs−239 helix-term/src/ui/fuzzy_match/test.rs−47 helix-term/src/ui/lsp.rs+5−3 helix-term/src/ui/markdown.rs+19−12 helix-term/src/ui/menu.rs+73−40 helix-term/src/ui/mod.rs+101−164 helix-term/src/ui/picker.rs+572−577 helix-term/src/ui/popup.rs+27−7 helix-term/src/ui/prompt.rs+55−48 helix-term/src/ui/statusline.rs+14 helix-term/tests/integration.rs+1 helix-term/tests/test/auto_pairs.rs+1−1 helix-term/tests/test/commands.rs+47 helix-term/tests/test/commands/movement.rs+452 helix-term/tests/test/commands/write.rs+122−3 helix-term/tests/test/helpers.rs+10−2 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+39 helix-term/tests/test/splits.rs+3−3 helix-tui/Cargo.toml+15−15 helix-tui/src/backend/crossterm.rs+51−33 helix-tui/src/buffer.rs+2−2 helix-tui/src/terminal.rs−14 helix-vcs/Cargo.toml+12−10 helix-vcs/src/diff.rs+6−19 helix-vcs/src/diff/worker.rs+3−9 helix-vcs/src/diff/worker/test.rs+1−5 helix-vcs/src/git.rs+5−5 helix-view/Cargo.toml+22−18 helix-view/src/clipboard.rs+7−2 helix-view/src/document.rs+220−76 helix-view/src/editor.rs+231−91 helix-view/src/gutter.rs+4−5 helix-view/src/handlers/dap.rs+1−3 helix-view/src/info.rs+4−11 helix-view/src/input.rs+67−3 helix-view/src/lib.rs+1 helix-view/src/register.rs+333 helix-view/src/theme.rs+25−4 helix-view/src/view.rs+8−2 languages.toml+592−210 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+5 runtime/queries/c/indents.scm+18−1 runtime/queries/comment/highlights.scm+8−8 runtime/queries/common-lisp/indents.scm+1 runtime/queries/dart/highlights.scm+3−1 runtime/queries/dbml/highlights.scm+44 runtime/queries/ecma/README.md+14 runtime/queries/ecma/highlights.scm+9−2 runtime/queries/ecma/locals.scm+17−3 runtime/queries/forth/highlights.scm+1−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/gemini/highlights.scm+26 runtime/queries/gleam/highlights.scm+16−5 runtime/queries/gn/highlights.scm+42 runtime/queries/gn/injections.scm+15 runtime/queries/gn/locals.scm+16 runtime/queries/go/highlights.scm+13−5 runtime/queries/go/locals.scm+10−2 runtime/queries/hare/highlights.scm+4−1 runtime/queries/haskell-persistent/folds.scm+3 runtime/queries/haskell-persistent/highlights.scm+37 runtime/queries/haskell-persistent/locals.scm+1 runtime/queries/haskell/highlights.scm+24−11 runtime/queries/haskell/injections.scm+8 runtime/queries/janet/highlights.scm+1 runtime/queries/java/indents.scm+35 runtime/queries/javascript/highlights.scm+2−37 runtime/queries/javascript/indents.scm+3−1 runtime/queries/javascript/injections.scm+3−1 runtime/queries/javascript/locals.scm+3−1 runtime/queries/javascript/tags.scm+2−87 runtime/queries/javascript/textobjects.scm+3−1 runtime/queries/jinja/highlights.scm+7 runtime/queries/jinja/injections.scm+4 runtime/queries/json5/highlights.scm+11 runtime/queries/jsx/highlights.scm+2−36 runtime/queries/jsx/indents.scm+2−8 runtime/queries/jsx/injections.scm+3−1 runtime/queries/jsx/locals.scm+3−1 runtime/queries/jsx/tags.scm+3 runtime/queries/jsx/textobjects.scm+3−1 runtime/queries/kdl/highlights.scm+4−4 runtime/queries/kdl/indents.scm+3 runtime/queries/kdl/textobjects.scm+27 runtime/queries/kotlin/highlights.scm+4−1 runtime/queries/kotlin/locals.scm+15 runtime/queries/log/highlights.scm+10 runtime/queries/lpf/highlights.scm+19 runtime/queries/markdown.inline/injections.scm+4−1 runtime/queries/matlab/context.scm+41 runtime/queries/matlab/folds.scm+11 runtime/queries/matlab/highlights.scm+108−77 runtime/queries/matlab/indents.scm+23 runtime/queries/matlab/injections.scm+2 runtime/queries/matlab/locals.scm+19 runtime/queries/matlab/textobjects.scm+9 runtime/queries/nix/injections.scm+14 runtime/queries/nu/folds.scm−4 runtime/queries/nu/highlights.scm+276−44 runtime/queries/nu/injections.scm+1−1 runtime/queries/nu/locals.scm−13 runtime/queries/nunjucks/highlights.scm+1 runtime/queries/nunjucks/injections.scm+1 runtime/queries/ocaml/highlights.scm+2 runtime/queries/perl/fold.scm+19 runtime/queries/perl/highlights.scm+72−155 runtime/queries/perl/indents.scm+25−11 runtime/queries/perl/injections.scm+3−1 runtime/queries/perl/textobjects.scm+10−13 runtime/queries/pod/highlights.scm+61 runtime/queries/prql/highlights.scm+19−12 runtime/queries/purescript/highlights.scm+164−1 runtime/queries/purescript/injections.scm+2−1 runtime/queries/purescript/locals.scm+4−1 runtime/queries/purescript/textobjects.scm+13 runtime/queries/python/highlights.scm+6 runtime/queries/python/indents.scm+9 runtime/queries/racket/indents.scm+1 runtime/queries/regex/highlights.scm+1−1 runtime/queries/robot/highlights.scm+51−13 runtime/queries/ron/highlights.scm+43−1 runtime/queries/ron/indents.scm+12−1 runtime/queries/ron/injections.scm+2−1 runtime/queries/rust/highlights.scm+7 runtime/queries/rust/indents.scm+69−2 runtime/queries/rust/injections.scm+6 runtime/queries/rust/locals.scm+14−1 runtime/queries/rust/textobjects.scm+4−1 runtime/queries/scheme/highlights.scm+5 runtime/queries/scheme/indents.scm+43 runtime/queries/slint/highlights.scm+118−72 runtime/queries/slint/indents.scm+6−5 runtime/queries/slint/injections.scm+2 runtime/queries/slint/locals.scm+1−1 runtime/queries/smali/folds.scm+12 runtime/queries/smali/highlights.scm+216 runtime/queries/smali/indents.scm+31 runtime/queries/smali/injections.scm+2 runtime/queries/smali/locals.scm+42 runtime/queries/sql/highlights.scm+326−176 runtime/queries/strace/highlights.scm+8 runtime/queries/svelte/indents.scm+18 runtime/queries/svelte/injections.scm+10 runtime/queries/t32/highlights.scm+108−26 runtime/queries/templ/highlights.scm+99 runtime/queries/templ/injections.scm+4 runtime/queries/todotxt/highlights.scm+6 runtime/queries/toml/highlights.scm+15−2 runtime/queries/tsx/highlights.scm+3−1 runtime/queries/tsx/indents.scm+3−1 runtime/queries/tsx/injections.scm+3−1 runtime/queries/tsx/locals.scm+3 runtime/queries/tsx/tags.scm+3 runtime/queries/tsx/textobjects.scm+3−1 runtime/queries/typescript/highlights.scm+2−81 runtime/queries/typescript/indents.scm+2−6 runtime/queries/typescript/injections.scm+3−1 runtime/queries/typescript/locals.scm+3−2 runtime/queries/typescript/tags.scm+2−22 runtime/queries/typescript/textobjects.scm+2−7 runtime/queries/typst/highlights.scm+77 runtime/queries/typst/injections.scm+6 runtime/queries/unison/highlights.scm+87 runtime/queries/unison/injections.scm+1 runtime/queries/v/highlights.scm+85−51 runtime/queries/v/indents.scm+2−3 runtime/queries/v/textobjects.scm+3−3 runtime/queries/webc/highlights.scm+1 runtime/queries/webc/injections.scm+1 runtime/queries/wren/highlights.scm+82 runtime/queries/wren/indents.scm+29 runtime/queries/wren/injections.scm+3 runtime/queries/wren/locals.scm+21 runtime/queries/wren/textobjects.scm+16 runtime/queries/yaml/indents.scm+35−1 runtime/queries/yaml/injections.scm+52 runtime/queries/yuck/highlights.scm+1−1 runtime/queries/zig/highlights.scm+5−2 runtime/queries/zig/textobjects.scm+3−3 runtime/themes/README.md+8 runtime/themes/autumn.toml+62−65 runtime/themes/autumn_night.toml+6−6 runtime/themes/catppuccin_frappe.toml+2 runtime/themes/catppuccin_latte.toml+2 runtime/themes/catppuccin_macchiato.toml+2 runtime/themes/catppuccin_mocha.toml+11 runtime/themes/cyan_light.toml+154 runtime/themes/darcula-solid.toml+1−4 runtime/themes/darcula.toml+10−4 runtime/themes/dark_plus.toml+2−1 runtime/themes/dracula.toml+2 runtime/themes/everblush.toml+1 runtime/themes/everforest_dark.toml+4 runtime/themes/gruber-darker.toml+114 runtime/themes/gruvbox.toml+1 runtime/themes/gruvbox_dark_hard.toml−2 runtime/themes/gruvbox_light.toml−2 runtime/themes/horizon-dark.toml+80 runtime/themes/jellybeans.toml+1−1 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/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+1−1 runtime/themes/monokai.toml+5 runtime/themes/naysayer.toml+91 runtime/themes/new_moon.toml+124 runtime/themes/nightfox.toml+2−2 runtime/themes/noctis.toml+26−26 runtime/themes/nord-night.toml+23 runtime/themes/nord.toml+162−105 runtime/themes/onedark.toml+1 runtime/themes/onedarker.toml+1 runtime/themes/papercolor-dark.toml+67−116 runtime/themes/papercolor-light.toml+194−103 runtime/themes/poimandres.toml+113 runtime/themes/poimandres_storm.toml+19 runtime/themes/pop-dark.toml+4−4 runtime/themes/rose_pine.toml+31−29 runtime/themes/starlight.toml+113 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−1 runtime/tutor+157−3 rust-toolchain.toml+2−2 xtask/Cargo.toml+12−6
.envrc+1
@@ -1,5 +1,6 @@
11watch_file shell.nix
22watch_file flake.lock
3+watch_file rust-toolchain.toml
34
45# try to use flakes, if it fails use normal nix (ie. shell.nix)
56use flake || use nix
.github/ISSUE_TEMPLATE/bug_report.yaml+10
@@ -55,6 +55,16 @@ body:
5555 placeholder: wezterm 20220101-133340-7edc5b5a
5656 validations:
5757 required: true
58+ - type: input
59+ id: installation-method
60+ attributes:
61+ label: Installation Method
62+ description: >
63+ How you installed Helix - from a package manager like Homebrew or the
64+ AUR, built from source, downloaded a binary from the releases page, etc.
65+ placeholder: "source / brew / nixpkgs / flake / releases page"
66+ validations:
67+ required: true
5868 - type: input
5969 id: helix-version
6070 attributes:
.github/workflows/build.yml+15−7
@@ -14,7 +14,7 @@ jobs:
1414 runs-on: ubuntu-latest
1515 steps:
1616 - name: Checkout sources
17− uses: actions/checkout@v3
17+ uses: actions/checkout@v4
1818 - name: Install stable toolchain
1919 uses: helix-editor/rust-toolchain@v1
2020 with:
@@ -22,6 +22,8 @@ jobs:
2222 override: true
2323
2424 - uses: Swatinem/rust-cache@v2
25+ with:
26+ shared-key: "build"
2527
2628 - name: Run cargo check
2729 run: cargo check
@@ -34,12 +36,14 @@ jobs:
3436 HELIX_LOG_LEVEL: info
3537 steps:
3638 - name: Checkout sources
37− uses: actions/checkout@v3
39+ uses: actions/checkout@v4
3840
3941 - name: Install stable toolchain
40− uses: dtolnay/rust-toolchain@1.65
42+ uses: dtolnay/rust-toolchain@1.70
4143
4244 - uses: Swatinem/rust-cache@v2
45+ with:
46+ shared-key: "build"
4347
4448 - name: Cache test tree-sitter grammar
4549 uses: actions/cache@v3
@@ -63,14 +67,16 @@ jobs:
6367 runs-on: ubuntu-latest
6468 steps:
6569 - name: Checkout sources
66− uses: actions/checkout@v3
70+ uses: actions/checkout@v4
6771
6872 - name: Install stable toolchain
69− uses: dtolnay/rust-toolchain@1.65
73+ uses: dtolnay/rust-toolchain@1.70
7074 with:
7175 components: rustfmt, clippy
7276
7377 - uses: Swatinem/rust-cache@v2
78+ with:
79+ shared-key: "build"
7480
7581 - name: Run cargo fmt
7682 run: cargo fmt --all --check
@@ -88,12 +94,14 @@ jobs:
8894 runs-on: ubuntu-latest
8995 steps:
9096 - name: Checkout sources
91− uses: actions/checkout@v3
97+ uses: actions/checkout@v4
9298
9399 - name: Install stable toolchain
94− uses: dtolnay/rust-toolchain@1.65
100+ uses: dtolnay/rust-toolchain@1.70
95101
96102 - uses: Swatinem/rust-cache@v2
103+ with:
104+ shared-key: "build"
97105
98106 - name: Validate queries
99107 run: cargo xtask query-check
.github/workflows/cachix.yml+3−3
@@ -11,13 +11,13 @@ jobs:
1111 runs-on: ubuntu-latest
1212 steps:
1313 - name: Checkout sources
14− uses: actions/checkout@v3
14+ uses: actions/checkout@v4
1515
1616 - name: Install nix
17− uses: cachix/install-nix-action@v21
17+ uses: cachix/install-nix-action@v24
1818
1919 - name: Authenticate with Cachix
20− uses: cachix/cachix-action@v12
20+ uses: cachix/cachix-action@v13
2121 with:
2222 name: helix
2323 authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
.github/workflows/gh-pages.yml+5−5
@@ -11,7 +11,7 @@ jobs:
1111 deploy:
1212 runs-on: ubuntu-latest
1313 steps:
14− - uses: actions/checkout@v3
14+ - uses: actions/checkout@v4
1515
1616 - name: Setup mdBook
1717 uses: peaceiris/actions-mdbook@v1
@@ -26,16 +26,16 @@ jobs:
2626 OUTDIR=$(basename ${{ github.ref }})
2727 echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
2828
29− - name: Deploy
29+ - name: Deploy stable
3030 uses: peaceiris/actions-gh-pages@v3
31+ if: startswith(github.ref, 'refs/tags/')
3132 with:
3233 github_token: ${{ secrets.GITHUB_TOKEN }}
3334 publish_dir: ./book/book
34− destination_dir: ./${{ env.OUTDIR }}
3535
36− - name: Deploy stable
36+ - name: Deploy
3737 uses: peaceiris/actions-gh-pages@v3
38− if: startswith(github.ref, 'refs/tags/')
3938 with:
4039 github_token: ${{ secrets.GITHUB_TOKEN }}
4140 publish_dir: ./book/book
41+ destination_dir: ./${{ env.OUTDIR }}
.github/workflows/release.yml+15−15
@@ -23,7 +23,7 @@ jobs:
2323 runs-on: ubuntu-latest
2424 steps:
2525 - name: Checkout sources
26− uses: actions/checkout@v3
26+ uses: actions/checkout@v4
2727
2828 - name: Install stable toolchain
2929 uses: dtolnay/rust-toolchain@stable
@@ -36,7 +36,7 @@ jobs:
3636 - name: Bundle grammars
3737 run: tar cJf grammars.tar.xz -C runtime/grammars/sources .
3838
39− - uses: actions/upload-artifact@v3
39+ - uses: actions/upload-artifact@v4
4040 with:
4141 name: grammars
4242 path: grammars.tar.xz
@@ -70,11 +70,11 @@ jobs:
7070 rust: stable
7171 target: aarch64-unknown-linux-gnu
7272 cross: true
73− - build: riscv64-linux
74− os: ubuntu-latest
75− rust: stable
76− target: riscv64gc-unknown-linux-gnu
77− cross: true
73+ # - build: riscv64-linux
74+ # os: ubuntu-latest
75+ # rust: stable
76+ # target: riscv64gc-unknown-linux-gnu
77+ # cross: true
7878 - build: x86_64-macos
7979 os: macos-latest
8080 rust: stable
@@ -103,10 +103,10 @@ jobs:
103103
104104 steps:
105105 - name: Checkout sources
106− uses: actions/checkout@v3
106+ uses: actions/checkout@v4
107107
108108 - name: Download grammars
109− uses: actions/download-artifact@v3
109+ uses: actions/download-artifact@v4
110110
111111 - name: Move grammars under runtime
112112 if: "!startsWith(matrix.os, 'windows')"
@@ -160,7 +160,7 @@ jobs:
160160
161161 - name: Build AppImage
162162 shell: bash
163− if: matrix.build == 'aarch64-linux' || matrix.build == 'x86_64-linux'
163+ if: matrix.build == 'x86_64-linux'
164164 run: |
165165 # Required as of 22.x https://github.com/AppImage/AppImageKit/wiki/FUSE
166166 sudo add-apt-repository universe
@@ -220,7 +220,7 @@ jobs:
220220 fi
221221 cp -r runtime dist
222222
223− - uses: actions/upload-artifact@v3
223+ - uses: actions/upload-artifact@v4
224224 with:
225225 name: bins-${{ matrix.build }}
226226 path: dist
@@ -231,9 +231,9 @@ jobs:
231231 runs-on: ubuntu-latest
232232 steps:
233233 - name: Checkout sources
234− uses: actions/checkout@v3
234+ uses: actions/checkout@v4
235235
236− - uses: actions/download-artifact@v3
236+ - uses: actions/download-artifact@v4
237237
238238 - name: Build archive
239239 shell: bash
@@ -263,7 +263,7 @@ jobs:
263263 mv bins-$platform/hx$exe $pkgname
264264 chmod +x $pkgname/hx$exe
265265
266− if [[ "$platform" = "aarch64-linux" || "$platform" = "x86_64-linux" ]]; then
266+ if [[ "$platform" = "x86_64-linux" ]]; then
267267 mv bins-$platform/helix-*.AppImage* dist/
268268 fi
269269
@@ -288,7 +288,7 @@ jobs:
288288 overwrite: true
289289
290290 - name: Upload binaries as artifact
291− uses: actions/upload-artifact@v3
291+ uses: actions/upload-artifact@v4
292292 if: env.preview == 'true'
293293 with:
294294 name: release
.ignore−3
@@ -1,5 +1,2 @@
11# Things that we don't want ripgrep to search that we do want in git
22# https://github.com/BurntSushi/ripgrep/blob/master/GUIDE.md#automatic-filtering
3−
4−# Minified JS vendored from mdbook
5−book/theme/highlight.js
CHANGELOG.md+260
@@ -1,3 +1,263 @@
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+
1261# 23.05 (2023-05-18)
2262
326323.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!
Cargo.lock+624−590
@@ -3,48 +3,38 @@
33version = 3
44
55[[package]]
6−name = "adler"
7−version = "1.0.2"
6+name = "addr2line"
7+version = "0.20.0"
88source = "registry+https://github.com/rust-lang/crates.io-index"
9−checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
9+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
10+dependencies = [
11+ "gimli",
12+]
1013
1114[[package]]
12−name = "ahash"
13−version = "0.7.6"
15+name = "adler"
16+version = "1.0.2"
1417source = "registry+https://github.com/rust-lang/crates.io-index"
15−checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
16−dependencies = [
17− "getrandom",
18− "once_cell",
19− "version_check",
20−]
18+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
2119
2220[[package]]
2321name = "ahash"
24−version = "0.8.3"
22+version = "0.8.6"
2523source = "registry+https://github.com/rust-lang/crates.io-index"
26−checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
24+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
2725dependencies = [
2826 "cfg-if",
2927 "getrandom",
3028 "once_cell",
3129 "version_check",
30+ "zerocopy",
3231]
3332
3433[[package]]
3534name = "aho-corasick"
36−version = "0.7.20"
35+version = "1.1.2"
3736source = "registry+https://github.com/rust-lang/crates.io-index"
38−checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
39−dependencies = [
40− "memchr",
41−]
42−
43−[[package]]
44−name = "aho-corasick"
45−version = "1.0.1"
46−source = "registry+https://github.com/rust-lang/crates.io-index"
47−checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
37+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
4838dependencies = [
4939 "memchr",
5040]
@@ -72,9 +62,9 @@ dependencies = [
7262
7363[[package]]
7464name = "anyhow"
75−version = "1.0.71"
65+version = "1.0.76"
7666source = "registry+https://github.com/rust-lang/crates.io-index"
77−checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
67+checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
7868
7969[[package]]
8070name = "arc-swap"
@@ -88,6 +78,21 @@ version = "1.1.0"
8878source = "registry+https://github.com/rust-lang/crates.io-index"
8979checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
9080
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+
9196[[package]]
9297name = "bitflags"
9398version = "1.3.2"
@@ -96,18 +101,17 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
96101
97102[[package]]
98103name = "bitflags"
99−version = "2.3.1"
104+version = "2.4.1"
100105source = "registry+https://github.com/rust-lang/crates.io-index"
101−checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
106+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
102107
103108[[package]]
104109name = "bstr"
105−version = "1.4.0"
110+version = "1.8.0"
106111source = "registry+https://github.com/rust-lang/crates.io-index"
107−checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09"
112+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
108113dependencies = [
109114 "memchr",
110− "once_cell",
111115 "regex-automata",
112116 "serde",
113117]
@@ -127,12 +131,6 @@ version = "3.12.0"
127131source = "registry+https://github.com/rust-lang/crates.io-index"
128132checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
129133
130−[[package]]
131−name = "bytecount"
132−version = "0.6.3"
133−source = "registry+https://github.com/rust-lang/crates.io-index"
134−checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
135−
136134[[package]]
137135name = "bytes"
138136version = "1.4.0"
@@ -147,9 +145,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
147145
148146[[package]]
149147name = "cc"
150−version = "1.0.79"
148+version = "1.0.84"
151149source = "registry+https://github.com/rust-lang/crates.io-index"
152−checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
150+checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
151+dependencies = [
152+ "libc",
153+]
153154
154155[[package]]
155156name = "cfg-if"
@@ -170,25 +171,23 @@ dependencies = [
170171
171172[[package]]
172173name = "chrono"
173−version = "0.4.26"
174+version = "0.4.31"
174175source = "registry+https://github.com/rust-lang/crates.io-index"
175−checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
176+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
176177dependencies = [
177178 "android-tzdata",
178179 "iana-time-zone",
179180 "num-traits",
180− "winapi",
181+ "windows-targets 0.48.0",
181182]
182183
183184[[package]]
184185name = "clipboard-win"
185−version = "4.5.0"
186+version = "5.0.0"
186187source = "registry+https://github.com/rust-lang/crates.io-index"
187−checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
188+checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
188189dependencies = [
189190 "error-code",
190− "str-buf",
191− "winapi",
192191]
193192
194193[[package]]
@@ -222,6 +221,12 @@ version = "0.8.4"
222221source = "registry+https://github.com/rust-lang/crates.io-index"
223222checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
224223
224+[[package]]
225+name = "cov-mark"
226+version = "1.1.0"
227+source = "registry+https://github.com/rust-lang/crates.io-index"
228+checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3"
229+
225230[[package]]
226231name = "crc32fast"
227232version = "1.3.2"
@@ -231,14 +236,58 @@ dependencies = [
231236 "cfg-if",
232237]
233238
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+
234282[[package]]
235283name = "crossterm"
236−version = "0.26.1"
284+version = "0.27.0"
237285source = "registry+https://github.com/rust-lang/crates.io-index"
238−checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
286+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
239287dependencies = [
240− "bitflags 1.3.2",
288+ "bitflags 2.4.1",
241289 "crossterm_winapi",
290+ "filedescriptor",
242291 "futures-core",
243292 "libc",
244293 "mio",
@@ -250,9 +299,9 @@ dependencies = [
250299
251300[[package]]
252301name = "crossterm_winapi"
253−version = "0.9.0"
302+version = "0.9.1"
254303source = "registry+https://github.com/rust-lang/crates.io-index"
255−checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
304+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
256305dependencies = [
257306 "winapi",
258307]
@@ -281,7 +330,7 @@ dependencies = [
281330 "proc-macro2",
282331 "quote",
283332 "scratch",
284− "syn 2.0.15",
333+ "syn 2.0.38",
285334]
286335
287336[[package]]
@@ -298,7 +347,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
298347dependencies = [
299348 "proc-macro2",
300349 "quote",
301− "syn 2.0.15",
350+ "syn 2.0.38",
302351]
303352
304353[[package]]
@@ -315,9 +364,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
315364
316365[[package]]
317366name = "encoding_rs"
318−version = "0.8.32"
367+version = "0.8.33"
319368source = "registry+https://github.com/rust-lang/crates.io-index"
320−checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
369+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
321370dependencies = [
322371 "cfg-if",
323372]
@@ -332,35 +381,26 @@ dependencies = [
332381]
333382
334383[[package]]
335−name = "errno"
336−version = "0.3.1"
384+name = "equivalent"
385+version = "1.0.0"
337386source = "registry+https://github.com/rust-lang/crates.io-index"
338−checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
339−dependencies = [
340− "errno-dragonfly",
341− "libc",
342− "windows-sys 0.48.0",
343−]
387+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
344388
345389[[package]]
346−name = "errno-dragonfly"
347−version = "0.1.2"
390+name = "errno"
391+version = "0.3.8"
348392source = "registry+https://github.com/rust-lang/crates.io-index"
349−checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
393+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
350394dependencies = [
351− "cc",
352395 "libc",
396+ "windows-sys 0.52.0",
353397]
354398
355399[[package]]
356400name = "error-code"
357−version = "2.3.1"
401+version = "3.0.0"
358402source = "registry+https://github.com/rust-lang/crates.io-index"
359−checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
360−dependencies = [
361− "libc",
362− "str-buf",
363−]
403+checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
364404
365405[[package]]
366406name = "etcetera"
@@ -374,14 +414,20 @@ dependencies = [
374414]
375415
376416[[package]]
377−name = "fastrand"
378−version = "1.9.0"
417+name = "faster-hex"
418+version = "0.9.0"
379419source = "registry+https://github.com/rust-lang/crates.io-index"
380−checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
420+checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
381421dependencies = [
382− "instant",
422+ "serde",
383423]
384424
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+
385431[[package]]
386432name = "fern"
387433version = "0.6.2"
@@ -392,53 +438,46 @@ dependencies = [
392438]
393439
394440[[package]]
395−name = "filetime"
396−version = "0.2.21"
441+name = "filedescriptor"
442+version = "0.8.2"
397443source = "registry+https://github.com/rust-lang/crates.io-index"
398−checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
444+checksum = "7199d965852c3bac31f779ef99cbb4537f80e952e2d6aa0ffeb30cce00f4f46e"
399445dependencies = [
400− "cfg-if",
401446 "libc",
402− "redox_syscall 0.2.16",
403− "windows-sys 0.48.0",
447+ "thiserror",
448+ "winapi",
404449]
405450
406451[[package]]
407452name = "flate2"
408−version = "1.0.25"
453+version = "1.0.27"
409454source = "registry+https://github.com/rust-lang/crates.io-index"
410−checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
455+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
411456dependencies = [
412457 "crc32fast",
413458 "miniz_oxide",
414459]
415460
416−[[package]]
417−name = "fnv"
418−version = "1.0.7"
419−source = "registry+https://github.com/rust-lang/crates.io-index"
420−checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
421−
422461[[package]]
423462name = "form_urlencoded"
424−version = "1.2.0"
463+version = "1.2.1"
425464source = "registry+https://github.com/rust-lang/crates.io-index"
426−checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
465+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
427466dependencies = [
428467 "percent-encoding",
429468]
430469
431470[[package]]
432471name = "futures-core"
433−version = "0.3.28"
472+version = "0.3.30"
434473source = "registry+https://github.com/rust-lang/crates.io-index"
435−checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
474+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
436475
437476[[package]]
438477name = "futures-executor"
439−version = "0.3.28"
478+version = "0.3.29"
440479source = "registry+https://github.com/rust-lang/crates.io-index"
441−checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
480+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
442481dependencies = [
443482 "futures-core",
444483 "futures-task",
@@ -447,15 +486,15 @@ dependencies = [
447486
448487[[package]]
449488name = "futures-task"
450−version = "0.3.28"
489+version = "0.3.30"
451490source = "registry+https://github.com/rust-lang/crates.io-index"
452−checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
491+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
453492
454493[[package]]
455494name = "futures-util"
456−version = "0.3.28"
495+version = "0.3.30"
457496source = "registry+https://github.com/rust-lang/crates.io-index"
458−checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
497+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
459498dependencies = [
460499 "futures-core",
461500 "futures-task",
@@ -464,15 +503,6 @@ dependencies = [
464503 "slab",
465504]
466505
467−[[package]]
468−name = "fuzzy-matcher"
469−version = "0.3.7"
470−source = "registry+https://github.com/rust-lang/crates.io-index"
471−checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
472−dependencies = [
473− "thread_local",
474−]
475−
476506[[package]]
477507name = "getrandom"
478508version = "0.2.9"
@@ -484,17 +514,21 @@ dependencies = [
484514 "wasi",
485515]
486516
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+
487523[[package]]
488524name = "gix"
489−version = "0.46.0"
525+version = "0.57.0"
490526source = "registry+https://github.com/rust-lang/crates.io-index"
491−checksum = "99368b48a2f68c3fdc26e62c6425bdc4baeb4f30a4f24eb2e0904d29a2ba97ab"
527+checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
492528dependencies = [
493529 "gix-actor",
494− "gix-attributes",
495530 "gix-commitgraph",
496531 "gix-config",
497− "gix-credentials",
498532 "gix-date",
499533 "gix-diff",
500534 "gix-discover",
@@ -503,29 +537,25 @@ dependencies = [
503537 "gix-glob",
504538 "gix-hash",
505539 "gix-hashtable",
506− "gix-ignore",
507− "gix-index",
508540 "gix-lock",
509− "gix-mailmap",
510− "gix-negotiate",
541+ "gix-macros",
511542 "gix-object",
512543 "gix-odb",
513544 "gix-pack",
514545 "gix-path",
515− "gix-prompt",
516546 "gix-ref",
517547 "gix-refspec",
518548 "gix-revision",
549+ "gix-revwalk",
519550 "gix-sec",
520551 "gix-tempfile",
552+ "gix-trace",
521553 "gix-traverse",
522554 "gix-url",
523555 "gix-utils",
524556 "gix-validate",
525− "gix-worktree",
526− "log",
527557 "once_cell",
528− "signal-hook",
558+ "parking_lot",
529559 "smallvec",
530560 "thiserror",
531561 "unicode-normalization",
@@ -533,67 +563,32 @@ dependencies = [
533563
534564[[package]]
535565name = "gix-actor"
536−version = "0.21.0"
566+version = "0.29.0"
537567source = "registry+https://github.com/rust-lang/crates.io-index"
538−checksum = "9fe73f9f6be1afbf1bd5be919a9636fa560e2f14d42262a934423ed6760cd838"
568+checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
539569dependencies = [
540570 "bstr",
541571 "btoi",
542572 "gix-date",
543573 "itoa",
544− "nom",
545− "thiserror",
546−]
547−
548−[[package]]
549−name = "gix-attributes"
550−version = "0.13.1"
551−source = "registry+https://github.com/rust-lang/crates.io-index"
552−checksum = "78b79590ac382f80d87e06416f5fcac6fee5d83dcb152a00ed0bdbaa988acc31"
553−dependencies = [
554− "bstr",
555− "gix-glob",
556− "gix-path",
557− "gix-quote",
558− "kstring",
559− "log",
560− "smallvec",
561− "thiserror",
562− "unicode-bom",
563−]
564−
565−[[package]]
566−name = "gix-bitmap"
567−version = "0.2.4"
568−source = "registry+https://github.com/rust-lang/crates.io-index"
569−checksum = "fc02feb20ad313d52a450852f2005c2205d24f851e74d82b7807cbe12c371667"
570−dependencies = [
571574 "thiserror",
575+ "winnow 0.5.28",
572576]
573577
574578[[package]]
575579name = "gix-chunk"
576−version = "0.4.2"
580+version = "0.4.6"
577581source = "registry+https://github.com/rust-lang/crates.io-index"
578−checksum = "a7acf3bc6c4b91e8fb260086daf5e105ea3a6d913f5fd3318137f7e309d6e540"
582+checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
579583dependencies = [
580584 "thiserror",
581585]
582586
583−[[package]]
584−name = "gix-command"
585−version = "0.2.5"
586−source = "registry+https://github.com/rust-lang/crates.io-index"
587−checksum = "5f6141b70cfb21255223e42f3379855037cbbe8673b58dd8318d2f09b516fad1"
588−dependencies = [
589− "bstr",
590−]
591−
592587[[package]]
593588name = "gix-commitgraph"
594−version = "0.16.0"
589+version = "0.23.0"
595590source = "registry+https://github.com/rust-lang/crates.io-index"
596−checksum = "e8490ae1b3d55c47e6a71d247c082304a2f79f8d0332c1a2f5693d42a2021a09"
591+checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
597592dependencies = [
598593 "bstr",
599594 "gix-chunk",
@@ -605,9 +600,9 @@ dependencies = [
605600
606601[[package]]
607602name = "gix-config"
608−version = "0.23.0"
603+version = "0.33.0"
609604source = "registry+https://github.com/rust-lang/crates.io-index"
610−checksum = "51f310120ae1ba8f0ca52fb22876ce9bad5b15c8ffb3eb7302e4b64a3b9f681c"
605+checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
611606dependencies = [
612607 "bstr",
613608 "gix-config-value",
@@ -616,49 +611,32 @@ dependencies = [
616611 "gix-path",
617612 "gix-ref",
618613 "gix-sec",
619− "log",
620614 "memchr",
621− "nom",
622615 "once_cell",
623616 "smallvec",
624617 "thiserror",
625618 "unicode-bom",
619+ "winnow 0.5.28",
626620]
627621
628622[[package]]
629623name = "gix-config-value"
630−version = "0.12.1"
624+version = "0.14.2"
631625source = "registry+https://github.com/rust-lang/crates.io-index"
632−checksum = "6f216df1c33e6e1555923eff0096858a879e8aaadd35b5d788641e4e8064c892"
626+checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
633627dependencies = [
634− "bitflags 2.3.1",
628+ "bitflags 2.4.1",
635629 "bstr",
636630 "gix-path",
637631 "libc",
638632 "thiserror",
639633]
640634
641−[[package]]
642−name = "gix-credentials"
643−version = "0.15.0"
644−source = "registry+https://github.com/rust-lang/crates.io-index"
645−checksum = "c6f89fea8acd28f5ef8fa5042146f1637afd4d834bc8f13439d8fd1e5aca0d65"
646−dependencies = [
647− "bstr",
648− "gix-command",
649− "gix-config-value",
650− "gix-path",
651− "gix-prompt",
652− "gix-sec",
653− "gix-url",
654− "thiserror",
655−]
656−
657635[[package]]
658636name = "gix-date"
659−version = "0.5.1"
637+version = "0.8.2"
660638source = "registry+https://github.com/rust-lang/crates.io-index"
661−checksum = "bc164145670e9130a60a21670d9b6f0f4f8de04e5dd256c51fa5a0340c625902"
639+checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
662640dependencies = [
663641 "bstr",
664642 "itoa",
@@ -668,21 +646,21 @@ dependencies = [
668646
669647[[package]]
670648name = "gix-diff"
671−version = "0.30.1"
649+version = "0.39.0"
672650source = "registry+https://github.com/rust-lang/crates.io-index"
673−checksum = "9029ad0083cc286a4bd2f5b3bf66bb66398abc26f2731a2824cd5edfc41a0e33"
651+checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
674652dependencies = [
653+ "bstr",
675654 "gix-hash",
676655 "gix-object",
677− "imara-diff",
678656 "thiserror",
679657]
680658
681659[[package]]
682660name = "gix-discover"
683−version = "0.19.0"
661+version = "0.28.0"
684662source = "registry+https://github.com/rust-lang/crates.io-index"
685−checksum = "aba9c6c0d1f2b2efe65581de73de4305004612d49c83773e783202a7ef204f46"
663+checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
686664dependencies = [
687665 "bstr",
688666 "dunce",
@@ -695,13 +673,14 @@ dependencies = [
695673
696674[[package]]
697675name = "gix-features"
698−version = "0.30.0"
676+version = "0.37.0"
699677source = "registry+https://github.com/rust-lang/crates.io-index"
700−checksum = "3a8c493409bf6060d408eec9bbdd1b12ea351266b50012e2a522f75dfc7b8314"
678+checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
701679dependencies = [
702680 "crc32fast",
703681 "flate2",
704682 "gix-hash",
683+ "gix-trace",
705684 "libc",
706685 "once_cell",
707686 "prodash",
@@ -712,20 +691,20 @@ dependencies = [
712691
713692[[package]]
714693name = "gix-fs"
715−version = "0.2.0"
694+version = "0.9.0"
716695source = "registry+https://github.com/rust-lang/crates.io-index"
717−checksum = "30da8997008adb87f94e15beb7ee229f8a48e97af585a584bfee4a5a1880aab5"
696+checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
718697dependencies = [
719698 "gix-features",
720699]
721700
722701[[package]]
723702name = "gix-glob"
724−version = "0.8.0"
703+version = "0.15.0"
725704source = "registry+https://github.com/rust-lang/crates.io-index"
726−checksum = "cd0ade1e80ab1f079703d1824e1daf73009096386aa7fd2f0477f6e4ac0a558e"
705+checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
727706dependencies = [
728− "bitflags 2.3.1",
707+ "bitflags 2.4.1",
729708 "bstr",
730709 "gix-features",
731710 "gix-path",
@@ -733,64 +712,30 @@ dependencies = [
733712
734713[[package]]
735714name = "gix-hash"
736−version = "0.11.2"
715+version = "0.14.0"
737716source = "registry+https://github.com/rust-lang/crates.io-index"
738−checksum = "ee181c85d3955f54c4426e6bfaeeada4428692e1a39b8788c2ac7785fc301dd8"
717+checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
739718dependencies = [
740− "hex",
719+ "faster-hex",
741720 "thiserror",
742721]
743722
744723[[package]]
745724name = "gix-hashtable"
746−version = "0.2.1"
725+version = "0.5.0"
747726source = "registry+https://github.com/rust-lang/crates.io-index"
748−checksum = "bd259bd0d96e6153e357a8cdaca76c48e103fd34208b6c0ce77b1ad995834bd2"
727+checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
749728dependencies = [
750729 "gix-hash",
751− "hashbrown 0.13.2",
730+ "hashbrown 0.14.3",
752731 "parking_lot",
753732]
754733
755−[[package]]
756−name = "gix-ignore"
757−version = "0.3.0"
758−source = "registry+https://github.com/rust-lang/crates.io-index"
759−checksum = "fc6f7f101a0ccce808dbf7008ba131dede94e20257e7bde7a44cbb2f8c775625"
760−dependencies = [
761− "bstr",
762− "gix-glob",
763− "gix-path",
764− "unicode-bom",
765−]
766−
767−[[package]]
768−name = "gix-index"
769−version = "0.18.0"
770−source = "registry+https://github.com/rust-lang/crates.io-index"
771−checksum = "ca0380cdab7863e67966eee4aed32856c864c20b077e026b637af6bb3a9281b4"
772−dependencies = [
773− "bitflags 2.3.1",
774− "bstr",
775− "btoi",
776− "filetime",
777− "gix-bitmap",
778− "gix-features",
779− "gix-hash",
780− "gix-lock",
781− "gix-object",
782− "gix-traverse",
783− "itoa",
784− "memmap2",
785− "smallvec",
786− "thiserror",
787−]
788−
789734[[package]]
790735name = "gix-lock"
791−version = "6.0.0"
736+version = "12.0.0"
792737source = "registry+https://github.com/rust-lang/crates.io-index"
793−checksum = "3ec5d5e6f07316d3553aa7425e3ecd935ec29882556021fe1696297a448af8d2"
738+checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
794739dependencies = [
795740 "gix-tempfile",
796741 "gix-utils",
@@ -798,57 +743,43 @@ dependencies = [
798743]
799744
800745[[package]]
801−name = "gix-mailmap"
802−version = "0.13.0"
803−source = "registry+https://github.com/rust-lang/crates.io-index"
804−checksum = "4653701922c920e009f1bc4309feaff14882ade017770788f9a150928da3fa6a"
805−dependencies = [
806− "bstr",
807− "gix-actor",
808− "thiserror",
809−]
810−
811−[[package]]
812−name = "gix-negotiate"
813−version = "0.2.1"
746+name = "gix-macros"
747+version = "0.1.2"
814748source = "registry+https://github.com/rust-lang/crates.io-index"
815−checksum = "945c3ef1e912e44a5f405fc9e924edf42000566a1b257ed52cb1293300f6f08c"
749+checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
816750dependencies = [
817− "bitflags 2.3.1",
818− "gix-commitgraph",
819− "gix-hash",
820− "gix-object",
821− "gix-revision",
822− "smallvec",
823− "thiserror",
751+ "proc-macro2",
752+ "quote",
753+ "syn 2.0.38",
824754]
825755
826756[[package]]
827757name = "gix-object"
828−version = "0.30.0"
758+version = "0.40.0"
829759source = "registry+https://github.com/rust-lang/crates.io-index"
830−checksum = "8926c8f51c44dec3e709cb5dbc93deb9e8d4064c43c9efc54c158dcdfe8446c7"
760+checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
831761dependencies = [
832762 "bstr",
833763 "btoi",
834764 "gix-actor",
765+ "gix-date",
835766 "gix-features",
836767 "gix-hash",
837768 "gix-validate",
838− "hex",
839769 "itoa",
840− "nom",
841770 "smallvec",
842771 "thiserror",
772+ "winnow 0.5.28",
843773]
844774
845775[[package]]
846776name = "gix-odb"
847−version = "0.47.0"
777+version = "0.56.0"
848778source = "registry+https://github.com/rust-lang/crates.io-index"
849−checksum = "91d98eaba4f649fed17250651c4ddfaf997c80a30f5ee4b47ac9bc18ffe3eb16"
779+checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
850780dependencies = [
851781 "arc-swap",
782+ "gix-date",
852783 "gix-features",
853784 "gix-hash",
854785 "gix-object",
@@ -862,20 +793,18 @@ dependencies = [
862793
863794[[package]]
864795name = "gix-pack"
865−version = "0.37.0"
796+version = "0.46.0"
866797source = "registry+https://github.com/rust-lang/crates.io-index"
867−checksum = "82e9e228f18cd87e7596e687b38619b5e4caebc678644ae6bb3d842598166d72"
798+checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
868799dependencies = [
869800 "clru",
870801 "gix-chunk",
871− "gix-diff",
872802 "gix-features",
873803 "gix-hash",
874804 "gix-hashtable",
875805 "gix-object",
876806 "gix-path",
877807 "gix-tempfile",
878− "gix-traverse",
879808 "memmap2",
880809 "parking_lot",
881810 "smallvec",
@@ -884,34 +813,22 @@ dependencies = [
884813
885814[[package]]
886815name = "gix-path"
887−version = "0.8.1"
816+version = "0.10.2"
888817source = "registry+https://github.com/rust-lang/crates.io-index"
889−checksum = "c1226f2e50adeb4d76c754c1856c06f13a24cad1624801653fbf09b869e5b808"
818+checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
890819dependencies = [
891820 "bstr",
821+ "gix-trace",
892822 "home",
893823 "once_cell",
894824 "thiserror",
895825]
896826
897−[[package]]
898−name = "gix-prompt"
899−version = "0.5.1"
900−source = "registry+https://github.com/rust-lang/crates.io-index"
901−checksum = "e15fe57fa48572b7d3bf465d6a2a0351cd3c55cba74fd5f0b9c23689f9c1a31e"
902−dependencies = [
903− "gix-command",
904− "gix-config-value",
905− "parking_lot",
906− "rustix",
907− "thiserror",
908−]
909−
910827[[package]]
911828name = "gix-quote"
912−version = "0.4.4"
829+version = "0.4.9"
913830source = "registry+https://github.com/rust-lang/crates.io-index"
914−checksum = "29d59489bff95b06dcdabe763b7266d3dc0a628cac1ac1caf65a7ca0a43eeae0"
831+checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
915832dependencies = [
916833 "bstr",
917834 "btoi",
@@ -920,11 +837,12 @@ dependencies = [
920837
921838[[package]]
922839name = "gix-ref"
923−version = "0.30.0"
840+version = "0.40.0"
924841source = "registry+https://github.com/rust-lang/crates.io-index"
925−checksum = "ebdd999256f4ce8a5eefa89999879c159c263f3493a951d62aa5ce42c0397e1c"
842+checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
926843dependencies = [
927844 "gix-actor",
845+ "gix-date",
928846 "gix-features",
929847 "gix-fs",
930848 "gix-hash",
@@ -934,15 +852,15 @@ dependencies = [
934852 "gix-tempfile",
935853 "gix-validate",
936854 "memmap2",
937− "nom",
938855 "thiserror",
856+ "winnow 0.5.28",
939857]
940858
941859[[package]]
942860name = "gix-refspec"
943−version = "0.11.0"
861+version = "0.21.0"
944862source = "registry+https://github.com/rust-lang/crates.io-index"
945−checksum = "72bfd622abc86dd8ad1ec51b9eb77b4f1a766b94e3a1b87cf4a022c5b5570cf4"
863+checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
946864dependencies = [
947865 "bstr",
948866 "gix-hash",
@@ -954,9 +872,9 @@ dependencies = [
954872
955873[[package]]
956874name = "gix-revision"
957−version = "0.15.2"
875+version = "0.25.0"
958876source = "registry+https://github.com/rust-lang/crates.io-index"
959−checksum = "5044f56cd7a487ce9b034cbe0252ae0b6b47ff56ca3dabd79bc30214d0932cd7"
877+checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
960878dependencies = [
961879 "bstr",
962880 "gix-date",
@@ -964,16 +882,18 @@ dependencies = [
964882 "gix-hashtable",
965883 "gix-object",
966884 "gix-revwalk",
885+ "gix-trace",
967886 "thiserror",
968887]
969888
970889[[package]]
971890name = "gix-revwalk"
972−version = "0.1.0"
891+version = "0.11.0"
973892source = "registry+https://github.com/rust-lang/crates.io-index"
974−checksum = "bc2623ba8747914f151f5e12b65adac576ab459dbed5f50a36c7a3e9cbf2d3ca"
893+checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
975894dependencies = [
976895 "gix-commitgraph",
896+ "gix-date",
977897 "gix-hash",
978898 "gix-hashtable",
979899 "gix-object",
@@ -983,38 +903,43 @@ dependencies = [
983903
984904[[package]]
985905name = "gix-sec"
986−version = "0.8.1"
906+version = "0.10.2"
987907source = "registry+https://github.com/rust-lang/crates.io-index"
988−checksum = "b2b7b38b766eb95dcc5350a9c450030b69892c0902fa35f4a6d0809273bd9dae"
908+checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
989909dependencies = [
990− "bitflags 2.3.1",
910+ "bitflags 2.4.1",
991911 "gix-path",
992912 "libc",
993− "windows",
913+ "windows 0.52.0",
994914]
995915
996916[[package]]
997917name = "gix-tempfile"
998−version = "6.0.0"
918+version = "12.0.0"
999919source = "registry+https://github.com/rust-lang/crates.io-index"
1000−checksum = "b3785cb010e9dc5c446dfbf02bc1119fc17d3a48a27c029efcb3a3c32953eb10"
920+checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
1001921dependencies = [
1002922 "gix-fs",
1003923 "libc",
1004924 "once_cell",
1005925 "parking_lot",
1006− "signal-hook",
1007− "signal-hook-registry",
1008926 "tempfile",
1009927]
1010928
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+
1011935[[package]]
1012936name = "gix-traverse"
1013−version = "0.27.0"
937+version = "0.36.0"
1014938source = "registry+https://github.com/rust-lang/crates.io-index"
1015−checksum = "8673546506391a10fdfd4e48c8e0f3ec92355cf1fac787d2e714c7d45e301ede"
939+checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
1016940dependencies = [
1017941 "gix-commitgraph",
942+ "gix-date",
1018943 "gix-hash",
1019944 "gix-hashtable",
1020945 "gix-object",
@@ -1025,9 +950,9 @@ dependencies = [
1025950
1026951[[package]]
1027952name = "gix-url"
1028−version = "0.19.0"
953+version = "0.26.0"
1029954source = "registry+https://github.com/rust-lang/crates.io-index"
1030−checksum = "f1663df25ac42047a2547618d2a6979a26f478073f6306997429235d2cd4c863"
955+checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
1031956dependencies = [
1032957 "bstr",
1033958 "gix-features",
@@ -1039,93 +964,70 @@ dependencies = [
1039964
1040965[[package]]
1041966name = "gix-utils"
1042−version = "0.1.2"
967+version = "0.1.7"
1043968source = "registry+https://github.com/rust-lang/crates.io-index"
1044−checksum = "dbcfcb150c7ef553d76988467d223254045bdcad0dc6724890f32fbe96415da5"
969+checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
1045970dependencies = [
1046971 "fastrand",
1047972]
1048973
1049974[[package]]
1050975name = "gix-validate"
1051−version = "0.7.5"
976+version = "0.8.2"
1052977source = "registry+https://github.com/rust-lang/crates.io-index"
1053−checksum = "57ea5845b506c7728b9d89f4227cc369a5fc5a1d5b26c3add0f0d323413a3a60"
978+checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
1054979dependencies = [
1055980 "bstr",
1056981 "thiserror",
1057982]
1058983
1059−[[package]]
1060−name = "gix-worktree"
1061−version = "0.19.0"
1062−source = "registry+https://github.com/rust-lang/crates.io-index"
1063−checksum = "0b32a0e7ed52577bfb050f5350bdee2741d1b08a9ed02a2f2df6effe353896ca"
1064−dependencies = [
1065− "bstr",
1066− "filetime",
1067− "gix-attributes",
1068− "gix-features",
1069− "gix-fs",
1070− "gix-glob",
1071− "gix-hash",
1072− "gix-ignore",
1073− "gix-index",
1074− "gix-object",
1075− "gix-path",
1076− "io-close",
1077− "thiserror",
1078−]
1079−
1080984[[package]]
1081985name = "globset"
1082−version = "0.4.10"
986+version = "0.4.14"
1083987source = "registry+https://github.com/rust-lang/crates.io-index"
1084−checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
988+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
1085989dependencies = [
1086− "aho-corasick 0.7.20",
990+ "aho-corasick",
1087991 "bstr",
1088− "fnv",
1089992 "log",
1090− "regex",
993+ "regex-automata",
994+ "regex-syntax",
1091995]
1092996
1093997[[package]]
1094998name = "grep-matcher"
1095−version = "0.1.6"
999+version = "0.1.7"
10961000source = "registry+https://github.com/rust-lang/crates.io-index"
1097−checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319"
1001+checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"
10981002dependencies = [
10991003 "memchr",
11001004]
11011005
11021006[[package]]
11031007name = "grep-regex"
1104−version = "0.1.11"
1008+version = "0.1.12"
11051009source = "registry+https://github.com/rust-lang/crates.io-index"
1106−checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
1010+checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"
11071011dependencies = [
1108− "aho-corasick 0.7.20",
11091012 "bstr",
11101013 "grep-matcher",
11111014 "log",
1112− "regex",
1113− "regex-syntax 0.6.29",
1114− "thread_local",
1015+ "regex-automata",
1016+ "regex-syntax",
11151017]
11161018
11171019[[package]]
11181020name = "grep-searcher"
1119−version = "0.1.11"
1021+version = "0.1.13"
11201022source = "registry+https://github.com/rust-lang/crates.io-index"
1121−checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f"
1023+checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"
11221024dependencies = [
11231025 "bstr",
1124− "bytecount",
11251026 "encoding_rs",
11261027 "encoding_rs_io",
11271028 "grep-matcher",
11281029 "log",
1030+ "memchr",
11291031 "memmap2",
11301032]
11311033
@@ -1134,43 +1036,36 @@ name = "hashbrown"
11341036version = "0.12.3"
11351037source = "registry+https://github.com/rust-lang/crates.io-index"
11361038checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1137−dependencies = [
1138− "ahash 0.7.6",
1139−]
11401039
11411040[[package]]
11421041name = "hashbrown"
1143−version = "0.13.2"
1042+version = "0.14.3"
11441043source = "registry+https://github.com/rust-lang/crates.io-index"
1145−checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
1146−
1147−[[package]]
1148−name = "hashbrown"
1149−version = "0.14.0"
1150−source = "registry+https://github.com/rust-lang/crates.io-index"
1151−checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
1044+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
11521045dependencies = [
1153− "ahash 0.8.3",
1046+ "ahash",
11541047 "allocator-api2",
11551048]
11561049
11571050[[package]]
11581051name = "helix-core"
1159−version = "0.6.0"
1052+version = "23.10.0"
11601053dependencies = [
1161− "ahash 0.8.3",
1054+ "ahash",
11621055 "arc-swap",
1163− "bitflags 2.3.1",
1056+ "bitflags 2.4.1",
11641057 "chrono",
11651058 "dunce",
11661059 "encoding_rs",
11671060 "etcetera",
1168− "hashbrown 0.14.0",
1061+ "hashbrown 0.14.3",
11691062 "helix-loader",
11701063 "imara-diff",
11711064 "indoc",
11721065 "log",
1066+ "nucleo",
11731067 "once_cell",
1068+ "parking_lot",
11741069 "quickcheck",
11751070 "regex",
11761071 "ropey",
@@ -1189,7 +1084,7 @@ dependencies = [
11891084
11901085[[package]]
11911086name = "helix-dap"
1192−version = "0.6.0"
1087+version = "23.10.0"
11931088dependencies = [
11941089 "anyhow",
11951090 "fern",
@@ -1202,12 +1097,21 @@ dependencies = [
12021097 "which",
12031098]
12041099
1100+[[package]]
1101+name = "helix-event"
1102+version = "23.10.0"
1103+dependencies = [
1104+ "parking_lot",
1105+ "tokio",
1106+]
1107+
12051108[[package]]
12061109name = "helix-loader"
1207−version = "0.6.0"
1110+version = "23.10.0"
12081111dependencies = [
12091112 "anyhow",
12101113 "cc",
1114+ "dunce",
12111115 "etcetera",
12121116 "libloading",
12131117 "log",
@@ -1222,11 +1126,12 @@ dependencies = [
12221126
12231127[[package]]
12241128name = "helix-lsp"
1225−version = "0.6.0"
1129+version = "23.10.0"
12261130dependencies = [
12271131 "anyhow",
12281132 "futures-executor",
12291133 "futures-util",
1134+ "globset",
12301135 "helix-core",
12311136 "helix-loader",
12321137 "helix-parsec",
@@ -1243,11 +1148,11 @@ dependencies = [
12431148
12441149[[package]]
12451150name = "helix-parsec"
1246−version = "0.6.0"
1151+version = "23.10.0"
12471152
12481153[[package]]
12491154name = "helix-term"
1250−version = "0.6.0"
1155+version = "23.10.0"
12511156dependencies = [
12521157 "anyhow",
12531158 "arc-swap",
@@ -1256,11 +1161,11 @@ dependencies = [
12561161 "crossterm",
12571162 "fern",
12581163 "futures-util",
1259− "fuzzy-matcher",
12601164 "grep-regex",
12611165 "grep-searcher",
12621166 "helix-core",
12631167 "helix-dap",
1168+ "helix-event",
12641169 "helix-loader",
12651170 "helix-lsp",
12661171 "helix-tui",
@@ -1270,7 +1175,9 @@ dependencies = [
12701175 "indoc",
12711176 "libc",
12721177 "log",
1178+ "nucleo",
12731179 "once_cell",
1180+ "open",
12741181 "pulldown-cmark",
12751182 "serde",
12761183 "serde_json",
@@ -1281,14 +1188,15 @@ dependencies = [
12811188 "tokio",
12821189 "tokio-stream",
12831190 "toml",
1191+ "url",
12841192 "which",
12851193]
12861194
12871195[[package]]
12881196name = "helix-tui"
1289−version = "0.6.0"
1197+version = "23.10.0"
12901198dependencies = [
1291− "bitflags 2.3.1",
1199+ "bitflags 2.4.1",
12921200 "cassowary",
12931201 "crossterm",
12941202 "helix-core",
@@ -1302,12 +1210,13 @@ dependencies = [
13021210
13031211[[package]]
13041212name = "helix-vcs"
1305−version = "0.6.0"
1213+version = "23.10.0"
13061214dependencies = [
13071215 "anyhow",
13081216 "arc-swap",
13091217 "gix",
13101218 "helix-core",
1219+ "helix-event",
13111220 "imara-diff",
13121221 "log",
13131222 "parking_lot",
@@ -1317,17 +1226,18 @@ dependencies = [
13171226
13181227[[package]]
13191228name = "helix-view"
1320−version = "0.6.0"
1229+version = "23.10.0"
13211230dependencies = [
13221231 "anyhow",
13231232 "arc-swap",
1324− "bitflags 2.3.1",
1233+ "bitflags 2.4.1",
13251234 "chardetng",
13261235 "clipboard-win",
13271236 "crossterm",
13281237 "futures-util",
13291238 "helix-core",
13301239 "helix-dap",
1240+ "helix-event",
13311241 "helix-loader",
13321242 "helix-lsp",
13331243 "helix-tui",
@@ -1336,6 +1246,7 @@ dependencies = [
13361246 "log",
13371247 "once_cell",
13381248 "parking_lot",
1249+ "rustix",
13391250 "serde",
13401251 "serde_json",
13411252 "slotmap",
@@ -1355,25 +1266,13 @@ dependencies = [
13551266 "libc",
13561267]
13571268
1358−[[package]]
1359−name = "hermit-abi"
1360−version = "0.3.1"
1361−source = "registry+https://github.com/rust-lang/crates.io-index"
1362−checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
1363−
1364−[[package]]
1365−name = "hex"
1366−version = "0.4.3"
1367−source = "registry+https://github.com/rust-lang/crates.io-index"
1368−checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
1369−
13701269[[package]]
13711270name = "home"
1372−version = "0.5.4"
1271+version = "0.5.5"
13731272source = "registry+https://github.com/rust-lang/crates.io-index"
1374−checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
1273+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
13751274dependencies = [
1376− "winapi",
1275+ "windows-sys 0.48.0",
13771276]
13781277
13791278[[package]]
@@ -1387,7 +1286,7 @@ dependencies = [
13871286 "iana-time-zone-haiku",
13881287 "js-sys",
13891288 "wasm-bindgen",
1390− "windows",
1289+ "windows 0.48.0",
13911290]
13921291
13931292[[package]]
@@ -1402,9 +1301,9 @@ dependencies = [
14021301
14031302[[package]]
14041303name = "idna"
1405−version = "0.4.0"
1304+version = "0.5.0"
14061305source = "registry+https://github.com/rust-lang/crates.io-index"
1407−checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
1306+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
14081307dependencies = [
14091308 "unicode-bidi",
14101309 "unicode-normalization",
@@ -1412,17 +1311,16 @@ dependencies = [
14121311
14131312[[package]]
14141313name = "ignore"
1415−version = "0.4.20"
1314+version = "0.4.21"
14161315source = "registry+https://github.com/rust-lang/crates.io-index"
1417−checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
1316+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
14181317dependencies = [
1318+ "crossbeam-deque",
14191319 "globset",
1420− "lazy_static",
14211320 "log",
14221321 "memchr",
1423− "regex",
1322+ "regex-automata",
14241323 "same-file",
1425− "thread_local",
14261324 "walkdir",
14271325 "winapi-util",
14281326]
@@ -1433,54 +1331,43 @@ version = "0.1.5"
14331331source = "registry+https://github.com/rust-lang/crates.io-index"
14341332checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
14351333dependencies = [
1436− "ahash 0.8.3",
1334+ "ahash",
14371335 "hashbrown 0.12.3",
14381336]
14391337
14401338[[package]]
14411339name = "indexmap"
1442−version = "1.9.3"
1340+version = "2.0.0"
14431341source = "registry+https://github.com/rust-lang/crates.io-index"
1444−checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
1342+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
14451343dependencies = [
1446− "autocfg",
1447− "hashbrown 0.12.3",
1344+ "equivalent",
1345+ "hashbrown 0.14.3",
14481346]
14491347
14501348[[package]]
14511349name = "indoc"
1452−version = "2.0.1"
1453−source = "registry+https://github.com/rust-lang/crates.io-index"
1454−checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690"
1455−
1456−[[package]]
1457−name = "instant"
1458−version = "0.1.12"
1350+version = "2.0.4"
14591351source = "registry+https://github.com/rust-lang/crates.io-index"
1460−checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
1461−dependencies = [
1462− "cfg-if",
1463−]
1352+checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
14641353
14651354[[package]]
1466−name = "io-close"
1467−version = "0.3.7"
1355+name = "is-docker"
1356+version = "0.2.0"
14681357source = "registry+https://github.com/rust-lang/crates.io-index"
1469−checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
1358+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
14701359dependencies = [
1471− "libc",
1472− "winapi",
1360+ "once_cell",
14731361]
14741362
14751363[[package]]
1476−name = "io-lifetimes"
1477−version = "1.0.10"
1364+name = "is-wsl"
1365+version = "0.4.0"
14781366source = "registry+https://github.com/rust-lang/crates.io-index"
1479−checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
1367+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
14801368dependencies = [
1481− "hermit-abi 0.3.1",
1482− "libc",
1483− "windows-sys 0.48.0",
1369+ "is-docker",
1370+ "once_cell",
14841371]
14851372
14861373[[package]]
@@ -1498,32 +1385,17 @@ dependencies = [
14981385 "wasm-bindgen",
14991386]
15001387
1501−[[package]]
1502−name = "kstring"
1503−version = "2.0.0"
1504−source = "registry+https://github.com/rust-lang/crates.io-index"
1505−checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
1506−dependencies = [
1507− "static_assertions",
1508−]
1509−
1510−[[package]]
1511−name = "lazy_static"
1512−version = "1.4.0"
1513−source = "registry+https://github.com/rust-lang/crates.io-index"
1514−checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
1515−
15161388[[package]]
15171389name = "libc"
1518−version = "0.2.146"
1390+version = "0.2.151"
15191391source = "registry+https://github.com/rust-lang/crates.io-index"
1520−checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
1392+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
15211393
15221394[[package]]
15231395name = "libloading"
1524−version = "0.8.0"
1396+version = "0.8.1"
15251397source = "registry+https://github.com/rust-lang/crates.io-index"
1526−checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
1398+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
15271399dependencies = [
15281400 "cfg-if",
15291401 "windows-sys 0.48.0",
@@ -1540,9 +1412,9 @@ dependencies = [
15401412
15411413[[package]]
15421414name = "linux-raw-sys"
1543−version = "0.3.4"
1415+version = "0.4.11"
15441416source = "registry+https://github.com/rust-lang/crates.io-index"
1545−checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
1417+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
15461418
15471419[[package]]
15481420name = "lock_api"
@@ -1556,15 +1428,15 @@ dependencies = [
15561428
15571429[[package]]
15581430name = "log"
1559−version = "0.4.19"
1431+version = "0.4.20"
15601432source = "registry+https://github.com/rust-lang/crates.io-index"
1561−checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
1433+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
15621434
15631435[[package]]
15641436name = "lsp-types"
1565−version = "0.94.0"
1437+version = "0.95.0"
15661438source = "registry+https://github.com/rust-lang/crates.io-index"
1567−checksum = "0b63735a13a1f9cd4f4835223d828ed9c2e35c8c5e61837774399f558b6a1237"
1439+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
15681440dependencies = [
15691441 "bitflags 1.3.2",
15701442 "serde",
@@ -1575,54 +1447,69 @@ dependencies = [
15751447
15761448[[package]]
15771449name = "memchr"
1578−version = "2.5.0"
1450+version = "2.6.3"
15791451source = "registry+https://github.com/rust-lang/crates.io-index"
1580−checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
1452+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
15811453
15821454[[package]]
15831455name = "memmap2"
1584−version = "0.5.10"
1456+version = "0.9.0"
15851457source = "registry+https://github.com/rust-lang/crates.io-index"
1586−checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
1458+checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
15871459dependencies = [
15881460 "libc",
15891461]
15901462
15911463[[package]]
1592−name = "minimal-lexical"
1593−version = "0.2.1"
1464+name = "memoffset"
1465+version = "0.9.0"
15941466source = "registry+https://github.com/rust-lang/crates.io-index"
1595−checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
1467+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
1468+dependencies = [
1469+ "autocfg",
1470+]
15961471
15971472[[package]]
15981473name = "miniz_oxide"
1599−version = "0.6.2"
1474+version = "0.7.1"
16001475source = "registry+https://github.com/rust-lang/crates.io-index"
1601−checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
1476+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
16021477dependencies = [
16031478 "adler",
16041479]
16051480
16061481[[package]]
16071482name = "mio"
1608−version = "0.8.6"
1483+version = "0.8.9"
16091484source = "registry+https://github.com/rust-lang/crates.io-index"
1610−checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
1485+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
16111486dependencies = [
16121487 "libc",
16131488 "log",
16141489 "wasi",
1615− "windows-sys 0.45.0",
1490+ "windows-sys 0.48.0",
1491+]
1492+
1493+[[package]]
1494+name = "nucleo"
1495+version = "0.2.1"
1496+source = "registry+https://github.com/rust-lang/crates.io-index"
1497+checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"
1498+dependencies = [
1499+ "nucleo-matcher",
1500+ "parking_lot",
1501+ "rayon",
16161502]
16171503
16181504[[package]]
1619−name = "nom"
1620−version = "7.1.3"
1505+name = "nucleo-matcher"
1506+version = "0.2.0"
16211507source = "registry+https://github.com/rust-lang/crates.io-index"
1622−checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
1508+checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57"
16231509dependencies = [
1510+ "cov-mark",
16241511 "memchr",
1625− "minimal-lexical",
1512+ "unicode-segmentation",
16261513]
16271514
16281515[[package]]
@@ -1640,7 +1527,7 @@ version = "1.15.0"
16401527source = "registry+https://github.com/rust-lang/crates.io-index"
16411528checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
16421529dependencies = [
1643− "hermit-abi 0.2.6",
1530+ "hermit-abi",
16441531 "libc",
16451532]
16461533
@@ -1653,11 +1540,31 @@ dependencies = [
16531540 "libc",
16541541]
16551542
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+
16561552[[package]]
16571553name = "once_cell"
1658−version = "1.18.0"
1554+version = "1.19.0"
1555+source = "registry+https://github.com/rust-lang/crates.io-index"
1556+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
1557+
1558+[[package]]
1559+name = "open"
1560+version = "5.0.1"
16591561source = "registry+https://github.com/rust-lang/crates.io-index"
1660−checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
1562+checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
1563+dependencies = [
1564+ "is-wsl",
1565+ "libc",
1566+ "pathdiff",
1567+]
16611568
16621569[[package]]
16631570name = "parking_lot"
@@ -1682,17 +1589,23 @@ dependencies = [
16821589 "windows-sys 0.45.0",
16831590]
16841591
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+
16851598[[package]]
16861599name = "percent-encoding"
1687−version = "2.3.0"
1600+version = "2.3.1"
16881601source = "registry+https://github.com/rust-lang/crates.io-index"
1689−checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
1602+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
16901603
16911604[[package]]
16921605name = "pin-project-lite"
1693−version = "0.2.9"
1606+version = "0.2.12"
16941607source = "registry+https://github.com/rust-lang/crates.io-index"
1695−checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
1608+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
16961609
16971610[[package]]
16981611name = "pin-utils"
@@ -1702,18 +1615,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
17021615
17031616[[package]]
17041617name = "proc-macro2"
1705−version = "1.0.56"
1618+version = "1.0.69"
17061619source = "registry+https://github.com/rust-lang/crates.io-index"
1707−checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
1620+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
17081621dependencies = [
17091622 "unicode-ident",
17101623]
17111624
17121625[[package]]
17131626name = "prodash"
1714−version = "25.0.0"
1627+version = "28.0.0"
17151628source = "registry+https://github.com/rust-lang/crates.io-index"
1716−checksum = "3236ce1618b6da4c7b618e0143c4d5b5dc190f75f81c49f248221382f7e9e9ae"
1629+checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
17171630
17181631[[package]]
17191632name = "pulldown-cmark"
@@ -1737,9 +1650,9 @@ dependencies = [
17371650
17381651[[package]]
17391652name = "quote"
1740−version = "1.0.26"
1653+version = "1.0.29"
17411654source = "registry+https://github.com/rust-lang/crates.io-index"
1742−checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
1655+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
17431656dependencies = [
17441657 "proc-macro2",
17451658]
@@ -1762,6 +1675,28 @@ dependencies = [
17621675 "getrandom",
17631676]
17641677
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+
17651700[[package]]
17661701name = "redox_syscall"
17671702version = "0.2.16"
@@ -1773,64 +1708,69 @@ dependencies = [
17731708
17741709[[package]]
17751710name = "redox_syscall"
1776−version = "0.3.5"
1711+version = "0.4.1"
17771712source = "registry+https://github.com/rust-lang/crates.io-index"
1778−checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
1713+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
17791714dependencies = [
17801715 "bitflags 1.3.2",
17811716]
17821717
17831718[[package]]
17841719name = "regex"
1785−version = "1.8.4"
1720+version = "1.10.2"
17861721source = "registry+https://github.com/rust-lang/crates.io-index"
1787−checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
1722+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
17881723dependencies = [
1789− "aho-corasick 1.0.1",
1724+ "aho-corasick",
17901725 "memchr",
1791− "regex-syntax 0.7.2",
1726+ "regex-automata",
1727+ "regex-syntax",
17921728]
17931729
17941730[[package]]
17951731name = "regex-automata"
1796−version = "0.1.10"
1797−source = "registry+https://github.com/rust-lang/crates.io-index"
1798−checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
1799−
1800−[[package]]
1801−name = "regex-syntax"
1802−version = "0.6.29"
1732+version = "0.4.3"
18031733source = "registry+https://github.com/rust-lang/crates.io-index"
1804−checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
1734+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
1735+dependencies = [
1736+ "aho-corasick",
1737+ "memchr",
1738+ "regex-syntax",
1739+]
18051740
18061741[[package]]
18071742name = "regex-syntax"
1808−version = "0.7.2"
1743+version = "0.8.2"
18091744source = "registry+https://github.com/rust-lang/crates.io-index"
1810−checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
1745+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
18111746
18121747[[package]]
18131748name = "ropey"
1814−version = "1.6.0"
1749+version = "1.6.1"
18151750source = "registry+https://github.com/rust-lang/crates.io-index"
1816−checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
1751+checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
18171752dependencies = [
18181753 "smallvec",
18191754 "str_indices",
18201755]
18211756
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+
18221763[[package]]
18231764name = "rustix"
1824−version = "0.37.15"
1765+version = "0.38.28"
18251766source = "registry+https://github.com/rust-lang/crates.io-index"
1826−checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
1767+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
18271768dependencies = [
1828− "bitflags 1.3.2",
1769+ "bitflags 2.4.1",
18291770 "errno",
1830− "io-lifetimes",
18311771 "libc",
18321772 "linux-raw-sys",
1833− "windows-sys 0.48.0",
1773+ "windows-sys 0.52.0",
18341774]
18351775
18361776[[package]]
@@ -1862,29 +1802,29 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
18621802
18631803[[package]]
18641804name = "serde"
1865−version = "1.0.164"
1805+version = "1.0.193"
18661806source = "registry+https://github.com/rust-lang/crates.io-index"
1867−checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
1807+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
18681808dependencies = [
18691809 "serde_derive",
18701810]
18711811
18721812[[package]]
18731813name = "serde_derive"
1874−version = "1.0.164"
1814+version = "1.0.193"
18751815source = "registry+https://github.com/rust-lang/crates.io-index"
1876−checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
1816+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
18771817dependencies = [
18781818 "proc-macro2",
18791819 "quote",
1880− "syn 2.0.15",
1820+ "syn 2.0.38",
18811821]
18821822
18831823[[package]]
18841824name = "serde_json"
1885−version = "1.0.96"
1825+version = "1.0.108"
18861826source = "registry+https://github.com/rust-lang/crates.io-index"
1887−checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
1827+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
18881828dependencies = [
18891829 "itoa",
18901830 "ryu",
@@ -1899,14 +1839,14 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
18991839dependencies = [
19001840 "proc-macro2",
19011841 "quote",
1902− "syn 2.0.15",
1842+ "syn 2.0.38",
19031843]
19041844
19051845[[package]]
19061846name = "serde_spanned"
1907−version = "0.6.2"
1847+version = "0.6.3"
19081848source = "registry+https://github.com/rust-lang/crates.io-index"
1909−checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
1849+checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
19101850dependencies = [
19111851 "serde",
19121852]
@@ -1919,9 +1859,9 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
19191859
19201860[[package]]
19211861name = "signal-hook"
1922−version = "0.3.15"
1862+version = "0.3.17"
19231863source = "registry+https://github.com/rust-lang/crates.io-index"
1924−checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
1864+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
19251865dependencies = [
19261866 "libc",
19271867 "signal-hook-registry",
@@ -1970,18 +1910,18 @@ dependencies = [
19701910
19711911[[package]]
19721912name = "slotmap"
1973−version = "1.0.6"
1913+version = "1.0.7"
19741914source = "registry+https://github.com/rust-lang/crates.io-index"
1975−checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
1915+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
19761916dependencies = [
19771917 "version_check",
19781918]
19791919
19801920[[package]]
19811921name = "smallvec"
1982−version = "1.10.0"
1922+version = "1.11.2"
19831923source = "registry+https://github.com/rust-lang/crates.io-index"
1984−checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
1924+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
19851925
19861926[[package]]
19871927name = "smartstring"
@@ -2002,12 +1942,12 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
20021942
20031943[[package]]
20041944name = "socket2"
2005−version = "0.4.9"
1945+version = "0.5.5"
20061946source = "registry+https://github.com/rust-lang/crates.io-index"
2007−checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
1947+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
20081948dependencies = [
20091949 "libc",
2010− "winapi",
1950+ "windows-sys 0.48.0",
20111951]
20121952
20131953[[package]]
@@ -2016,12 +1956,6 @@ version = "1.1.0"
20161956source = "registry+https://github.com/rust-lang/crates.io-index"
20171957checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
20181958
2019−[[package]]
2020−name = "str-buf"
2021−version = "1.0.6"
2022−source = "registry+https://github.com/rust-lang/crates.io-index"
2023−checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
2024−
20251959[[package]]
20261960name = "str_indices"
20271961version = "0.4.1"
@@ -2041,9 +1975,9 @@ dependencies = [
20411975
20421976[[package]]
20431977name = "syn"
2044−version = "2.0.15"
1978+version = "2.0.38"
20451979source = "registry+https://github.com/rust-lang/crates.io-index"
2046−checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
1980+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
20471981dependencies = [
20481982 "proc-macro2",
20491983 "quote",
@@ -2052,14 +1986,13 @@ dependencies = [
20521986
20531987[[package]]
20541988name = "tempfile"
2055−version = "3.6.0"
1989+version = "3.8.1"
20561990source = "registry+https://github.com/rust-lang/crates.io-index"
2057−checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6"
1991+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
20581992dependencies = [
2059− "autocfg",
20601993 "cfg-if",
20611994 "fastrand",
2062− "redox_syscall 0.3.5",
1995+ "redox_syscall 0.4.1",
20631996 "rustix",
20641997 "windows-sys 0.48.0",
20651998]
@@ -2095,32 +2028,22 @@ dependencies = [
20952028
20962029[[package]]
20972030name = "thiserror"
2098−version = "1.0.40"
2031+version = "1.0.52"
20992032source = "registry+https://github.com/rust-lang/crates.io-index"
2100−checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
2033+checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
21012034dependencies = [
21022035 "thiserror-impl",
21032036]
21042037
21052038[[package]]
21062039name = "thiserror-impl"
2107−version = "1.0.40"
2040+version = "1.0.52"
21082041source = "registry+https://github.com/rust-lang/crates.io-index"
2109−checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
2042+checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
21102043dependencies = [
21112044 "proc-macro2",
21122045 "quote",
2113− "syn 2.0.15",
2114−]
2115−
2116−[[package]]
2117−name = "thread_local"
2118−version = "1.1.7"
2119−source = "registry+https://github.com/rust-lang/crates.io-index"
2120−checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
2121−dependencies = [
2122− "cfg-if",
2123− "once_cell",
2046+ "syn 2.0.38",
21242047]
21252048
21262049[[package]]
@@ -2134,9 +2057,9 @@ dependencies = [
21342057
21352058[[package]]
21362059name = "time"
2137−version = "0.3.20"
2060+version = "0.3.23"
21382061source = "registry+https://github.com/rust-lang/crates.io-index"
2139−checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
2062+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
21402063dependencies = [
21412064 "itoa",
21422065 "libc",
@@ -2148,15 +2071,15 @@ dependencies = [
21482071
21492072[[package]]
21502073name = "time-core"
2151−version = "0.1.0"
2074+version = "0.1.1"
21522075source = "registry+https://github.com/rust-lang/crates.io-index"
2153−checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
2076+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
21542077
21552078[[package]]
21562079name = "time-macros"
2157−version = "0.2.8"
2080+version = "0.2.10"
21582081source = "registry+https://github.com/rust-lang/crates.io-index"
2159−checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
2082+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
21602083dependencies = [
21612084 "time-core",
21622085]
@@ -2178,11 +2101,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
21782101
21792102[[package]]
21802103name = "tokio"
2181−version = "1.28.2"
2104+version = "1.35.1"
21822105source = "registry+https://github.com/rust-lang/crates.io-index"
2183−checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
2106+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
21842107dependencies = [
2185− "autocfg",
2108+ "backtrace",
21862109 "bytes",
21872110 "libc",
21882111 "mio",
@@ -2197,13 +2120,13 @@ dependencies = [
21972120
21982121[[package]]
21992122name = "tokio-macros"
2200−version = "2.1.0"
2123+version = "2.2.0"
22012124source = "registry+https://github.com/rust-lang/crates.io-index"
2202−checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
2125+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
22032126dependencies = [
22042127 "proc-macro2",
22052128 "quote",
2206− "syn 2.0.15",
2129+ "syn 2.0.38",
22072130]
22082131
22092132[[package]]
@@ -2219,9 +2142,9 @@ dependencies = [
22192142
22202143[[package]]
22212144name = "toml"
2222−version = "0.7.4"
2145+version = "0.7.6"
22232146source = "registry+https://github.com/rust-lang/crates.io-index"
2224−checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
2147+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
22252148dependencies = [
22262149 "serde",
22272150 "serde_spanned",
@@ -2231,31 +2154,30 @@ dependencies = [
22312154
22322155[[package]]
22332156name = "toml_datetime"
2234−version = "0.6.2"
2157+version = "0.6.3"
22352158source = "registry+https://github.com/rust-lang/crates.io-index"
2236−checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
2159+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
22372160dependencies = [
22382161 "serde",
22392162]
22402163
22412164[[package]]
22422165name = "toml_edit"
2243−version = "0.19.9"
2166+version = "0.19.12"
22442167source = "registry+https://github.com/rust-lang/crates.io-index"
2245−checksum = "92d964908cec0d030b812013af25a0e57fddfadb1e066ecc6681d86253129d4f"
2168+checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
22462169dependencies = [
22472170 "indexmap",
22482171 "serde",
22492172 "serde_spanned",
22502173 "toml_datetime",
2251− "winnow",
2174+ "winnow 0.4.6",
22522175]
22532176
22542177[[package]]
22552178name = "tree-sitter"
22562179version = "0.20.10"
2257−source = "registry+https://github.com/rust-lang/crates.io-index"
2258−checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
2180+source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
22592181dependencies = [
22602182 "cc",
22612183 "regex",
@@ -2296,13 +2218,9 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
22962218
22972219[[package]]
22982220name = "unicode-linebreak"
2299−version = "0.1.4"
2221+version = "0.1.5"
23002222source = "registry+https://github.com/rust-lang/crates.io-index"
2301−checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
2302−dependencies = [
2303− "hashbrown 0.12.3",
2304− "regex",
2305−]
2223+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
23062224
23072225[[package]]
23082226name = "unicode-normalization"
@@ -2321,15 +2239,15 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
23212239
23222240[[package]]
23232241name = "unicode-width"
2324−version = "0.1.10"
2242+version = "0.1.11"
23252243source = "registry+https://github.com/rust-lang/crates.io-index"
2326−checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
2244+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
23272245
23282246[[package]]
23292247name = "url"
2330−version = "2.4.0"
2248+version = "2.5.0"
23312249source = "registry+https://github.com/rust-lang/crates.io-index"
2332−checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
2250+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
23332251dependencies = [
23342252 "form_urlencoded",
23352253 "idna",
@@ -2345,9 +2263,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
23452263
23462264[[package]]
23472265name = "walkdir"
2348−version = "2.3.3"
2266+version = "2.4.0"
23492267source = "registry+https://github.com/rust-lang/crates.io-index"
2350−checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
2268+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
23512269dependencies = [
23522270 "same-file",
23532271 "winapi-util",
@@ -2415,13 +2333,15 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
24152333
24162334[[package]]
24172335name = "which"
2418−version = "4.4.0"
2336+version = "5.0.0"
24192337source = "registry+https://github.com/rust-lang/crates.io-index"
2420−checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
2338+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
24212339dependencies = [
24222340 "either",
2423− "libc",
2341+ "home",
24242342 "once_cell",
2343+ "rustix",
2344+ "windows-sys 0.48.0",
24252345]
24262346
24272347[[package]]
@@ -2464,6 +2384,25 @@ dependencies = [
24642384 "windows-targets 0.48.0",
24652385]
24662386
2387+[[package]]
2388+name = "windows"
2389+version = "0.52.0"
2390+source = "registry+https://github.com/rust-lang/crates.io-index"
2391+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
2392+dependencies = [
2393+ "windows-core",
2394+ "windows-targets 0.52.0",
2395+]
2396+
2397+[[package]]
2398+name = "windows-core"
2399+version = "0.52.0"
2400+source = "registry+https://github.com/rust-lang/crates.io-index"
2401+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
2402+dependencies = [
2403+ "windows-targets 0.52.0",
2404+]
2405+
24672406[[package]]
24682407name = "windows-sys"
24692408version = "0.45.0"
@@ -2482,6 +2421,15 @@ dependencies = [
24822421 "windows-targets 0.48.0",
24832422]
24842423
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+
24852433[[package]]
24862434name = "windows-targets"
24872435version = "0.42.2"
@@ -2512,6 +2460,21 @@ dependencies = [
25122460 "windows_x86_64_msvc 0.48.0",
25132461]
25142462
2463+[[package]]
2464+name = "windows-targets"
2465+version = "0.52.0"
2466+source = "registry+https://github.com/rust-lang/crates.io-index"
2467+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
2468+dependencies = [
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",
2476+]
2477+
25152478[[package]]
25162479name = "windows_aarch64_gnullvm"
25172480version = "0.42.2"
@@ -2524,6 +2487,12 @@ version = "0.48.0"
25242487source = "registry+https://github.com/rust-lang/crates.io-index"
25252488checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
25262489
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+
25272496[[package]]
25282497name = "windows_aarch64_msvc"
25292498version = "0.42.2"
@@ -2536,6 +2505,12 @@ version = "0.48.0"
25362505source = "registry+https://github.com/rust-lang/crates.io-index"
25372506checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
25382507
2508+[[package]]
2509+name = "windows_aarch64_msvc"
2510+version = "0.52.0"
2511+source = "registry+https://github.com/rust-lang/crates.io-index"
2512+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
2513+
25392514[[package]]
25402515name = "windows_i686_gnu"
25412516version = "0.42.2"
@@ -2548,6 +2523,12 @@ version = "0.48.0"
25482523source = "registry+https://github.com/rust-lang/crates.io-index"
25492524checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
25502525
2526+[[package]]
2527+name = "windows_i686_gnu"
2528+version = "0.52.0"
2529+source = "registry+https://github.com/rust-lang/crates.io-index"
2530+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
2531+
25512532[[package]]
25522533name = "windows_i686_msvc"
25532534version = "0.42.2"
@@ -2560,6 +2541,12 @@ version = "0.48.0"
25602541source = "registry+https://github.com/rust-lang/crates.io-index"
25612542checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
25622543
2544+[[package]]
2545+name = "windows_i686_msvc"
2546+version = "0.52.0"
2547+source = "registry+https://github.com/rust-lang/crates.io-index"
2548+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
2549+
25632550[[package]]
25642551name = "windows_x86_64_gnu"
25652552version = "0.42.2"
@@ -2572,6 +2559,12 @@ version = "0.48.0"
25722559source = "registry+https://github.com/rust-lang/crates.io-index"
25732560checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
25742561
2562+[[package]]
2563+name = "windows_x86_64_gnu"
2564+version = "0.52.0"
2565+source = "registry+https://github.com/rust-lang/crates.io-index"
2566+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
2567+
25752568[[package]]
25762569name = "windows_x86_64_gnullvm"
25772570version = "0.42.2"
@@ -2584,6 +2577,12 @@ version = "0.48.0"
25842577source = "registry+https://github.com/rust-lang/crates.io-index"
25852578checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
25862579
2580+[[package]]
2581+name = "windows_x86_64_gnullvm"
2582+version = "0.52.0"
2583+source = "registry+https://github.com/rust-lang/crates.io-index"
2584+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
2585+
25872586[[package]]
25882587name = "windows_x86_64_msvc"
25892588version = "0.42.2"
@@ -2596,6 +2595,12 @@ version = "0.48.0"
25962595source = "registry+https://github.com/rust-lang/crates.io-index"
25972596checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
25982597
2598+[[package]]
2599+name = "windows_x86_64_msvc"
2600+version = "0.52.0"
2601+source = "registry+https://github.com/rust-lang/crates.io-index"
2602+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
2603+
25992604[[package]]
26002605name = "winnow"
26012606version = "0.4.6"
@@ -2605,9 +2610,18 @@ dependencies = [
26052610 "memchr",
26062611]
26072612
2613+[[package]]
2614+name = "winnow"
2615+version = "0.5.28"
2616+source = "registry+https://github.com/rust-lang/crates.io-index"
2617+checksum = "6c830786f7720c2fd27a1a0e27a709dbd3c4d009b56d098fc742d4f4eab91fe2"
2618+dependencies = [
2619+ "memchr",
2620+]
2621+
26082622[[package]]
26092623name = "xtask"
2610−version = "0.6.0"
2624+version = "23.10.0"
26112625dependencies = [
26122626 "helix-core",
26132627 "helix-loader",
@@ -2615,3 +2629,23 @@ dependencies = [
26152629 "helix-view",
26162630 "toml",
26172631]
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+16
@@ -1,10 +1,12 @@
11[workspace]
2+resolver = "2"
23members = [
34 "helix-core",
45 "helix-view",
56 "helix-term",
67 "helix-tui",
78 "helix-lsp",
9+ "helix-event",
810 "helix-dap",
911 "helix-loader",
1012 "helix-vcs",
@@ -32,3 +34,17 @@ inherits = "test"
3234package.helix-core.opt-level = 2
3335package.helix-tui.opt-level = 2
3436package.helix-term.opt-level = 2
37+
38+[workspace.dependencies]
39+tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
40+nucleo = "0.2.0"
41+
42+[workspace.package]
43+version = "23.10.0"
44+edition = "2021"
45+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
46+categories = ["editor"]
47+repository = "https://github.com/helix-editor/helix"
48+homepage = "https://helix-editor.com"
49+license = "MPL-2.0"
50+rust-version = "1.70"
README.md+2−2
@@ -18,7 +18,7 @@
1818
1919![Screenshot](./screenshot.png)
2020
21−A Kakoune / Neovim inspired editor, written in Rust.
21+A [Kakoune](https://github.com/mawww/kakoune) / [Neovim](https://github.com/neovim/neovim) inspired editor, written in Rust.
2222
2323The editing model is very heavily based on Kakoune; during development I found
2424myself agreeing with most of Kakoune's design decisions.
@@ -61,4 +61,4 @@ Discuss the project on the community [Matrix Space](https://matrix.to/#/#helix-c
6161
6262# Credits
6363
64−Thanks to [@JakeHL](https://github.com/JakeHL) for designing the logo!
64+Thanks to [@jakenvac](https://github.com/jakenvac) for designing the logo!
VERSIONdeleted−1
@@ -1 +0,0 @@
1−23.05
book/book.toml+4
@@ -10,3 +10,7 @@ default-theme = "colibri"
1010preferred-dark-theme = "colibri"
1111git-repository-url = "https://github.com/helix-editor/helix"
1212edit-url-template = "https://github.com/helix-editor/helix/edit/master/book/{path}"
13+additional-css = ["custom.css"]
14+
15+[output.html.search]
16+use-boolean-and = true
book/custom.cssnew file+231
@@ -0,0 +1,231 @@
1+html {
2+ font-family: "Inter", sans-serif;
3+}
4+
5+.sidebar .sidebar-scrollbox {
6+ padding: 0;
7+}
8+
9+.chapter {
10+ margin: 0.25rem 0;
11+}
12+
13+.chapter li.chapter-item {
14+ line-height: initial;
15+ margin: 0;
16+ padding: 1rem 1.5rem;
17+}
18+
19+.chapter .section li.chapter-item {
20+ line-height: inherit;
21+ padding: .5rem .5rem 0 .5rem;
22+}
23+
24+.content {
25+ overflow-y: auto;
26+ padding: 0 15px;
27+ padding-bottom: 50px;
28+}
29+
30+/* 2 1.75 1.5 1.25 1 .875 */
31+.content h1 { font-size: 2em }
32+.content h2 { font-size: 1.75em }
33+.content h3 { font-size: 1.5em }
34+.content h4 { font-size: 1.25em }
35+.content h5 { font-size: 1em }
36+.content h6 { font-size: .875em }
37+
38+.content h1,
39+.content h2,
40+.content h3,
41+.content h4 {
42+ font-weight: 500;
43+ margin-top: 1.275em;
44+ margin-bottom: .875em;
45+}
46+
47+.content p,
48+.content ol,
49+.content ul,
50+.content table {
51+ margin-top: 0;
52+ margin-bottom: .875em;
53+}
54+
55+.content ul li {
56+ margin-bottom: .25rem;
57+}
58+
59+.content ul {
60+ list-style-type: square;
61+}
62+
63+.content ul ul,
64+.content ol ul {
65+ margin-bottom: .5rem;
66+}
67+
68+.content li p {
69+ margin-bottom: .5em;
70+}
71+
72+blockquote {
73+ margin: 1.5rem 0;
74+ padding: 1rem 1.5rem;
75+ color: var(--fg);
76+ opacity: .9;
77+ background-color: var(--quote-bg);
78+ border-left: 4px solid var(--quote-border);
79+ border-top: none;
80+ border-bottom: none;
81+}
82+
83+blockquote *:last-child {
84+ margin-bottom: 0;
85+}
86+
87+table {
88+ width: 100%;
89+}
90+
91+table thead th {
92+ padding: .75rem;
93+ text-align: left;
94+ font-weight: 500;
95+ line-height: 1.5;
96+ width: auto;
97+}
98+
99+table td {
100+ padding: .75rem;
101+ border: none;
102+}
103+
104+table thead tr {
105+ border: none;
106+ border-bottom: 2px var(--table-border-color) solid;
107+}
108+
109+table tbody tr {
110+ border-bottom: 1px var(--table-border-line) solid;
111+}
112+
113+table tbody tr:nth-child(2n) {
114+ background: unset;
115+}
116+
117+pre code.hljs {
118+ display: block;
119+ overflow-x: auto;
120+ padding: 1em;
121+}
122+
123+code.hljs {
124+ padding: 3px 5px;
125+}
126+
127+.colibri {
128+ --bg: #3b224c;
129+ --fg: #bcbdd0;
130+ --heading-fg: #fff;
131+
132+ --sidebar-bg: #281733;
133+ --sidebar-fg: #c8c9db;
134+ --sidebar-non-existent: #505274;
135+ --sidebar-active: #a4a0e8;
136+ --sidebar-spacer: #2d334f;
137+
138+ --scrollbar: var(--sidebar-fg);
139+
140+ --icons: #737480;
141+ --icons-hover: #b7b9cc;
142+
143+ /* --links: #a4a0e8; */
144+ --links: #ECCDBA;
145+
146+ --inline-code-color: hsl(48.7, 7.8%, 70%);
147+
148+ --theme-popup-bg: #161923;
149+ --theme-popup-border: #737480;
150+ --theme-hover: rgba(0, 0, 0, .2);
151+
152+ --quote-bg: #281733;
153+ --quote-border: hsl(226, 15%, 22%);
154+
155+ --table-border-color: hsl(226, 23%, 76%);
156+ --table-header-bg: hsla(226, 23%, 31%, 0);
157+ --table-alternate-bg: hsl(226, 23%, 14%);
158+ --table-border-line: hsla(201deg, 20%, 92%, 0.2);
159+
160+ --searchbar-border-color: #aaa;
161+ --searchbar-bg: #aeaec6;
162+ --searchbar-fg: #000;
163+ --searchbar-shadow-color: #aaa;
164+ --searchresults-header-fg: #5f5f71;
165+ --searchresults-border-color: #5c5c68;
166+ --searchresults-li-bg: #242430;
167+ --search-mark-bg: #a2cff5;
168+}
169+
170+.colibri .content .header {
171+ color: #fff;
172+}
173+
174+/* highlight.js theme, :where() is used to avoid increasing specificity */
175+
176+:where(.colibri) .hljs {
177+ background: #2f1e2e;
178+ color: #a39e9b;
179+}
180+
181+:where(.colibri) .hljs-comment,
182+:where(.colibri) .hljs-quote {
183+ color: #8d8687;
184+}
185+
186+:where(.colibri) .hljs-link,
187+:where(.colibri) .hljs-meta,
188+:where(.colibri) .hljs-name,
189+:where(.colibri) .hljs-regexp,
190+:where(.colibri) .hljs-selector-class,
191+:where(.colibri) .hljs-selector-id,
192+:where(.colibri) .hljs-tag,
193+:where(.colibri) .hljs-template-variable,
194+:where(.colibri) .hljs-variable {
195+ color: #ef6155;
196+}
197+
198+:where(.colibri) .hljs-built_in,
199+:where(.colibri) .hljs-deletion,
200+:where(.colibri) .hljs-literal,
201+:where(.colibri) .hljs-number,
202+:where(.colibri) .hljs-params,
203+:where(.colibri) .hljs-type {
204+ color: #f99b15;
205+}
206+
207+:where(.colibri) .hljs-attribute,
208+:where(.colibri) .hljs-section,
209+:where(.colibri) .hljs-title {
210+ color: #fec418;
211+}
212+
213+:where(.colibri) .hljs-addition,
214+:where(.colibri) .hljs-bullet,
215+:where(.colibri) .hljs-string,
216+:where(.colibri) .hljs-symbol {
217+ color: #48b685;
218+}
219+
220+:where(.colibri) .hljs-keyword,
221+:where(.colibri) .hljs-selector-tag {
222+ color: #815ba4;
223+}
224+
225+:where(.colibri) .hljs-emphasis {
226+ font-style: italic;
227+}
228+
229+:where(.colibri) .hljs-strong {
230+ font-weight: 700;
231+}
book/src/configuration.md+39−11
@@ -51,7 +51,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
5151| `auto-completion` | Enable automatic pop up of auto-completion | `true` |
5252| `auto-format` | Enable automatic formatting on save | `true` |
5353| `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 | `400` |
54+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `250` |
5555| `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |
5656| `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
5757| `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |
@@ -63,6 +63,10 @@ Its settings will be merged with the configuration directory `config.toml` and t
6363| `color-modes` | Whether to color the mode indicator with different colors depending on the mode itself | `false` |
6464| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set | `80` |
6565| `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`
6670
6771### `[editor.statusline]` Section
6872
@@ -88,9 +92,9 @@ The `[editor.statusline]` key takes the following sub-keys:
8892
8993| Key | Description | Default |
9094| --- | --- | --- |
91−| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name"]` |
95+| `left` | A list of elements aligned to the left of the statusline | `["mode", "spinner", "file-name", "read-only-indicator", "file-modification-indicator"]` |
9296| `center` | A list of elements aligned to the middle of the statusline | `[]` |
93−| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "position", "file-encoding"]` |
97+| `right` | A list of elements aligned to the right of the statusline | `["diagnostics", "selections", "register", "position", "file-encoding"]` |
9498| `separator` | The character used to separate elements in the statusline | `"│"` |
9599| `mode.normal` | The text shown in the `mode` element for normal mode | `"NOR"` |
96100| `mode.insert` | The text shown in the `mode` element for insert mode | `"INS"` |
@@ -107,6 +111,7 @@ The following statusline elements can be configured:
107111| `file-modification-indicator` | The indicator to show whether the file is modified (a `[+]` appears when there are unsaved changes) |
108112| `file-encoding` | The encoding of the opened file if it differs from UTF-8 |
109113| `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 |
110115| `total-line-numbers` | The total line numbers of the opened file |
111116| `file-type` | The type of the opened file |
112117| `diagnostics` | The number of warnings and/or errors |
@@ -163,16 +168,31 @@ All git related options are only enabled in a git repository.
163168
164169| Key | Description | Default |
165170|--|--|---------|
166−|`hidden` | Enables ignoring hidden files | true
167−|`follow-symlinks` | Follow symlinks instead of ignoring them | true
168−|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
169−|`parents` | Enables reading ignore files from parent directories | true
170−|`ignore` | Enables reading `.ignore` files | true
171−|`git-ignore` | Enables reading `.gitignore` files | true
172−|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` option | true
173−|`git-exclude` | Enables reading `.git/info/exclude` files | true
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`
174179|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
175180
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+
176196### `[editor.auto-pairs]` Section
177197
178198Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a
@@ -346,3 +366,11 @@ max-wrap = 25 # increase value to reduce forced mid-word wrapping
346366max-indent-retain = 0
347367wrap-indicator = "" # set wrap-indicator to "" to hide it
348368```
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/generated/lang-support.md+39−17
@@ -1,8 +1,9 @@
11| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
22| --- | --- | --- | --- | --- |
3+| agda | ✓ | | | |
34| astro | ✓ | | | |
45| awk | ✓ | ✓ | | `awk-language-server` |
5−| bash | ✓ | | ✓ | `bash-language-server` |
6+| bash | ✓ | ✓ | ✓ | `bash-language-server` |
67| bass | ✓ | | | `bass` |
78| beancount | ✓ | | | |
89| bibtex | ✓ | | | `texlab` |
@@ -10,13 +11,13 @@
1011| blueprint | ✓ | | | `blueprint-compiler` |
1112| c | ✓ | ✓ | ✓ | `clangd` |
1213| c-sharp | ✓ | ✓ | | `OmniSharp` |
13−| cabal | | | | |
14+| cabal | | | | `haskell-language-server-wrapper` |
1415| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
1516| capnp | ✓ | | ✓ | |
1617| clojure | ✓ | | | `clojure-lsp` |
1718| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
1819| comment | ✓ | | | |
19−| common-lisp | ✓ | | | `cl-lsp` |
20+| common-lisp | ✓ | | ✓ | `cl-lsp` |
2021| cpon | ✓ | | ✓ | |
2122| cpp | ✓ | ✓ | ✓ | `clangd` |
2223| crystal | ✓ | ✓ | | `crystalline` |
@@ -24,6 +25,7 @@
2425| cue | ✓ | | | `cuelsp` |
2526| d | ✓ | ✓ | ✓ | `serve-d` |
2627| dart | ✓ | | ✓ | `dart` |
28+| dbml | ✓ | | | |
2729| devicetree | ✓ | | | |
2830| dhall | ✓ | ✓ | | `dhall-lsp-server` |
2931| diff | ✓ | | | |
@@ -41,9 +43,12 @@
4143| erlang | ✓ | ✓ | | `erlang_ls` |
4244| esdl | ✓ | | | |
4345| fish | ✓ | ✓ | ✓ | |
44−| forth | ✓ | | | |
46+| forth | ✓ | | | `forth-lsp` |
4547| fortran | ✓ | | ✓ | `fortls` |
48+| fsharp | ✓ | | | `fsautocomplete` |
49+| gas | ✓ | ✓ | | |
4650| gdscript | ✓ | ✓ | ✓ | |
51+| gemini | ✓ | | | |
4752| git-attributes | ✓ | | | |
4853| git-commit | ✓ | ✓ | | |
4954| git-config | ✓ | | | |
@@ -51,14 +56,16 @@
5156| git-rebase | ✓ | | | |
5257| gleam | ✓ | ✓ | | `gleam` |
5358| glsl | ✓ | ✓ | ✓ | |
54−| go | ✓ | ✓ | ✓ | `gopls` |
59+| gn | ✓ | | | |
60+| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
5561| godot-resource | ✓ | | | |
5662| gomod | ✓ | | | `gopls` |
5763| gotmpl | ✓ | | | `gopls` |
5864| gowork | ✓ | | | `gopls` |
59−| graphql | ✓ | | | |
65+| graphql | ✓ | | | `graphql-lsp` |
6066| hare | ✓ | | | |
6167| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
68+| haskell-persistent | ✓ | | | |
6269| hcl | ✓ | | ✓ | `terraform-ls` |
6370| heex | ✓ | ✓ | | `elixir-ls` |
6471| hosts | ✓ | | | |
@@ -67,15 +74,18 @@
6774| idris | | | | `idris2-lsp` |
6875| iex | ✓ | | | |
6976| ini | ✓ | | | |
70−| java | ✓ | ✓ | | `jdtls` |
77+| janet | ✓ | | | |
78+| java | ✓ | ✓ | ✓ | `jdtls` |
7179| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
80+| jinja | ✓ | | | |
7281| jsdoc | ✓ | | | |
7382| json | ✓ | | ✓ | `vscode-json-language-server` |
83+| json5 | ✓ | | | |
7484| jsonnet | ✓ | | | `jsonnet-language-server` |
7585| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
7686| julia | ✓ | ✓ | ✓ | `julia` |
7787| just | ✓ | ✓ | ✓ | |
78−| kdl | ✓ | | | |
88+| kdl | ✓ | ✓ | ✓ | |
7989| kotlin | ✓ | | | `kotlin-language-server` |
8090| latex | ✓ | ✓ | | `texlab` |
8191| lean | ✓ | | | `lean` |
@@ -83,12 +93,14 @@
8393| llvm | ✓ | ✓ | ✓ | |
8494| llvm-mir | ✓ | ✓ | ✓ | |
8595| llvm-mir-yaml | ✓ | | ✓ | |
96+| log | ✓ | | | |
97+| lpf | ✓ | | | |
8698| lua | ✓ | ✓ | ✓ | `lua-language-server` |
8799| make | ✓ | | | |
88100| markdoc | ✓ | | | `markdoc-ls` |
89101| markdown | ✓ | | | `marksman` |
90102| markdown.inline | ✓ | | | |
91−| matlab | ✓ | | | |
103+| matlab | ✓ | ✓ | ✓ | |
92104| mermaid | ✓ | | | |
93105| meson | ✓ | | ✓ | |
94106| mint | | | | `mint` |
@@ -97,7 +109,8 @@
97109| nickel | ✓ | | ✓ | `nls` |
98110| nim | ✓ | ✓ | ✓ | `nimlangserver` |
99111| nix | ✓ | | | `nil` |
100−| nu | ✓ | | | |
112+| nu | ✓ | | | `nu` |
113+| nunjucks | ✓ | | | |
101114| ocaml | ✓ | | ✓ | `ocamllsp` |
102115| ocaml-interface | ✓ | | | `ocamllsp` |
103116| odin | ✓ | | ✓ | `ols` |
@@ -110,16 +123,17 @@
110123| perl | ✓ | ✓ | ✓ | `perlnavigator` |
111124| php | ✓ | ✓ | ✓ | `intelephense` |
112125| po | ✓ | ✓ | | |
126+| pod | ✓ | | | |
113127| ponylang | ✓ | ✓ | ✓ | |
114128| prisma | ✓ | | | `prisma-language-server` |
115129| prolog | | | | `swipl` |
116−| protobuf | ✓ | | ✓ | |
130+| protobuf | ✓ | | ✓ | `bufls`, `pb` |
117131| prql | ✓ | | | |
118−| purescript | ✓ | | | `purescript-language-server` |
132+| purescript | ✓ | ✓ | | `purescript-language-server` |
119133| python | ✓ | ✓ | ✓ | `pylsp` |
120134| qml | ✓ | | ✓ | `qmlls` |
121135| r | ✓ | | | `R` |
122−| racket | ✓ | | | `racket` |
136+| racket | ✓ | | ✓ | `racket` |
123137| regex | ✓ | | | |
124138| rego | ✓ | | | `regols` |
125139| rescript | ✓ | ✓ | | `rescript-language-server` |
@@ -131,30 +145,36 @@
131145| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
132146| sage | ✓ | ✓ | | |
133147| scala | ✓ | | ✓ | `metals` |
134−| scheme | ✓ | | | |
148+| scheme | ✓ | | ✓ | |
135149| scss | ✓ | | | `vscode-css-language-server` |
136150| slint | ✓ | | ✓ | `slint-lsp` |
151+| smali | ✓ | | ✓ | |
137152| smithy | ✓ | | | `cs` |
138153| sml | ✓ | | | |
139154| solidity | ✓ | | | `solc` |
140155| sql | ✓ | | | |
141156| sshclientconfig | ✓ | | | |
142157| starlark | ✓ | ✓ | | |
143−| svelte | ✓ | | | `svelteserver` |
158+| strace | ✓ | | | |
159+| svelte | ✓ | | ✓ | `svelteserver` |
144160| sway | ✓ | ✓ | ✓ | `forc` |
145161| swift | ✓ | | | `sourcekit-lsp` |
146162| t32 | ✓ | | | |
147163| tablegen | ✓ | ✓ | ✓ | |
148164| task | ✓ | | | |
165+| templ | ✓ | | | `templ` |
149166| tfvars | ✓ | | ✓ | `terraform-ls` |
167+| todotxt | ✓ | | | |
150168| toml | ✓ | | | `taplo` |
151169| tsq | ✓ | | | |
152170| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
153171| twig | ✓ | | | |
154172| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
173+| typst | ✓ | | | `typst-lsp` |
155174| ungrammar | ✓ | | | |
175+| unison | ✓ | | | |
156176| uxntal | ✓ | | | |
157−| v | ✓ | ✓ | ✓ | `v` |
177+| v | ✓ | ✓ | ✓ | `v-analyzer` |
158178| vala | ✓ | | | `vala-language-server` |
159179| verilog | ✓ | ✓ | | `svlangserver` |
160180| vhdl | ✓ | | | `vhdl_ls` |
@@ -162,10 +182,12 @@
162182| vue | ✓ | | | `vue-language-server` |
163183| wast | ✓ | | | |
164184| wat | ✓ | | | |
185+| webc | ✓ | | | |
165186| wgsl | ✓ | | | `wgsl_analyzer` |
166187| wit | ✓ | | ✓ | |
188+| wren | ✓ | ✓ | ✓ | |
167189| xit | ✓ | | | |
168190| xml | ✓ | | ✓ | |
169−| yaml | ✓ | | ✓ | `yaml-language-server` |
191+| yaml | ✓ | | ✓ | `yaml-language-server`, `ansible-language-server` |
170192| yuck | ✓ | | | |
171193| zig | ✓ | ✓ | ✓ | `zls` |
book/src/generated/typable-cmd.md+8−3
@@ -17,13 +17,14 @@
1717| `: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) |
1818| `:new`, `:n` | Create a new scratch buffer. |
1919| `:format`, `:fmt` | Format the file using the LSP formatter. |
20−| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.) |
20+| `:indent-style` | Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.) |
2121| `:line-ending` | Set the document's default line ending. Options: crlf, lf. |
2222| `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. |
2323| `:later`, `:lat` | Jump to a later point in edit history. Accepts a number of steps or a time span. |
2424| `:write-quit`, `:wq`, `:x` | Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt) |
2525| `:write-quit!`, `:wq!`, `:x!` | Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt) |
2626| `: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. |
2728| `:write-quit-all`, `:wqa`, `:xa` | Write changes from all buffers to disk and close all views. |
2829| `:write-quit-all!`, `:wqa!`, `:xa!` | Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes). |
2930| `:quit-all`, `:qa` | Close all views. |
@@ -31,6 +32,7 @@
3132| `:cquit`, `:cq` | Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2). |
3233| `:cquit!`, `:cq!` | Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2). |
3334| `: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. |
3436| `:clipboard-yank` | Yank main selection into system clipboard. |
3537| `:clipboard-yank-join` | Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline. |
3638| `:primary-clipboard-yank` | Yank main selection into system primary clipboard. |
@@ -46,13 +48,14 @@
4648| `:show-directory`, `:pwd` | Show the current working directory. |
4749| `:encoding` | Set encoding. Based on `https://encoding.spec.whatwg.org`. |
4850| `:character-info`, `:char` | Get info about the character under the primary cursor. |
49−| `:reload` | Discard changes and reload from the source file. |
50−| `:reload-all` | Discard changes and reload all documents from the source files. |
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. |
5153| `:update`, `:u` | Write changes only if the file has been modified. |
5254| `:lsp-workspace-command` | Open workspace command picker |
5355| `:lsp-restart` | Restarts the language servers used by the current doc |
5456| `:lsp-stop` | Stops the language servers that are used by the current doc |
5557| `: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. |
5659| `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
5760| `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
5861| `:debug-eval` | Evaluate expression in current debug context. |
@@ -81,3 +84,5 @@
8184| `:run-shell-command`, `:sh` | Run a shell command |
8285| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
8386| `: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+2
@@ -36,6 +36,7 @@ below.
36363. Refer to the
3737 [tree-sitter website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)
3838 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).
3940
4041> 💡 In Helix, the first matching query takes precedence when evaluating
4142> queries, which is different from other editors such as Neovim where the last
@@ -51,3 +52,4 @@ below.
5152 grammars.
5253- If a parser is causing a segfault, or you want to remove it, make sure to
5354 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+319−43
@@ -1,76 +1,308 @@
11# Adding indent queries
22
3−Helix uses tree-sitter to correctly indent new lines. This requires
4−a tree-sitter grammar and an `indent.scm` query file placed in
5−`runtime/queries/{language}/indents.scm`. The indentation for a line
6−is calculated by traversing the syntax tree from the lowest node at the
7−beginning of the new line. Each of these nodes contributes to the total
8−indent when it is captured by the query (in what way depends on the name
9−of the capture).
3+Helix uses tree-sitter to correctly indent new lines. This requires a tree-
4+sitter grammar and an `indent.scm` query file placed in `runtime/queries/
5+{language}/indents.scm`. The indentation for a line is calculated by traversing
6+the syntax tree from the lowest node at the beginning of the new line (see
7+[Indent queries](#indent-queries)). Each of these nodes contributes to the total
8+indent when it is captured by the query (in what way depends on the name of
9+the capture.
1010
1111Note that it matters where these added indents begin. For example,
1212multiple indent level increases that start on the same line only increase
13−the total indent level by 1.
13+the total indent level by 1. See [Capture types](#capture-types).
1414
15−## Scopes
15+By default, Helix uses the `hybrid` indentation heuristic. This means that
16+indent queries are not used to compute the expected absolute indentation of a
17+line but rather the expected difference in indentation between the new and an
18+already existing line. This difference is then added to the actual indentation
19+of the already existing line. Since this makes errors in the indent queries
20+harder to find, it is recommended to disable it when testing via
21+`:set indent-heuristic tree-sitter`. The rest of this guide assumes that
22+the `tree-sitter` heuristic is used.
1623
17−Added indents don't always apply to the whole node. For example, in most
18−cases when a node should be indented, we actually only want everything
19−except for its first line to be indented. For this, there are several
20−scopes (more scopes may be added in the future if required):
24+## Indent queries
2125
22−- `all`:
23−This scope applies to the whole captured node. This is only different from
24−`tail` when the captured node is the first node on its line.
26+When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine
27+the indent level for the new line, the query in `indents.scm` is run on the
28+document. The starting position of the query is the end of the line above where
29+a new line will be inserted.
2530
26−- `tail`:
27−This scope applies to everything except for the first line of the
28−captured node.
31+For `o`, the inserted line is the line below the cursor, so that starting
32+position of the query is the end of the current line.
2933
30−Every capture type has a default scope which should do the right thing
31−in most situations. When a different scope is required, this can be
32−changed by using a `#set!` declaration anywhere in the pattern:
33−```scm
34−(assignment_expression
35− right: (_) @indent
36− (#set! "scope" "all"))
34+```rust
35+fn need_hero(some_hero: Hero, life: Life) -> {
36+ matches!(some_hero, Hero { // ←─────────────────╮
37+ strong: true,//←╮ ↑ ↑ │
38+ fast: true, // │ │ ╰── query start │
39+ sure: true, // │ ╰───── cursor ├─ traversal
40+ soon: true, // ╰──────── new line inserted │ start node
41+ }) && // │
42+// ↑ │
43+// ╰───────────────────────────────────────────────╯
44+ some_hero > life
45+}
3746```
3847
39−## Capture types
48+For `O`, the newly inserted line is the *current* line, so the starting position
49+of the query is the end of the line above the cursor.
4050
41−- `@indent` (default scope `tail`):
42−Increase the indent level by 1. Multiple occurrences in the same line
43−don't stack. If there is at least one `@indent` and one `@outdent`
44−capture on the same line, the indent level isn't changed at all.
51+```rust
52+fn need_hero(some_hero: Hero, life: Life) -> { // ←─╮
53+ matches!(some_hero, Hero { // ←╮ ↑ │
54+ strong: true,// ↑ ╭───╯ │ │
55+ fast: true, // │ │ query start ─╯ │
56+ sure: true, // ╰───┼ cursor ├─ traversal
57+ soon: true, // ╰ new line inserted │ start node
58+ }) && // │
59+ some_hero > life // │
60+} // ←──────────────────────────────────────────────╯
61+```
4562
46−- `@outdent` (default scope `all`):
47−Decrease the indent level by 1. The same rules as for `@indent` apply.
63+From this starting node, the syntax tree is traversed up until the root node.
64+Each indent capture is collected along the way, and then combined according to
65+their [capture types](#capture-types) and [scopes](#scopes) to a final indent
66+level for the line.
4867
49−- `@extend`:
50−Extend the range of this node to the end of the line and to lines that
51−are indented more than the line that this node starts on. This is useful
52−for languages like Python, where for the purpose of indentation some nodes
53−(like functions or classes) should also contain indented lines that follow them.
68+### Capture types
5469
70+- `@indent` (default scope `tail`):
71+ Increase the indent level by 1. Multiple occurrences in the same line *do not*
72+ stack. If there is at least one `@indent` and one `@outdent` capture on the
73+ same line, the indent level isn't changed at all.
74+- `@outdent` (default scope `all`):
75+ Decrease the indent level by 1. The same rules as for `@indent` apply.
76+- `@indent.always` (default scope `tail`):
77+ Increase the indent level by 1. Multiple occurrences on the same line *do*
78+ stack. The final indent level is `@indent.always` – `@outdent.always`. If
79+ an `@indent` and an `@indent.always` are on the same line, the `@indent` is
80+ ignored.
81+- `@outdent.always` (default scope `all`):
82+ Decrease the indent level by 1. The same rules as for `@indent.always` apply.
83+- `@align` (default scope `all`):
84+ Align everything inside this node to some anchor. The anchor is given
85+ by the start of the node captured by `@anchor` in the same pattern.
86+ Every pattern with an `@align` should contain exactly one `@anchor`.
87+ Indent (and outdent) for nodes below (in terms of their starting line)
88+ the `@align` node is added to the indentation required for alignment.
89+- `@extend`:
90+ Extend the range of this node to the end of the line and to lines that are
91+ indented more than the line that this node starts on. This is useful for
92+ languages like Python, where for the purpose of indentation some nodes (like
93+ functions or classes) should also contain indented lines that follow them.
5594- `@extend.prevent-once`:
56−Prevents the first extension of an ancestor of this node. For example, in Python
57−a return expression always ends the block that it is in. Note that this only stops the
58−extension of the next `@extend` capture. If multiple ancestors are captured,
59−only the extension of the innermost one is prevented. All other ancestors are unaffected
60−(regardless of whether the innermost ancestor would actually have been extended).
95+ Prevents the first extension of an ancestor of this node. For example, in Python
96+ a return expression always ends the block that it is in. Note that this only
97+ stops the extension of the next `@extend` capture. If multiple ancestors are
98+ captured, only the extension of the innermost one is prevented. All other
99+ ancestors are unaffected (regardless of whether the innermost ancestor would
100+ actually have been extended).
101+
102+#### `@indent` / `@outdent`
103+
104+Consider this example:
105+
106+```rust
107+fn shout(things: Vec<Thing>) {
108+ // ↑
109+ // ├───────────────────────╮ indent level
110+ // @indent ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
111+ // │
112+ let it_all = |out| { things.filter(|thing| { // │ 1
113+ // ↑ ↑ │
114+ // ├───────────────────────┼─────┼┄┄┄┄┄┄┄┄┄┄┄┄┄┄
115+ // @indent @indent │
116+ // │ 2
117+ thing.can_do_with(out) // │
118+ })}; // ├┄┄┄┄┄┄┄┄┄┄┄┄┄┄
119+ //↑↑↑ │ 1
120+} //╰┼┴──────────────────────────────────────────────┴┄┄┄┄┄┄┄┄┄┄┄┄┄┄
121+// 3x @outdent
122+```
123+
124+```scm
125+((block) @indent)
126+["}" ")"] @outdent
127+```
128+
129+Note how on the second line, we have two blocks begin on the same line. In this
130+case, since both captures occur on the same line, they are combined and only
131+result in a net increase of 1. Also note that the closing `}`s are part of the
132+`@indent` captures, but the 3 `@outdent`s also combine into 1 and result in that
133+line losing one indent level.
134+
135+#### `@extend` / `@extend.prevent-once`
136+
137+For an example of where `@extend` can be useful, consider Python, which is
138+whitespace-sensitive.
139+
140+```scm
141+]
142+ (parenthesized_expression)
143+ (function_definition)
144+ (class_definition)
145+] @indent
146+
147+```
148+
149+```python
150+class Hero:
151+ def __init__(self, strong, fast, sure, soon):# ←─╮
152+ self.is_strong = strong # │
153+ self.is_fast = fast # ╭─── query start │
154+ self.is_sure = sure # │ ╭─ cursor │
155+ self.is_soon = soon # │ │ │
156+ # ↑ ↑ │ │ │
157+ # │ ╰──────╯ │ │
158+ # ╰─────────────────────╯ │
159+ # ├─ traversal
160+ def need_hero(self, life): # │ start node
161+ return ( # │
162+ self.is_strong # │
163+ and self.is_fast # │
164+ and self.is_sure # │
165+ and self.is_soon # │
166+ and self > life # │
167+ ) # ←─────────────────────────────────────────╯
168+```
169+
170+Without braces to catch the scope of the function, the smallest descendant of
171+the cursor on a line feed ends up being the entire inside of the class. Because
172+of this, it will miss the entire function node and its indent capture, leading
173+to an indent level one too small.
174+
175+To address this case, `@extend` tells helix to "extend" the captured node's span
176+to the line feed and every consecutive line that has a greater indent level than
177+the line of the node.
178+
179+```scm
180+(parenthesized_expression) @indent
181+
182+]
183+ (function_definition)
184+ (class_definition)
185+] @indent @extend
186+
187+```
188+
189+```python
190+class Hero:
191+ def __init__(self, strong, fast, sure, soon):# ←─╮
192+ self.is_strong = strong # │
193+ self.is_fast = fast # ╭─── query start ├─ traversal
194+ self.is_sure = sure # │ ╭─ cursor │ start node
195+ self.is_soon = soon # │ │ ←───────────────╯
196+ # ↑ ↑ │ │
197+ # │ ╰──────╯ │
198+ # ╰─────────────────────╯
199+ def need_hero(self, life):
200+ return (
201+ self.is_strong
202+ and self.is_fast
203+ and self.is_sure
204+ and self.is_soon
205+ and self > life
206+ )
207+```
61208
209+Furthermore, there are some cases where extending to everything with a greater
210+indent level may not be desirable. Consider the `need_hero` function above. If
211+our cursor is on the last line of the returned expression.
212+
213+```python
214+class Hero:
215+ def __init__(self, strong, fast, sure, soon):
216+ self.is_strong = strong
217+ self.is_fast = fast
218+ self.is_sure = sure
219+ self.is_soon = soon
220+
221+ def need_hero(self, life):
222+ return (
223+ self.is_strong
224+ and self.is_fast
225+ and self.is_sure
226+ and self.is_soon
227+ and self > life
228+ ) # ←─── cursor
229+ #←────────── where cursor should go on new line
230+```
231+
232+In Python, the are a few tokens that will always end a scope, such as a return
233+statement. Since the scope ends, so should the indent level. But because the
234+function span is extended to every line with a greater indent level, a new line
235+would just continue on the same level. And an `@outdent` would not help us here
236+either, since it would cause everything in the parentheses to become outdented
237+as well.
238+
239+To help, we need to signal an end to the extension. We can do this with
240+`@extend.prevent-once`.
241+
242+```scm
243+(parenthesized_expression) @indent
244+
245+]
246+ (function_definition)
247+ (class_definition)
248+] @indent @extend
249+
250+(return_statement) @extend.prevent-once
251+```
252+
253+#### `@indent.always` / `@outdent.always`
254+
255+As mentioned before, normally if there is more than one `@indent` or `@outdent`
256+capture on the same line, they are combined.
257+
258+Sometimes, there are cases when you may want to ensure that every indent capture
259+is additive, regardless of how many occur on the same line. Consider this
260+example in YAML.
261+
262+```yaml
263+ - foo: bar
264+# ↑ ↑
265+# │ ╰─────────────── start of map
266+# ╰───────────────── start of list element
267+ baz: quux # ←─── cursor
268+ # ←───────────── where the cursor should go on a new line
269+ garply: waldo
270+ - quux:
271+ bar: baz
272+ xyzzy: thud
273+ fred: plugh
274+```
275+
276+In YAML, you often have lists of maps. In these cases, the syntax is such that
277+the list element and the map both start on the same line. But we really do want
278+to start an indentation for each of these so that subsequent keys in the map
279+hang over the list and align properly. This is where `@indent.always` helps.
280+
281+```scm
282+((block_sequence_item) @item @indent.always @extend
283+ (#not-one-line? @item))
284+
285+((block_mapping_pair
286+ key: (_) @key
287+ value: (_) @val
288+ (#not-same-line? @key @val)
289+ ) @indent.always @extend
290+)
291+```
62292
63293## Predicates
64294
65295In some cases, an S-expression cannot express exactly what pattern should be matched.
66296For that, tree-sitter allows for predicates to appear anywhere within a pattern,
67297similar to how `#set!` declarations work:
298+
68299```scm
69300(some_kind
70301 (child_kind) @indent
71302 (#predicate? arg1 arg2 ...)
72303)
73304```
305+
74306The number of arguments depends on the predicate that's used.
75307Each argument is either a capture (`@name`) or a string (`"some string"`).
76308The following predicates are supported by tree-sitter:
@@ -91,3 +323,47 @@ argument (a string).
91323
92324- `#same-line?`/`#not-same-line?`:
93325The captures given by the 2 arguments must/must not start on the same line.
326+
327+- `#one-line?`/`#not-one-line?`:
328+The captures given by the fist argument must/must span a total of one line.
329+
330+### Scopes
331+
332+Added indents don't always apply to the whole node. For example, in most
333+cases when a node should be indented, we actually only want everything
334+except for its first line to be indented. For this, there are several
335+scopes (more scopes may be added in the future if required):
336+
337+- `tail`:
338+This scope applies to everything except for the first line of the
339+captured node.
340+- `all`:
341+This scope applies to the whole captured node. This is only different from
342+`tail` when the captured node is the first node on its line.
343+
344+For example, imagine we have the following function
345+
346+```rust
347+fn aha() { // ←─────────────────────────────────────╮
348+ let take = "on me"; // ←──────────────╮ scope: │
349+ let take = "me on"; // ├─ "tail" ├─ (block) @indent
350+ let ill = be_gone_days(1 || 2); // │ │
351+} // ←───────────────────────────────────┴──────────┴─ "}" @outdent
352+ // scope: "all"
353+```
354+
355+We can write the following query with the `#set!` declaration:
356+
357+ ```scm
358+ ((block) @indent
359+ (#set! "scope" "tail"))
360+ ("}" @outdent
361+ (#set! "scope" "all"))
362+ ```
363+
364+As we can see, the "tail" scope covers the node, except for the first line.
365+Everything up to and including the closing brace gets an indent level of 1.
366+Then, on the closing brace, we encounter an outdent with a scope of "all", which
367+means the first line is included, and the indent level is cancelled out on this
368+line. (Note these scopes are the defaults for `@indent` and `@outdent`—they are
369+written explicitly for demonstration.)
book/src/guides/injection.md+1−1
@@ -1,7 +1,7 @@
11# Adding Injection Queries
22
33Writing 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
4+In addition to the [standard][upstream-docs] language injection options used by tree-sitter, there
55are a few Helix specific extensions that allow for more control.
66
77And example of a simple query that would highlight all strings as bash in Nix:
book/src/install.md+62−21
@@ -6,12 +6,14 @@
66- [Linux](#linux)
77 - [Ubuntu](#ubuntu)
88 - [Fedora/RHEL](#fedorarhel)
9− - [Arch Linux community](#arch-linux-community)
9+ - [Arch Linux extra](#arch-linux-extra)
1010 - [NixOS](#nixos)
1111 - [Flatpak](#flatpak)
12+ - [Snap](#snap)
1213 - [AppImage](#appimage)
1314- [macOS](#macos)
1415 - [Homebrew Core](#homebrew-core)
16+ - [MacPorts](#macports)
1517- [Windows](#windows)
1618 - [Winget](#winget)
1719 - [Scoop](#scoop)
@@ -63,16 +65,13 @@ sudo apt install helix
6365
6466### Fedora/RHEL
6567
66−Enable the `COPR` repository for Helix:
67−
6868```sh
69−sudo dnf copr enable varlad/helix
7069sudo dnf install helix
7170```
7271
73−### Arch Linux community
72+### Arch Linux extra
7473
75−Releases are available in the `community` repository:
74+Releases are available in the `extra` repository:
7675
7776```sh
7877sudo pacman -S helix
@@ -104,6 +103,16 @@ flatpak install flathub com.helix_editor.Helix
104103flatpak run com.helix_editor.Helix
105104```
106105
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+
107116### AppImage
108117
109118Install Helix using the Linux [AppImage](https://appimage.org/) format.
@@ -122,6 +131,12 @@ chmod +x helix-*.AppImage # change permission for executable mode
122131brew install helix
123132```
124133
134+### MacPorts
135+
136+```sh
137+port install helix
138+```
139+
125140## Windows
126141
127142Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
@@ -159,6 +174,10 @@ pacman -S mingw-w64-ucrt-x86_64-helix
159174
160175Requirements:
161176
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+
162181- The [Rust toolchain](https://www.rust-lang.org/tools/install)
163182- The [Git version control system](https://git-scm.com/)
164183- A C++14 compatible compiler to build the tree-sitter grammars, for example GCC or Clang
@@ -171,19 +190,19 @@ RUSTFLAGS="-C target-feature=-crt-static"
171190
1721911. Clone the repository:
173192
174−```sh
175−git clone https://github.com/helix-editor/helix
176−cd helix
177−```
193+ ```sh
194+ git clone https://github.com/helix-editor/helix
195+ cd helix
196+ ```
178197
1791982. Compile from source:
180199
181−```sh
182−cargo install --path helix-term --locked
183−```
200+ ```sh
201+ cargo install --path helix-term --locked
202+ ```
184203
185−This command will create the `hx` executable and construct the tree-sitter
186−grammars in the local `runtime` folder.
204+ This command will create the `hx` executable and construct the tree-sitter
205+ grammars in the local `runtime` folder.
187206
188207> 💡 Tree-sitter grammars can be fetched and compiled if not pre-packaged. Fetch
189208> grammars with `hx --grammar fetch` and compile them with
@@ -195,19 +214,21 @@ grammars in the local `runtime` folder.
195214
196215#### Linux and macOS
197216
198−Either set the `HELIX_RUNTIME` environment variable to point to the runtime files and add it to your `~/.bashrc` or equivalent:
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:
199220
200221```sh
201−HELIX_RUNTIME=/home/user-name/src/helix/runtime
222+HELIX_RUNTIME=~/src/helix/runtime
202223```
203224
204−Or, create a symlink in `~/.config/helix` that links to the source code directory:
225+Or, create a symbolic link:
205226
206227```sh
207228ln -Ts $PWD/runtime ~/.config/helix/runtime
208229```
209230
210−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.
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.
211232
212233#### Windows
213234
@@ -240,12 +261,32 @@ following order:
2402611. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
241262 developing and testing helix only).
2422632. `runtime/` subdirectory of OS-dependent helix user config directory.
243−3. `$HELIX_RUNTIME`.
244−4. `runtime/` subdirectory of path to Helix executable.
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.
245268
246269This order also sets the priority for selecting which file will be used if multiple runtime
247270directories have files with the same name.
248271
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+
249290### Validating the installation
250291
251292To make sure everything is set up as expected you should run the Helix health
book/src/keymap.md+21−14
@@ -25,6 +25,8 @@
2525
2626## Normal mode
2727
28+Normal mode is the default mode when you launch helix. You can return to it from other modes by pressing the `Escape` key.
29+
2830### Movement
2931
3032> NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line.
@@ -289,7 +291,7 @@ This layer is a kludge of mappings, mostly pickers.
289291| `w` | Enter [window mode](#window-mode) | N/A |
290292| `p` | Paste system clipboard after selections | `paste_clipboard_after` |
291293| `P` | Paste system clipboard before selections | `paste_clipboard_before` |
292−| `y` | Join and yank selections to clipboard | `yank_joined_to_clipboard` |
294+| `y` | Yank selections to clipboard | `yank_to_clipboard` |
293295| `Y` | Yank main selection to clipboard | `yank_main_selection_to_clipboard` |
294296| `R` | Replace selections by clipboard contents | `replace_selections_with_clipboard` |
295297| `/` | Global search in workspace folder | `global_search` |
@@ -337,6 +339,8 @@ These mappings are in the style of [vim-unimpaired](https://github.com/tpope/vim
337339
338340## Insert mode
339341
342+Accessed by typing `i` in [normal mode](#normal-mode).
343+
340344Insert mode bindings are minimal by default. Helix is designed to
341345be a modal editor, and this is reflected in the user experience and internal
342346mechanics. Changes to the text are only saved for undos when
@@ -390,6 +394,8 @@ end = "no_op"
390394
391395## Select / extend mode
392396
397+Accessed by typing `v` in [normal mode](#normal-mode).
398+
393399Select mode echoes Normal mode, but changes any movements to extend
394400selections rather than replace them. Goto motions are also changed to
395401extend, so that `vgl`, for example, extends the selection to the end of
@@ -405,19 +411,20 @@ you to selectively add search terms to your selections.
405411
406412Keys to use within picker. Remapping currently not supported.
407413
408−| Key | Description |
409−| ----- | ------------- |
410−| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
411−| `Tab`, `Down`, `Ctrl-n` | Next entry |
412−| `PageUp`, `Ctrl-u` | Page up |
413−| `PageDown`, `Ctrl-d` | Page down |
414−| `Home` | Go to first entry |
415−| `End` | Go to last entry |
416−| `Enter` | Open selected |
417−| `Ctrl-s` | Open horizontally |
418−| `Ctrl-v` | Open vertically |
419−| `Ctrl-t` | Toggle preview |
420−| `Escape`, `Ctrl-c` | Close picker |
414+| Key | Description |
415+| ----- | ------------- |
416+| `Shift-Tab`, `Up`, `Ctrl-p` | Previous entry |
417+| `Tab`, `Down`, `Ctrl-n` | Next entry |
418+| `PageUp`, `Ctrl-u` | Page up |
419+| `PageDown`, `Ctrl-d` | Page down |
420+| `Home` | Go to first entry |
421+| `End` | Go to last entry |
422+| `Enter` | Open selected |
423+| `Alt-Enter` | Open selected in the background without closing the picker |
424+| `Ctrl-s` | Open horizontally |
425+| `Ctrl-v` | Open vertically |
426+| `Ctrl-t` | Toggle preview |
427+| `Escape`, `Ctrl-c` | Close picker |
421428
422429## Prompt
423430
book/src/languages.md+3−1
@@ -66,8 +66,10 @@ These configuration keys are available:
6666| `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) |
6767| `grammar` | The tree-sitter grammar to use (defaults to the value of `name`) |
6868| `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)
6970| `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` |
7071| `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.
7173
7274### File-type detection and the `file-types` key
7375
@@ -127,7 +129,7 @@ These are the available options for a language server.
127129| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
128130
129131A `format` sub-table within `config` can be used to pass extra formatting options to
130−[Document Formatting Requests](https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-17.md#document-formatting-request--leftwards_arrow_with_hook).
132+[Document Formatting Requests](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting).
131133For example, with typescript:
132134
133135```toml
book/src/themes.md+9−1
@@ -70,6 +70,7 @@ over it and is merged into the default palette.
7070
7171| Color Name |
7272| --- |
73+| `default` |
7374| `black` |
7475| `red` |
7576| `green` |
@@ -154,6 +155,7 @@ We use a similar set of scopes as
154155
155156- `type` - Types
156157 - `builtin` - Primitive types provided by the language (`int`, `usize`)
158+ - `parameter` - Generic type parameters (`T`)
157159 - `enum`
158160 - `variant`
159161- `constructor`
@@ -244,9 +246,12 @@ We use a similar set of scopes as
244246
245247- `diff` - version control changes
246248 - `plus` - additions
249+ - `gutter` - gutter indicator
247250 - `minus` - deletions
251+ - `gutter` - gutter indicator
248252 - `delta` - modifications
249253 - `moved` - renamed or moved files/changes
254+ - `gutter` - gutter indicator
250255
251256#### Interface
252257
@@ -291,11 +296,14 @@ These scopes are used for theming the editor interface:
291296| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
292297| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
293298| `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 |
294302| `ui.popup` | Documentation popups (e.g. Space + k) |
295303| `ui.popup.info` | Prompt for multiple key options |
296304| `ui.window` | Borderlines separating splits |
297305| `ui.help` | Description box for commands |
298−| `ui.text` | Command prompts, popup text, etc. |
306+| `ui.text` | Default text style, command prompts, popup text, etc. |
299307| `ui.text.focus` | The currently selected line in the picker |
300308| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
301309| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
book/src/usage.md+21−5
@@ -37,19 +37,35 @@ 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−### Special registers
40+### Default registers
41+
42+Commands that use registers, like yank (`y`), use a default register if none is specified.
43+These registers are used as defaults:
4144
4245| Register character | Contains |
4346| --- | --- |
4447| `/` | Last search |
4548| `:` | Last executed command |
4649| `"` | Last yanked text |
47−| `_` | Black hole |
50+| `@` | Last recorded macro |
4851
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.
52+### Special registers
5153
52−The black hole register is a no-op register, meaning that no data will be read or written to it.
54+Some registers have special behavior when read from and written to.
55+
56+| Register character | When read | When written |
57+| --- | --- | --- |
58+| `_` | No values are returned | All values are discarded |
59+| `#` | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
60+| `.` | Contents of the current selections | This register is not writable |
61+| `%` | Name of the current file | This register is not writable |
62+| `+` | Reads from the system clipboard | Joins and yanks to the system clipboard |
63+| `*` | Reads from the primary clipboard | Joins and yanks to the primary clipboard |
64+
65+When yanking multiple selections to the clipboard registers, the selections
66+are joined with newlines. Pasting from these registers will paste multiple
67+selections if the clipboard was last yanked to by the Helix session. Otherwise
68+the clipboard contents are pasted as one selection.
5369
5470## Surround
5571
book/theme/book.jsdeleted−660
@@ -1,660 +0,0 @@
1−"use strict";
2−
3−// Fix back button cache problem
4−window.onunload = function () { };
5−
6−// Global variable, shared between modules
7−function playground_text(playground) {
8− let code_block = playground.querySelector("code");
9−
10− if (window.ace && code_block.classList.contains("editable")) {
11− let editor = window.ace.edit(code_block);
12− return editor.getValue();
13− } else {
14− return code_block.textContent;
15− }
16−}
17−
18−(function codeSnippets() {
19− function fetch_with_timeout(url, options, timeout = 6000) {
20− return Promise.race([
21− fetch(url, options),
22− new Promise((_, reject) => setTimeout(() => reject(new Error('timeout')), timeout))
23− ]);
24− }
25−
26− var playgrounds = Array.from(document.querySelectorAll(".playground"));
27− if (playgrounds.length > 0) {
28− fetch_with_timeout("https://play.rust-lang.org/meta/crates", {
29− headers: {
30− 'Content-Type': "application/json",
31− },
32− method: 'POST',
33− mode: 'cors',
34− })
35− .then(response => response.json())
36− .then(response => {
37− // get list of crates available in the rust playground
38− let playground_crates = response.crates.map(item => item["id"]);
39− playgrounds.forEach(block => handle_crate_list_update(block, playground_crates));
40− });
41− }
42−
43− function handle_crate_list_update(playground_block, playground_crates) {
44− // update the play buttons after receiving the response
45− update_play_button(playground_block, playground_crates);
46−
47− // and install on change listener to dynamically update ACE editors
48− if (window.ace) {
49− let code_block = playground_block.querySelector("code");
50− if (code_block.classList.contains("editable")) {
51− let editor = window.ace.edit(code_block);
52− editor.addEventListener("change", function (e) {
53− update_play_button(playground_block, playground_crates);
54− });
55− // add Ctrl-Enter command to execute rust code
56− editor.commands.addCommand({
57− name: "run",
58− bindKey: {
59− win: "Ctrl-Enter",
60− mac: "Ctrl-Enter"
61− },
62− exec: _editor => run_rust_code(playground_block)
63− });
64− }
65− }
66− }
67−
68− // updates the visibility of play button based on `no_run` class and
69− // used crates vs ones available on http://play.rust-lang.org
70− function update_play_button(pre_block, playground_crates) {
71− var play_button = pre_block.querySelector(".play-button");
72−
73− // skip if code is `no_run`
74− if (pre_block.querySelector('code').classList.contains("no_run")) {
75− play_button.classList.add("hidden");
76− return;
77− }
78−
79− // get list of `extern crate`'s from snippet
80− var txt = playground_text(pre_block);
81− var re = /extern\s+crate\s+([a-zA-Z_0-9]+)\s*;/g;
82− var snippet_crates = [];
83− var item;
84− while (item = re.exec(txt)) {
85− snippet_crates.push(item[1]);
86− }
87−
88− // check if all used crates are available on play.rust-lang.org
89− var all_available = snippet_crates.every(function (elem) {
90− return playground_crates.indexOf(elem) > -1;
91− });
92−
93− if (all_available) {
94− play_button.classList.remove("hidden");
95− } else {
96− play_button.classList.add("hidden");
97− }
98− }
99−
100− function run_rust_code(code_block) {
101− var result_block = code_block.querySelector(".result");
102− if (!result_block) {
103− result_block = document.createElement('code');
104− result_block.className = 'result hljs language-bash';
105−
106− code_block.append(result_block);
107− }
108−
109− let text = playground_text(code_block);
110− let classes = code_block.querySelector('code').classList;
111− let has_2018 = classes.contains("edition2018");
112− let edition = has_2018 ? "2018" : "2015";
113−
114− var params = {
115− version: "stable",
116− optimize: "0",
117− code: text,
118− edition: edition
119− };
120−
121− if (text.indexOf("#![feature") !== -1) {
122− params.version = "nightly";
123− }
124−
125− result_block.innerText = "Running...";
126−
127− fetch_with_timeout("https://play.rust-lang.org/evaluate.json", {
128− headers: {
129− 'Content-Type': "application/json",
130− },
131− method: 'POST',
132− mode: 'cors',
133− body: JSON.stringify(params)
134− })
135− .then(response => response.json())
136− .then(response => result_block.innerText = response.result)
137− .catch(error => result_block.innerText = "Playground Communication: " + error.message);
138− }
139−
140− // Syntax highlighting Configuration
141− hljs.configure({
142− tabReplace: ' ', // 4 spaces
143− languages: [], // Languages used for auto-detection
144− });
145−
146− let code_nodes = Array
147− .from(document.querySelectorAll('code'))
148− // Don't highlight `inline code` blocks in headers.
149− .filter(function (node) {return !node.parentElement.classList.contains("header"); });
150−
151− if (window.ace) {
152− // language-rust class needs to be removed for editable
153− // blocks or highlightjs will capture events
154− Array
155− .from(document.querySelectorAll('code.editable'))
156− .forEach(function (block) { block.classList.remove('language-rust'); });
157−
158− Array
159− .from(document.querySelectorAll('code:not(.editable)'))
160− .forEach(function (block) { hljs.highlightBlock(block); });
161− } else {
162− code_nodes.forEach(function (block) { hljs.highlightBlock(block); });
163− }
164−
165− // Adding the hljs class gives code blocks the color css
166− // even if highlighting doesn't apply
167− code_nodes.forEach(function (block) { block.classList.add('hljs'); });
168−
169− Array.from(document.querySelectorAll("code.language-rust")).forEach(function (block) {
170−
171− var lines = Array.from(block.querySelectorAll('.boring'));
172− // If no lines were hidden, return
173− if (!lines.length) { return; }
174− block.classList.add("hide-boring");
175−
176− var buttons = document.createElement('div');
177− buttons.className = 'buttons';
178− buttons.innerHTML = "<button class=\"fa fa-eye\" title=\"Show hidden lines\" aria-label=\"Show hidden lines\"></button>";
179−
180− // add expand button
181− var pre_block = block.parentNode;
182− pre_block.insertBefore(buttons, pre_block.firstChild);
183−
184− pre_block.querySelector('.buttons').addEventListener('click', function (e) {
185− if (e.target.classList.contains('fa-eye')) {
186− e.target.classList.remove('fa-eye');
187− e.target.classList.add('fa-eye-slash');
188− e.target.title = 'Hide lines';
189− e.target.setAttribute('aria-label', e.target.title);
190−
191− block.classList.remove('hide-boring');
192− } else if (e.target.classList.contains('fa-eye-slash')) {
193− e.target.classList.remove('fa-eye-slash');
194− e.target.classList.add('fa-eye');
195− e.target.title = 'Show hidden lines';
196− e.target.setAttribute('aria-label', e.target.title);
197−
198− block.classList.add('hide-boring');
199− }
200− });
201− });
202−
203− if (window.playground_copyable) {
204− Array.from(document.querySelectorAll('pre code')).forEach(function (block) {
205− var pre_block = block.parentNode;
206− if (!pre_block.classList.contains('playground')) {
207− var buttons = pre_block.querySelector(".buttons");
208− if (!buttons) {
209− buttons = document.createElement('div');
210− buttons.className = 'buttons';
211− pre_block.insertBefore(buttons, pre_block.firstChild);
212− }
213−
214− var clipButton = document.createElement('button');
215− clipButton.className = 'fa fa-copy clip-button';
216− clipButton.title = 'Copy to clipboard';
217− clipButton.setAttribute('aria-label', clipButton.title);
218− clipButton.innerHTML = '<i class=\"tooltiptext\"></i>';
219−
220− buttons.insertBefore(clipButton, buttons.firstChild);
221− }
222− });
223− }
224−
225− // Process playground code blocks
226− Array.from(document.querySelectorAll(".playground")).forEach(function (pre_block) {
227− // Add play button
228− var buttons = pre_block.querySelector(".buttons");
229− if (!buttons) {
230− buttons = document.createElement('div');
231− buttons.className = 'buttons';
232− pre_block.insertBefore(buttons, pre_block.firstChild);
233− }
234−
235− var runCodeButton = document.createElement('button');
236− runCodeButton.className = 'fa fa-play play-button';
237− runCodeButton.hidden = true;
238− runCodeButton.title = 'Run this code';
239− runCodeButton.setAttribute('aria-label', runCodeButton.title);
240−
241− buttons.insertBefore(runCodeButton, buttons.firstChild);
242− runCodeButton.addEventListener('click', function (e) {
243− run_rust_code(pre_block);
244− });
245−
246− if (window.playground_copyable) {
247− var copyCodeClipboardButton = document.createElement('button');
248− copyCodeClipboardButton.className = 'fa fa-copy clip-button';
249− copyCodeClipboardButton.innerHTML = '<i class="tooltiptext"></i>';
250− copyCodeClipboardButton.title = 'Copy to clipboard';
251− copyCodeClipboardButton.setAttribute('aria-label', copyCodeClipboardButton.title);
252−
253− buttons.insertBefore(copyCodeClipboardButton, buttons.firstChild);
254− }
255−
256− let code_block = pre_block.querySelector("code");
257− if (window.ace && code_block.classList.contains("editable")) {
258− var undoChangesButton = document.createElement('button');
259− undoChangesButton.className = 'fa fa-history reset-button';
260− undoChangesButton.title = 'Undo changes';
261− undoChangesButton.setAttribute('aria-label', undoChangesButton.title);
262−
263− buttons.insertBefore(undoChangesButton, buttons.firstChild);
264−
265− undoChangesButton.addEventListener('click', function () {
266− let editor = window.ace.edit(code_block);
267− editor.setValue(editor.originalCode);
268− editor.clearSelection();
269− });
270− }
271− });
272−})();
273−
274−(function themes() {
275− var html = document.querySelector('html');
276− var themeToggleButton = document.getElementById('theme-toggle');
277− var themePopup = document.getElementById('theme-list');
278− var themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
279− var stylesheets = {
280− ayuHighlight: document.querySelector("[href$='ayu-highlight.css']"),
281− tomorrowNight: document.querySelector("[href$='tomorrow-night.css']"),
282− highlight: document.querySelector("[href$='highlight.css']"),
283− };
284−
285− function showThemes() {
286− themePopup.style.display = 'block';
287− themeToggleButton.setAttribute('aria-expanded', true);
288− themePopup.querySelector("button#" + get_theme()).focus();
289− }
290−
291− function hideThemes() {
292− themePopup.style.display = 'none';
293− themeToggleButton.setAttribute('aria-expanded', false);
294− themeToggleButton.focus();
295− }
296−
297− function get_theme() {
298− var theme;
299− try { theme = localStorage.getItem('mdbook-theme'); } catch (e) { }
300− if (theme === null || theme === undefined) {
301− return default_theme;
302− } else {
303− return theme;
304− }
305− }
306−
307− function set_theme(theme, store = true) {
308− let ace_theme;
309−
310− if (theme == 'coal' || theme == 'navy') {
311− stylesheets.ayuHighlight.disabled = true;
312− stylesheets.tomorrowNight.disabled = false;
313− stylesheets.highlight.disabled = true;
314−
315− ace_theme = "ace/theme/tomorrow_night";
316− } else if (theme == 'ayu') {
317− stylesheets.ayuHighlight.disabled = false;
318− stylesheets.tomorrowNight.disabled = true;
319− stylesheets.highlight.disabled = true;
320− ace_theme = "ace/theme/tomorrow_night";
321− } else {
322− stylesheets.ayuHighlight.disabled = true;
323− stylesheets.tomorrowNight.disabled = true;
324− stylesheets.highlight.disabled = false;
325− ace_theme = "ace/theme/dawn";
326− }
327−
328− setTimeout(function () {
329− themeColorMetaTag.content = getComputedStyle(document.body).backgroundColor;
330− }, 1);
331−
332− if (window.ace && window.editors) {
333− window.editors.forEach(function (editor) {
334− editor.setTheme(ace_theme);
335− });
336− }
337−
338− var previousTheme = get_theme();
339−
340− if (store) {
341− try { localStorage.setItem('mdbook-theme', theme); } catch (e) { }
342− }
343−
344− html.classList.remove(previousTheme);
345− html.classList.add(theme);
346− }
347−
348− // Set theme
349− var theme = get_theme();
350−
351− set_theme(theme, false);
352−
353− themeToggleButton.addEventListener('click', function () {
354− if (themePopup.style.display === 'block') {
355− hideThemes();
356− } else {
357− showThemes();
358− }
359− });
360−
361− themePopup.addEventListener('click', function (e) {
362− var theme = e.target.id || e.target.parentElement.id;
363− set_theme(theme);
364− });
365−
366− themePopup.addEventListener('focusout', function(e) {
367− // e.relatedTarget is null in Safari and Firefox on macOS (see workaround below)
368− if (!!e.relatedTarget && !themeToggleButton.contains(e.relatedTarget) && !themePopup.contains(e.relatedTarget)) {
369− hideThemes();
370− }
371− });
372−
373− // Should not be needed, but it works around an issue on macOS & iOS: https://github.com/rust-lang/mdBook/issues/628
374− document.addEventListener('click', function(e) {
375− if (themePopup.style.display === 'block' && !themeToggleButton.contains(e.target) && !themePopup.contains(e.target)) {
376− hideThemes();
377− }
378− });
379−
380− document.addEventListener('keydown', function (e) {
381− if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
382− if (!themePopup.contains(e.target)) { return; }
383−
384− switch (e.key) {
385− case 'Escape':
386− e.preventDefault();
387− hideThemes();
388− break;
389− case 'ArrowUp':
390− e.preventDefault();
391− var li = document.activeElement.parentElement;
392− if (li && li.previousElementSibling) {
393− li.previousElementSibling.querySelector('button').focus();
394− }
395− break;
396− case 'ArrowDown':
397− e.preventDefault();
398− var li = document.activeElement.parentElement;
399− if (li && li.nextElementSibling) {
400− li.nextElementSibling.querySelector('button').focus();
401− }
402− break;
403− case 'Home':
404− e.preventDefault();
405− themePopup.querySelector('li:first-child button').focus();
406− break;
407− case 'End':
408− e.preventDefault();
409− themePopup.querySelector('li:last-child button').focus();
410− break;
411− }
412− });
413−})();
414−
415−(function sidebar() {
416− var html = document.querySelector("html");
417− var sidebar = document.getElementById("sidebar");
418− var sidebarLinks = document.querySelectorAll('#sidebar a');
419− var sidebarToggleButton = document.getElementById("sidebar-toggle");
420− var sidebarResizeHandle = document.getElementById("sidebar-resize-handle");
421− var firstContact = null;
422−
423− function showSidebar() {
424− html.classList.remove('sidebar-hidden')
425− html.classList.add('sidebar-visible');
426− Array.from(sidebarLinks).forEach(function (link) {
427− link.setAttribute('tabIndex', 0);
428− });
429− sidebarToggleButton.setAttribute('aria-expanded', true);
430− sidebar.setAttribute('aria-hidden', false);
431− try { localStorage.setItem('mdbook-sidebar', 'visible'); } catch (e) { }
432− }
433−
434−
435− var sidebarAnchorToggles = document.querySelectorAll('#sidebar a.toggle');
436−
437− function toggleSection(ev) {
438− ev.currentTarget.parentElement.classList.toggle('expanded');
439− }
440−
441− Array.from(sidebarAnchorToggles).forEach(function (el) {
442− el.addEventListener('click', toggleSection);
443− });
444−
445− function hideSidebar() {
446− html.classList.remove('sidebar-visible')
447− html.classList.add('sidebar-hidden');
448− Array.from(sidebarLinks).forEach(function (link) {
449− link.setAttribute('tabIndex', -1);
450− });
451− sidebarToggleButton.setAttribute('aria-expanded', false);
452− sidebar.setAttribute('aria-hidden', true);
453− try { localStorage.setItem('mdbook-sidebar', 'hidden'); } catch (e) { }
454− }
455−
456− // Toggle sidebar
457− sidebarToggleButton.addEventListener('click', function sidebarToggle() {
458− if (html.classList.contains("sidebar-hidden")) {
459− var current_width = parseInt(
460− document.documentElement.style.getPropertyValue('--sidebar-width'), 10);
461− if (current_width < 150) {
462− document.documentElement.style.setProperty('--sidebar-width', '150px');
463− }
464− showSidebar();
465− } else if (html.classList.contains("sidebar-visible")) {
466− hideSidebar();
467− } else {
468− if (getComputedStyle(sidebar)['transform'] === 'none') {
469− hideSidebar();
470− } else {
471− showSidebar();
472− }
473− }
474− });
475−
476− sidebarResizeHandle.addEventListener('mousedown', initResize, false);
477−
478− function initResize(e) {
479− window.addEventListener('mousemove', resize, false);
480− window.addEventListener('mouseup', stopResize, false);
481− html.classList.add('sidebar-resizing');
482− }
483− function resize(e) {
484− var pos = (e.clientX - sidebar.offsetLeft);
485− if (pos < 20) {
486− hideSidebar();
487− } else {
488− if (html.classList.contains("sidebar-hidden")) {
489− showSidebar();
490− }
491− pos = Math.min(pos, window.innerWidth - 100);
492− document.documentElement.style.setProperty('--sidebar-width', pos + 'px');
493− }
494− }
495− //on mouseup remove windows functions mousemove & mouseup
496− function stopResize(e) {
497− html.classList.remove('sidebar-resizing');
498− window.removeEventListener('mousemove', resize, false);
499− window.removeEventListener('mouseup', stopResize, false);
500− }
501−
502− document.addEventListener('touchstart', function (e) {
503− firstContact = {
504− x: e.touches[0].clientX,
505− time: Date.now()
506− };
507− }, { passive: true });
508−
509− document.addEventListener('touchmove', function (e) {
510− if (!firstContact)
511− return;
512−
513− var curX = e.touches[0].clientX;
514− var xDiff = curX - firstContact.x,
515− tDiff = Date.now() - firstContact.time;
516−
517− if (tDiff < 250 && Math.abs(xDiff) >= 150) {
518− if (xDiff >= 0 && firstContact.x < Math.min(document.body.clientWidth * 0.25, 300))
519− showSidebar();
520− else if (xDiff < 0 && curX < 300)
521− hideSidebar();
522−
523− firstContact = null;
524− }
525− }, { passive: true });
526−
527− // Scroll sidebar to current active section
528− var activeSection = document.getElementById("sidebar").querySelector(".active");
529− if (activeSection) {
530− // https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollIntoView
531− activeSection.scrollIntoView({ block: 'center' });
532− }
533−})();
534−
535−(function chapterNavigation() {
536− document.addEventListener('keydown', function (e) {
537− if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) { return; }
538− if (window.search && window.search.hasFocus()) { return; }
539−
540− switch (e.key) {
541− case 'ArrowRight':
542− e.preventDefault();
543− var nextButton = document.querySelector('.nav-chapters.next');
544− if (nextButton) {
545− window.location.href = nextButton.href;
546− }
547− break;
548− case 'ArrowLeft':
549− e.preventDefault();
550− var previousButton = document.querySelector('.nav-chapters.previous');
551− if (previousButton) {
552− window.location.href = previousButton.href;
553− }
554− break;
555− }
556− });
557−})();
558−
559−(function clipboard() {
560− var clipButtons = document.querySelectorAll('.clip-button');
561−
562− function hideTooltip(elem) {
563− elem.firstChild.innerText = "";
564− elem.className = 'fa fa-copy clip-button';
565− }
566−
567− function showTooltip(elem, msg) {
568− elem.firstChild.innerText = msg;
569− elem.className = 'fa fa-copy tooltipped';
570− }
571−
572− var clipboardSnippets = new ClipboardJS('.clip-button', {
573− text: function (trigger) {
574− hideTooltip(trigger);
575− let playground = trigger.closest("pre");
576− return playground_text(playground);
577− }
578− });
579−
580− Array.from(clipButtons).forEach(function (clipButton) {
581− clipButton.addEventListener('mouseout', function (e) {
582− hideTooltip(e.currentTarget);
583− });
584− });
585−
586− clipboardSnippets.on('success', function (e) {
587− e.clearSelection();
588− showTooltip(e.trigger, "Copied!");
589− });
590−
591− clipboardSnippets.on('error', function (e) {
592− showTooltip(e.trigger, "Clipboard error!");
593− });
594−})();
595−
596−(function scrollToTop () {
597− var menuTitle = document.querySelector('.menu-title');
598−
599− menuTitle.addEventListener('click', function () {
600− document.scrollingElement.scrollTo({ top: 0, behavior: 'smooth' });
601− });
602−})();
603−
604−(function controlMenu() {
605− var menu = document.getElementById('menu-bar');
606−
607− (function controlPosition() {
608− var scrollTop = document.scrollingElement.scrollTop;
609− var prevScrollTop = scrollTop;
610− var minMenuY = -menu.clientHeight - 50;
611− // When the script loads, the page can be at any scroll (e.g. if you reforesh it).
612− menu.style.top = scrollTop + 'px';
613− // Same as parseInt(menu.style.top.slice(0, -2), but faster
614− var topCache = menu.style.top.slice(0, -2);
615− menu.classList.remove('sticky');
616− var stickyCache = false; // Same as menu.classList.contains('sticky'), but faster
617− document.addEventListener('scroll', function () {
618− scrollTop = Math.max(document.scrollingElement.scrollTop, 0);
619− // `null` means that it doesn't need to be updated
620− var nextSticky = null;
621− var nextTop = null;
622− var scrollDown = scrollTop > prevScrollTop;
623− var menuPosAbsoluteY = topCache - scrollTop;
624− if (scrollDown) {
625− nextSticky = false;
626− if (menuPosAbsoluteY > 0) {
627− nextTop = prevScrollTop;
628− }
629− } else {
630− if (menuPosAbsoluteY > 0) {
631− nextSticky = true;
632− } else if (menuPosAbsoluteY < minMenuY) {
633− nextTop = prevScrollTop + minMenuY;
634− }
635− }
636− if (nextSticky === true && stickyCache === false) {
637− menu.classList.add('sticky');
638− stickyCache = true;
639− } else if (nextSticky === false && stickyCache === true) {
640− menu.classList.remove('sticky');
641− stickyCache = false;
642− }
643− if (nextTop !== null) {
644− menu.style.top = nextTop + 'px';
645− topCache = nextTop;
646− }
647− prevScrollTop = scrollTop;
648− }, { passive: true });
649− })();
650− (function controlBorder() {
651− menu.classList.remove('bordered');
652− document.addEventListener('scroll', function () {
653− if (menu.offsetTop === 0) {
654− menu.classList.remove('bordered');
655− } else {
656− menu.classList.add('bordered');
657− }
658− }, { passive: true });
659− })();
660−})();
book/theme/css/chrome.cssdeleted−499
@@ -1,499 +0,0 @@
1−/* CSS for UI elements (a.k.a. chrome) */
2−
3−@import 'variables.css';
4−
5−::-webkit-scrollbar {
6− background: var(--bg);
7−}
8−::-webkit-scrollbar-thumb {
9− background: var(--scrollbar);
10−}
11−html {
12− scrollbar-color: var(--scrollbar) var(--bg);
13−}
14−#searchresults a,
15−.content a:link,
16−a:visited,
17−a > .hljs {
18− color: var(--links);
19−}
20−.content a:hover {
21− text-decoration: underline;
22−}
23−
24−/* Menu Bar */
25−
26−#menu-bar,
27−#menu-bar-hover-placeholder {
28− z-index: 101;
29− margin: auto calc(0px - var(--page-padding));
30−}
31−#menu-bar {
32− position: relative;
33− display: flex;
34− flex-wrap: wrap;
35− background-color: var(--bg);
36− border-bottom-color: var(--bg);
37− border-bottom-width: 1px;
38− border-bottom-style: solid;
39−}
40−#menu-bar.sticky,
41−.js #menu-bar-hover-placeholder:hover + #menu-bar,
42−.js #menu-bar:hover,
43−.js.sidebar-visible #menu-bar {
44− position: -webkit-sticky;
45− position: sticky;
46− top: 0 !important;
47−}
48−#menu-bar-hover-placeholder {
49− position: sticky;
50− position: -webkit-sticky;
51− top: 0;
52− height: var(--menu-bar-height);
53−}
54−#menu-bar.bordered {
55− border-bottom-color: var(--table-border-color);
56−}
57−#menu-bar i, #menu-bar .icon-button {
58− position: relative;
59− padding: 0 8px;
60− z-index: 10;
61− line-height: var(--menu-bar-height);
62− cursor: pointer;
63− transition: color 0.5s;
64−}
65−@media only screen and (max-width: 420px) {
66− #menu-bar i, #menu-bar .icon-button {
67− padding: 0 5px;
68− }
69−}
70−
71−.icon-button {
72− border: none;
73− background: none;
74− padding: 0;
75− color: inherit;
76−}
77−.icon-button i {
78− margin: 0;
79−}
80−
81−.right-buttons {
82− margin: 0 15px;
83−}
84−.right-buttons a {
85− text-decoration: none;
86−}
87−
88−.left-buttons {
89− display: flex;
90− margin: 0 5px;
91−}
92−.no-js .left-buttons {
93− display: none;
94−}
95−
96−.menu-title {
97− display: inline-block;
98− font-weight: 200;
99− font-size: 2.4rem;
100− line-height: var(--menu-bar-height);
101− text-align: center;
102− margin: 0;
103− flex: 1;
104− white-space: nowrap;
105− overflow: hidden;
106− text-overflow: ellipsis;
107−}
108−.js .menu-title {
109− cursor: pointer;
110−}
111−
112−.menu-bar,
113−.menu-bar:visited,
114−.nav-chapters,
115−.nav-chapters:visited,
116−.mobile-nav-chapters,
117−.mobile-nav-chapters:visited,
118−.menu-bar .icon-button,
119−.menu-bar a i {
120− color: var(--icons);
121−}
122−
123−.menu-bar i:hover,
124−.menu-bar .icon-button:hover,
125−.nav-chapters:hover,
126−.mobile-nav-chapters i:hover {
127− color: var(--icons-hover);
128−}
129−
130−/* Nav Icons */
131−
132−.nav-chapters {
133− font-size: 2.5em;
134− text-align: center;
135− text-decoration: none;
136−
137− position: fixed;
138− top: 0;
139− bottom: 0;
140− margin: 0;
141− max-width: 150px;
142− min-width: 90px;
143−
144− display: flex;
145− justify-content: center;
146− align-content: center;
147− flex-direction: column;
148−
149− transition: color 0.5s, background-color 0.5s;
150−}
151−
152−.nav-chapters:hover {
153− text-decoration: none;
154− background-color: var(--theme-hover);
155− transition: background-color 0.15s, color 0.15s;
156−}
157−
158−.nav-wrapper {
159− margin-top: 50px;
160− display: none;
161−}
162−
163−.mobile-nav-chapters {
164− font-size: 2.5em;
165− text-align: center;
166− text-decoration: none;
167− width: 90px;
168− border-radius: 5px;
169− background-color: var(--sidebar-bg);
170−}
171−
172−.previous {
173− float: left;
174−}
175−
176−.next {
177− float: right;
178− right: var(--page-padding);
179−}
180−
181−@media only screen and (max-width: 1080px) {
182− .nav-wide-wrapper { display: none; }
183− .nav-wrapper { display: block; }
184−}
185−
186−@media only screen and (max-width: 1380px) {
187− .sidebar-visible .nav-wide-wrapper { display: none; }
188− .sidebar-visible .nav-wrapper { display: block; }
189−}
190−
191−/* Inline code */
192−
193−:not(pre) > .hljs {
194− display: inline;
195− padding: 0.1em 0.3em;
196− border-radius: 3px;
197−}
198−
199−:not(pre):not(a):not(td):not(p) > .hljs {
200− color: var(--inline-code-color);
201− overflow-x: initial;
202−}
203−
204−a:hover > .hljs {
205− text-decoration: underline;
206−}
207−
208−pre {
209− position: relative;
210−}
211−pre > .buttons {
212− position: absolute;
213− z-index: 100;
214− right: 5px;
215− top: 5px;
216−
217− color: var(--sidebar-fg);
218− cursor: pointer;
219−}
220−pre > .buttons :hover {
221− color: var(--sidebar-active);
222−}
223−pre > .buttons i {
224− margin-left: 8px;
225−}
226−pre > .buttons button {
227− color: inherit;
228− background: transparent;
229− border: none;
230− cursor: inherit;
231−}
232−pre > .result {
233− margin-top: 10px;
234−}
235−
236−/* Search */
237−
238−#searchresults a {
239− text-decoration: none;
240−}
241−
242−mark {
243− border-radius: 2px;
244− padding: 0 3px 1px 3px;
245− margin: 0 -3px -1px -3px;
246− background-color: var(--search-mark-bg);
247− transition: background-color 300ms linear;
248− cursor: pointer;
249−}
250−
251−mark.fade-out {
252− background-color: rgba(0,0,0,0) !important;
253− cursor: auto;
254−}
255−
256−.searchbar-outer {
257− margin-left: auto;
258− margin-right: auto;
259− max-width: var(--content-max-width);
260−}
261−
262−#searchbar {
263− width: 100%;
264− margin: 5px auto 0px auto;
265− padding: 10px 16px;
266− transition: box-shadow 300ms ease-in-out;
267− border: 1px solid var(--searchbar-border-color);
268− border-radius: 3px;
269− background-color: var(--searchbar-bg);
270− color: var(--searchbar-fg);
271−}
272−#searchbar:focus,
273−#searchbar.active {
274− box-shadow: 0 0 3px var(--searchbar-shadow-color);
275−}
276−
277−.searchresults-header {
278− font-weight: bold;
279− font-size: 1em;
280− padding: 18px 0 0 5px;
281− color: var(--searchresults-header-fg);
282−}
283−
284−.searchresults-outer {
285− margin-left: auto;
286− margin-right: auto;
287− max-width: var(--content-max-width);
288− border-bottom: 1px dashed var(--searchresults-border-color);
289−}
290−
291−ul#searchresults {
292− list-style: none;
293− padding-left: 20px;
294−}
295−ul#searchresults li {
296− margin: 10px 0px;
297− padding: 2px;
298− border-radius: 2px;
299−}
300−ul#searchresults li.focus {
301− background-color: var(--searchresults-li-bg);
302−}
303−ul#searchresults span.teaser {
304− display: block;
305− clear: both;
306− margin: 5px 0 0 20px;
307− font-size: 0.8em;
308−}
309−ul#searchresults span.teaser em {
310− font-weight: bold;
311− font-style: normal;
312−}
313−
314−/* Sidebar */
315−
316−.sidebar {
317− position: fixed;
318− left: 0;
319− top: 0;
320− bottom: 0;
321− width: var(--sidebar-width);
322− font-size: 0.875em;
323− box-sizing: border-box;
324− -webkit-overflow-scrolling: touch;
325− overscroll-behavior-y: contain;
326− background-color: var(--sidebar-bg);
327− color: var(--sidebar-fg);
328−}
329−.sidebar-resizing {
330− -moz-user-select: none;
331− -webkit-user-select: none;
332− -ms-user-select: none;
333− user-select: none;
334−}
335−.js:not(.sidebar-resizing) .sidebar {
336− transition: transform 0.3s; /* Animation: slide away */
337−}
338−.sidebar code {
339− line-height: 2em;
340−}
341−.sidebar .sidebar-scrollbox {
342− overflow-y: auto;
343− position: absolute;
344− top: 0;
345− bottom: 0;
346− left: 0;
347− right: 0;
348−}
349−.sidebar .sidebar-resize-handle {
350− position: absolute;
351− cursor: col-resize;
352− width: 0;
353− right: 0;
354− top: 0;
355− bottom: 0;
356−}
357−.js .sidebar .sidebar-resize-handle {
358− cursor: col-resize;
359− width: 5px;
360−}
361−.sidebar-hidden .sidebar {
362− transform: translateX(calc(0px - var(--sidebar-width)));
363−}
364−.sidebar::-webkit-scrollbar {
365− background: var(--sidebar-bg);
366−}
367−.sidebar::-webkit-scrollbar-thumb {
368− background: var(--scrollbar);
369−}
370−
371−.sidebar-visible .page-wrapper {
372− transform: translateX(var(--sidebar-width));
373−}
374−@media only screen and (min-width: 620px) {
375− .sidebar-visible .page-wrapper {
376− transform: none;
377− margin-left: var(--sidebar-width);
378− }
379−}
380−
381−.chapter {
382− list-style: none outside none;
383− padding-left: 0;
384− margin: .25rem 0;
385−}
386−
387−.chapter ol {
388− width: 100%;
389−}
390−
391−.chapter li {
392− display: flex;
393− color: var(--sidebar-non-existent);
394−}
395−.chapter li a {
396− display: block;
397− text-decoration: none;
398− color: var(--sidebar-fg);
399−}
400−
401−.chapter li a:hover {
402− color: var(--sidebar-active);
403−}
404−
405−.chapter li a.active {
406− color: var(--sidebar-active);
407−}
408−
409−.chapter li > a.toggle {
410− cursor: pointer;
411− display: block;
412− margin-left: auto;
413− padding: 0 10px;
414− user-select: none;
415− opacity: 0.68;
416−}
417−
418−.chapter li > a.toggle div {
419− transition: transform 0.5s;
420−}
421−
422−/* collapse the section */
423−.chapter li:not(.expanded) + li > ol {
424− display: none;
425−}
426−
427−.chapter li.chapter-item {
428− padding: 1rem 1.5rem;
429−}
430−
431−.chapter .section li.chapter-item {
432− padding: .5rem .5rem 0 .5rem;
433−}
434−
435−.chapter li.expanded > a.toggle div {
436− transform: rotate(90deg);
437−}
438−
439−.spacer {
440− width: 100%;
441− height: 3px;
442− margin: 5px 0px;
443−}
444−.chapter .spacer {
445− background-color: var(--sidebar-spacer);
446−}
447−
448−@media (-moz-touch-enabled: 1), (pointer: coarse) {
449− .chapter li a { padding: 5px 0; }
450− .spacer { margin: 10px 0; }
451−}
452−
453−.section {
454− list-style: none outside none;
455− padding-left: 2rem;
456− line-height: 1.9em;
457−}
458−
459−/* Theme Menu Popup */
460−
461−.theme-popup {
462− position: absolute;
463− left: 10px;
464− top: var(--menu-bar-height);
465− z-index: 1000;
466− border-radius: 4px;
467− font-size: 0.7em;
468− color: var(--fg);
469− background: var(--theme-popup-bg);
470− border: 1px solid var(--theme-popup-border);
471− margin: 0;
472− padding: 0;
473− list-style: none;
474− display: none;
475−}
476−.theme-popup .default {
477− color: var(--icons);
478−}
479−.theme-popup .theme {
480− width: 100%;
481− border: 0;
482− margin: 0;
483− padding: 2px 10px;
484− line-height: 25px;
485− white-space: nowrap;
486− text-align: left;
487− cursor: pointer;
488− color: inherit;
489− background: inherit;
490− font-size: inherit;
491−}
492−.theme-popup .theme:hover {
493− background-color: var(--theme-hover);
494−}
495−.theme-popup .theme:hover:first-child,
496−.theme-popup .theme:hover:last-child {
497− border-top-left-radius: inherit;
498− border-top-right-radius: inherit;
499−}
book/theme/css/general.cssdeleted−233
@@ -1,233 +0,0 @@
1−/* Base styles and content styles */
2−
3−@import 'variables.css';
4−
5−:root {
6− /* Browser default font-size is 16px, this way 1 rem = 10px */
7− font-size: 62.5%;
8−}
9−
10−/* TODO: replace with self hosted fonts */
11−
12−html {
13− font-family: "Inter", sans-serif;
14− color: var(--fg);
15− background-color: var(--bg);
16− text-size-adjust: none;
17−}
18−
19−/* @supports (font-variation-settings: normal) { */
20−/* html { font-family: 'Inter var', sans-serif; } */
21−/* } */
22−
23−body {
24− margin: 0;
25− font-size: 1.6rem;
26− overflow-x: hidden;
27−}
28−
29−code {
30− font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace !important;
31− font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */
32−}
33−
34−/* Don't change font size in headers. */
35−h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
36− font-size: unset;
37−}
38−
39−.left { float: left; }
40−.right { float: right; }
41−.boring { opacity: 0.6; }
42−.hide-boring .boring { display: none; }
43−.hidden { display: none !important; }
44−
45−h2, h3 { margin-top: 2.5em; }
46−h4, h5 { margin-top: 2em; }
47−
48−.header + .header h3,
49−.header + .header h4,
50−.header + .header h5 {
51− margin-top: 1em;
52−}
53−
54−h1:target::before,
55−h2:target::before,
56−h3:target::before,
57−h4:target::before,
58−h5:target::before,
59−h6:target::before {
60− display: inline-block;
61− content: "»";
62− margin-left: -30px;
63− width: 30px;
64−}
65−
66−/* This is broken on Safari as of version 14, but is fixed
67− in Safari Technology Preview 117 which I think will be Safari 14.2.
68− https://bugs.webkit.org/show_bug.cgi?id=218076
69−*/
70−:target {
71− scroll-margin-top: calc(var(--menu-bar-height) + 0.5em);
72−}
73−
74−.page {
75− outline: 0;
76− padding: 0 var(--page-padding);
77− margin-top: calc(0px - var(--menu-bar-height)); /* Compensate for the #menu-bar-hover-placeholder */
78−}
79−.page-wrapper {
80− box-sizing: border-box;
81−}
82−.js:not(.sidebar-resizing) .page-wrapper {
83− transition: margin-left 0.3s ease, transform 0.3s ease; /* Animation: slide away */
84−}
85−
86−.content {
87− overflow-y: auto;
88− padding: 0 15px;
89− padding-bottom: 50px;
90−}
91−.content main {
92− margin-left: auto;
93− margin-right: auto;
94− max-width: var(--content-max-width);
95−}
96−
97−
98−/* 2 1.75 1.5 1.25 1 .875 */
99−
100−.content h1 { font-size: 2em }
101−.content h2 { font-size: 1.75em }
102−.content h3 { font-size: 1.5em }
103−.content h4 { font-size: 1.25em }
104−.content h5 { font-size: 1em }
105−.content h6 { font-size: .875em }
106−
107−.content h1, .content h2, .content h3, .content h4 {
108− font-weight: 500;
109− margin-top: 1.275em;
110− margin-bottom: .875em;
111−}
112−.content p, .content ol, .content ul, .content table {
113− margin-top: 0;
114− margin-bottom: .875em;
115−}
116−
117−.content ul li {
118−margin-bottom: .25rem;
119−}
120−.content ul {
121− list-style-type: square;
122−}
123−.content ul ul, .content ol ul {
124− margin-bottom: .5rem;
125−}
126−.content li p {
127− margin-bottom: .5em;
128−}
129−
130−.content p { line-height: 1.45em; }
131−.content ol { line-height: 1.45em; }
132−.content ul { line-height: 1.45em; }
133−.content a { text-decoration: none; }
134−.content a:hover { text-decoration: underline; }
135−.content img { max-width: 100%; }
136−.content .header:link,
137−.content .header:visited {
138− color: var(--fg);
139− color: var(--heading-fg);
140−}
141−.content .header:link,
142−.content .header:visited:hover {
143− text-decoration: none;
144−}
145−
146−table {
147− margin: 0 auto;
148− border-collapse: collapse;
149− width: 100%;
150−}
151−table td {
152− padding: .75rem;
153− width: auto;
154−}
155−table thead {
156− background: var(--table-header-bg);
157−}
158−table thead td {
159− font-weight: 700;
160− border: none;
161−}
162−table thead th {
163− padding: .75rem;
164− text-align: left;
165− font-weight: 500;
166− line-height: 1.5;
167− width: auto;
168−}
169−table thead tr {
170− border-bottom: 2px var(--table-border-color) solid;
171−}
172−table tbody tr {
173− border-bottom: 1px var(--table-border-line) solid;
174−}
175−/* Alternate background colors for rows */
176−table tbody tr:nth-child(2n) {
177− /* background: var(--table-alternate-bg); */
178−}
179−
180−
181−blockquote {
182− margin: 1.5rem 0;
183− padding: 1rem 1.5rem;
184− color: var(--fg);
185− opacity: .9;
186− background-color: var(--quote-bg);
187− border-left: 4px solid var(--quote-border);
188−}
189−blockquote *:last-child {
190− margin-bottom: 0;
191−}
192−
193−
194−:not(.footnote-definition) + .footnote-definition,
195−.footnote-definition + :not(.footnote-definition) {
196− margin-top: 2em;
197−}
198−.footnote-definition {
199− font-size: 0.9em;
200− margin: 0.5em 0;
201−}
202−.footnote-definition p {
203− display: inline;
204−}
205−
206−.tooltiptext {
207− position: absolute;
208− visibility: hidden;
209− color: #fff;
210− background-color: #333;
211− transform: translateX(-50%); /* Center by moving tooltip 50% of its width left */
212− left: -8px; /* Half of the width of the icon */
213− top: -35px;
214− font-size: 0.8em;
215− text-align: center;
216− border-radius: 6px;
217− padding: 5px 8px;
218− margin: 5px;
219− z-index: 1000;
220−}
221−.tooltipped .tooltiptext {
222− visibility: visible;
223−}
224−
225−.chapter li.part-title {
226− color: var(--sidebar-fg);
227− margin: 5px 0px;
228− font-weight: bold;
229−}
230−
231−.result-no-output {
232− font-style: italic;
233−}
book/theme/css/print.cssdeleted−54
@@ -1,54 +0,0 @@
1−
2−#sidebar,
3−#menu-bar,
4−.nav-chapters,
5−.mobile-nav-chapters {
6− display: none;
7−}
8−
9−#page-wrapper.page-wrapper {
10− transform: none;
11− margin-left: 0px;
12− overflow-y: initial;
13−}
14−
15−#content {
16− max-width: none;
17− margin: 0;
18− padding: 0;
19−}
20−
21−.page {
22− overflow-y: initial;
23−}
24−
25−code {
26− background-color: #666666;
27− border-radius: 5px;
28−
29− /* Force background to be printed in Chrome */
30− -webkit-print-color-adjust: exact;
31−}
32−
33−pre > .buttons {
34− z-index: 2;
35−}
36−
37−a, a:visited, a:active, a:hover {
38− color: #4183c4;
39− text-decoration: none;
40−}
41−
42−h1, h2, h3, h4, h5, h6 {
43− page-break-inside: avoid;
44− page-break-after: avoid;
45−}
46−
47−pre, code {
48− page-break-inside: avoid;
49− white-space: pre-wrap;
50−}
51−
52−.fa {
53− display: none !important;
54−}
book/theme/css/variables.cssdeleted−411
@@ -1,411 +0,0 @@
1−
2−/* Globals */
3−
4−:root {
5− --sidebar-width: 300px;
6− --page-padding: 15px;
7− --content-max-width: 750px;
8− --menu-bar-height: 50px;
9−}
10−
11−/* Themes */
12−
13−.ayu {
14− --bg: hsl(210, 25%, 8%);
15− --fg: #c5c5c5;
16−
17− --sidebar-bg: #14191f;
18− --sidebar-fg: #c8c9db;
19− --sidebar-non-existent: #5c6773;
20− --sidebar-active: #ffb454;
21− --sidebar-spacer: #2d334f;
22−
23− --scrollbar: var(--sidebar-fg);
24−
25− --icons: #737480;
26− --icons-hover: #b7b9cc;
27−
28− --links: #0096cf;
29−
30− --inline-code-color: #ffb454;
31−
32− --theme-popup-bg: #14191f;
33− --theme-popup-border: #5c6773;
34− --theme-hover: #191f26;
35−
36− --quote-bg: hsl(226, 15%, 17%);
37− --quote-border: hsl(226, 15%, 22%);
38−
39− --table-border-color: hsl(210, 25%, 13%);
40− --table-header-bg: hsl(210, 25%, 28%);
41− --table-alternate-bg: hsl(210, 25%, 11%);
42−
43− --searchbar-border-color: #848484;
44− --searchbar-bg: #424242;
45− --searchbar-fg: #fff;
46− --searchbar-shadow-color: #d4c89f;
47− --searchresults-header-fg: #666;
48− --searchresults-border-color: #888;
49− --searchresults-li-bg: #252932;
50− --search-mark-bg: #e3b171;
51− --hljs-background: #191f26;
52− --hljs-color: #e6e1cf;
53− --hljs-quote: #5c6773;
54− --hljs-variable: #ff7733;
55− --hljs-type: #ffee99;
56− --hljs-title: #b8cc52;
57− --hljs-symbol: #ffb454;
58− --hljs-selector-tag: #ff7733;
59− --hljs-selector-tag: #36a3d9;
60− --hljs-selector-tag: #00568d;
61− --hljs-selector-tag: #91b362;
62− --hljs-selector-tag: #d96c75;
63−}
64−
65−.coal {
66− --bg: hsl(200, 7%, 8%);
67− --fg: #98a3ad;
68−
69− --sidebar-bg: #292c2f;
70− --sidebar-fg: #a1adb8;
71− --sidebar-non-existent: #505254;
72− --sidebar-active: #3473ad;
73− --sidebar-spacer: #393939;
74−
75− --scrollbar: var(--sidebar-fg);
76−
77− --icons: #43484d;
78− --icons-hover: #b3c0cc;
79−
80− --links: #2b79a2;
81−
82− --inline-code-color: #c5c8c6;
83−
84− --theme-popup-bg: #141617;
85− --theme-popup-border: #43484d;
86− --theme-hover: #1f2124;
87−
88− --quote-bg: hsl(234, 21%, 18%);
89− --quote-border: hsl(234, 21%, 23%);
90−
91− --table-border-color: hsl(200, 7%, 13%);
92− --table-header-bg: hsl(200, 7%, 28%);
93− --table-alternate-bg: hsl(200, 7%, 11%);
94−
95− --searchbar-border-color: #aaa;
96− --searchbar-bg: #b7b7b7;
97− --searchbar-fg: #000;
98− --searchbar-shadow-color: #aaa;
99− --searchresults-header-fg: #666;
100− --searchresults-border-color: #98a3ad;
101− --searchresults-li-bg: #2b2b2f;
102− --search-mark-bg: #355c7d;
103− --hljs-background: #969896;
104− --hljs-color: #cc6666;
105− --hljs-quote: #de935f;
106− --hljs-variable: #f0c674;
107− --hljs-type: #b5bd68;
108− --hljs-title: #8abeb7;
109− --hljs-symbol: #81a2be;
110− --hljs-selector-tag: #b294bb;
111− --hljs-selector-tag: #1d1f21;
112− --hljs-selector-tag: #c5c8c6;
113− --hljs-selector-tag: #718c00;
114− --hljs-selector-tag: #c82829;
115−}
116−
117−.light {
118− --bg: hsl(0, 0%, 100%);
119− --fg: hsl(0, 0%, 0%);
120−
121− --sidebar-bg: #fafafa;
122− --sidebar-fg: hsl(0, 0%, 0%);
123− --sidebar-non-existent: #aaaaaa;
124− --sidebar-active: #1f1fff;
125− --sidebar-spacer: #f4f4f4;
126−
127− --scrollbar: #8F8F8F;
128−
129− --icons: #747474;
130− --icons-hover: #000000;
131−
132− --links: #20609f;
133−
134− --inline-code-color: #301900;
135−
136− --theme-popup-bg: #fafafa;
137− --theme-popup-border: #cccccc;
138− --theme-hover: #e6e6e6;
139−
140− --quote-bg: hsl(197, 37%, 96%);
141− --quote-border: hsl(197, 37%, 91%);
142−
143− --table-border-color: hsl(0, 0%, 95%);
144− --table-header-bg: hsl(0, 0%, 80%);
145− --table-alternate-bg: hsl(0, 0%, 97%);
146−
147− --searchbar-border-color: #aaa;
148− --searchbar-bg: #fafafa;
149− --searchbar-fg: #000;
150− --searchbar-shadow-color: #aaa;
151− --searchresults-header-fg: #666;
152− --searchresults-border-color: #888;
153− --searchresults-li-bg: #e4f2fe;
154− --search-mark-bg: #a2cff5;
155− --hljs-background: #f6f7f6;
156− --hljs-color: #000;
157− --hljs-quote: #575757;
158− --hljs-variable: #d70025;
159− --hljs-type: #b21e00;
160− --hljs-title: #0030f2;
161− --hljs-symbol: #008200;
162− --hljs-selector-tag: #9d00ec;
163−}
164−
165−.navy {
166− --bg: hsl(226, 23%, 11%);
167− --fg: #bcbdd0;
168−
169− --sidebar-bg: #282d3f;
170− --sidebar-fg: #c8c9db;
171− --sidebar-non-existent: #505274;
172− --sidebar-active: #2b79a2;
173− --sidebar-spacer: #2d334f;
174−
175− --scrollbar: var(--sidebar-fg);
176−
177− --icons: #737480;
178− --icons-hover: #b7b9cc;
179−
180− --links: #2b79a2;
181−
182− --inline-code-color: #c5c8c6;
183−
184− --theme-popup-bg: #161923;
185− --theme-popup-border: #737480;
186− --theme-hover: #282e40;
187−
188− --quote-bg: hsl(226, 15%, 17%);
189− --quote-border: hsl(226, 15%, 22%);
190−
191− --table-border-color: hsl(226, 23%, 16%);
192− --table-header-bg: hsl(226, 23%, 31%);
193− --table-alternate-bg: hsl(226, 23%, 14%);
194−
195− --searchbar-border-color: #aaa;
196− --searchbar-bg: #aeaec6;
197− --searchbar-fg: #000;
198− --searchbar-shadow-color: #aaa;
199− --searchresults-header-fg: #5f5f71;
200− --searchresults-border-color: #5c5c68;
201− --searchresults-li-bg: #242430;
202− --search-mark-bg: #a2cff5;
203−
204− --hljs-background: #969896;
205− --hljs-color: #cc6666;
206− --hljs-quote: #de935f;
207− --hljs-variable: #f0c674;
208− --hljs-type: #b5bd68;
209− --hljs-title: #8abeb7;
210− --hljs-symbol: #81a2be;
211− --hljs-selector-tag: #b294bb;
212− --hljs-selector-tag: #1d1f21;
213− --hljs-selector-tag: #c5c8c6;
214− --hljs-selector-tag: #718c00;
215− --hljs-selector-tag: #c82829;
216−}
217−
218−.rust {
219− --bg: hsl(60, 9%, 87%);
220− --fg: #262625;
221−
222− --sidebar-bg: #3b2e2a;
223− --sidebar-fg: #c8c9db;
224− --sidebar-non-existent: #505254;
225− --sidebar-active: #e69f67;
226− --sidebar-spacer: #45373a;
227−
228− --scrollbar: var(--sidebar-fg);
229−
230− --icons: #737480;
231− --icons-hover: #262625;
232−
233− --links: #2b79a2;
234−
235− --inline-code-color: #6e6b5e;
236−
237− --theme-popup-bg: #e1e1db;
238− --theme-popup-border: #b38f6b;
239− --theme-hover: #99908a;
240−
241− --quote-bg: hsl(60, 5%, 75%);
242− --quote-border: hsl(60, 5%, 70%);
243−
244− --table-border-color: hsl(60, 9%, 82%);
245− --table-header-bg: #b3a497;
246− --table-alternate-bg: hsl(60, 9%, 84%);
247−
248− --searchbar-border-color: #aaa;
249− --searchbar-bg: #fafafa;
250− --searchbar-fg: #000;
251− --searchbar-shadow-color: #aaa;
252− --searchresults-header-fg: #666;
253− --searchresults-border-color: #888;
254− --searchresults-li-bg: #dec2a2;
255− --search-mark-bg: #e69f67;
256− --hljs-background: #f6f7f6;
257− --hljs-color: #000;
258− --hljs-quote: #575757;
259− --hljs-variable: #d70025;
260− --hljs-type: #b21e00;
261− --hljs-title: #0030f2;
262− --hljs-symbol: #008200;
263− --hljs-selector-tag: #9d00ec;
264−}
265−
266−@media (prefers-color-scheme: dark) {
267− .light.no-js {
268− --bg: hsl(200, 7%, 8%);
269− --fg: #98a3ad;
270−
271− --sidebar-bg: #292c2f;
272− --sidebar-fg: #a1adb8;
273− --sidebar-non-existent: #505254;
274− --sidebar-active: #3473ad;
275− --sidebar-spacer: #393939;
276−
277− --scrollbar: var(--sidebar-fg);
278−
279− --icons: #43484d;
280− --icons-hover: #b3c0cc;
281−
282− --links: #2b79a2;
283−
284− --inline-code-color: #c5c8c6;
285−
286− --theme-popup-bg: #141617;
287− --theme-popup-border: #43484d;
288− --theme-hover: #1f2124;
289−
290− --quote-bg: hsl(234, 21%, 18%);
291− --quote-border: hsl(234, 21%, 23%);
292−
293− --table-border-color: hsl(200, 7%, 13%);
294− --table-header-bg: hsl(200, 7%, 28%);
295− --table-alternate-bg: hsl(200, 7%, 11%);
296−
297− --searchbar-border-color: #aaa;
298− --searchbar-bg: #b7b7b7;
299− --searchbar-fg: #000;
300− --searchbar-shadow-color: #aaa;
301− --searchresults-header-fg: #666;
302− --searchresults-border-color: #98a3ad;
303− --searchresults-li-bg: #2b2b2f;
304− --search-mark-bg: #355c7d;
305− }
306−}
307−
308−.colibri {
309− --bg: #3b224c;
310− --fg: #bcbdd0;
311− --heading-fg: #fff;
312−
313− --sidebar-bg: #281733;
314− --sidebar-fg: #c8c9db;
315− --sidebar-non-existent: #505274;
316− --sidebar-active: #a4a0e8;
317− --sidebar-spacer: #2d334f;
318−
319− --scrollbar: var(--sidebar-fg);
320−
321− --icons: #737480;
322− --icons-hover: #b7b9cc;
323−
324− /* --links: #a4a0e8; */
325− --links: #ECCDBA;
326−
327− --inline-code-color: hsl(48.7, 7.8%, 70%);
328−
329− --theme-popup-bg: #161923;
330− --theme-popup-border: #737480;
331− --theme-hover: rgba(0,0,0, .2);
332−
333− --quote-bg: #281733;
334− --quote-border: hsl(226, 15%, 22%);
335−
336− --table-border-color: hsl(226, 23%, 76%);
337− --table-header-bg: hsla(226, 23%, 31%, 0);
338− --table-alternate-bg: hsl(226, 23%, 14%);
339− --table-border-line: hsla(201deg, 20%, 92%, 0.2);
340−
341− --searchbar-border-color: #aaa;
342− --searchbar-bg: #aeaec6;
343− --searchbar-fg: #000;
344− --searchbar-shadow-color: #aaa;
345− --searchresults-header-fg: #5f5f71;
346− --searchresults-border-color: #5c5c68;
347− --searchresults-li-bg: #242430;
348− --search-mark-bg: #acff5;
349− --hljs-background: #2f1e2e;
350− --hljs-color: #a39e9b;
351− --hljs-quote: #8d8687;
352− --hljs-variable: #ef6155;
353− --hljs-type: #f99b15;
354− --hljs-title: #fec418;
355− --hljs-symbol: #48b685;
356− --hljs-selector-tag: #815ba4;
357−}
358−
359−.colibri {
360−/*
361− --bg: #ffffff;
362− --fg: #452859;
363− --fg: #5a5977;
364− --heading-fg: #281733;
365−
366− --sidebar-bg: #281733;
367− --sidebar-fg: #c8c9db;
368− --sidebar-non-existent: #505274;
369− --sidebar-active: #a4a0e8;
370− --sidebar-spacer: #2d334f;
371−
372− --scrollbar: var(--sidebar-fg);
373−
374− --icons: #737480;
375− --icons-hover: #b7b9cc;
376−
377− --links: #6F44F0;
378−
379− --inline-code-color: #a39e9b;
380−
381− --theme-popup-bg: #161923;
382− --theme-popup-border: #737480;
383− --theme-hover: rgba(0,0,0, .2);
384−
385− --quote-bg: rgba(0, 0, 0, 0);
386− --quote-border: hsl(226, 15%, 75%);
387−
388− --table-border-color: #5a5977;
389− --table-border-color: hsl(201deg 10% 67%);
390− --table-header-bg: hsl(0, 0%, 100%);
391− --table-alternate-bg: hsl(0, 0%, 97%);
392− --table-border-line: hsl(201deg, 20%, 92%);
393−
394− --searchbar-border-color: #aaa;
395− --searchbar-bg: #aeaec6;
396− --searchbar-fg: #000;
397− --searchbar-shadow-color: #aaa;
398− --searchresults-header-fg: #5f5f71;
399− --searchresults-border-color: #5c5c68;
400− --searchresults-li-bg: #242430;
401− --search-mark-bg: #a2cff5;
402− --hljs-background: #TODO;
403− --hljs-color: #TODO;
404− --hljs-quote: #TODO;
405− --hljs-variable: #TODO;
406− --hljs-type: #TODO;
407− --hljs-title: #TODO;
408− --hljs-symbol: #TODO;
409− --hljs-selector-tag: #TODO;
410−*/
411−}
book/theme/highlight.cssdeleted−56
@@ -1,56 +0,0 @@
1−pre code.hljs {
2− display:block;
3− overflow-x:auto;
4− padding:1em
5−}
6−code.hljs {
7− padding:3px 5px
8−}
9−.hljs {
10− background: var(--hljs-background);
11− color: var(--hljs-color);
12−}
13−.hljs-comment,
14−.hljs-quote {
15− color: var(--hljs-quote)
16−}
17−.hljs-link,
18−.hljs-meta,
19−.hljs-name,
20−.hljs-regexp,
21−.hljs-selector-class,
22−.hljs-selector-id,
23−.hljs-tag,
24−.hljs-template-variable,
25−.hljs-variable {
26− color: var(--hljs-variable)
27−}
28−.hljs-built_in,
29−.hljs-deletion,
30−.hljs-literal,
31−.hljs-number,
32−.hljs-params,
33−.hljs-type {
34− color: var(--hljs-type)
35−}
36−.hljs-attribute,
37−.hljs-section,
38−.hljs-title {
39− color: var(--hljs-title)
40−}
41−.hljs-addition,
42−.hljs-bullet,
43−.hljs-string,
44−.hljs-symbol {
45− color: var(--hljs-symbol)
46−}
47−.hljs-keyword,
48−.hljs-selector-tag {
49− color: var(--hljs-selector-tag)
50−}
51−.hljs-emphasis {
52− font-style:italic
53−}
54−.hljs-strong {
55− font-weight:700
56−}
book/theme/highlight.jsdeleted−6
@@ -1,6 +0,0 @@
1−/*
2− Highlight.js 10.1.1 (93fd0d73)
3− License: BSD-3-Clause
4− Copyright (c) 2006-2020, Ivan Sagalaev
5−*/
6−var hljs=function(){"use strict";function e(n){Object.freeze(n);var t="function"==typeof n;return Object.getOwnPropertyNames(n).forEach((function(r){!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r])})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}ignoreMatch(){this.ignore=!0}}function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function d(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var g=l();if(s+=t(r.substring(i,g[0].offset)),i=g[0].offset,g===e){o.reverse().forEach(u);do{d(g.splice(0,1)[0]),g=l()}while(g===e&&g.length&&g[0].offset===i);o.reverse().forEach(c)}else"start"===g[0].event?o.push(g[0].node):o.pop(),d(g.splice(0,1)[0])}return s+t(r.substr(i))}});const s="</span>",o=e=>!!e.kind;class l{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!o(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){o(e)&&(this.buffer+=s)}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class c{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{c._collapse(e)}))}}class u extends c{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new l(this,this.options).value()}finalize(){return!0}}function d(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",h={begin:"\\\\[\\s\\S]",relevance:0},f={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[h]},p={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[h]},b={begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},m=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(b),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},v=m("//","$"),x=m("/\\*","\\*/"),E=m("#","$");var _=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>d(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:h,APOS_STRING_MODE:f,QUOTE_STRING_MODE:p,PHRASAL_WORDS_MODE:b,COMMENT:m,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:x,HASH_COMMENT_MODE:E,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[h,{begin:/\[/,end:/\]/,relevance:0,contains:[h]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),N="of and for in not or if then".split(" ");function w(e,n){return n?+n:function(e){return N.includes(e.toLowerCase())}(e)?0:1}const R=t,y=r,{nodeStream:k,mergeStreams:O}=i,M=Symbol("nomatch");return function(t){var a=[],i={},s={},o=[],l=!0,c=/(^(<[^>]+>|\t|)+|\n)/gm,g="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:u};function p(e){return f.noHighlightRe.test(e)}function b(e,n,t,r){var a={code:n,language:e};S("before:highlight",a);var i=a.result?a.result:m(a.language,a.code,t,r);return i.code=a.code,S("after:highlight",i),i}function m(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function u(){null!=y.subLanguage?function(){if(""!==A){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void O.addText(A);e=m(y.subLanguage,A,!0,k[y.subLanguage]),k[y.subLanguage]=e.top}else e=v(A,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(I+=e.relevance),O.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void O.addText(A);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(A),t="";for(;n;){t+=A.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;O.addText(t),t="",I+=a,O.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(A)}t+=A.substr(e),O.addText(t)}(),A=""}function h(e){return e.className&&O.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(A+=e[0],1):(L=!0,0)}var b={};function x(t,r){var i=r&&r[0];if(A+=t,null==i)return u(),0;if("begin"===b.type&&"end"===r.type&&b.index===r.index&&""===i){if(A+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=b.rule,n}return 1}if(b=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?A+=t:(r.excludeBegin&&(A+=t),u(),r.returnBegin||r.excludeBegin||(A=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return M;var i=y;i.skip?A+=t:(i.returnEnd||i.excludeEnd||(A+=t),u(),i.excludeEnd&&(A=t));do{y.className&&O.closeNode(),y.skip||y.subLanguage||(I+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==M)return s}if("illegal"===r.type&&""===i)return 1;if(B>1e5&&B>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return A+=i,i.length}var E=T(e);if(!E)throw console.error(g.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=d(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(+l[1]+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;const t=n.exec(e);return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&(this.regexIndex=0)),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language. See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,w(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=d(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),N="",y=s||_,k={},O=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>O.openNode(e))}();var A="",I=0,S=0,B=0,L=!1;try{for(y.matcher.considerAll();;){B++,L?L=!1:(y.matcher.lastIndex=S,y.matcher.considerAll());const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(S,e.index),e);S=e.index+n}return x(o.substr(S)),O.closeAllNodes(),O.finalize(),N=O.toHTML(),{relevance:I,value:N,language:e,illegal:!1,emitter:O,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(S-100,S+100),mode:n.mode},sofar:N,relevance:0,value:R(o),emitter:O};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:O,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(T).filter(I).forEach((function(n){var a=m(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(c,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function E(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=T(t[1]);return r||(console.warn(g.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||T(e))}(e);if(p(t))return;S("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"):n=e;const r=n.textContent,a=t?b(t,r,!0):v(r),i=k(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=O(i,k(e),r)}a.value=x(a.value),S("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const N=()=>{if(!N.called){N.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,E)}};function T(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function A(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function I(e){var n=T(e);return n&&!n.disableAutodetect}function S(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:b,highlightAuto:v,fixMarkup:x,highlightBlock:E,configure:function(e){f=y(f,e)},initHighlighting:N,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",N,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&A(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:T,registerAliases:A,requireLanguage:function(e){var n=T(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:I,inherit:y,addPlugin:function(e){o.push(e)}}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.1.1";for(const n in _)"object"==typeof _[n]&&e(_[n]);return Object.assign(t,_),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);hljs.registerLanguage("php",function(){"use strict";return function(e){var r={begin:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},t={className:"meta",variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:'b"',end:'"'},{begin:"b'",end:"'"},e.inherit(e.APOS_STRING_MODE,{illegal:null}),e.inherit(e.QUOTE_STRING_MODE,{illegal:null})]},n={variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},i={keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list new object or private protected public real return string switch throw trait try unset use var void while xor yield",literal:"false null true",built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass"};return{aliases:["php","php3","php4","php5","php6","php7"],case_insensitive:!0,keywords:i,contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t]}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0,keywords:"__halt_compiler"}),{className:"string",begin:/<<<['"]?\w+['"]?$/,end:/^\w+;?$/,contains:[e.BACKSLASH_ESCAPE,{className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}]}]},t,{className:"keyword",begin:/\$this\b/},r,{begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function",beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]",contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0,keywords:i,contains:["self",r,e.C_BLOCK_COMMENT_MODE,a,n]}]},{className:"class",beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"namespace",end:";",illegal:/[\.']/,contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";",contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},a,n]}}}());hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{$pattern:"[a-z/_]+",literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n]},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^",end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number",begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}],illegal:"[^\\s\\}]"}}}());hljs.registerLanguage("csharp",function(){"use strict";return function(e){var n={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while add alias ascending async await by descending dynamic equals from get global group into join let nameof on orderby partial remove select set value var when where yield",literal:"null false true"},i=e.inherit(e.TITLE_MODE,{begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}]},t=e.inherit(s,{illegal:/\n/}),l={className:"subst",begin:"{",end:"}",keywords:n},r=e.inherit(l,{illegal:/\n/}),c={className:"string",begin:/\$"/,end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,r]},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},l]},g=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},{begin:'""'},r]});l.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE],r.contains=[g,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{illegal:/\n/})];var d={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},i]},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"],keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0,contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{begin:"\x3c!--|--\x3e"},{begin:"</?",end:">"}]}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#",end:"$",keywords:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},d,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/,contains:[{beginKeywords:"where class"},i,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace",end:/[{;=]/,illegal:/[^\s:]/,contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta",begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{className:"meta-string",begin:/"/,end:/"/}]},{beginKeywords:"new return throw await else",relevance:0},{className:"function",begin:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{begin:e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0,contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0,contains:[d,a,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}}());hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet",literal:"true false nil",built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip"},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst",begin:/\\\(/,end:"\\)",keywords:i,contains:[]},a={className:"string",contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/,end:/"/}]},r={className:"number",begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b",relevance:0};return t.contains=[r],{name:"Swift",keywords:i,contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*[!?]"},{className:"type",begin:"\\b[A-Z][\\wÀ-ʸ']*",relevance:0},r,{className:"function",beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin:/</,end:/>/},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:i,contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}],illegal:/\[|%/},{className:"class",beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta",begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b"},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("makefile",function(){"use strict";return function(e){var i={className:"variable",variants:[{begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",contains:[e.BACKSLASH_ESCAPE]},{begin:/\$[@%<?\^\+\*]/}]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,i]},a={className:"variable",begin:/\$\([\w-]+\s/,end:/\)/,keywords:{built_in:"subst patsubst strip findstring filter filter-out sort word wordlist firstword lastword dir notdir suffix basename addsuffix addprefix join wildcard realpath abspath error warning shell origin flavor foreach if or and call eval file value"},contains:[i]},r={begin:"^"+e.UNDERSCORE_IDENT_RE+"\\s*(?=[:+?]?=)"},s={className:"section",begin:/^[^\s]+:/,end:/$/,contains:[i]};return{name:"Makefile",aliases:["mk","mak"],keywords:{$pattern:/[\w-]+/,keyword:"define endef undefine ifdef ifndef ifeq ifneq else endif include -include sinclude override export unexport private vpath"},contains:[e.HASH_COMMENT_MODE,i,n,a,r,{className:"meta",begin:/^\.PHONY:/,end:/$/,keywords:{$pattern:/[\.\w]+/,"meta-keyword":".PHONY"}},s]}}}());hljs.registerLanguage("css",function(){"use strict";return function(e){var n={begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";",endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":",excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{begin:/[\w-]+\(/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/},{begin:/\(/,end:/\)/,contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}]}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/,contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$",contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",illegal:/:/,returnBegin:!0,contains:[{className:"keyword",begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0,relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/,className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}());hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\\(",end:"\\)"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$\(\(/,end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());hljs.registerLanguage("c-like",function(){"use strict";return function(e){function t(e){return"(?:"+e+")?"}var n="(decltype\\(auto\\)|"+t("[a-zA-Z_]\\w*::")+"[a-zA-Z_]\\w*"+t("<.*?>")+")",r={className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},a={className:"string",variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)",end:"'",illegal:"."},e.END_SAME_AS_BEGIN({begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},i={className:"number",variants:[{begin:"\\b(0b[01']+)"},{begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],relevance:0},s={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(a,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},o={className:"title",begin:t("[a-zA-Z_]\\w*::")+e.IDENT_RE,relevance:0},c=t("[a-zA-Z_]\\w*::")+e.IDENT_RE+"\\s*\\(",l={keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq",built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary",literal:"true false nullptr NULL"},d=[r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,i,a],_={variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{beginKeywords:"new throw return else",end:/;/}],keywords:l,contains:d.concat([{begin:/\(/,end:/\)/,keywords:l,contains:d.concat(["self"]),relevance:0}]),relevance:0},u={className:"function",begin:"("+n+"[\\*&\\s]+)+"+c,returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:l,illegal:/[^\w\s\*&:<>]/,contains:[{begin:"decltype\\(auto\\)",keywords:l,relevance:0},{begin:c,returnBegin:!0,contains:[o],relevance:0},{className:"params",begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r,{begin:/\(/,end:/\)/,keywords:l,relevance:0,contains:["self",e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,i,r]}]},r,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s]};return{aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:l,disableAutodetect:!0,illegal:"</",contains:[].concat(_,u,d,[s,{begin:"\\b(deque|list|queue|priority_queue|pair|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",end:">",keywords:l,contains:["self",r]},{begin:e.IDENT_RE+"::",keywords:l},{className:"class",beginKeywords:"class struct",end:/[{;:]/,contains:[{begin:/</,end:/>/,contains:["self"]},e.TITLE_MODE]}]),exports:{preprocessor:s,strings:a,keywords:l}}}}());hljs.registerLanguage("coffeescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((e=>n=>!e.includes(n))(["var","const","let","function","static"])).join(" "),literal:n.concat(["yes","no","on","off"]).join(" "),built_in:a.concat(["npm","print"]).join(" ")},i="[A-Za-z$_][0-9A-Za-z$_]*",s={className:"subst",begin:/#\{/,end:/}/,keywords:t},o=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?",relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/,contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE]},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,s]},{begin:/"/,end:/"/,contains:[r.BACKSLASH_ESCAPE,s]}]},{className:"regexp",variants:[{begin:"///",end:"///",contains:[s,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)",relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+i},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{begin:"```",end:"```"},{begin:"`",end:"`"}]}];s.contains=o;var c=r.inherit(r.TITLE_MODE,{begin:i}),l={className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/,end:/\)/,keywords:t,contains:["self"].concat(o)}]};return{name:"CoffeeScript",aliases:["coffee","cson","iced"],keywords:t,illegal:/\/\*/,contains:o.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{className:"function",begin:"^\\s*"+i+"\\s*=\\s*(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[c,l]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function",begin:"(\\(.*\\))?\\s*\\B[-=]>",end:"[-=]>",returnBegin:!0,contains:[l]}]},{className:"class",beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[c]},c]},{begin:i+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}());hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(",end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());hljs.registerLanguage("d",function(){"use strict";return function(e){var a={$pattern:e.UNDERSCORE_IDENT_RE,keyword:"abstract alias align asm assert auto body break byte case cast catch class const continue debug default delete deprecated do else enum export extern final finally for foreach foreach_reverse|10 goto if immutable import in inout int interface invariant is lazy macro mixin module new nothrow out override package pragma private protected public pure ref return scope shared static struct super switch synchronized template this throw try typedef typeid typeof union unittest version void volatile while with __FILE__ __LINE__ __gshared|10 __thread __traits __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__",built_in:"bool cdouble cent cfloat char creal dchar delegate double dstring float function idouble ifloat ireal long real short string ubyte ucent uint ulong ushort wchar wstring",literal:"false null true"},d="((0|[1-9][\\d_]*)|0[bB][01_]+|0[xX]([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))",n="\\\\(['\"\\?\\\\abfnrtv]|u[\\dA-Fa-f]{4}|[0-7]{1,3}|x[\\dA-Fa-f]{2}|U[\\dA-Fa-f]{8})|&[a-zA-Z\\d]{2,};",t={className:"number",begin:"\\b"+d+"(L|u|U|Lu|LU|uL|UL)?",relevance:0},_={className:"number",begin:"\\b(((0[xX](([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)\\.([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*)|\\.?([\\da-fA-F][\\da-fA-F_]*|_[\\da-fA-F][\\da-fA-F_]*))[pP][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))|((0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(\\.\\d*|([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)))|\\d+\\.(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d)|\\.(0|[1-9][\\d_]*)([eE][+-]?(0|[1-9][\\d_]*|\\d[\\d_]*|[\\d_]+?\\d))?))([fF]|L|i|[fF]i|Li)?|"+d+"(i|[fF]i|Li))",relevance:0},r={className:"string",begin:"'("+n+"|.)",end:"'",illegal:"."},i={className:"string",begin:'"',contains:[{begin:n,relevance:0}],end:'"[cwd]?'},s=e.COMMENT("\\/\\+","\\+\\/",{contains:["self"],relevance:10});return{name:"D",keywords:a,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,s,{className:"string",begin:'x"[\\da-fA-F\\s\\n\\r]*"[cwd]?',relevance:10},i,{className:"string",begin:'[rq]"',end:'"[cwd]?',relevance:5},{className:"string",begin:"`",end:"`[cwd]?"},{className:"string",begin:'q"\\{',end:'\\}"'},_,t,r,{className:"meta",begin:"^#!",end:"$",relevance:5},{className:"meta",begin:"#(line)",end:"$",relevance:5},{className:"keyword",begin:"@[a-zA-Z_][a-zA-Z_\\d]*"}]}}}());hljs.registerLanguage("properties",function(){"use strict";return function(e){var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\:= \\t\\f\\n]|\\\\.)+",s={end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/,contains:[e.COMMENT("^\\s*[!#]","$"),{begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+"+t,returnBegin:!0,contains:[{className:"attr",begin:"([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",endsParent:!0,relevance:0}],starts:s},{begin:a+t,returnBegin:!0,relevance:0,contains:[{className:"meta",begin:a,endsParent:!0,relevance:0}],starts:s},{className:"attr",relevance:0,begin:a+n+"$"}]}}}());hljs.registerLanguage("http",function(){"use strict";return function(e){var n="HTTP/[0-9\\.]+";return{name:"HTTP",aliases:["https"],illegal:"\\S",contains:[{begin:"^"+n,end:"$",contains:[{className:"number",begin:"\\b\\d{3}\\b"}]},{begin:"^[A-Z]+ (.*?) "+n+"$",returnBegin:!0,end:"$",contains:[{className:"string",begin:" ",end:" ",excludeBegin:!0,excludeEnd:!0},{begin:n},{className:"keyword",begin:"[A-Z]+"}]},{className:"attribute",begin:"^\\w",end:": ",excludeEnd:!0,illegal:"\\n|\\s|=",starts:{end:"$",relevance:0}},{begin:"\\n\\n",starts:{subLanguage:[],endsWithParent:!0}}]}}}());hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",end:"\\)",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());hljs.registerLanguage("handlebars",function(){"use strict";function e(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(n){const a={"builtin-name":"action bindattr collection component concat debugger each each-in get hash if in input link-to loc log lookup mut outlet partial query-params render template textarea unbound unless view with yield"},t=/\[.*?\]/,s=/[^\s!"#%&'()*+,.\/;<=>@\[\\\]^`{|}~]+/,i=e("(",/'.*?'/,"|",/".*?"/,"|",t,"|",s,"|",/\.|\//,")+"),r=e("(",t,"|",s,")(?==)"),l={begin:i,lexemes:/[\w.\/]+/},c=n.inherit(l,{keywords:{literal:"true false undefined null"}}),o={begin:/\(/,end:/\)/},m={className:"attr",begin:r,relevance:0,starts:{begin:/=/,end:/=/,starts:{contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,c,o]}}},d={contains:[n.NUMBER_MODE,n.QUOTE_STRING_MODE,n.APOS_STRING_MODE,{begin:/as\s+\|/,keywords:{keyword:"as"},end:/\|/,contains:[{begin:/\w+/}]},m,c,o],returnEnd:!0},g=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/\)/})});o.contains=[g];const u=n.inherit(l,{keywords:a,className:"name",starts:n.inherit(d,{end:/}}/})}),b=n.inherit(l,{keywords:a,className:"name"}),h=n.inherit(l,{className:"name",keywords:a,starts:n.inherit(d,{end:/}}/})});return{name:"Handlebars",aliases:["hbs","html.hbs","html.handlebars","htmlbars"],case_insensitive:!0,subLanguage:"xml",contains:[{begin:/\\\{\{/,skip:!0},{begin:/\\\\(?=\{\{)/,skip:!0},n.COMMENT(/\{\{!--/,/--\}\}/),n.COMMENT(/\{\{!/,/\}\}/),{className:"template-tag",begin:/\{\{\{\{(?!\/)/,end:/\}\}\}\}/,contains:[u],starts:{end:/\{\{\{\{\//,returnEnd:!0,subLanguage:"xml"}},{className:"template-tag",begin:/\{\{\{\{\//,end:/\}\}\}\}/,contains:[b]},{className:"template-tag",begin:/\{\{#/,end:/\}\}/,contains:[u]},{className:"template-tag",begin:/\{\{(?=else\}\})/,end:/\}\}/,keywords:"else"},{className:"template-tag",begin:/\{\{\//,end:/\}\}/,contains:[b]},{className:"template-variable",begin:/\{\{\{/,end:/\}\}\}/,contains:[h]},{className:"template-variable",begin:/\{\{/,end:/\}\}/,contains:[h]}]}}}());hljs.registerLanguage("rust",function(){"use strict";return function(e){var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!";return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?",keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield",literal:"true false Some None Ok Err",built_in:t},illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.COMMENT("/\\*","\\*/",{contains:["self"]}),e.inherit(e.QUOTE_STRING_MODE,{begin:/b?"/,illegal:null}),{className:"string",variants:[{begin:/r(#*)"(.|\n)*?"\1(?!#)/},{begin:/b?'\\?(x\w{2}|u\w{4}|U\w{8}|.)'/}]},{className:"symbol",begin:/'[a-zA-Z_][a-zA-Z0-9_]*/},{className:"number",variants:[{begin:"\\b0b([01_]+)"+n},{begin:"\\b0o([0-7_]+)"+n},{begin:"\\b0x([A-Fa-f0-9_]+)"+n},{begin:"\\b(\\d[\\d_]*(\\.[0-9_]+)?([eE][+-]?[0-9_]+)?)"+n}],relevance:0},{className:"function",beginKeywords:"fn",end:"(\\(|<)",excludeEnd:!0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"meta",begin:"#\\!?\\[",end:"\\]",contains:[{className:"meta-string",begin:/"/,end:/"/}]},{className:"class",beginKeywords:"type",end:";",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"\\S"},{className:"class",beginKeywords:"trait enum struct union",end:"{",contains:[e.inherit(e.UNDERSCORE_TITLE_MODE,{endsParent:!0})],illegal:"[\\w\\d]"},{begin:e.IDENT_RE+"::",keywords:{built_in:t}},{begin:"->"}]}}}());hljs.registerLanguage("cpp",function(){"use strict";return function(e){var t=e.getLanguage("c-like").rawDefinition();return t.disableAutodetect=!1,t.name="C++",t.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],t}}());hljs.registerLanguage("ini",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(...n){return n.map(n=>e(n)).join("")}return function(a){var s={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}]},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"],relevance:0},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map(n=>e(n)).join("|")+")";return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}());hljs.registerLanguage("objectivec",function(){"use strict";return function(e){var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n,keyword:"@interface @class @protocol @implementation"};return{name:"Objective-C",aliases:["mm","objc","obj-c"],keywords:{$pattern:n,keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},illegal:"</",contains:[{className:"built_in",begin:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.C_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"string",variants:[{begin:'@"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]}]},{className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},contains:[{begin:/\\\n/,relevance:0},e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),{className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)",excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}());hljs.registerLanguage("apache",function(){"use strict";return function(e){var n={className:"number",begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{name:"Apache config",aliases:["apacheconf"],case_insensitive:!0,contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"</?",end:">",contains:[n,{className:"number",begin:":\\d{1,5}"},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute",begin:/\w+/,relevance:0,keywords:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"},contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable",begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number",begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]}}],illegal:/\S/}}}());hljs.registerLanguage("java",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(e){return a("(",e,")?")}function a(...n){return n.map(n=>e(n)).join("")}function s(...n){return"("+n.map(n=>e(n)).join("|")+")"}return function(e){var t="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",i={className:"meta",begin:"@[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*",contains:[{begin:/\(/,end:/\)/,contains:["self"]}]},r=e=>a("[",e,"]+([",e,"_]*[",e,"]+)?"),c={className:"number",variants:[{begin:`\\b(0[bB]${r("01")})[lL]?`},{begin:`\\b(0${r("0-7")})[dDfFlL]?`},{begin:a(/\b0[xX]/,s(a(r("a-fA-F0-9"),/\./,r("a-fA-F0-9")),a(r("a-fA-F0-9"),/\.?/),a(/\./,r("a-fA-F0-9"))),/([pP][+-]?(\d+))?/,/[fFdDlL]?/)},{begin:a(/\b/,s(a(/\d*\./,r("\\d")),r("\\d")),/[eE][+-]?[\d]+[dDfF]?/)},{begin:a(/\b/,r(/\d/),n(/\.?/),n(r(/\d/)),/[dDfFlL]?/)}],relevance:0};return{name:"Java",aliases:["jsp"],keywords:t,illegal:/<\/|#/,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/,relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"class",beginKeywords:"class interface",end:/[{;=]/,excludeEnd:!0,keywords:"class interface",illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"new throw return else",relevance:0},{className:"function",begin:"([À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(<[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*(\\s*,\\s*[À-ʸa-zA-Z_$][À-ʸa-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:t,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/,keywords:t,relevance:0,contains:[i,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE]},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},c,i]}}}());hljs.registerLanguage("x86asm",function(){"use strict";return function(s){return{name:"Intel x86 Assembly",case_insensitive:!0,keywords:{$pattern:"[.%]?"+s.IDENT_RE,keyword:"lock rep repe repz repne repnz xaquire xrelease bnd nobnd aaa aad aam aas adc add and arpl bb0_reset bb1_reset bound bsf bsr bswap bt btc btr bts call cbw cdq cdqe clc cld cli clts cmc cmp cmpsb cmpsd cmpsq cmpsw cmpxchg cmpxchg486 cmpxchg8b cmpxchg16b cpuid cpu_read cpu_write cqo cwd cwde daa das dec div dmint emms enter equ f2xm1 fabs fadd faddp fbld fbstp fchs fclex fcmovb fcmovbe fcmove fcmovnb fcmovnbe fcmovne fcmovnu fcmovu fcom fcomi fcomip fcomp fcompp fcos fdecstp fdisi fdiv fdivp fdivr fdivrp femms feni ffree ffreep fiadd ficom ficomp fidiv fidivr fild fimul fincstp finit fist fistp fisttp fisub fisubr fld fld1 fldcw fldenv fldl2e fldl2t fldlg2 fldln2 fldpi fldz fmul fmulp fnclex fndisi fneni fninit fnop fnsave fnstcw fnstenv fnstsw fpatan fprem fprem1 fptan frndint frstor fsave fscale fsetpm fsin fsincos fsqrt fst fstcw fstenv fstp fstsw fsub fsubp fsubr fsubrp ftst fucom fucomi fucomip fucomp fucompp fxam fxch fxtract fyl2x fyl2xp1 hlt ibts icebp idiv imul in inc incbin insb insd insw int int01 int1 int03 int3 into invd invpcid invlpg invlpga iret iretd iretq iretw jcxz jecxz jrcxz jmp jmpe lahf lar lds lea leave les lfence lfs lgdt lgs lidt lldt lmsw loadall loadall286 lodsb lodsd lodsq lodsw loop loope loopne loopnz loopz lsl lss ltr mfence monitor mov movd movq movsb movsd movsq movsw movsx movsxd movzx mul mwait neg nop not or out outsb outsd outsw packssdw packsswb packuswb paddb paddd paddsb paddsiw paddsw paddusb paddusw paddw pand pandn pause paveb pavgusb pcmpeqb pcmpeqd pcmpeqw pcmpgtb pcmpgtd pcmpgtw pdistib pf2id pfacc pfadd pfcmpeq pfcmpge pfcmpgt pfmax pfmin pfmul pfrcp pfrcpit1 pfrcpit2 pfrsqit1 pfrsqrt pfsub pfsubr pi2fd pmachriw pmaddwd pmagw pmulhriw pmulhrwa pmulhrwc pmulhw pmullw pmvgezb pmvlzb pmvnzb pmvzb pop popa popad popaw popf popfd popfq popfw por prefetch prefetchw pslld psllq psllw psrad psraw psrld psrlq psrlw psubb psubd psubsb psubsiw psubsw psubusb psubusw psubw punpckhbw punpckhdq punpckhwd punpcklbw punpckldq punpcklwd push pusha pushad pushaw pushf pushfd pushfq pushfw pxor rcl rcr rdshr rdmsr rdpmc rdtsc rdtscp ret retf retn rol ror rdm rsdc rsldt rsm rsts sahf sal salc sar sbb scasb scasd scasq scasw sfence sgdt shl shld shr shrd sidt sldt skinit smi smint smintold smsw stc std sti stosb stosd stosq stosw str sub svdc svldt svts swapgs syscall sysenter sysexit sysret test ud0 ud1 ud2b ud2 ud2a umov verr verw fwait wbinvd wrshr wrmsr xadd xbts xchg xlatb xlat xor cmove cmovz cmovne cmovnz cmova cmovnbe cmovae cmovnb cmovb cmovnae cmovbe cmovna cmovg cmovnle cmovge cmovnl cmovl cmovnge cmovle cmovng cmovc cmovnc cmovo cmovno cmovs cmovns cmovp cmovpe cmovnp cmovpo je jz jne jnz ja jnbe jae jnb jb jnae jbe jna jg jnle jge jnl jl jnge jle jng jc jnc jo jno js jns jpo jnp jpe jp sete setz setne setnz seta setnbe setae setnb setnc setb setnae setcset setbe setna setg setnle setge setnl setl setnge setle setng sets setns seto setno setpe setp setpo setnp addps addss andnps andps cmpeqps cmpeqss cmpleps cmpless cmpltps cmpltss cmpneqps cmpneqss cmpnleps cmpnless cmpnltps cmpnltss cmpordps cmpordss cmpunordps cmpunordss cmpps cmpss comiss cvtpi2ps cvtps2pi cvtsi2ss cvtss2si cvttps2pi cvttss2si divps divss ldmxcsr maxps maxss minps minss movaps movhps movlhps movlps movhlps movmskps movntps movss movups mulps mulss orps rcpps rcpss rsqrtps rsqrtss shufps sqrtps sqrtss stmxcsr subps subss ucomiss unpckhps unpcklps xorps fxrstor fxrstor64 fxsave fxsave64 xgetbv xsetbv xsave xsave64 xsaveopt xsaveopt64 xrstor xrstor64 prefetchnta prefetcht0 prefetcht1 prefetcht2 maskmovq movntq pavgb pavgw pextrw pinsrw pmaxsw pmaxub pminsw pminub pmovmskb pmulhuw psadbw pshufw pf2iw pfnacc pfpnacc pi2fw pswapd maskmovdqu clflush movntdq movnti movntpd movdqa movdqu movdq2q movq2dq paddq pmuludq pshufd pshufhw pshuflw pslldq psrldq psubq punpckhqdq punpcklqdq addpd addsd andnpd andpd cmpeqpd cmpeqsd cmplepd cmplesd cmpltpd cmpltsd cmpneqpd cmpneqsd cmpnlepd cmpnlesd cmpnltpd cmpnltsd cmpordpd cmpordsd cmpunordpd cmpunordsd cmppd comisd cvtdq2pd cvtdq2ps cvtpd2dq cvtpd2pi cvtpd2ps cvtpi2pd cvtps2dq cvtps2pd cvtsd2si cvtsd2ss cvtsi2sd cvtss2sd cvttpd2pi cvttpd2dq cvttps2dq cvttsd2si divpd divsd maxpd maxsd minpd minsd movapd movhpd movlpd movmskpd movupd mulpd mulsd orpd shufpd sqrtpd sqrtsd subpd subsd ucomisd unpckhpd unpcklpd xorpd addsubpd addsubps haddpd haddps hsubpd hsubps lddqu movddup movshdup movsldup clgi stgi vmcall vmclear vmfunc vmlaunch vmload vmmcall vmptrld vmptrst vmread vmresume vmrun vmsave vmwrite vmxoff vmxon invept invvpid pabsb pabsw pabsd palignr phaddw phaddd phaddsw phsubw phsubd phsubsw pmaddubsw pmulhrsw pshufb psignb psignw psignd extrq insertq movntsd movntss lzcnt blendpd blendps blendvpd blendvps dppd dpps extractps insertps movntdqa mpsadbw packusdw pblendvb pblendw pcmpeqq pextrb pextrd pextrq phminposuw pinsrb pinsrd pinsrq pmaxsb pmaxsd pmaxud pmaxuw pminsb pminsd pminud pminuw pmovsxbw pmovsxbd pmovsxbq pmovsxwd pmovsxwq pmovsxdq pmovzxbw pmovzxbd pmovzxbq pmovzxwd pmovzxwq pmovzxdq pmuldq pmulld ptest roundpd roundps roundsd roundss crc32 pcmpestri pcmpestrm pcmpistri pcmpistrm pcmpgtq popcnt getsec pfrcpv pfrsqrtv movbe aesenc aesenclast aesdec aesdeclast aesimc aeskeygenassist vaesenc vaesenclast vaesdec vaesdeclast vaesimc vaeskeygenassist vaddpd vaddps vaddsd vaddss vaddsubpd vaddsubps vandpd vandps vandnpd vandnps vblendpd vblendps vblendvpd vblendvps vbroadcastss vbroadcastsd vbroadcastf128 vcmpeq_ospd vcmpeqpd vcmplt_ospd vcmpltpd vcmple_ospd vcmplepd vcmpunord_qpd vcmpunordpd vcmpneq_uqpd vcmpneqpd vcmpnlt_uspd vcmpnltpd vcmpnle_uspd vcmpnlepd vcmpord_qpd vcmpordpd vcmpeq_uqpd vcmpnge_uspd vcmpngepd vcmpngt_uspd vcmpngtpd vcmpfalse_oqpd vcmpfalsepd vcmpneq_oqpd vcmpge_ospd vcmpgepd vcmpgt_ospd vcmpgtpd vcmptrue_uqpd vcmptruepd vcmplt_oqpd vcmple_oqpd vcmpunord_spd vcmpneq_uspd vcmpnlt_uqpd vcmpnle_uqpd vcmpord_spd vcmpeq_uspd vcmpnge_uqpd vcmpngt_uqpd vcmpfalse_ospd vcmpneq_ospd vcmpge_oqpd vcmpgt_oqpd vcmptrue_uspd vcmppd vcmpeq_osps vcmpeqps vcmplt_osps vcmpltps vcmple_osps vcmpleps vcmpunord_qps vcmpunordps vcmpneq_uqps vcmpneqps vcmpnlt_usps vcmpnltps vcmpnle_usps vcmpnleps vcmpord_qps vcmpordps vcmpeq_uqps vcmpnge_usps vcmpngeps vcmpngt_usps vcmpngtps vcmpfalse_oqps vcmpfalseps vcmpneq_oqps vcmpge_osps vcmpgeps vcmpgt_osps vcmpgtps vcmptrue_uqps vcmptrueps vcmplt_oqps vcmple_oqps vcmpunord_sps vcmpneq_usps vcmpnlt_uqps vcmpnle_uqps vcmpord_sps vcmpeq_usps vcmpnge_uqps vcmpngt_uqps vcmpfalse_osps vcmpneq_osps vcmpge_oqps vcmpgt_oqps vcmptrue_usps vcmpps vcmpeq_ossd vcmpeqsd vcmplt_ossd vcmpltsd vcmple_ossd vcmplesd vcmpunord_qsd vcmpunordsd vcmpneq_uqsd vcmpneqsd vcmpnlt_ussd vcmpnltsd vcmpnle_ussd vcmpnlesd vcmpord_qsd vcmpordsd vcmpeq_uqsd vcmpnge_ussd vcmpngesd vcmpngt_ussd vcmpngtsd vcmpfalse_oqsd vcmpfalsesd vcmpneq_oqsd vcmpge_ossd vcmpgesd vcmpgt_ossd vcmpgtsd vcmptrue_uqsd vcmptruesd vcmplt_oqsd vcmple_oqsd vcmpunord_ssd vcmpneq_ussd vcmpnlt_uqsd vcmpnle_uqsd vcmpord_ssd vcmpeq_ussd vcmpnge_uqsd vcmpngt_uqsd vcmpfalse_ossd vcmpneq_ossd vcmpge_oqsd vcmpgt_oqsd vcmptrue_ussd vcmpsd vcmpeq_osss vcmpeqss vcmplt_osss vcmpltss vcmple_osss vcmpless vcmpunord_qss vcmpunordss vcmpneq_uqss vcmpneqss vcmpnlt_usss vcmpnltss vcmpnle_usss vcmpnless vcmpord_qss vcmpordss vcmpeq_uqss vcmpnge_usss vcmpngess vcmpngt_usss vcmpngtss vcmpfalse_oqss vcmpfalsess vcmpneq_oqss vcmpge_osss vcmpgess vcmpgt_osss vcmpgtss vcmptrue_uqss vcmptruess vcmplt_oqss vcmple_oqss vcmpunord_sss vcmpneq_usss vcmpnlt_uqss vcmpnle_uqss vcmpord_sss vcmpeq_usss vcmpnge_uqss vcmpngt_uqss vcmpfalse_osss vcmpneq_osss vcmpge_oqss vcmpgt_oqss vcmptrue_usss vcmpss vcomisd vcomiss vcvtdq2pd vcvtdq2ps vcvtpd2dq vcvtpd2ps vcvtps2dq vcvtps2pd vcvtsd2si vcvtsd2ss vcvtsi2sd vcvtsi2ss vcvtss2sd vcvtss2si vcvttpd2dq vcvttps2dq vcvttsd2si vcvttss2si vdivpd vdivps vdivsd vdivss vdppd vdpps vextractf128 vextractps vhaddpd vhaddps vhsubpd vhsubps vinsertf128 vinsertps vlddqu vldqqu vldmxcsr vmaskmovdqu vmaskmovps vmaskmovpd vmaxpd vmaxps vmaxsd vmaxss vminpd vminps vminsd vminss vmovapd vmovaps vmovd vmovq vmovddup vmovdqa vmovqqa vmovdqu vmovqqu vmovhlps vmovhpd vmovhps vmovlhps vmovlpd vmovlps vmovmskpd vmovmskps vmovntdq vmovntqq vmovntdqa vmovntpd vmovntps vmovsd vmovshdup vmovsldup vmovss vmovupd vmovups vmpsadbw vmulpd vmulps vmulsd vmulss vorpd vorps vpabsb vpabsw vpabsd vpacksswb vpackssdw vpackuswb vpackusdw vpaddb vpaddw vpaddd vpaddq vpaddsb vpaddsw vpaddusb vpaddusw vpalignr vpand vpandn vpavgb vpavgw vpblendvb vpblendw vpcmpestri vpcmpestrm vpcmpistri vpcmpistrm vpcmpeqb vpcmpeqw vpcmpeqd vpcmpeqq vpcmpgtb vpcmpgtw vpcmpgtd vpcmpgtq vpermilpd vpermilps vperm2f128 vpextrb vpextrw vpextrd vpextrq vphaddw vphaddd vphaddsw vphminposuw vphsubw vphsubd vphsubsw vpinsrb vpinsrw vpinsrd vpinsrq vpmaddwd vpmaddubsw vpmaxsb vpmaxsw vpmaxsd vpmaxub vpmaxuw vpmaxud vpminsb vpminsw vpminsd vpminub vpminuw vpminud vpmovmskb vpmovsxbw vpmovsxbd vpmovsxbq vpmovsxwd vpmovsxwq vpmovsxdq vpmovzxbw vpmovzxbd vpmovzxbq vpmovzxwd vpmovzxwq vpmovzxdq vpmulhuw vpmulhrsw vpmulhw vpmullw vpmulld vpmuludq vpmuldq vpor vpsadbw vpshufb vpshufd vpshufhw vpshuflw vpsignb vpsignw vpsignd vpslldq vpsrldq vpsllw vpslld vpsllq vpsraw vpsrad vpsrlw vpsrld vpsrlq vptest vpsubb vpsubw vpsubd vpsubq vpsubsb vpsubsw vpsubusb vpsubusw vpunpckhbw vpunpckhwd vpunpckhdq vpunpckhqdq vpunpcklbw vpunpcklwd vpunpckldq vpunpcklqdq vpxor vrcpps vrcpss vrsqrtps vrsqrtss vroundpd vroundps vroundsd vroundss vshufpd vshufps vsqrtpd vsqrtps vsqrtsd vsqrtss vstmxcsr vsubpd vsubps vsubsd vsubss vtestps vtestpd vucomisd vucomiss vunpckhpd vunpckhps vunpcklpd vunpcklps vxorpd vxorps vzeroall vzeroupper pclmullqlqdq pclmulhqlqdq pclmullqhqdq pclmulhqhqdq pclmulqdq vpclmullqlqdq vpclmulhqlqdq vpclmullqhqdq vpclmulhqhqdq vpclmulqdq vfmadd132ps vfmadd132pd vfmadd312ps vfmadd312pd vfmadd213ps vfmadd213pd vfmadd123ps vfmadd123pd vfmadd231ps vfmadd231pd vfmadd321ps vfmadd321pd vfmaddsub132ps vfmaddsub132pd vfmaddsub312ps vfmaddsub312pd vfmaddsub213ps vfmaddsub213pd vfmaddsub123ps vfmaddsub123pd vfmaddsub231ps vfmaddsub231pd vfmaddsub321ps vfmaddsub321pd vfmsub132ps vfmsub132pd vfmsub312ps vfmsub312pd vfmsub213ps vfmsub213pd vfmsub123ps vfmsub123pd vfmsub231ps vfmsub231pd vfmsub321ps vfmsub321pd vfmsubadd132ps vfmsubadd132pd vfmsubadd312ps vfmsubadd312pd vfmsubadd213ps vfmsubadd213pd vfmsubadd123ps vfmsubadd123pd vfmsubadd231ps vfmsubadd231pd vfmsubadd321ps vfmsubadd321pd vfnmadd132ps vfnmadd132pd vfnmadd312ps vfnmadd312pd vfnmadd213ps vfnmadd213pd vfnmadd123ps vfnmadd123pd vfnmadd231ps vfnmadd231pd vfnmadd321ps vfnmadd321pd vfnmsub132ps vfnmsub132pd vfnmsub312ps vfnmsub312pd vfnmsub213ps vfnmsub213pd vfnmsub123ps vfnmsub123pd vfnmsub231ps vfnmsub231pd vfnmsub321ps vfnmsub321pd vfmadd132ss vfmadd132sd vfmadd312ss vfmadd312sd vfmadd213ss vfmadd213sd vfmadd123ss vfmadd123sd vfmadd231ss vfmadd231sd vfmadd321ss vfmadd321sd vfmsub132ss vfmsub132sd vfmsub312ss vfmsub312sd vfmsub213ss vfmsub213sd vfmsub123ss vfmsub123sd vfmsub231ss vfmsub231sd vfmsub321ss vfmsub321sd vfnmadd132ss vfnmadd132sd vfnmadd312ss vfnmadd312sd vfnmadd213ss vfnmadd213sd vfnmadd123ss vfnmadd123sd vfnmadd231ss vfnmadd231sd vfnmadd321ss vfnmadd321sd vfnmsub132ss vfnmsub132sd vfnmsub312ss vfnmsub312sd vfnmsub213ss vfnmsub213sd vfnmsub123ss vfnmsub123sd vfnmsub231ss vfnmsub231sd vfnmsub321ss vfnmsub321sd rdfsbase rdgsbase rdrand wrfsbase wrgsbase vcvtph2ps vcvtps2ph adcx adox rdseed clac stac xstore xcryptecb xcryptcbc xcryptctr xcryptcfb xcryptofb montmul xsha1 xsha256 llwpcb slwpcb lwpval lwpins vfmaddpd vfmaddps vfmaddsd vfmaddss vfmaddsubpd vfmaddsubps vfmsubaddpd vfmsubaddps vfmsubpd vfmsubps vfmsubsd vfmsubss vfnmaddpd vfnmaddps vfnmaddsd vfnmaddss vfnmsubpd vfnmsubps vfnmsubsd vfnmsubss vfrczpd vfrczps vfrczsd vfrczss vpcmov vpcomb vpcomd vpcomq vpcomub vpcomud vpcomuq vpcomuw vpcomw vphaddbd vphaddbq vphaddbw vphadddq vphaddubd vphaddubq vphaddubw vphaddudq vphadduwd vphadduwq vphaddwd vphaddwq vphsubbw vphsubdq vphsubwd vpmacsdd vpmacsdqh vpmacsdql vpmacssdd vpmacssdqh vpmacssdql vpmacsswd vpmacssww vpmacswd vpmacsww vpmadcsswd vpmadcswd vpperm vprotb vprotd vprotq vprotw vpshab vpshad vpshaq vpshaw vpshlb vpshld vpshlq vpshlw vbroadcasti128 vpblendd vpbroadcastb vpbroadcastw vpbroadcastd vpbroadcastq vpermd vpermpd vpermps vpermq vperm2i128 vextracti128 vinserti128 vpmaskmovd vpmaskmovq vpsllvd vpsllvq vpsravd vpsrlvd vpsrlvq vgatherdpd vgatherqpd vgatherdps vgatherqps vpgatherdd vpgatherqd vpgatherdq vpgatherqq xabort xbegin xend xtest andn bextr blci blcic blsi blsic blcfill blsfill blcmsk blsmsk blsr blcs bzhi mulx pdep pext rorx sarx shlx shrx tzcnt tzmsk t1mskc valignd valignq vblendmpd vblendmps vbroadcastf32x4 vbroadcastf64x4 vbroadcasti32x4 vbroadcasti64x4 vcompresspd vcompressps vcvtpd2udq vcvtps2udq vcvtsd2usi vcvtss2usi vcvttpd2udq vcvttps2udq vcvttsd2usi vcvttss2usi vcvtudq2pd vcvtudq2ps vcvtusi2sd vcvtusi2ss vexpandpd vexpandps vextractf32x4 vextractf64x4 vextracti32x4 vextracti64x4 vfixupimmpd vfixupimmps vfixupimmsd vfixupimmss vgetexppd vgetexpps vgetexpsd vgetexpss vgetmantpd vgetmantps vgetmantsd vgetmantss vinsertf32x4 vinsertf64x4 vinserti32x4 vinserti64x4 vmovdqa32 vmovdqa64 vmovdqu32 vmovdqu64 vpabsq vpandd vpandnd vpandnq vpandq vpblendmd vpblendmq vpcmpltd vpcmpled vpcmpneqd vpcmpnltd vpcmpnled vpcmpd vpcmpltq vpcmpleq vpcmpneqq vpcmpnltq vpcmpnleq vpcmpq vpcmpequd vpcmpltud vpcmpleud vpcmpnequd vpcmpnltud vpcmpnleud vpcmpud vpcmpequq vpcmpltuq vpcmpleuq vpcmpnequq vpcmpnltuq vpcmpnleuq vpcmpuq vpcompressd vpcompressq vpermi2d vpermi2pd vpermi2ps vpermi2q vpermt2d vpermt2pd vpermt2ps vpermt2q vpexpandd vpexpandq vpmaxsq vpmaxuq vpminsq vpminuq vpmovdb vpmovdw vpmovqb vpmovqd vpmovqw vpmovsdb vpmovsdw vpmovsqb vpmovsqd vpmovsqw vpmovusdb vpmovusdw vpmovusqb vpmovusqd vpmovusqw vpord vporq vprold vprolq vprolvd vprolvq vprord vprorq vprorvd vprorvq vpscatterdd vpscatterdq vpscatterqd vpscatterqq vpsraq vpsravq vpternlogd vpternlogq vptestmd vptestmq vptestnmd vptestnmq vpxord vpxorq vrcp14pd vrcp14ps vrcp14sd vrcp14ss vrndscalepd vrndscaleps vrndscalesd vrndscaless vrsqrt14pd vrsqrt14ps vrsqrt14sd vrsqrt14ss vscalefpd vscalefps vscalefsd vscalefss vscatterdpd vscatterdps vscatterqpd vscatterqps vshuff32x4 vshuff64x2 vshufi32x4 vshufi64x2 kandnw kandw kmovw knotw kortestw korw kshiftlw kshiftrw kunpckbw kxnorw kxorw vpbroadcastmb2q vpbroadcastmw2d vpconflictd vpconflictq vplzcntd vplzcntq vexp2pd vexp2ps vrcp28pd vrcp28ps vrcp28sd vrcp28ss vrsqrt28pd vrsqrt28ps vrsqrt28sd vrsqrt28ss vgatherpf0dpd vgatherpf0dps vgatherpf0qpd vgatherpf0qps vgatherpf1dpd vgatherpf1dps vgatherpf1qpd vgatherpf1qps vscatterpf0dpd vscatterpf0dps vscatterpf0qpd vscatterpf0qps vscatterpf1dpd vscatterpf1dps vscatterpf1qpd vscatterpf1qps prefetchwt1 bndmk bndcl bndcu bndcn bndmov bndldx bndstx sha1rnds4 sha1nexte sha1msg1 sha1msg2 sha256rnds2 sha256msg1 sha256msg2 hint_nop0 hint_nop1 hint_nop2 hint_nop3 hint_nop4 hint_nop5 hint_nop6 hint_nop7 hint_nop8 hint_nop9 hint_nop10 hint_nop11 hint_nop12 hint_nop13 hint_nop14 hint_nop15 hint_nop16 hint_nop17 hint_nop18 hint_nop19 hint_nop20 hint_nop21 hint_nop22 hint_nop23 hint_nop24 hint_nop25 hint_nop26 hint_nop27 hint_nop28 hint_nop29 hint_nop30 hint_nop31 hint_nop32 hint_nop33 hint_nop34 hint_nop35 hint_nop36 hint_nop37 hint_nop38 hint_nop39 hint_nop40 hint_nop41 hint_nop42 hint_nop43 hint_nop44 hint_nop45 hint_nop46 hint_nop47 hint_nop48 hint_nop49 hint_nop50 hint_nop51 hint_nop52 hint_nop53 hint_nop54 hint_nop55 hint_nop56 hint_nop57 hint_nop58 hint_nop59 hint_nop60 hint_nop61 hint_nop62 hint_nop63",built_in:"ip eip rip al ah bl bh cl ch dl dh sil dil bpl spl r8b r9b r10b r11b r12b r13b r14b r15b ax bx cx dx si di bp sp r8w r9w r10w r11w r12w r13w r14w r15w eax ebx ecx edx esi edi ebp esp eip r8d r9d r10d r11d r12d r13d r14d r15d rax rbx rcx rdx rsi rdi rbp rsp r8 r9 r10 r11 r12 r13 r14 r15 cs ds es fs gs ss st st0 st1 st2 st3 st4 st5 st6 st7 mm0 mm1 mm2 mm3 mm4 mm5 mm6 mm7 xmm0 xmm1 xmm2 xmm3 xmm4 xmm5 xmm6 xmm7 xmm8 xmm9 xmm10 xmm11 xmm12 xmm13 xmm14 xmm15 xmm16 xmm17 xmm18 xmm19 xmm20 xmm21 xmm22 xmm23 xmm24 xmm25 xmm26 xmm27 xmm28 xmm29 xmm30 xmm31 ymm0 ymm1 ymm2 ymm3 ymm4 ymm5 ymm6 ymm7 ymm8 ymm9 ymm10 ymm11 ymm12 ymm13 ymm14 ymm15 ymm16 ymm17 ymm18 ymm19 ymm20 ymm21 ymm22 ymm23 ymm24 ymm25 ymm26 ymm27 ymm28 ymm29 ymm30 ymm31 zmm0 zmm1 zmm2 zmm3 zmm4 zmm5 zmm6 zmm7 zmm8 zmm9 zmm10 zmm11 zmm12 zmm13 zmm14 zmm15 zmm16 zmm17 zmm18 zmm19 zmm20 zmm21 zmm22 zmm23 zmm24 zmm25 zmm26 zmm27 zmm28 zmm29 zmm30 zmm31 k0 k1 k2 k3 k4 k5 k6 k7 bnd0 bnd1 bnd2 bnd3 cr0 cr1 cr2 cr3 cr4 cr8 dr0 dr1 dr2 dr3 dr8 tr3 tr4 tr5 tr6 tr7 r0 r1 r2 r3 r4 r5 r6 r7 r0b r1b r2b r3b r4b r5b r6b r7b r0w r1w r2w r3w r4w r5w r6w r7w r0d r1d r2d r3d r4d r5d r6d r7d r0h r1h r2h r3h r0l r1l r2l r3l r4l r5l r6l r7l r8l r9l r10l r11l r12l r13l r14l r15l db dw dd dq dt ddq do dy dz resb resw resd resq rest resdq reso resy resz incbin equ times byte word dword qword nosplit rel abs seg wrt strict near far a32 ptr",meta:"%define %xdefine %+ %undef %defstr %deftok %assign %strcat %strlen %substr %rotate %elif %else %endif %if %ifmacro %ifctx %ifidn %ifidni %ifid %ifnum %ifstr %iftoken %ifempty %ifenv %error %warning %fatal %rep %endrep %include %push %pop %repl %pathsearch %depend %use %arg %stacksize %local %line %comment %endcomment .nolist __FILE__ __LINE__ __SECT__ __BITS__ __OUTPUT_FORMAT__ __DATE__ __TIME__ __DATE_NUM__ __TIME_NUM__ __UTC_DATE__ __UTC_TIME__ __UTC_DATE_NUM__ __UTC_TIME_NUM__ __PASS__ struc endstruc istruc at iend align alignb sectalign daz nodaz up down zero default option assume public bits use16 use32 use64 default section segment absolute extern global common cpu float __utf16__ __utf16le__ __utf16be__ __utf32__ __utf32le__ __utf32be__ __float8__ __float16__ __float32__ __float64__ __float80m__ __float80e__ __float128l__ __float128h__ __Infinity__ __QNaN__ __SNaN__ Inf NaN QNaN SNaN float8 float16 float32 float64 float80m float80e float128l float128h __FLOAT_DAZ__ __FLOAT_ROUND__ __FLOAT__"},contains:[s.COMMENT(";","$",{relevance:0}),{className:"number",variants:[{begin:"\\b(?:([0-9][0-9_]*)?\\.[0-9_]*(?:[eE][+-]?[0-9_]+)?|(0[Xx])?[0-9][0-9_]*\\.?[0-9_]*(?:[pP](?:[+-]?[0-9_]+)?)?)\\b",relevance:0},{begin:"\\$[0-9][0-9A-Fa-f]*",relevance:0},{begin:"\\b(?:[0-9A-Fa-f][0-9A-Fa-f_]*[Hh]|[0-9][0-9_]*[DdTt]?|[0-7][0-7_]*[QqOo]|[0-1][0-1_]*[BbYy])\\b"},{begin:"\\b(?:0[Xx][0-9A-Fa-f_]+|0[DdTt][0-9_]+|0[QqOo][0-7_]+|0[BbYy][0-1_]+)\\b"}]},s.QUOTE_STRING_MODE,{className:"string",variants:[{begin:"'",end:"[^\\\\]'"},{begin:"`",end:"[^\\\\]`"}],relevance:0},{className:"symbol",variants:[{begin:"^\\s*[A-Za-z._?][A-Za-z0-9_$#@~.?]*(:|\\s+label)"},{begin:"^\\s*%%[A-Za-z0-9_$#@~.?]*:"}],relevance:0},{className:"subst",begin:"%[0-9]+",relevance:0},{className:"subst",begin:"%!S+",relevance:0},{className:"meta",begin:/^\s*\.[\w_-]+/}]}}}());hljs.registerLanguage("kotlin",function(){"use strict";return function(e){var n={keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual trait volatile transient native default",built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing",literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@"},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string",variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'",illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/,contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta",begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?"},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/,end:/\)/,contains:[e.inherit(t,{className:"meta-string"})]}]},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,contains:[]}]},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}]}),e.C_LINE_COMMENT_MODE,c,{className:"keyword",begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol",begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$",returnBegin:!0,excludeEnd:!0,keywords:n,illegal:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0,contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin:/</,end:/>/,keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/\)/,endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/,endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class",beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0,illegal:"extends implements",contains:[{beginKeywords:"public protected internal private constructor"},e.UNDERSCORE_TITLE_MODE,{className:"type",begin:/</,end:/>/,excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/,excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env",end:"$",illegal:"\n"},{className:"number",begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",relevance:0}]}}}());hljs.registerLanguage("armasm",function(){"use strict";return function(s){const e={variants:[s.COMMENT("^[ \\t]*(?=#)","$",{relevance:0,excludeBegin:!0}),s.COMMENT("[;@]","$",{relevance:0}),s.C_LINE_COMMENT_MODE,s.C_BLOCK_COMMENT_MODE]};return{name:"ARM Assembly",case_insensitive:!0,aliases:["arm"],keywords:{$pattern:"\\.?"+s.IDENT_RE,meta:".2byte .4byte .align .ascii .asciz .balign .byte .code .data .else .end .endif .endm .endr .equ .err .exitm .extern .global .hword .if .ifdef .ifndef .include .irp .long .macro .rept .req .section .set .skip .space .text .word .arm .thumb .code16 .code32 .force_thumb .thumb_func .ltorg ALIAS ALIGN ARM AREA ASSERT ATTR CN CODE CODE16 CODE32 COMMON CP DATA DCB DCD DCDU DCDO DCFD DCFDU DCI DCQ DCQU DCW DCWU DN ELIF ELSE END ENDFUNC ENDIF ENDP ENTRY EQU EXPORT EXPORTAS EXTERN FIELD FILL FUNCTION GBLA GBLL GBLS GET GLOBAL IF IMPORT INCBIN INCLUDE INFO KEEP LCLA LCLL LCLS LTORG MACRO MAP MEND MEXIT NOFP OPT PRESERVE8 PROC QN READONLY RELOC REQUIRE REQUIRE8 RLIST FN ROUT SETA SETL SETS SN SPACE SUBT THUMB THUMBX TTL WHILE WEND ",built_in:"r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 pc lr sp ip sl sb fp a1 a2 a3 a4 v1 v2 v3 v4 v5 v6 v7 v8 f0 f1 f2 f3 f4 f5 f6 f7 p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 q0 q1 q2 q3 q4 q5 q6 q7 q8 q9 q10 q11 q12 q13 q14 q15 cpsr_c cpsr_x cpsr_s cpsr_f cpsr_cx cpsr_cxs cpsr_xs cpsr_xsf cpsr_sf cpsr_cxsf spsr_c spsr_x spsr_s spsr_f spsr_cx spsr_cxs spsr_xs spsr_xsf spsr_sf spsr_cxsf s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 {PC} {VAR} {TRUE} {FALSE} {OPT} {CONFIG} {ENDIAN} {CODESIZE} {CPU} {FPU} {ARCHITECTURE} {PCSTOREOFFSET} {ARMASM_VERSION} {INTER} {ROPI} {RWPI} {SWST} {NOSWST} . @"},contains:[{className:"keyword",begin:"\\b(adc|(qd?|sh?|u[qh]?)?add(8|16)?|usada?8|(q|sh?|u[qh]?)?(as|sa)x|and|adrl?|sbc|rs[bc]|asr|b[lx]?|blx|bxj|cbn?z|tb[bh]|bic|bfc|bfi|[su]bfx|bkpt|cdp2?|clz|clrex|cmp|cmn|cpsi[ed]|cps|setend|dbg|dmb|dsb|eor|isb|it[te]{0,3}|lsl|lsr|ror|rrx|ldm(([id][ab])|f[ds])?|ldr((s|ex)?[bhd])?|movt?|mvn|mra|mar|mul|[us]mull|smul[bwt][bt]|smu[as]d|smmul|smmla|mla|umlaal|smlal?([wbt][bt]|d)|mls|smlsl?[ds]|smc|svc|sev|mia([bt]{2}|ph)?|mrr?c2?|mcrr2?|mrs|msr|orr|orn|pkh(tb|bt)|rbit|rev(16|sh)?|sel|[su]sat(16)?|nop|pop|push|rfe([id][ab])?|stm([id][ab])?|str(ex)?[bhd]?|(qd?)?sub|(sh?|q|u[qh]?)?sub(8|16)|[su]xt(a?h|a?b(16)?)|srs([id][ab])?|swpb?|swi|smi|tst|teq|wfe|wfi|yield)(eq|ne|cs|cc|mi|pl|vs|vc|hi|ls|ge|lt|gt|le|al|hs|lo)?[sptrx]?(?=\\s)"},e,s.QUOTE_STRING_MODE,{className:"string",begin:"'",end:"[^\\\\]'",relevance:0},{className:"title",begin:"\\|",end:"\\|",illegal:"\\n",relevance:0},{className:"number",variants:[{begin:"[#$=]?0x[0-9a-f]+"},{begin:"[#$=]?0b[01]+"},{begin:"[#$=]\\d+"},{begin:"\\b\\d+"}],relevance:0},{className:"symbol",variants:[{begin:"^[ \\t]*[a-z_\\.\\$][a-z0-9_\\.\\$]+:"},{begin:"^[a-z_\\.\\$][a-z0-9_\\.\\$]+"},{begin:"[=#]\\w+"}],relevance:0}]}}}());hljs.registerLanguage("go",function(){"use strict";return function(e){var n={keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune",literal:"true false iota nil",built_in:"append cap close complex copy imag len make new panic print println real recover delete"};return{name:"Go",aliases:["golang"],keywords:n,illegal:"</",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"string",variants:[e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{begin:"`",end:"`"}]},{className:"number",variants:[{begin:e.C_NUMBER_RE+"[i]",relevance:1},e.C_NUMBER_MODE]},{begin:/:=/},{className:"function",beginKeywords:"func",end:"\\s*(\\{|$)",excludeEnd:!0,contains:[e.TITLE_MODE,{className:"params",begin:/\(/,end:/\)/,keywords:n,illegal:/["']/}]}]}}}());hljs.registerLanguage("diff",function(){"use strict";return function(e){return{name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10,variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!",end:"$"}]}}}());hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());hljs.registerLanguage("scala",function(){"use strict";return function(e){var n={className:"subst",variants:[{begin:"\\$[A-Za-z0-9_]+"},{begin:"\\${",end:"}"}]},a={className:"string",variants:[{begin:'"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE]},{begin:'"""',end:'"""',relevance:10},{begin:'[a-z]+"',end:'"',illegal:"\\n",contains:[e.BACKSLASH_ESCAPE,n]},{className:"string",begin:'[a-z]+"""',end:'"""',contains:[n],relevance:10}]},s={className:"type",begin:"\\b[A-Z][A-Za-z0-9_]*",relevance:0},t={className:"title",begin:/[^0-9\n\t "'(),.`{}\[\]:;][^\n\t "'(),.`{}\[\]:;]+|[^0-9\n\t "'(),.`{}\[\]:;=]/,relevance:0},i={className:"class",beginKeywords:"class object trait type",end:/[:={\[\n;]/,excludeEnd:!0,contains:[{beginKeywords:"extends with",relevance:10},{begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},{className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,relevance:0,contains:[s]},t]},l={className:"function",beginKeywords:"def",end:/[:={\[(\n;]/,excludeEnd:!0,contains:[t]};return{name:"Scala",keywords:{literal:"true false null",keyword:"type yield lazy override def with val var sealed abstract private trait object if forSome for while throw finally protected extends import final return else break new catch super class case package default try this match continue throws implicit"},contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,a,{className:"symbol",begin:"'\\w[\\w\\d_]*(?!')"},s,l,i,e.C_NUMBER_MODE,{className:"meta",begin:"@[A-Za-z]+"}]}}}());hljs.registerLanguage("julia",function(){"use strict";return function(e){var r="[A-Za-z_\\u00A1-\\uFFFF][A-Za-z_0-9\\u00A1-\\uFFFF]*",t={$pattern:r,keyword:"in isa where baremodule begin break catch ccall const continue do else elseif end export false finally for function global if import importall let local macro module quote return true try using while type immutable abstract bitstype typealias ",literal:"true false ARGS C_NULL DevNull ENDIAN_BOM ENV I Inf Inf16 Inf32 Inf64 InsertionSort JULIA_HOME LOAD_PATH MergeSort NaN NaN16 NaN32 NaN64 PROGRAM_FILE QuickSort RoundDown RoundFromZero RoundNearest RoundNearestTiesAway RoundNearestTiesUp RoundToZero RoundUp STDERR STDIN STDOUT VERSION catalan e|0 eu|0 eulergamma golden im nothing pi γ π φ ",built_in:"ANY AbstractArray AbstractChannel AbstractFloat AbstractMatrix AbstractRNG AbstractSerializer AbstractSet AbstractSparseArray AbstractSparseMatrix AbstractSparseVector AbstractString AbstractUnitRange AbstractVecOrMat AbstractVector Any ArgumentError Array AssertionError Associative Base64DecodePipe Base64EncodePipe Bidiagonal BigFloat BigInt BitArray BitMatrix BitVector Bool BoundsError BufferStream CachingPool CapturedException CartesianIndex CartesianRange Cchar Cdouble Cfloat Channel Char Cint Cintmax_t Clong Clonglong ClusterManager Cmd CodeInfo Colon Complex Complex128 Complex32 Complex64 CompositeException Condition ConjArray ConjMatrix ConjVector Cptrdiff_t Cshort Csize_t Cssize_t Cstring Cuchar Cuint Cuintmax_t Culong Culonglong Cushort Cwchar_t Cwstring DataType Date DateFormat DateTime DenseArray DenseMatrix DenseVecOrMat DenseVector Diagonal Dict DimensionMismatch Dims DirectIndexString Display DivideError DomainError EOFError EachLine Enum Enumerate ErrorException Exception ExponentialBackOff Expr Factorization FileMonitor Float16 Float32 Float64 Function Future GlobalRef GotoNode HTML Hermitian IO IOBuffer IOContext IOStream IPAddr IPv4 IPv6 IndexCartesian IndexLinear IndexStyle InexactError InitError Int Int128 Int16 Int32 Int64 Int8 IntSet Integer InterruptException InvalidStateException Irrational KeyError LabelNode LinSpace LineNumberNode LoadError LowerTriangular MIME Matrix MersenneTwister Method MethodError MethodTable Module NTuple NewvarNode NullException Nullable Number ObjectIdDict OrdinalRange OutOfMemoryError OverflowError Pair ParseError PartialQuickSort PermutedDimsArray Pipe PollingFileWatcher ProcessExitedException Ptr QuoteNode RandomDevice Range RangeIndex Rational RawFD ReadOnlyMemoryError Real ReentrantLock Ref Regex RegexMatch RemoteChannel RemoteException RevString RoundingMode RowVector SSAValue SegmentationFault SerializationState Set SharedArray SharedMatrix SharedVector Signed SimpleVector Slot SlotNumber SparseMatrixCSC SparseVector StackFrame StackOverflowError StackTrace StepRange StepRangeLen StridedArray StridedMatrix StridedVecOrMat StridedVector String SubArray SubString SymTridiagonal Symbol Symmetric SystemError TCPSocket Task Text TextDisplay Timer Tridiagonal Tuple Type TypeError TypeMapEntry TypeMapLevel TypeName TypeVar TypedSlot UDPSocket UInt UInt128 UInt16 UInt32 UInt64 UInt8 UndefRefError UndefVarError UnicodeError UniformScaling Union UnionAll UnitRange Unsigned UpperTriangular Val Vararg VecElement VecOrMat Vector VersionNumber Void WeakKeyDict WeakRef WorkerConfig WorkerPool "},a={keywords:t,illegal:/<\//},n={className:"subst",begin:/\$\(/,end:/\)/,keywords:t},o={className:"variable",begin:"\\$"+r},i={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],variants:[{begin:/\w*"""/,end:/"""\w*/,relevance:10},{begin:/\w*"/,end:/"\w*/}]},l={className:"string",contains:[e.BACKSLASH_ESCAPE,n,o],begin:"`",end:"`"},s={className:"meta",begin:"@"+r};return a.name="Julia",a.contains=[{className:"number",begin:/(\b0x[\d_]*(\.[\d_]*)?|0x\.\d[\d_]*)p[-+]?\d+|\b0[box][a-fA-F0-9][a-fA-F0-9_]*|(\b\d[\d_]*(\.[\d_]*)?|\.\d[\d_]*)([eEfF][-+]?\d+)?/,relevance:0},{className:"string",begin:/'(.|\\[xXuU][a-zA-Z0-9]+)'/},i,l,s,{className:"comment",variants:[{begin:"#=",end:"=#",relevance:10},{begin:"#",end:"$"}]},e.HASH_COMMENT_MODE,{className:"keyword",begin:"\\b(((abstract|primitive)\\s+)type|(mutable\\s+)?struct)\\b"},{begin:/<:/}],n.contains=a.contains,a}}());hljs.registerLanguage("php-template",function(){"use strict";return function(n){return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/,end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null,contains:null,skip:!0})]}]}}}());hljs.registerLanguage("scss",function(){"use strict";return function(e){var t={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b"},i={className:"number",begin:"#[0-9A-Fa-f]+"};return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0,illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{className:"selector-tag",begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b",relevance:0},{className:"selector-pseudo",begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)"},{className:"selector-pseudo",begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)"},t,{className:"attribute",begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b",illegal:"[^\\s]"},{begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b"},{begin:":",end:";",contains:[t,i,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0,keywords:"and or not only",contains:[{begin:"@[a-z-]+",className:"keyword"},t,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,i,e.CSS_NUMBER_MODE]}]}}}());hljs.registerLanguage("r",function(){"use strict";return function(e){var n="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{name:"R",contains:[e.HASH_COMMENT_MODE,{begin:n,keywords:{$pattern:n,keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},relevance:0},{className:"number",begin:"0[xX][0-9a-fA-F]+[Li]?\\b",relevance:0},{className:"number",begin:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",relevance:0},{className:"number",begin:"\\d+\\.(?!\\d)(?:i\\b)?",relevance:0},{className:"number",begin:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{className:"number",begin:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",relevance:0},{begin:"`",end:"`",relevance:0},{className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:'"',end:'"'},{begin:"'",end:"'"}]}]}}}());hljs.registerLanguage("sql",function(){"use strict";return function(e){var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0,illegal:/[<>{}*]/,contains:[{beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with",end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/,keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null unknown",built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void"},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{className:"string",begin:"`",end:"`"},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}());hljs.registerLanguage("c",function(){"use strict";return function(e){var n=e.getLanguage("c-like").rawDefinition();return n.name="C",n.aliases=["c","h"],n}}());hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());hljs.registerLanguage("python-repl",function(){"use strict";return function(n){return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{begin:/^\.\.\.(?=[ ]|$)/}]}]}}}());hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());hljs.registerLanguage("javascript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);function s(e){return r("(?=",e,")")}function r(...e){return e.map(e=>(function(e){return e?"string"==typeof e?e:e.source:null})(e)).join("")}return function(t){var i="[A-Za-z$_][0-9A-Za-z$_]*",c={begin:/<[A-Za-z0-9\\._:-]+/,end:/\/[A-Za-z0-9\\._:-]+>|\/>/},o={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.join(" "),literal:n.join(" "),built_in:a.join(" ")},l={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:t.C_NUMBER_RE+"n?"}],relevance:0},E={className:"subst",begin:"\\$\\{",end:"\\}",keywords:o,contains:[]},d={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"xml"}},g={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[t.BACKSLASH_ESCAPE,E],subLanguage:"css"}},u={className:"string",begin:"`",end:"`",contains:[t.BACKSLASH_ESCAPE,E]};E.contains=[t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,l,t.REGEXP_MODE];var b=E.contains.concat([{begin:/\(/,end:/\)/,contains:["self"].concat(E.contains,[t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE])},t.C_BLOCK_COMMENT_MODE,t.C_LINE_COMMENT_MODE]),_={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:b};return{name:"JavaScript",aliases:["js","jsx","mjs","cjs"],keywords:o,contains:[t.SHEBANG({binary:"node",relevance:5}),{className:"meta",relevance:10,begin:/^\s*['"]use (strict|asm)['"]/},t.APOS_STRING_MODE,t.QUOTE_STRING_MODE,d,g,u,t.C_LINE_COMMENT_MODE,t.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type",begin:"\\{",end:"\\}",relevance:0},{className:"variable",begin:i+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/,relevance:0}]}]}),t.C_BLOCK_COMMENT_MODE,l,{begin:r(/[{,\n]\s*/,s(r(/(((\/\/.*)|(\/\*(.|\n)*\*\/))\s*)*/,i+"\\s*:"))),relevance:0,contains:[{className:"attr",begin:i+s("\\s*:"),relevance:0}]},{begin:"("+t.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[t.C_LINE_COMMENT_MODE,t.C_BLOCK_COMMENT_MODE,t.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+t.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:t.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:o,contains:b}]}]},{begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{begin:"<>",end:"</>"},{begin:c.begin,end:c.end}],subLanguage:"xml",contains:[{begin:c.begin,end:c.end,skip:!0,contains:["self"]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/\{/,excludeEnd:!0,contains:[t.inherit(t.TITLE_MODE,{begin:i}),_],illegal:/\[|%/},{begin:/\$[(.]/},t.METHOD_GUARD,{className:"class",beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{beginKeywords:"extends"},t.UNDERSCORE_TITLE_MODE]},{beginKeywords:"constructor",end:/\{/,excludeEnd:!0},{begin:"(get|set)\\s+(?="+i+"\\()",end:/{/,keywords:"get set",contains:[t.inherit(t.TITLE_MODE,{begin:i}),{begin:/\(\)/},_]}],illegal:/#(?!!)/}}}());hljs.registerLanguage("typescript",function(){"use strict";const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]);return function(r){var t={$pattern:"[A-Za-z$_][0-9A-Za-z$_]*",keyword:e.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "),literal:n.join(" "),built_in:a.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ")},s={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},i={className:"number",variants:[{begin:"\\b(0[bB][01]+)n?"},{begin:"\\b(0[oO][0-7]+)n?"},{begin:r.C_NUMBER_RE+"n?"}],relevance:0},o={className:"subst",begin:"\\$\\{",end:"\\}",keywords:t,contains:[]},c={begin:"html`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"xml"}},l={begin:"css`",end:"",starts:{end:"`",returnEnd:!1,contains:[r.BACKSLASH_ESCAPE,o],subLanguage:"css"}},E={className:"string",begin:"`",end:"`",contains:[r.BACKSLASH_ESCAPE,o]};o.contains=[r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,i,r.REGEXP_MODE];var d={begin:"\\(",end:/\)/,keywords:t,contains:["self",r.QUOTE_STRING_MODE,r.APOS_STRING_MODE,r.NUMBER_MODE]},u={className:"params",begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,s,d]};return{name:"TypeScript",aliases:["ts"],keywords:t,contains:[r.SHEBANG(),{className:"meta",begin:/^\s*['"]use strict['"]/},r.APOS_STRING_MODE,r.QUOTE_STRING_MODE,c,l,E,r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,i,{begin:"("+r.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*",keywords:"return throw case",contains:[r.C_LINE_COMMENT_MODE,r.C_BLOCK_COMMENT_MODE,r.REGEXP_MODE,{className:"function",begin:"(\\([^(]*(\\([^(]*(\\([^(]*\\))?\\))?\\)|"+r.UNDERSCORE_IDENT_RE+")\\s*=>",returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{begin:r.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:t,contains:d.contains}]}]}],relevance:0},{className:"function",beginKeywords:"function",end:/[\{;]/,excludeEnd:!0,keywords:t,contains:["self",r.inherit(r.TITLE_MODE,{begin:"[A-Za-z$_][0-9A-Za-z$_]*"}),u],illegal:/%/,relevance:0},{beginKeywords:"constructor",end:/[\{;]/,excludeEnd:!0,contains:["self",u]},{begin:/module\./,keywords:{built_in:"module"},relevance:0},{beginKeywords:"module",end:/\{/,excludeEnd:!0},{beginKeywords:"interface",end:/\{/,excludeEnd:!0,keywords:"interface extends"},{begin:/\$[(.]/},{begin:"\\."+r.IDENT_RE,relevance:0},s,d]}}}());hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());hljs.registerLanguage("less",function(){"use strict";return function(e){var n="([\\w-]+|@{[\\w-]+})",a=[],s=[],t=function(e){return{className:"string",begin:"~?"+e+".*?"+e}},r=function(e,n,a){return{className:e,begin:n,relevance:a}},i={begin:"\\(",end:"\\)",contains:s,relevance:0};s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t("'"),t('"'),e.CSS_NUMBER_MODE,{begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]",excludeEnd:!0}},r("number","#[0-9A-Fa-f]+\\b"),i,r("variable","@@?[\\w-]+",10),r("variable","@{[\\w-]+}"),r("built_in","~?`[^`]*?`"),{className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0},{className:"meta",begin:"!important"});var c=s.concat({begin:"{",end:"}",contains:a}),l={beginKeywords:"when",endsWithParent:!0,contains:[{beginKeywords:"and not"}].concat(s)},o={begin:n+"\\s*:",returnBegin:!0,end:"[;}]",relevance:0,contains:[{className:"attribute",begin:n,end:":",excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s}}]},g={className:"keyword",begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{end:"[;{}]",returnEnd:!0,contains:s,relevance:0}},d={className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:c}},b={variants:[{begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:n,end:"{"}],returnBegin:!0,returnEnd:!0,illegal:"[<='$\"]",relevance:0,contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,l,r("keyword","all\\b"),r("variable","@{[\\w-]+}"),r("selector-tag",n+"%?",0),r("selector-id","#"+n),r("selector-class","\\."+n,0),r("selector-tag","&",0),{className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo",begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"\\(",end:"\\)",contains:c},{begin:"!important"}]};return a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,d,o,b),{name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:a}}}());hljs.registerLanguage("lua",function(){"use strict";return function(e){var t={begin:"\\[=*\\[",end:"\\]=*\\]",contains:["self"]},a=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[","\\]=*\\]",{contains:[t],relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE,literal:"true false nil",keyword:"and break do else elseif end for goto if in local not or repeat return then until while",built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove"},contains:a.concat([{className:"function",beginKeywords:"function",end:"\\)",contains:[e.inherit(e.TITLE_MODE,{begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params",begin:"\\(",endsWithParent:!0,contains:a}].concat(a)},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string",begin:"\\[=*\\[",end:"\\]=*\\]",contains:[t],relevance:5}])}}}());
book/theme/index.hbs+87−51
@@ -1,11 +1,11 @@
11<!DOCTYPE HTML>
2−<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
2+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
33 <head>
44 <!-- Book generated using mdBook -->
55 <meta charset="UTF-8">
66 <title>{{ title }}</title>
77 {{#if is_print }}
8− <meta name="robots" content="noindex" />
8+ <meta name="robots" content="noindex">
99 {{/if}}
1010 {{#if base_url}}
1111 <base href="{{ base_url }}">
@@ -15,10 +15,9 @@
1515 <!-- Custom HTML head -->
1616 {{> head}}
1717
18− <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
1918 <meta name="description" content="{{ description }}">
2019 <meta name="viewport" content="width=device-width, initial-scale=1">
21− <meta name="theme-color" content="#ffffff" />
20+ <meta name="theme-color" content="#ffffff">
2221
2322 {{#if favicon_svg}}
2423 <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -35,8 +34,6 @@
3534
3635 <!-- Fonts -->
3736 <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
38− <link rel="preconnect" href="https://fonts.gstatic.com">
39− <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;400;500;700&display=swap" rel="stylesheet">
4037 {{#if copy_fonts}}
4138 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
4239 {{/if}}
@@ -53,18 +50,19 @@
5350
5451 {{#if mathjax_support}}
5552 <!-- MathJax -->
56− <script async type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
53+ <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
5754 {{/if}}
5855 </head>
59− <body>
56+ <body class="sidebar-visible no-js">
57+ <div id="body-container">
6058 <!-- Provide site root to javascript -->
61− <script type="text/javascript">
59+ <script>
6260 var path_to_root = "{{ path_to_root }}";
6361 var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
6462 </script>
6563
6664 <!-- Work around some values being stored in localStorage wrapped in quotes -->
67− <script type="text/javascript">
65+ <script>
6866 try {
6967 var theme = localStorage.getItem('mdbook-theme');
7068 var sidebar = localStorage.getItem('mdbook-sidebar');
@@ -80,27 +78,34 @@
8078 </script>
8179
8280 <!-- Set the theme before any content is loaded, prevents flash -->
83− <script type="text/javascript">
81+ <script>
8482 var theme;
8583 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
8684 if (theme === null || theme === undefined) { theme = default_theme; }
8785 var html = document.querySelector('html');
88− html.classList.remove('no-js')
8986 html.classList.remove('{{ default_theme }}')
9087 html.classList.add(theme);
91− html.classList.add('js');
88+ var body = document.querySelector('body');
89+ body.classList.remove('no-js')
90+ body.classList.add('js');
9291 </script>
9392
93+ <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
94+
9495 <!-- Hide / unhide sidebar before it is displayed -->
95− <script type="text/javascript">
96− var html = document.querySelector('html');
97− var sidebar = 'hidden';
96+ <script>
97+ var body = document.querySelector('body');
98+ var sidebar = null;
99+ var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
98100 if (document.body.clientWidth >= 1080) {
99101 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
100102 sidebar = sidebar || 'visible';
103+ } else {
104+ sidebar = 'hidden';
101105 }
102− html.classList.remove('sidebar-visible');
103− html.classList.add("sidebar-" + sidebar);
106+ sidebar_toggle.checked = sidebar === 'visible';
107+ body.classList.remove('sidebar-visible');
108+ body.classList.add("sidebar-" + sidebar);
104109 </script>
105110
106111 <nav id="sidebar" class="sidebar" aria-label="Table of contents">
@@ -110,26 +115,48 @@
110115 <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
111116 </nav>
112117
118+ <!-- Track and set sidebar scroll position -->
119+ <script>
120+ var sidebarScrollbox = document.querySelector('#sidebar .sidebar-scrollbox');
121+ sidebarScrollbox.addEventListener('click', function(e) {
122+ if (e.target.tagName === 'A') {
123+ sessionStorage.setItem('sidebar-scroll', sidebarScrollbox.scrollTop);
124+ }
125+ }, { passive: true });
126+ var sidebarScrollTop = sessionStorage.getItem('sidebar-scroll');
127+ sessionStorage.removeItem('sidebar-scroll');
128+ if (sidebarScrollTop) {
129+ // preserve sidebar scroll position when navigating via links within sidebar
130+ sidebarScrollbox.scrollTop = sidebarScrollTop;
131+ } else {
132+ // scroll sidebar to current active section when navigating via "next/previous chapter" buttons
133+ var activeSection = document.querySelector('#sidebar .active');
134+ if (activeSection) {
135+ activeSection.scrollIntoView({ block: 'center' });
136+ }
137+ }
138+ </script>
139+
113140 <div id="page-wrapper" class="page-wrapper">
114141
115142 <div class="page">
116143 {{> header}}
117144 <div id="menu-bar-hover-placeholder"></div>
118− <div id="menu-bar" class="menu-bar sticky bordered">
145+ <div id="menu-bar" class="menu-bar sticky">
119146 <div class="left-buttons">
120− <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
147+ <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
121148 <i class="fa fa-bars"></i>
122− </button>
149+ </label>
123150 <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
124151 <i class="fa fa-paint-brush"></i>
125152 </button>
126153 <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
127− <li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>
128− <li role="none"><button role="menuitem" class="theme" id="rust">{{ theme_option "Rust" }}</button></li>
129− <li role="none"><button role="menuitem" class="theme" id="coal">{{ theme_option "Coal" }}</button></li>
130− <li role="none"><button role="menuitem" class="theme" id="navy">{{ theme_option "Navy" }}</button></li>
131− <li role="none"><button role="menuitem" class="theme" id="ayu">{{ theme_option "Ayu" }}</button></li>
132− <li role="none"><button role="menuitem" class="theme" id="colibri">{{ theme_option "Colibri" }}</button></li>
154+ <li role="none"><button role="menuitem" class="theme" id="light">Light</button></li>
155+ <li role="none"><button role="menuitem" class="theme" id="rust">Rust</button></li>
156+ <li role="none"><button role="menuitem" class="theme" id="coal">Coal</button></li>
157+ <li role="none"><button role="menuitem" class="theme" id="navy">Navy</button></li>
158+ <li role="none"><button role="menuitem" class="theme" id="ayu">Ayu</button></li>
159+ <li role="none"><button role="menuitem" class="theme" id="colibri">Colibri</button></li>
133160 </ul>
134161 {{#if search_enabled}}
135162 <button id="search-toggle" class="icon-button" type="button" title="Search. (Shortkey: s)" aria-label="Toggle Searchbar" aria-expanded="false" aria-keyshortcuts="S" aria-controls="searchbar">
@@ -151,13 +178,19 @@
151178 <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
152179 </a>
153180 {{/if}}
181+ {{#if git_repository_edit_url}}
182+ <a href="{{git_repository_edit_url}}" title="Suggest an edit" aria-label="Suggest an edit">
183+ <i id="git-edit-button" class="fa fa-edit"></i>
184+ </a>
185+ {{/if}}
186+
154187 </div>
155188 </div>
156189
157190 {{#if search_enabled}}
158191 <div id="search-wrapper" class="hidden">
159192 <form id="searchbar-outer" class="searchbar-outer">
160− <input type="search" name="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
193+ <input type="search" id="searchbar" name="searchbar" placeholder="Search this book ..." aria-controls="searchresults-outer" aria-describedby="searchresults-header">
161194 </form>
162195 <div id="searchresults-outer" class="searchresults-outer hidden">
163196 <div id="searchresults-header" class="searchresults-header"></div>
@@ -168,7 +201,7 @@
168201 {{/if}}
169202
170203 <!-- Apply ARIA attributes after the sidebar and the sidebar toggle button are added to the DOM -->
171− <script type="text/javascript">
204+ <script>
172205 document.getElementById('sidebar-toggle').setAttribute('aria-expanded', sidebar === 'visible');
173206 document.getElementById('sidebar').setAttribute('aria-hidden', sidebar !== 'visible');
174207 Array.from(document.querySelectorAll('#sidebar a')).forEach(function(link) {
@@ -190,7 +223,7 @@
190223 {{/previous}}
191224
192225 {{#next}}
193− <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
226+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
194227 <i class="fa fa-angle-right"></i>
195228 </a>
196229 {{/next}}
@@ -208,7 +241,7 @@
208241 {{/previous}}
209242
210243 {{#next}}
211− <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
244+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
212245 <i class="fa fa-angle-right"></i>
213246 </a>
214247 {{/next}}
@@ -216,10 +249,12 @@
216249
217250 </div>
218251
219− {{#if livereload}}
252+ {{#if live_reload_endpoint}}
220253 <!-- Livereload script (if served using the cli tool) -->
221− <script type="text/javascript">
222− var socket = new WebSocket("{{{livereload}}}");
254+ <script>
255+ const wsProtocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
256+ const wsAddress = wsProtocol + "//" + location.host + "/" + "{{{live_reload_endpoint}}}";
257+ const socket = new WebSocket(wsAddress);
223258 socket.onmessage = function (event) {
224259 if (event.data === "reload") {
225260 socket.close();
@@ -235,7 +270,7 @@
235270
236271 {{#if google_analytics}}
237272 <!-- Google Analytics Tag -->
238− <script type="text/javascript">
273+ <script>
239274 var localAddrs = ["localhost", "127.0.0.1", ""];
240275
241276 // make sure we don't activate google analytics if the developer is
@@ -253,43 +288,43 @@
253288 {{/if}}
254289
255290 {{#if playground_line_numbers}}
256− <script type="text/javascript">
291+ <script>
257292 window.playground_line_numbers = true;
258293 </script>
259294 {{/if}}
260295
261296 {{#if playground_copyable}}
262− <script type="text/javascript">
297+ <script>
263298 window.playground_copyable = true;
264299 </script>
265300 {{/if}}
266301
267302 {{#if playground_js}}
268− <script src="{{ path_to_root }}ace.js" type="text/javascript" charset="utf-8"></script>
269− <script src="{{ path_to_root }}editor.js" type="text/javascript" charset="utf-8"></script>
270− <script src="{{ path_to_root }}mode-rust.js" type="text/javascript" charset="utf-8"></script>
271− <script src="{{ path_to_root }}theme-dawn.js" type="text/javascript" charset="utf-8"></script>
272− <script src="{{ path_to_root }}theme-tomorrow_night.js" type="text/javascript" charset="utf-8"></script>
303+ <script src="{{ path_to_root }}ace.js"></script>
304+ <script src="{{ path_to_root }}editor.js"></script>
305+ <script src="{{ path_to_root }}mode-rust.js"></script>
306+ <script src="{{ path_to_root }}theme-dawn.js"></script>
307+ <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
273308 {{/if}}
274309
275310 {{#if search_js}}
276− <script src="{{ path_to_root }}elasticlunr.min.js" type="text/javascript" charset="utf-8"></script>
277− <script src="{{ path_to_root }}mark.min.js" type="text/javascript" charset="utf-8"></script>
278− <script src="{{ path_to_root }}searcher.js" type="text/javascript" charset="utf-8"></script>
311+ <script src="{{ path_to_root }}elasticlunr.min.js"></script>
312+ <script src="{{ path_to_root }}mark.min.js"></script>
313+ <script src="{{ path_to_root }}searcher.js"></script>
279314 {{/if}}
280315
281− <script src="{{ path_to_root }}clipboard.min.js" type="text/javascript" charset="utf-8"></script>
282− <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
283− <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
316+ <script src="{{ path_to_root }}clipboard.min.js"></script>
317+ <script src="{{ path_to_root }}highlight.js"></script>
318+ <script src="{{ path_to_root }}book.js"></script>
284319
285320 <!-- Custom JS scripts -->
286321 {{#each additional_js}}
287− <script type="text/javascript" src="{{ ../path_to_root }}{{this}}"></script>
322+ <script src="{{ ../path_to_root }}{{this}}"></script>
288323 {{/each}}
289324
290325 {{#if is_print}}
291326 {{#if mathjax_support}}
292− <script type="text/javascript">
327+ <script>
293328 window.addEventListener('load', function() {
294329 MathJax.Hub.Register.StartupHook('End', function() {
295330 window.setTimeout(window.print, 100);
@@ -297,7 +332,7 @@
297332 });
298333 </script>
299334 {{else}}
300− <script type="text/javascript">
335+ <script>
301336 window.addEventListener('load', function() {
302337 window.setTimeout(window.print, 100);
303338 });
@@ -305,5 +340,6 @@
305340 {{/if}}
306341 {{/if}}
307342
343+ </div>
308344 </body>
309345</html>
contrib/Helix.appdata.xml+15
@@ -5,6 +5,7 @@
55 <project_license>MPL-2.0</project_license>
66 <name>Helix</name>
77 <summary>A post-modern text editor</summary>
8+ <summary xml:lang="ar">مُحَرِّرُ نُصُوصٍ سَابِقٌ لِعَهدِه</summary>
89
910 <description>
1011 <p>
@@ -17,6 +18,17 @@
1718 <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
1819 </ul>
1920 </description>
21+ <description xml:lang="ar">
22+ <p>
23+ مُحَرِّرُ نُصُوصٍ يَعمَلُ فِي الطَّرَفِيَّة، مُستَلهَمٌ مِن Kakoune وَ Neovim وَمَكتُوبٌ بِلُغَةِ رَست البَرمَجِيَّة.
24+ </p>
25+ <ul>
26+ <li>تَحرِيرٌ وَضعِيٌّ شَبيهٌ بِـVim</li>
27+ <li>تَحدِيدَاتٌ لِلنَّصِ مُتَعَدِّدَة</li>
28+ <li>دَعْمٌ مُدمَجٌ لِخَوادِمِ اللُّغَات</li>
29+ <li>تَحرِيرُ التَّعلِيمَاتِ البَّرمَجِيَّةِ مَعَ تَمييزٍ لِلتَّركِيبِ النَّحُويِّ بِواسِطَةِ tree-sitter</li>
30+ </ul>
31+ </description>
2032
2133 <launchable type="desktop-id">Helix.desktop</launchable>
2234
@@ -36,6 +48,9 @@
3648 <content_rating type="oars-1.1" />
3749
3850 <releases>
51+ <release version="23.10" date="2023-10-24">
52+ <url>https://helix-editor.com/news/release-23-10-highlights/</url>
53+ </release>
3954 <release version="23.05" date="2023-05-18">
4055 <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
4156 </release>
contrib/Helix.desktop+3−1
@@ -1,6 +1,7 @@
11[Desktop Entry]
22Name=Helix
33GenericName=Text Editor
4+GenericName[ar]=مُحَرِّرُ نُصُوص
45GenericName[de]=Texteditor
56GenericName[fr]=Éditeur de texte
67GenericName[ru]=Текстовый редактор
@@ -9,7 +10,7 @@ GenericName[tr]=Metin Düzenleyici
910Comment=Edit text files
1011Comment[af]=Redigeer tekslêers
1112Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
12−Comment[ar]=حرّر ملفات نصية
13+Comment[ar]=مُحَرِّرُ مِلَفَّاتٍ نَصِّيَّة
1314Comment[az]=Mətn fayllarını redaktə edin
1415Comment[be]=Рэдагаваньне тэкставых файлаў
1516Comment[bg]=Редактиране на текстови файлове
@@ -79,6 +80,7 @@ Exec=hx %F
7980Terminal=true
8081Type=Application
8182Keywords=Text;editor;
83+Keywords[ar]=نص;نصوص;محرر;
8284Keywords[fr]=Texte;éditeur;
8385Keywords[ru]=текст;текстовый редактор;
8486Keywords[sr]=Текст;едитор;
docs/CONTRIBUTING.md+10−3
@@ -29,9 +29,15 @@ files, run
2929cargo xtask docgen
3030```
3131
32−inside the project. We use [xtask][xtask] as an ad-hoc task runner and
33−thus do not require any dependencies other than `cargo` (You don't have
34−to `cargo install` anything either).
32+inside the project. We use [xtask][xtask] as an ad-hoc task runner.
33+
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).
3541
3642# Testing
3743
@@ -58,4 +64,5 @@ The current MSRV and future changes to the MSRV are listed in the [Firefox docum
5864[architecture.md]: ./architecture.md
5965[docs]: https://docs.helix-editor.com/
6066[xtask]: https://github.com/matklad/cargo-xtask
67+[mdbook]: https://rust-lang.github.io/mdBook/guide/installation.html
6168[helpers.rs]: ../helix-term/tests/test/helpers.rs
docs/releases.md+12−5
@@ -1,16 +1,23 @@
11## Checklist
22
33Helix releases are versioned in the Calendar Versioning scheme:
4−`YY.0M(.MICRO)`, for example, `22.05` for May of 2022. In these instructions
5−we'll use `<tag>` as a placeholder for the tag being published.
4+`YY.0M(.MICRO)`, for example, `22.05` for May of 2022, or in a patch release,
5+`22.05.1`. In these instructions we'll use `<tag>` as a placeholder for the tag
6+being published.
67
78* Merge the changelog PR
89* Add new `<release>` entry in `contrib/Helix.appdata.xml` with release information according to the [AppStream spec](https://www.freedesktop.org/software/appstream/docs/sect-Metadata-Releases.html)
910* Tag and push
1011 * `git tag -s -m "<tag>" -a <tag> && git push`
1112 * Make sure to switch to master and pull first
12−* Edit the `VERSION` file and change the date to the next planned release
13− * Releases are planned to happen every two months, so `22.05` would change to `22.07`
13+* Edit the `Cargo.toml` file and change the date in the `version` field to the next planned release
14+ * Due to Cargo having a strict requirement on SemVer with 3 or more version
15+ numbers, a `0` is required in the micro version; however, unless we are
16+ publishing a patch release after a major release, the `.0` is dropped in
17+ the user facing version.
18+ * Releases are planned to happen every two months, so `22.05.0` would change to `22.07.0`
19+ * If we are pushing a patch/bugfix release in the same month as the previous
20+ release, bump the micro version, e.g. `22.07.0` to `22.07.1`
1421* Wait for the Release CI to finish
1522 * It will automatically turn the git tag into a GitHub release when it uploads artifacts
1623* Edit the new release
@@ -57,4 +64,4 @@ versions for convenience:
5764> release. For the full log, check out the git log.
5865
5966Typically, small changes like dependencies or documentation updates, refactors,
60−or meta changes like GitHub Actions work are left out.
67+or meta changes like GitHub Actions work are left out.
docs/vision.md+1−1
@@ -20,5 +20,5 @@ Vision statements are all well and good, but are also vague and subjective. Her
2020* **Built-in tools** for working with code bases efficiently. Most projects aren't a single file, and an editor should handle that as a first-class use case. In Helix's case, this means (among other things) a fuzzy-search file navigator and LSP support.
2121* **Edit anything** that comes up when coding, within reason. Whether it's a 200 MB XML file, a megabyte of minified javascript on a single line, or Japanese text encoded in ShiftJIS, you should be able to open it and edit it without problems. (Note: this doesn't mean handle every esoteric use case. Sometimes you do just need a specialized tool, and Helix isn't that.)
2222* **Configurable**, within reason. Although the defaults should be good, not everyone will agree on what "good" is. Within the bounds of Helix's core interaction models, it should be reasonably configurable so that it can be "good" for more people. This means, for example, custom key maps among other things.
23−* **Extensible**, within reason. Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor. The basics should be built-in, but you should be able to extend it with additional functionality as needed. Right now we're thinking Wasm-based plugins.
23+* **Extensible**, within reason. Although we want Helix to be productive out-of-the-box, it's not practical or desirable to cram every useful feature and use case into the core editor. The basics should be built-in, but you should be able to extend it with additional functionality as needed.
2424* **Clean code base.** Sometimes other factors (e.g. significant performance gains, important features, correctness, etc.) will trump strict readability, but we nevertheless want to keep the code base straightforward and easy to understand to the extent we can.
flake.lock+21−237
@@ -1,126 +1,22 @@
11{
22 "nodes": {
33 "crane": {
4− "flake": false,
5− "locked": {
6− "lastModified": 1681175776,
7− "narHash": "sha256-7SsUy9114fryHAZ8p1L6G6YSu7jjz55FddEwa2U8XZc=",
8− "owner": "ipetkov",
9− "repo": "crane",
10− "rev": "445a3d222947632b5593112bb817850e8a9cf737",
11− "type": "github"
12− },
13− "original": {
14− "owner": "ipetkov",
15− "ref": "v0.12.1",
16− "repo": "crane",
17− "type": "github"
18− }
19− },
20− "dream2nix": {
214 "inputs": {
22− "all-cabal-json": [
23− "nci"
24− ],
25− "crane": "crane",
26− "devshell": [
27− "nci"
28− ],
29− "drv-parts": "drv-parts",
30− "flake-compat": "flake-compat",
31− "flake-parts": [
32− "nci",
33− "parts"
34− ],
35− "flake-utils-pre-commit": [
36− "nci"
37− ],
38− "ghc-utils": [
39− "nci"
40− ],
41− "gomod2nix": [
42− "nci"
43− ],
44− "mach-nix": [
45− "nci"
46− ],
47− "nix-pypi-fetcher": [
48− "nci"
49− ],
505 "nixpkgs": [
51− "nci",
526 "nixpkgs"
53− ],
54− "nixpkgsV1": "nixpkgsV1",
55− "poetry2nix": [
56− "nci"
57− ],
58− "pre-commit-hooks": [
59− "nci"
60− ],
61− "pruned-racket-catalog": [
62− "nci"
637 ]
648 },
659 "locked": {
66− "lastModified": 1683212002,
67− "narHash": "sha256-EObtqyQsv9v+inieRY5cvyCMCUI5zuU5qu+1axlJCPM=",
68− "owner": "nix-community",
69− "repo": "dream2nix",
70− "rev": "fbfb09d2ab5ff761d822dd40b4a1def81651d096",
71− "type": "github"
72− },
73− "original": {
74− "owner": "nix-community",
75− "repo": "dream2nix",
76− "type": "github"
77− }
78− },
79− "drv-parts": {
80− "inputs": {
81− "flake-compat": [
82− "nci",
83− "dream2nix",
84− "flake-compat"
85− ],
86− "flake-parts": [
87− "nci",
88− "dream2nix",
89− "flake-parts"
90− ],
91− "nixpkgs": [
92− "nci",
93− "dream2nix",
94− "nixpkgs"
95− ]
96− },
97− "locked": {
98− "lastModified": 1680698112,
99− "narHash": "sha256-FgnobN/DvCjEsc0UAZEAdPLkL4IZi2ZMnu2K2bUaElc=",
100− "owner": "davhau",
101− "repo": "drv-parts",
102− "rev": "e8c2ec1157dc1edb002989669a0dbd935f430201",
103− "type": "github"
104− },
105− "original": {
106− "owner": "davhau",
107− "repo": "drv-parts",
108− "type": "github"
109− }
110− },
111− "flake-compat": {
112− "flake": false,
113− "locked": {
114− "lastModified": 1673956053,
115− "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
116− "owner": "edolstra",
117− "repo": "flake-compat",
118− "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
10+ "lastModified": 1701025348,
11+ "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
12+ "owner": "ipetkov",
13+ "repo": "crane",
14+ "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
11915 "type": "github"
12016 },
12117 "original": {
122− "owner": "edolstra",
123− "repo": "flake-compat",
18+ "owner": "ipetkov",
19+ "repo": "crane",
12420 "type": "github"
12521 }
12622 },
@@ -129,11 +25,11 @@
12925 "systems": "systems"
13026 },
13127 "locked": {
132− "lastModified": 1681202837,
133− "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
28+ "lastModified": 1694529238,
29+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
13430 "owner": "numtide",
13531 "repo": "flake-utils",
136− "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
32+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
13733 "type": "github"
13834 },
13935 "original": {
@@ -142,55 +38,13 @@
14238 "type": "github"
14339 }
14440 },
145− "mk-naked-shell": {
146− "flake": false,
147− "locked": {
148− "lastModified": 1681286841,
149− "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=",
150− "owner": "yusdacra",
151− "repo": "mk-naked-shell",
152− "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd",
153− "type": "github"
154− },
155− "original": {
156− "owner": "yusdacra",
157− "repo": "mk-naked-shell",
158− "type": "github"
159− }
160− },
161− "nci": {
162− "inputs": {
163− "dream2nix": "dream2nix",
164− "mk-naked-shell": "mk-naked-shell",
165− "nixpkgs": [
166− "nixpkgs"
167− ],
168− "parts": "parts",
169− "rust-overlay": [
170− "rust-overlay"
171− ]
172− },
173− "locked": {
174− "lastModified": 1683699050,
175− "narHash": "sha256-UWKQpzVcSshB+sU2O8CCHjOSTQrNS7Kk9V3+UeBsJpg=",
176− "owner": "yusdacra",
177− "repo": "nix-cargo-integration",
178− "rev": "ed27173cd1b223f598343ea3c15aacb1d140feac",
179− "type": "github"
180− },
181− "original": {
182− "owner": "yusdacra",
183− "repo": "nix-cargo-integration",
184− "type": "github"
185− }
186− },
18741 "nixpkgs": {
18842 "locked": {
189− "lastModified": 1683408522,
190− "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
43+ "lastModified": 1700794826,
44+ "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
19145 "owner": "nixos",
19246 "repo": "nixpkgs",
193− "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
47+ "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
19448 "type": "github"
19549 },
19650 "original": {
@@ -200,99 +54,29 @@
20054 "type": "github"
20155 }
20256 },
203− "nixpkgs-lib": {
204− "locked": {
205− "dir": "lib",
206− "lastModified": 1682879489,
207− "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
208− "owner": "NixOS",
209− "repo": "nixpkgs",
210− "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
211− "type": "github"
212− },
213− "original": {
214− "dir": "lib",
215− "owner": "NixOS",
216− "ref": "nixos-unstable",
217− "repo": "nixpkgs",
218− "type": "github"
219− }
220− },
221− "nixpkgsV1": {
222− "locked": {
223− "lastModified": 1678500271,
224− "narHash": "sha256-tRBLElf6f02HJGG0ZR7znMNFv/Uf7b2fFInpTHiHaSE=",
225− "owner": "NixOS",
226− "repo": "nixpkgs",
227− "rev": "5eb98948b66de29f899c7fe27ae112a47964baf8",
228− "type": "github"
229− },
230− "original": {
231− "id": "nixpkgs",
232− "ref": "nixos-22.11",
233− "type": "indirect"
234− }
235− },
236− "parts": {
237− "inputs": {
238− "nixpkgs-lib": [
239− "nci",
240− "nixpkgs"
241− ]
242− },
243− "locked": {
244− "lastModified": 1683560683,
245− "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
246− "owner": "hercules-ci",
247− "repo": "flake-parts",
248− "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
249− "type": "github"
250− },
251− "original": {
252− "owner": "hercules-ci",
253− "repo": "flake-parts",
254− "type": "github"
255− }
256− },
257− "parts_2": {
258− "inputs": {
259− "nixpkgs-lib": "nixpkgs-lib"
260− },
261− "locked": {
262− "lastModified": 1683560683,
263− "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=",
264− "owner": "hercules-ci",
265− "repo": "flake-parts",
266− "rev": "006c75898cf814ef9497252b022e91c946ba8e17",
267− "type": "github"
268− },
269− "original": {
270− "owner": "hercules-ci",
271− "repo": "flake-parts",
272− "type": "github"
273− }
274− },
27557 "root": {
27658 "inputs": {
277− "nci": "nci",
59+ "crane": "crane",
60+ "flake-utils": "flake-utils",
27861 "nixpkgs": "nixpkgs",
279− "parts": "parts_2",
28062 "rust-overlay": "rust-overlay"
28163 }
28264 },
28365 "rust-overlay": {
28466 "inputs": {
285− "flake-utils": "flake-utils",
67+ "flake-utils": [
68+ "flake-utils"
69+ ],
28670 "nixpkgs": [
28771 "nixpkgs"
28872 ]
28973 },
29074 "locked": {
291− "lastModified": 1683771545,
292− "narHash": "sha256-we0GYcKTo2jRQGmUGrzQ9VH0OYAUsJMCsK8UkF+vZUA=",
75+ "lastModified": 1701137803,
76+ "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
29377 "owner": "oxalica",
29478 "repo": "rust-overlay",
295− "rev": "c57e210faf68e5d5386f18f1b17ad8365d25e4ed",
79+ "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
29680 "type": "github"
29781 },
29882 "original": {
flake.nix+170−143
@@ -3,166 +3,193 @@
33
44 inputs = {
55 nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
6+ flake-utils.url = "github:numtide/flake-utils";
67 rust-overlay = {
78 url = "github:oxalica/rust-overlay";
8− inputs.nixpkgs.follows = "nixpkgs";
9+ inputs = {
10+ nixpkgs.follows = "nixpkgs";
11+ flake-utils.follows = "flake-utils";
12+ };
913 };
10− nci = {
11− url = "github:yusdacra/nix-cargo-integration";
14+ crane = {
15+ url = "github:ipetkov/crane";
1216 inputs.nixpkgs.follows = "nixpkgs";
13− inputs.rust-overlay.follows = "rust-overlay";
1417 };
15− parts.url = "github:hercules-ci/flake-parts";
1618 };
1719
18− outputs = inp: let
19− mkRootPath = rel:
20− builtins.path {
21− path = "${toString ./.}/${rel}";
22− name = rel;
23− };
24− filteredSource = let
25− pathsToIgnore = [
26− ".envrc"
27− ".ignore"
28− ".github"
29− ".gitignore"
30− "logo.svg"
31− "logo_dark.svg"
32− "logo_light.svg"
33− "rust-toolchain.toml"
34− "rustfmt.toml"
35− "runtime"
36− "screenshot.png"
37− "book"
38− "contrib"
39− "docs"
40− "README.md"
41− "CHANGELOG.md"
42− "shell.nix"
43− "default.nix"
44− "grammars.nix"
45− "flake.nix"
46− "flake.lock"
47− ];
48− ignorePaths = path: type: let
49− inherit (inp.nixpkgs) lib;
50− # split the nix store path into its components
51− components = lib.splitString "/" path;
52− # drop off the `/nix/hash-source` section from the path
53− relPathComponents = lib.drop 4 components;
54− # reassemble the path components
55− relPath = lib.concatStringsSep "/" relPathComponents;
56− in
57− lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
58− in
59− builtins.path {
60− name = "helix-source";
61− path = toString ./.;
62− # filter out unnecessary paths
63− filter = ignorePaths;
20+ outputs = {
21+ self,
22+ nixpkgs,
23+ crane,
24+ flake-utils,
25+ rust-overlay,
26+ ...
27+ }:
28+ flake-utils.lib.eachDefaultSystem (system: let
29+ pkgs = import nixpkgs {
30+ inherit system;
31+ overlays = [(import rust-overlay)];
6432 };
65− in
66− inp.parts.lib.mkFlake {inputs = inp;} {
67− imports = [inp.nci.flakeModule inp.parts.flakeModules.easyOverlay];
68− systems = [
69− "x86_64-linux"
70− "x86_64-darwin"
71− "aarch64-linux"
72− "aarch64-darwin"
73− "i686-linux"
74− ];
75− perSystem = {
76− config,
77− pkgs,
78− lib,
79− ...
80− }: let
81− makeOverridableHelix = old: config: let
82− grammars = pkgs.callPackage ./grammars.nix config;
83− runtimeDir = pkgs.runCommand "helix-runtime" {} ''
84− mkdir -p $out
85− ln -s ${mkRootPath "runtime"}/* $out
86− rm -r $out/grammars
87− ln -s ${grammars} $out/grammars
88− '';
89− helix-wrapped =
90− pkgs.runCommand
91− old.name
92− {
93− inherit (old) pname version;
94− meta = old.meta or {};
95− passthru =
96− (old.passthru or {})
97− // {
98− unwrapped = old;
99− };
100− nativeBuildInputs = [pkgs.makeWrapper];
101− makeWrapperArgs = config.makeWrapperArgs or [];
102− }
103− ''
104− cp -rs --no-preserve=mode,ownership ${old} $out
105− wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
106− '';
33+ mkRootPath = rel:
34+ builtins.path {
35+ path = "${toString ./.}/${rel}";
36+ name = rel;
37+ };
38+ filteredSource = let
39+ pathsToIgnore = [
40+ ".envrc"
41+ ".ignore"
42+ ".github"
43+ ".gitignore"
44+ "logo_dark.svg"
45+ "logo_light.svg"
46+ "rust-toolchain.toml"
47+ "rustfmt.toml"
48+ "runtime"
49+ "screenshot.png"
50+ "book"
51+ "docs"
52+ "README.md"
53+ "CHANGELOG.md"
54+ "shell.nix"
55+ "default.nix"
56+ "grammars.nix"
57+ "flake.nix"
58+ "flake.lock"
59+ ];
60+ ignorePaths = path: type: let
61+ inherit (nixpkgs) lib;
62+ # split the nix store path into its components
63+ components = lib.splitString "/" path;
64+ # drop off the `/nix/hash-source` section from the path
65+ relPathComponents = lib.drop 4 components;
66+ # reassemble the path components
67+ relPath = lib.concatStringsSep "/" relPathComponents;
10768 in
108− helix-wrapped
109− // {
110− override = makeOverridableHelix old;
69+ lib.all (p: ! (lib.hasPrefix p relPath)) pathsToIgnore;
70+ in
71+ builtins.path {
72+ name = "helix-source";
73+ path = toString ./.;
74+ # filter out unnecessary paths
75+ filter = ignorePaths;
76+ };
77+ makeOverridableHelix = old: config: let
78+ grammars = pkgs.callPackage ./grammars.nix config;
79+ runtimeDir = pkgs.runCommand "helix-runtime" {} ''
80+ mkdir -p $out
81+ ln -s ${mkRootPath "runtime"}/* $out
82+ rm -r $out/grammars
83+ ln -s ${grammars} $out/grammars
84+ '';
85+ helix-wrapped =
86+ pkgs.runCommand
87+ old.name
88+ {
89+ inherit (old) pname version;
90+ meta = old.meta or {};
11191 passthru =
112− helix-wrapped.passthru
92+ (old.passthru or {})
11393 // {
114− wrapper = old: makeOverridableHelix old config;
94+ unwrapped = old;
11595 };
116− };
117− stdenv =
118− if pkgs.stdenv.isLinux
119− then pkgs.stdenv
120− else pkgs.clangStdenv;
121− rustFlagsEnv =
122− if stdenv.isLinux
123− then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
124− else "$RUSTFLAGS";
125− in {
126− nci.projects."helix-project".relPath = "";
127− nci.crates."helix-term" = {
128− overrides = {
129− add-meta.override = _: {meta.mainProgram = "hx";};
130− add-inputs.overrideAttrs = prev: {
131− buildInputs = (prev.buildInputs or []) ++ [stdenv.cc.cc.lib];
132− };
133− disable-grammar-builds = {
134− # disable fetching and building of tree-sitter grammars in the helix-term build.rs
135− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
96+ nativeBuildInputs = [pkgs.makeWrapper];
97+ makeWrapperArgs = config.makeWrapperArgs or [];
98+ }
99+ ''
100+ cp -rs --no-preserve=mode,ownership ${old} $out
101+ wrapProgram "$out/bin/hx" ''${makeWrapperArgs[@]} --set HELIX_RUNTIME "${runtimeDir}"
102+ '';
103+ in
104+ helix-wrapped
105+ // {
106+ override = makeOverridableHelix old;
107+ passthru =
108+ helix-wrapped.passthru
109+ // {
110+ wrapper = old: makeOverridableHelix old config;
136111 };
137− disable-tests = {checkPhase = ":";};
138− set-stdenv.override = _: {inherit stdenv;};
139− set-filtered-src.override = _: {src = filteredSource;};
140− };
141112 };
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+ };
142152
143− packages.helix-unwrapped = config.nci.outputs."helix-term".packages.release;
144− packages.helix-unwrapped-dev = config.nci.outputs."helix-term".packages.dev;
145− packages.helix = makeOverridableHelix config.packages.helix-unwrapped {};
146− packages.helix-dev = makeOverridableHelix config.packages.helix-unwrapped-dev {};
147− packages.default = config.packages.helix;
153+ checks = {
154+ # Build the crate itself
155+ inherit (self.packages.${system}) helix;
148156
149− overlayAttrs = {
150− inherit (config.packages) helix;
151− };
157+ clippy = craneLibMSRV.cargoClippy (commonArgs
158+ // {
159+ inherit cargoArtifacts;
160+ cargoClippyExtraArgs = "--all-targets -- --deny warnings";
161+ });
152162
153− devShells.default = config.nci.outputs."helix-project".devShell.overrideAttrs (old: {
154− nativeBuildInputs =
155− (old.nativeBuildInputs or [])
156− ++ (with pkgs; [lld_13 cargo-flamegraph rust-analyzer])
157− ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) pkgs.cargo-tarpaulin)
158− ++ (lib.optional stdenv.isLinux pkgs.lldb)
159− ++ (lib.optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreFoundation);
160− shellHook = ''
161− export HELIX_RUNTIME="$PWD/runtime"
162− export RUST_BACKTRACE="1"
163− export RUSTFLAGS="${rustFlagsEnv}"
164− '';
165− });
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;
166193 };
167194 };
168195
grammars.nix+24−21
@@ -5,6 +5,7 @@
55 runCommand,
66 yj,
77 includeGrammarIf ? _: true,
8+ grammarOverlays ? [],
89 ...
910}: let
1011 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
@@ -48,22 +49,22 @@
4849 then sourceGitHub
4950 else sourceGit;
5051 in
51− stdenv.mkDerivation rec {
52+ stdenv.mkDerivation {
5253 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
5354
5455 pname = "helix-tree-sitter-${grammar.name}";
5556 version = grammar.source.rev;
5657
57− src =
58− if builtins.hasAttr "subpath" grammar.source
59− then "${source}/${grammar.source.subpath}"
60− else source;
58+ src = source;
59+ sourceRoot = if builtins.hasAttr "subpath" grammar.source then
60+ "source/${grammar.source.subpath}"
61+ else
62+ "source";
6163
62− dontUnpack = true;
6364 dontConfigure = true;
6465
6566 FLAGS = [
66− "-I${src}/src"
67+ "-Isrc"
6768 "-g"
6869 "-O3"
6970 "-fPIC"
@@ -76,13 +77,13 @@
7677 buildPhase = ''
7778 runHook preBuild
7879
79− if [[ -e "$src/src/scanner.cc" ]]; then
80− $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS
81− elif [[ -e "$src/src/scanner.c" ]]; then
82− $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS
80+ if [[ -e src/scanner.cc ]]; then
81+ $CXX -c src/scanner.cc -o scanner.o $FLAGS
82+ elif [[ -e src/scanner.c ]]; then
83+ $CC -c src/scanner.c -o scanner.o $FLAGS
8384 fi
8485
85− $CC -c "$src/src/parser.c" -o parser.o $FLAGS
86+ $CC -c src/parser.c -o parser.o $FLAGS
8687 $CXX -shared -o $NAME.so *.o
8788
8889 ls -al
@@ -105,15 +106,17 @@
105106 '';
106107 };
107108 grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
108− builtGrammars =
109− builtins.map (grammar: {
110− inherit (grammar) name;
111− artifact = buildGrammar grammar;
112− })
113− grammarsToBuild;
114− grammarLinks =
115− builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
116− builtGrammars;
109+ builtGrammars = builtins.map (grammar: {
110+ inherit (grammar) name;
111+ value = buildGrammar grammar;
112+ }) grammarsToBuild;
113+ extensibleGrammars =
114+ lib.makeExtensible (self: builtins.listToAttrs builtGrammars);
115+ overlayedGrammars = lib.pipe extensibleGrammars
116+ (builtins.map (overlay: grammar: grammar.extend overlay) grammarOverlays);
117+ grammarLinks = lib.mapAttrsToList
118+ (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")
119+ (lib.filterAttrs (n: v: lib.isDerivation v) overlayedGrammars);
117120in
118121 runCommand "consolidated-helix-grammars" {} ''
119122 mkdir -p $out
helix-core/Cargo.toml+20−16
@@ -1,37 +1,38 @@
11[package]
22name = "helix-core"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
73description = "Helix editor core editing primitives"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
114include = ["src/**/*", "README.md"]
5+version.workspace = true
6+authors.workspace = true
7+edition.workspace = true
8+license.workspace = true
9+rust-version.workspace = true
10+categories.workspace = true
11+repository.workspace = true
12+homepage.workspace = true
1213
1314[features]
1415unicode-lines = ["ropey/unicode_lines"]
1516integration = []
1617
1718[dependencies]
18−helix-loader = { version = "0.6", path = "../helix-loader" }
19+helix-loader = { path = "../helix-loader" }
1920
20−ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
21−smallvec = "1.10"
21+ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
22+smallvec = "1.11"
2223smartstring = "1.0.1"
2324unicode-segmentation = "1.10"
2425unicode-width = "0.1"
2526unicode-general-category = "0.6"
2627# slab = "0.4.2"
2728slotmap = "1.0"
28−tree-sitter = "0.20"
29−once_cell = "1.18"
29+tree-sitter.workspace = true
30+once_cell = "1.19"
3031arc-swap = "1"
3132regex = "1"
32−bitflags = "2.3"
33−ahash = "0.8.3"
34−hashbrown = { version = "0.14.0", features = ["raw"] }
33+bitflags = "2.4"
34+ahash = "0.8.6"
35+hashbrown = { version = "0.14.3", features = ["raw"] }
3536dunce = "1.0"
3637
3738log = "0.4"
@@ -48,6 +49,9 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"
4849etcetera = "0.8"
4950textwrap = "0.16.0"
5051
52+nucleo.workspace = true
53+parking_lot = "0.12"
54+
5155[dev-dependencies]
5256quickcheck = { version = "1", default-features = false }
53−indoc = "2.0.1"
57+indoc = "2.0.4"
helix-core/src/diagnostic.rs+4
@@ -39,6 +39,10 @@ pub enum DiagnosticTag {
3939#[derive(Debug, Clone)]
4040pub struct Diagnostic {
4141 pub range: Range,
42+ // whether this diagnostic ends at the end of(or inside) a word
43+ pub ends_at_word: bool,
44+ pub starts_at_word: bool,
45+ pub zero_width: bool,
4246 pub line: usize,
4347 pub message: String,
4448 pub severity: Option<Severity>,
helix-core/src/fuzzy.rsnew file+43
@@ -0,0 +1,43 @@
1+use std::ops::DerefMut;
2+
3+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
4+use nucleo::Config;
5+use parking_lot::Mutex;
6+
7+pub struct LazyMutex<T> {
8+ inner: Mutex<Option<T>>,
9+ init: fn() -> T,
10+}
11+
12+impl<T> LazyMutex<T> {
13+ pub const fn new(init: fn() -> T) -> Self {
14+ Self {
15+ inner: Mutex::new(None),
16+ init,
17+ }
18+ }
19+
20+ pub fn lock(&self) -> impl DerefMut<Target = T> + '_ {
21+ parking_lot::MutexGuard::map(self.inner.lock(), |val| val.get_or_insert_with(self.init))
22+ }
23+}
24+
25+pub static MATCHER: LazyMutex<nucleo::Matcher> = LazyMutex::new(nucleo::Matcher::default);
26+
27+/// convenience function to easily fuzzy match
28+/// on a (relatively small list of inputs). This is not recommended for building a full tui
29+/// application that can match large numbers of matches as all matching is done on the current
30+/// thread, effectively blocking the UI
31+pub fn fuzzy_match<T: AsRef<str>>(
32+ pattern: &str,
33+ items: impl IntoIterator<Item = T>,
34+ path: bool,
35+) -> Vec<(T, u16)> {
36+ let mut matcher = MATCHER.lock();
37+ matcher.config = Config::DEFAULT;
38+ if path {
39+ matcher.config.set_match_paths();
40+ }
41+ let pattern = Atom::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy, false);
42+ pattern.match_list(items, &mut matcher)
43+}
helix-core/src/graphemes.rs+1−1
@@ -481,7 +481,7 @@ impl<'a> From<String> for GraphemeStr<'a> {
481481 let ptr = Box::into_raw(g.into_bytes().into_boxed_slice()) as *mut u8;
482482 GraphemeStr {
483483 ptr: unsafe { NonNull::new_unchecked(ptr) },
484− len: i32::try_from(len).unwrap() as u32,
484+ len: (i32::try_from(len).unwrap() as u32) | Self::MASK_OWNED,
485485 phantom: PhantomData,
486486 }
487487 }
helix-core/src/history.rs+2−2
@@ -72,8 +72,8 @@ impl Default for History {
7272 revisions: vec![Revision {
7373 parent: 0,
7474 last_child: None,
75− transaction: Transaction::from(ChangeSet::new(&Rope::new())),
76− inversion: Transaction::from(ChangeSet::new(&Rope::new())),
75+ transaction: Transaction::from(ChangeSet::new("".into())),
76+ inversion: Transaction::from(ChangeSet::new("".into())),
7777 timestamp: Instant::now(),
7878 }],
7979 current: 0,
helix-core/src/indent.rs+617−145
@@ -1,13 +1,14 @@
1−use std::collections::HashMap;
1+use std::{borrow::Cow, collections::HashMap};
22
33use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
44
55use crate::{
66 chars::{char_is_line_ending, char_is_whitespace},
7− graphemes::tab_width_at,
8− syntax::{LanguageConfiguration, RopeProvider, Syntax},
7+ find_first_non_whitespace_char,
8+ graphemes::{grapheme_width, tab_width_at},
9+ syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
910 tree_sitter::Node,
10− Rope, RopeSlice,
11+ Position, Rope, RopeGraphemes, RopeSlice,
1112};
1213
1314/// Enum representing indentation style.
@@ -19,6 +20,10 @@ pub enum IndentStyle {
1920 Spaces(u8),
2021}
2122
23+// 16 spaces
24+const INDENTS: &str = " ";
25+pub const MAX_INDENT: u8 = 16;
26+
2227impl IndentStyle {
2328 /// Creates an `IndentStyle` from an indentation string.
2429 ///
@@ -27,10 +32,10 @@ impl IndentStyle {
2732 #[inline]
2833 pub fn from_str(indent: &str) -> Self {
2934 // XXX: do we care about validating the input more than this? Probably not...?
30− debug_assert!(!indent.is_empty() && indent.len() <= 8);
35+ debug_assert!(!indent.is_empty() && indent.len() <= MAX_INDENT as usize);
3136
3237 if indent.starts_with(' ') {
33− IndentStyle::Spaces(indent.len() as u8)
38+ IndentStyle::Spaces(indent.len().clamp(1, MAX_INDENT as usize) as u8)
3439 } else {
3540 IndentStyle::Tabs
3641 }
@@ -40,20 +45,13 @@ impl IndentStyle {
4045 pub fn as_str(&self) -> &'static str {
4146 match *self {
4247 IndentStyle::Tabs => "\t",
43− IndentStyle::Spaces(1) => " ",
44− IndentStyle::Spaces(2) => " ",
45− IndentStyle::Spaces(3) => " ",
46− IndentStyle::Spaces(4) => " ",
47− IndentStyle::Spaces(5) => " ",
48− IndentStyle::Spaces(6) => " ",
49− IndentStyle::Spaces(7) => " ",
50− IndentStyle::Spaces(8) => " ",
51−
52− // Unsupported indentation style. This should never happen,
53− // but just in case fall back to two spaces.
5448 IndentStyle::Spaces(n) => {
55− debug_assert!(n > 0 && n <= 8); // Always triggers. `debug_panic!()` wanted.
56− " "
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]
5755 }
5856 }
5957 }
@@ -75,9 +73,9 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
7573 // Build a histogram of the indentation *increases* between
7674 // subsequent lines, ignoring lines that are all whitespace.
7775 //
78− // Index 0 is for tabs, the rest are 1-8 spaces.
79− let histogram: [usize; 9] = {
80− let mut histogram = [0; 9];
76+ // Index 0 is for tabs, the rest are 1-MAX_INDENT spaces.
77+ let histogram: [usize; MAX_INDENT as usize + 1] = {
78+ let mut histogram = [0; MAX_INDENT as usize + 1];
8179 let mut prev_line_is_tabs = false;
8280 let mut prev_line_leading_count = 0usize;
8381
@@ -136,7 +134,7 @@ pub fn auto_detect_indent_style(document_text: &Rope) -> Option<IndentStyle> {
136134 histogram[0] += 1;
137135 } else {
138136 let amount = leading_count - prev_line_leading_count;
139− if amount <= 8 {
137+ if amount <= MAX_INDENT as usize {
140138 histogram[amount] += 1;
141139 }
142140 }
@@ -199,6 +197,56 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
199197 len / indent_width
200198}
201199
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+
202250/// Computes for node and all ancestors whether they are the first node on their line.
203251/// The first entry in the return value represents the root node, the last one the node itself
204252fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
@@ -240,68 +288,140 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
240288/// This is usually constructed in one of 2 ways:
241289/// - Successively add indent captures to get the (added) indent from a single line
242290/// - Successively add the indent results for each line
243−#[derive(Default)]
244−pub struct Indentation {
245− /// The total indent (the number of indent levels) is defined as max(0, indent-outdent).
246− /// The string that this results in depends on the indent style (spaces or tabs, etc.)
291+/// The string that this indentation defines starts with the string contained in the align field (unless it is None), followed by:
292+/// - max(0, indent - outdent) tabs, if tabs are used for indentation
293+/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
294+#[derive(Default, Debug, PartialEq, Eq, Clone)]
295+pub struct Indentation<'a> {
247296 indent: usize,
297+ indent_always: usize,
248298 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>>,
249303}
250−impl Indentation {
304+
305+impl<'a> Indentation<'a> {
251306 /// Add some other [Indentation] to this.
252− /// The added indent should be the total added indent from one line
253− fn add_line(&mut self, added: &Indentation) {
254− if added.indent > 0 && added.outdent == 0 {
255− self.indent += 1;
256− } else if added.outdent > 0 && added.indent == 0 {
257− self.outdent += 1;
307+ /// The added indent should be the total added indent from one line.
308+ /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).
309+ fn add_line(&mut self, added: Indentation<'a>) {
310+ // Align overrides the indent from outer scopes.
311+ if self.align.is_some() {
312+ return;
258313 }
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;
259322 }
323+
260324 /// Add an indent capture to this indent.
261− /// All the captures that are added in this way should be on the same line.
262− fn add_capture(&mut self, added: IndentCaptureType) {
325+ /// Only captures that apply to the same line should be added together in this way (otherwise use `add_line`)
326+ /// and the captures should be added starting from the innermost tree-sitter node (currently this only matters
327+ /// if multiple `@align` patterns occur on the same line).
328+ fn add_capture(&mut self, added: IndentCaptureType<'a>) {
263329 match added {
264330 IndentCaptureType::Indent => {
265− self.indent = 1;
331+ if self.indent_always == 0 {
332+ self.indent = 1;
333+ }
334+ }
335+ IndentCaptureType::IndentAlways => {
336+ // any time we encounter an `indent.always` on the same line, we
337+ // want to cancel out all regular indents
338+ self.indent_always += 1;
339+ self.indent = 0;
266340 }
267341 IndentCaptureType::Outdent => {
268− self.outdent = 1;
342+ if self.outdent_always == 0 {
343+ self.outdent = 1;
344+ }
345+ }
346+ IndentCaptureType::OutdentAlways => {
347+ self.outdent_always += 1;
348+ self.outdent = 0;
349+ }
350+ IndentCaptureType::Align(align) => {
351+ if self.align.is_none() {
352+ self.align = Some(align);
353+ }
269354 }
270355 }
271356 }
272− fn as_string(&self, indent_style: &IndentStyle) -> String {
273− let indent_level = if self.indent >= self.outdent {
274− self.indent - self.outdent
357+ fn net_indent(&self) -> isize {
358+ (self.indent + self.indent_always) as isize
359+ - ((self.outdent + self.outdent_always) as isize)
360+ }
361+ /// Convert `self` into a string, taking into account the computed and actual indentation of some other line.
362+ fn relative_indent(
363+ &self,
364+ other_computed_indent: &Self,
365+ other_leading_whitespace: RopeSlice,
366+ indent_style: &IndentStyle,
367+ tab_width: usize,
368+ ) -> Option<String> {
369+ if self.align == other_computed_indent.align {
370+ // If self and baseline are either not aligned to anything or both aligned the same way,
371+ // we can simply take `other_leading_whitespace` and add some indent / outdent to it (in the second
372+ // case, the alignment should already be accounted for in `other_leading_whitespace`).
373+ let indent_diff = self.net_indent() - other_computed_indent.net_indent();
374+ Some(add_indent_level(
375+ String::from(other_leading_whitespace),
376+ indent_diff,
377+ indent_style,
378+ tab_width,
379+ ))
275380 } else {
276− log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
277− 0
278− };
279− indent_style.as_str().repeat(indent_level)
381+ // If the alignment of both lines is different, we cannot compare their indentation in any meaningful way
382+ None
383+ }
384+ }
385+ pub fn to_string(&self, indent_style: &IndentStyle, tab_width: usize) -> String {
386+ add_indent_level(
387+ self.align
388+ .map_or_else(String::new, whitespace_with_same_width),
389+ self.net_indent(),
390+ indent_style,
391+ tab_width,
392+ )
280393 }
281394}
282395
283396/// An indent definition which corresponds to a capture from the indent query
284−struct IndentCapture {
285− capture_type: IndentCaptureType,
397+#[derive(Debug)]
398+struct IndentCapture<'a> {
399+ capture_type: IndentCaptureType<'a>,
286400 scope: IndentScope,
287401}
288−#[derive(Clone, Copy)]
289−enum IndentCaptureType {
402+#[derive(Debug, Clone, PartialEq)]
403+enum IndentCaptureType<'a> {
290404 Indent,
405+ IndentAlways,
291406 Outdent,
407+ OutdentAlways,
408+ /// Alignment given as a string of whitespace
409+ Align(RopeSlice<'a>),
292410}
293−impl IndentCaptureType {
411+
412+impl<'a> IndentCaptureType<'a> {
294413 fn default_scope(&self) -> IndentScope {
295414 match self {
296− IndentCaptureType::Indent => IndentScope::Tail,
297− IndentCaptureType::Outdent => IndentScope::All,
415+ IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
416+ IndentCaptureType::Outdent | IndentCaptureType::OutdentAlways => IndentScope::All,
417+ IndentCaptureType::Align(_) => IndentScope::All,
298418 }
299419 }
300420}
301421/// This defines which part of a node an [IndentCapture] applies to.
302422/// Each [IndentCaptureType] has a default scope, but the scope can be changed
303423/// with `#set!` property declarations.
304−#[derive(Clone, Copy)]
424+#[derive(Debug, Clone, Copy)]
305425enum IndentScope {
306426 /// The indent applies to the whole node
307427 All,
@@ -311,6 +431,7 @@ enum IndentScope {
311431
312432/// A capture from the indent query which does not define an indent but extends
313433/// the range of a node. This is used before the indent is calculated.
434+#[derive(Debug)]
314435enum ExtendCapture {
315436 Extend,
316437 PreventOnce,
@@ -319,24 +440,41 @@ enum ExtendCapture {
319440/// The result of running a tree-sitter indent query. This stores for
320441/// each node (identified by its ID) the relevant captures (already filtered
321442/// by predicates).
322−struct IndentQueryResult {
323− indent_captures: HashMap<usize, Vec<IndentCapture>>,
443+#[derive(Debug)]
444+struct IndentQueryResult<'a> {
445+ indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,
324446 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
325447}
326448
327−fn query_indents(
449+fn get_node_start_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
450+ let mut node_line = node.start_position().row;
451+ // Adjust for the new line that will be inserted
452+ if new_line_byte_pos.map_or(false, |pos| node.start_byte() >= pos) {
453+ node_line += 1;
454+ }
455+ node_line
456+}
457+fn get_node_end_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
458+ let mut node_line = node.end_position().row;
459+ // Adjust for the new line that will be inserted (with a strict inequality since end_byte is exclusive)
460+ if new_line_byte_pos.map_or(false, |pos| node.end_byte() > pos) {
461+ node_line += 1;
462+ }
463+ node_line
464+}
465+
466+fn query_indents<'a>(
328467 query: &Query,
329468 syntax: &Syntax,
330469 cursor: &mut QueryCursor,
331− text: RopeSlice,
470+ text: RopeSlice<'a>,
332471 range: std::ops::Range<usize>,
333− // Position of the (optional) newly inserted line break.
334− // Given as (line, byte_pos)
335− new_line_break: Option<(usize, usize)>,
336−) -> IndentQueryResult {
472+ new_line_byte_pos: Option<usize>,
473+) -> IndentQueryResult<'a> {
337474 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
338475 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
339476 cursor.set_byte_range(range);
477+
340478 // Iterate over all captures from the query
341479 for m in cursor.matches(query, syntax.tree().root_node(), RopeProvider(text)) {
342480 // Skip matches where not all custom predicates are fulfilled
@@ -363,21 +501,13 @@ fn query_indents(
363501 Some(QueryPredicateArg::Capture(capt1)),
364502 Some(QueryPredicateArg::Capture(capt2))
365503 ) => {
366− let get_line_num = |node: Node| {
367− let mut node_line = node.start_position().row;
368− // Adjust for the new line that will be inserted
369− if let Some((line, byte)) = new_line_break {
370− if node_line==line && node.start_byte()>=byte {
371− node_line += 1;
372− }
373− }
374− node_line
375− };
376504 let n1 = m.nodes_for_capture_index(*capt1).next();
377505 let n2 = m.nodes_for_capture_index(*capt2).next();
378506 match (n1, n2) {
379507 (Some(n1), Some(n2)) => {
380− let same_line = get_line_num(n1)==get_line_num(n2);
508+ let n1_line = get_node_start_line(n1, new_line_byte_pos);
509+ let n2_line = get_node_start_line(n2, new_line_byte_pos);
510+ let same_line = n1_line == n2_line;
381511 same_line==(pred.operator.as_ref()=="same-line?")
382512 }
383513 _ => true,
@@ -388,6 +518,23 @@ fn query_indents(
388518 }
389519 }
390520 }
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+ },
391538 _ => {
392539 panic!(
393540 "Invalid indent query: Unknown predicate (\"{}\")",
@@ -398,11 +545,28 @@ fn query_indents(
398545 }) {
399546 continue;
400547 }
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;
401553 for capture in m.captures {
402554 let capture_name = query.capture_names()[capture.index as usize].as_str();
403555 let capture_type = match capture_name {
404556 "indent" => IndentCaptureType::Indent,
557+ "indent.always" => IndentCaptureType::IndentAlways,
405558 "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+ }
406570 "extend" => {
407571 extend_captures
408572 .entry(capture.node.id())
@@ -452,17 +616,40 @@ fn query_indents(
452616 }
453617 }
454618 }
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+ }
455638 indent_captures
456− .entry(capture.node.id())
457− // Most entries only need to contain a single IndentCapture
639+ .entry(node_id)
458640 .or_insert_with(|| Vec::with_capacity(1))
459− .push(indent_capture);
641+ .push(capture);
460642 }
461643 }
462− IndentQueryResult {
644+
645+ let result = IndentQueryResult {
463646 indent_captures,
464647 extend_captures,
465− }
648+ };
649+
650+ log::trace!("indent result = {:?}", result);
651+
652+ result
466653}
467654
468655/// Handle extend queries. deepest_preceding is the deepest descendant of node that directly precedes the cursor position.
@@ -532,61 +719,27 @@ fn extend_nodes<'a>(
532719 }
533720}
534721
535−/// Use the syntax tree to determine the indentation for a given position.
536−/// This can be used in 2 ways:
537−///
538−/// - To get the correct indentation for an existing line (new_line=false), not necessarily equal to the current indentation.
539−/// - In this case, pos should be inside the first tree-sitter node on that line.
540−/// In most cases, this can just be the first non-whitespace on that line.
541−/// - To get the indentation for a new line (new_line=true). This behaves like the first usecase if the part of the current line
542−/// after pos were moved to a new line.
543−///
544−/// The indentation is determined by traversing all the tree-sitter nodes containing the position.
545−/// Each of these nodes produces some [Indentation] for:
546−///
547−/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
548−/// - The line after the node. This is defined by:
549−/// - The scope `tail`.
550−/// - The scope `all` if this node is not the first node on its line.
551−/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
552−/// The indents from different nodes for the same line are then combined.
553−/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
554−///
555−/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
556−/// ```ignore
557−/// some_function(|| {
558−/// // Both the function parameters as well as the contained block should be indented.
559−/// // Because they are on the same line, this only yields one indent level
560−/// });
561−/// ```
562−///
563−/// ```ignore
564−/// some_function(
565−/// param1,
566−/// || {
567−/// // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines
568−/// },
569−/// );
570−/// ```
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.
571725#[allow(clippy::too_many_arguments)]
572−pub fn treesitter_indent_for_pos(
726+fn init_indent_query<'a, 'b>(
573727 query: &Query,
574− syntax: &Syntax,
575− indent_style: &IndentStyle,
728+ syntax: &'a Syntax,
729+ text: RopeSlice<'b>,
576730 tab_width: usize,
577731 indent_width: usize,
578− text: RopeSlice,
579732 line: usize,
580− pos: usize,
581− new_line: bool,
582−) -> Option<String> {
583− let byte_pos = text.char_to_byte(pos);
733+ byte_pos: usize,
734+ new_line_byte_pos: Option<usize>,
735+) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {
584736 // The innermost tree-sitter node which is considered for the indent
585737 // computation. It may change if some predeceding node is extended
586738 let mut node = syntax
587739 .tree()
588740 .root_node()
589741 .descendant_for_byte_range(byte_pos, byte_pos)?;
742+
590743 let (query_result, deepest_preceding) = {
591744 // The query range should intersect with all nodes directly preceding
592745 // the position of the indent query in case one of them is extended.
@@ -617,13 +770,12 @@ pub fn treesitter_indent_for_pos(
617770 &mut cursor,
618771 text,
619772 query_range,
620− new_line.then_some((line, byte_pos)),
773+ new_line_byte_pos,
621774 );
622775 ts_parser.cursors.push(cursor);
623776 (query_result, deepest_preceding)
624777 })
625778 };
626− let indent_captures = query_result.indent_captures;
627779 let extend_captures = query_result.extend_captures;
628780
629781 // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -638,6 +790,68 @@ pub fn treesitter_indent_for_pos(
638790 indent_width,
639791 );
640792 }
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+ )?;
641855 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
642856
643857 let mut result = Indentation::default();
@@ -645,12 +859,16 @@ pub fn treesitter_indent_for_pos(
645859 // even if there are multiple "indent" nodes on the same line
646860 let mut indent_for_line = Indentation::default();
647861 let mut indent_for_line_below = Indentation::default();
862+
648863 loop {
649864 // This can safely be unwrapped because `first_in_line` contains
650865 // one entry for each ancestor of the node (which is what we iterate over)
651866 let is_first = *first_in_line.last().unwrap();
652− // Apply all indent definitions for this node
653− if let Some(definitions) = indent_captures.get(&node.id()) {
867+
868+ // Apply all indent definitions for this node.
869+ // Since we only iterate over each node once, we can remove the
870+ // corresponding captures from the HashMap to avoid cloning them.
871+ if let Some(definitions) = indent_captures.remove(&node.id()) {
654872 for definition in definitions {
655873 match definition.scope {
656874 IndentScope::All => {
@@ -668,28 +886,22 @@ pub fn treesitter_indent_for_pos(
668886 }
669887
670888 if let Some(parent) = node.parent() {
671− let mut node_line = node.start_position().row;
672− let mut parent_line = parent.start_position().row;
673− if node_line == line && new_line {
674− // Also consider the line that will be inserted
675− if node.start_byte() >= byte_pos {
676− node_line += 1;
677− }
678− if parent.start_byte() >= byte_pos {
679− parent_line += 1;
680− }
681− };
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+
682892 if node_line != parent_line {
893+ // Don't add indent for the line below the line of the query
683894 if node_line < line + (new_line as usize) {
684− // Don't add indent for the line below the line of the query
685− result.add_line(&indent_for_line_below);
895+ result.add_line(indent_for_line_below);
686896 }
897+
687898 if node_line == parent_line + 1 {
688899 indent_for_line_below = indent_for_line;
689900 } else {
690− result.add_line(&indent_for_line);
901+ result.add_line(indent_for_line);
691902 indent_for_line_below = Indentation::default();
692903 }
904+
693905 indent_for_line = Indentation::default();
694906 }
695907
@@ -701,13 +913,13 @@ pub fn treesitter_indent_for_pos(
701913 if (node.start_position().row < line)
702914 || (new_line && node.start_position().row == line && node.start_byte() < byte_pos)
703915 {
704− result.add_line(&indent_for_line_below);
916+ result.add_line(indent_for_line_below);
705917 }
706− result.add_line(&indent_for_line);
918+ result.add_line(indent_for_line);
707919 break;
708920 }
709921 }
710− Some(result.as_string(indent_style))
922+ Some(result)
711923}
712924
713925/// Returns the indentation for a new line.
@@ -716,6 +928,7 @@ pub fn treesitter_indent_for_pos(
716928pub fn indent_for_newline(
717929 language_config: Option<&LanguageConfiguration>,
718930 syntax: Option<&Syntax>,
931+ indent_heuristic: &IndentationHeuristic,
719932 indent_style: &IndentStyle,
720933 tab_width: usize,
721934 text: RopeSlice,
@@ -724,14 +937,18 @@ pub fn indent_for_newline(
724937 current_line: usize,
725938) -> String {
726939 let indent_width = indent_style.indent_width(tab_width);
727− if let (Some(query), Some(syntax)) = (
940+ if let (
941+ IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,
942+ Some(query),
943+ Some(syntax),
944+ ) = (
945+ indent_heuristic,
728946 language_config.and_then(|config| config.indent_query()),
729947 syntax,
730948 ) {
731949 if let Some(indent) = treesitter_indent_for_pos(
732950 query,
733951 syntax,
734− indent_style,
735952 tab_width,
736953 indent_width,
737954 text,
@@ -739,9 +956,57 @@ pub fn indent_for_newline(
739956 line_before_end_pos,
740957 true,
741958 ) {
742− return indent;
959+ if *indent_heuristic == IndentationHeuristic::Hybrid {
960+ // We want to compute the indentation not only based on the
961+ // syntax tree but also on the actual indentation of a previous
962+ // line. This makes indentation computation more resilient to
963+ // incomplete queries, incomplete source code & differing indentation
964+ // styles for the same language.
965+ // However, using the indent of a previous line as a baseline may not
966+ // make sense, e.g. if it has a different alignment than the new line.
967+ // In order to prevent edge cases with long running times, we only try
968+ // a constant number of (non-empty) lines.
969+ const MAX_ATTEMPTS: usize = 4;
970+ let mut num_attempts = 0;
971+ for line_idx in (0..=line_before).rev() {
972+ let line = text.line(line_idx);
973+ let first_non_whitespace_char = match find_first_non_whitespace_char(line) {
974+ Some(i) => i,
975+ None => {
976+ continue;
977+ }
978+ };
979+ if let Some(indent) = (|| {
980+ let computed_indent = treesitter_indent_for_pos(
981+ query,
982+ syntax,
983+ tab_width,
984+ indent_width,
985+ text,
986+ line_idx,
987+ text.line_to_char(line_idx) + first_non_whitespace_char,
988+ false,
989+ )?;
990+ let leading_whitespace = line.slice(0..first_non_whitespace_char);
991+ indent.relative_indent(
992+ &computed_indent,
993+ leading_whitespace,
994+ indent_style,
995+ tab_width,
996+ )
997+ })() {
998+ return indent;
999+ }
1000+ num_attempts += 1;
1001+ if num_attempts == MAX_ATTEMPTS {
1002+ break;
1003+ }
1004+ }
1005+ }
1006+ return indent.to_string(indent_style, tab_width);
7431007 };
7441008 }
1009+ // Fallback in case we either don't have indent queries or they failed for some reason
7451010 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
7461011 indent_style.as_str().repeat(indent_level)
7471012}
@@ -797,4 +1062,211 @@ mod test {
7971062 3
7981063 );
7991064 }
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+ }
8001272}
helix-core/src/lib.rs+4−2
@@ -7,6 +7,7 @@ pub mod config;
77pub mod diagnostic;
88pub mod diff;
99pub mod doc_formatter;
10+pub mod fuzzy;
1011pub mod graphemes;
1112pub mod history;
1213pub mod increment;
@@ -18,7 +19,6 @@ pub mod movement;
1819pub mod object;
1920pub mod path;
2021mod position;
21−pub mod register;
2222pub mod search;
2323pub mod selection;
2424pub mod shellwords;
@@ -41,7 +41,9 @@ pub use helix_loader::find_workspace;
4141pub fn find_first_non_whitespace_char(line: RopeSlice) -> Option<usize> {
4242 line.chars().position(|ch| !ch.is_whitespace())
4343}
44+mod rope_reader;
4445
46+pub use rope_reader::RopeReader;
4547pub use ropey::{self, str_utils, Rope, RopeBuilder, RopeSlice};
4648
4749// pub use tendril::StrTendril as Tendril;
@@ -66,5 +68,5 @@ pub use syntax::Syntax;
6668
6769pub use diagnostic::Diagnostic;
6870
69−pub use line_ending::{LineEnding, DEFAULT_LINE_ENDING};
71+pub use line_ending::{LineEnding, NATIVE_LINE_ENDING};
7072pub use transaction::{Assoc, Change, ChangeSet, Deletion, Operation, Transaction};
helix-core/src/line_ending.rs+2−2
@@ -1,9 +1,9 @@
11use crate::{Rope, RopeSlice};
22
33#[cfg(target_os = "windows")]
4−pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::Crlf;
4+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::Crlf;
55#[cfg(not(target_os = "windows"))]
6−pub const DEFAULT_LINE_ENDING: LineEnding = LineEnding::LF;
6+pub const NATIVE_LINE_ENDING: LineEnding = LineEnding::LF;
77
88/// Represents one of the valid Unicode line endings.
99#[derive(PartialEq, Eq, Copy, Clone, Debug)]
helix-core/src/match_brackets.rs+127−27
@@ -1,8 +1,13 @@
1+use std::iter;
2+
3+use ropey::RopeSlice;
14use tree_sitter::Node;
25
3−use crate::{Rope, Syntax};
6+use crate::movement::Direction::{self, Backward, Forward};
7+use crate::Syntax;
48
59const MAX_PLAINTEXT_SCAN: usize = 10000;
10+const MATCH_LIMIT: usize = 16;
611
712// Limit matching pairs to only ( ) { } [ ] < > ' ' " "
813const PAIRS: &[(char, char)] = &[
@@ -24,7 +29,7 @@ const PAIRS: &[(char, char)] = &[
2429///
2530/// If no matching bracket is found, `None` is returned.
2631#[must_use]
27−pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
32+pub fn find_matching_bracket(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
2833 if pos >= doc.len_chars() || !is_valid_bracket(doc.char(pos)) {
2934 return None;
3035 }
@@ -42,35 +47,84 @@ pub fn find_matching_bracket(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<
4247//
4348// If no surrounding scope is found, the function returns `None`.
4449#[must_use]
45−pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: &Rope, pos: usize) -> Option<usize> {
50+pub fn find_matching_bracket_fuzzy(syntax: &Syntax, doc: RopeSlice, pos: usize) -> Option<usize> {
4651 find_pair(syntax, doc, pos, true)
4752}
4853
49−fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) -> Option<usize> {
54+fn find_pair(
55+ syntax: &Syntax,
56+ doc: RopeSlice,
57+ pos_: usize,
58+ traverse_parents: bool,
59+) -> Option<usize> {
5060 let tree = syntax.tree();
51− let pos = doc.char_to_byte(pos);
61+ let pos = doc.char_to_byte(pos_);
5262
53− let mut node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
63+ let mut node = tree.root_node().descendant_for_byte_range(pos, pos)?;
5464
5565 loop {
56− let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;
57− let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));
66+ if node.is_named() {
67+ let (start_byte, end_byte) = surrounding_bytes(doc, &node)?;
68+ let (start_char, end_char) = (doc.byte_to_char(start_byte), doc.byte_to_char(end_byte));
69+
70+ if is_valid_pair(doc, start_char, end_char) {
71+ if end_byte == pos {
72+ return Some(start_char);
73+ }
74+
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+ }
80+ }
81+ }
82+ // this node itselt wasn't a pair but maybe its siblings are
5883
59− if is_valid_pair(doc, start_char, end_char) {
60− if end_byte == pos {
61− return Some(start_char);
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);
6289 }
63− // We return the end char if the cursor is either on the start char
64− // or at some arbitrary position between start and end char.
65− return Some(end_char);
6690 }
6791
68− if traverse_parents {
69− node = node.parent()?;
70− } else {
71− return None;
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+ }
72104 }
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;
73120 }
121+ let node = tree.root_node().named_descendant_for_byte_range(pos, pos)?;
122+ if node.child_count() != 0 {
123+ return None;
124+ }
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)
74128}
75129
76130/// Returns the position of the matching bracket under cursor.
@@ -85,10 +139,7 @@ fn find_pair(syntax: &Syntax, doc: &Rope, pos: usize, traverse_parents: bool) ->
85139///
86140/// If no matching bracket is found, `None` is returned.
87141#[must_use]
88−pub fn find_matching_bracket_current_line_plaintext(
89− doc: &Rope,
90− cursor_pos: usize,
91−) -> Option<usize> {
142+pub fn find_matching_bracket_plaintext(doc: RopeSlice, cursor_pos: usize) -> Option<usize> {
92143 // Don't do anything when the cursor is not on top of a bracket.
93144 let bracket = doc.char(cursor_pos);
94145 if !is_valid_bracket(bracket) {
@@ -144,11 +195,11 @@ fn is_forward_bracket(c: char) -> bool {
144195 PAIRS.iter().any(|(l, _)| *l == c)
145196}
146197
147−fn is_valid_pair(doc: &Rope, start_char: usize, end_char: usize) -> bool {
198+fn is_valid_pair(doc: RopeSlice, start_char: usize, end_char: usize) -> bool {
148199 PAIRS.contains(&(doc.char(start_char), doc.char(end_char)))
149200}
150201
151−fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
202+fn surrounding_bytes(doc: RopeSlice, node: &Node) -> Option<(usize, usize)> {
152203 let len = doc.len_bytes();
153204
154205 let start_byte = node.start_byte();
@@ -161,6 +212,55 @@ fn surrounding_bytes(doc: &Rope, node: &Node) -> Option<(usize, usize)> {
161212 Some((start_byte, end_byte))
162213}
163214
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+
164264#[cfg(test)]
165265mod tests {
166266 use super::*;
@@ -168,11 +268,11 @@ mod tests {
168268 #[test]
169269 fn test_find_matching_bracket_current_line_plaintext() {
170270 let assert = |input: &str, pos, expected| {
171− let input = &Rope::from(input);
172− let actual = find_matching_bracket_current_line_plaintext(input, pos);
271+ let input = RopeSlice::from(input);
272+ let actual = find_matching_bracket_plaintext(input, pos);
173273 assert_eq!(expected, actual.unwrap());
174274
175− let actual = find_matching_bracket_current_line_plaintext(input, expected);
275+ let actual = find_matching_bracket_plaintext(input, expected);
176276 assert_eq!(pos, actual.unwrap(), "expected symmetrical behaviour");
177277 };
178278
helix-core/src/movement.rs+83−4
@@ -1,4 +1,4 @@
1−use std::iter;
1+use std::{cmp::Reverse, iter};
22
33use ropey::iter::Chars;
44use tree_sitter::{Node, QueryCursor};
@@ -16,7 +16,7 @@ use crate::{
1616 syntax::LanguageConfiguration,
1717 text_annotations::TextAnnotations,
1818 textobject::TextObject,
19− visual_offset_from_block, Range, RopeSlice,
19+ visual_offset_from_block, Range, RopeSlice, Selection, Syntax,
2020};
2121
2222#[derive(Debug, Copy, Clone, PartialEq, Eq)]
@@ -527,10 +527,10 @@ pub fn goto_treesitter_object(
527527 let node = match dir {
528528 Direction::Forward => nodes
529529 .filter(|n| n.start_byte() > byte_pos)
530− .min_by_key(|n| n.start_byte())?,
530+ .min_by_key(|n| (n.start_byte(), Reverse(n.end_byte())))?,
531531 Direction::Backward => nodes
532532 .filter(|n| n.end_byte() < byte_pos)
533− .max_by_key(|n| n.end_byte())?,
533+ .max_by_key(|n| (n.end_byte(), Reverse(n.start_byte())))?,
534534 };
535535
536536 let len = slice.len_bytes();
@@ -556,6 +556,85 @@ pub fn goto_treesitter_object(
556556 last_range
557557}
558558
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+
559638#[cfg(test)]
560639mod test {
561640 use ropey::Rope;
helix-core/src/path.rs+5−7
@@ -85,23 +85,21 @@ pub fn get_normalized_path(path: &Path) -> PathBuf {
8585///
8686/// This function is used instead of `std::fs::canonicalize` because we don't want to verify
8787/// here if the path exists, just normalize it's components.
88−pub fn get_canonicalized_path(path: &Path) -> std::io::Result<PathBuf> {
88+pub fn get_canonicalized_path(path: &Path) -> PathBuf {
8989 let path = expand_tilde(path);
9090 let path = if path.is_relative() {
91− std::env::current_dir().map(|current_dir| current_dir.join(path))?
91+ helix_loader::current_working_dir().join(path)
9292 } else {
9393 path
9494 };
9595
96− Ok(get_normalized_path(path.as_path()))
96+ get_normalized_path(path.as_path())
9797}
9898
9999pub fn get_relative_path(path: &Path) -> PathBuf {
100100 let path = PathBuf::from(path);
101101 let path = if path.is_absolute() {
102− let cwdir = std::env::current_dir()
103− .map(|path| get_normalized_path(&path))
104− .expect("couldn't determine current directory");
102+ let cwdir = get_normalized_path(&helix_loader::current_working_dir());
105103 get_normalized_path(&path)
106104 .strip_prefix(cwdir)
107105 .map(PathBuf::from)
@@ -142,7 +140,7 @@ pub fn get_relative_path(path: &Path) -> PathBuf {
142140/// ```
143141///
144142pub fn get_truncated_path<P: AsRef<Path>>(path: P) -> PathBuf {
145− let cwd = std::env::current_dir().unwrap_or_default();
143+ let cwd = helix_loader::current_working_dir();
146144 let path = path
147145 .as_ref()
148146 .strip_prefix(cwd)
helix-core/src/register.rsdeleted−89
@@ -1,89 +0,0 @@
1−use std::collections::HashMap;
2−
3−#[derive(Debug)]
4−pub struct Register {
5− name: char,
6− values: Vec<String>,
7−}
8−
9−impl Register {
10− pub const fn new(name: char) -> Self {
11− Self {
12− name,
13− values: Vec::new(),
14− }
15− }
16−
17− pub fn new_with_values(name: char, values: Vec<String>) -> Self {
18− Self { name, values }
19− }
20−
21− pub const fn name(&self) -> char {
22− self.name
23− }
24−
25− pub fn read(&self) -> &[String] {
26− &self.values
27− }
28−
29− pub fn write(&mut self, values: Vec<String>) {
30− self.values = values;
31− }
32−
33− pub fn push(&mut self, value: String) {
34− self.values.push(value);
35− }
36−}
37−
38−/// Currently just wraps a `HashMap` of `Register`s
39−#[derive(Debug, Default)]
40−pub struct Registers {
41− inner: HashMap<char, Register>,
42−}
43−
44−impl Registers {
45− pub fn get(&self, name: char) -> Option<&Register> {
46− self.inner.get(&name)
47− }
48−
49− pub fn read(&self, name: char) -> Option<&[String]> {
50− self.get(name).map(|reg| reg.read())
51− }
52−
53− pub fn write(&mut self, name: char, values: Vec<String>) {
54− if name != '_' {
55− self.inner
56− .insert(name, Register::new_with_values(name, values));
57− }
58− }
59−
60− pub fn push(&mut self, name: char, value: String) {
61− if name != '_' {
62− if let Some(r) = self.inner.get_mut(&name) {
63− r.push(value);
64− } else {
65− self.write(name, vec![value]);
66− }
67− }
68− }
69−
70− pub fn first(&self, name: char) -> Option<&String> {
71− self.read(name).and_then(|entries| entries.first())
72− }
73−
74− pub fn last(&self, name: char) -> Option<&String> {
75− self.read(name).and_then(|entries| entries.last())
76− }
77−
78− pub fn inner(&self) -> &HashMap<char, Register> {
79− &self.inner
80− }
81−
82− pub fn clear(&mut self) {
83− self.inner.clear();
84− }
85−
86− pub fn remove(&mut self, name: char) -> Option<Register> {
87− self.inner.remove(&name)
88− }
89−}
helix-core/src/rope_reader.rsnew file+37
@@ -0,0 +1,37 @@
1+use std::io;
2+
3+use ropey::iter::Chunks;
4+use ropey::RopeSlice;
5+
6+pub struct RopeReader<'a> {
7+ current_chunk: &'a [u8],
8+ chunks: Chunks<'a>,
9+}
10+
11+impl<'a> RopeReader<'a> {
12+ pub fn new(rope: RopeSlice<'a>) -> RopeReader<'a> {
13+ RopeReader {
14+ current_chunk: &[],
15+ chunks: rope.chunks(),
16+ }
17+ }
18+}
19+
20+impl io::Read for RopeReader<'_> {
21+ fn read(&mut self, mut buf: &mut [u8]) -> io::Result<usize> {
22+ let buf_len = buf.len();
23+ loop {
24+ let read_bytes = self.current_chunk.read(buf)?;
25+ buf = &mut buf[read_bytes..];
26+ if buf.is_empty() {
27+ return Ok(buf_len);
28+ }
29+
30+ if let Some(next_chunk) = self.chunks.next() {
31+ self.current_chunk = next_chunk.as_bytes();
32+ } else {
33+ return Ok(buf_len - buf.len());
34+ }
35+ }
36+ }
37+}
helix-core/src/selection.rs+68−42
@@ -161,34 +161,35 @@ impl Range {
161161 self.from() <= pos && pos < self.to()
162162 }
163163
164− /// Map a range through a set of changes. Returns a new range representing the same position
165− /// after the changes are applied.
166− pub fn map(self, changes: &ChangeSet) -> Self {
164+ /// Map a range through a set of changes. Returns a new range representing
165+ /// the same position after the changes are applied. Note that this
166+ /// function runs in O(N) (N is number of changes) and can therefore
167+ /// cause performance problems if run for a large number of ranges as the
168+ /// complexity is then O(MN) (for multicuror M=N usually). Instead use
169+ /// [Selection::map] or [ChangeSet::update_positions] instead
170+ pub fn map(mut self, changes: &ChangeSet) -> Self {
167171 use std::cmp::Ordering;
168− let (anchor, head) = match self.anchor.cmp(&self.head) {
169− Ordering::Equal => (
170− changes.map_pos(self.anchor, Assoc::After),
171− changes.map_pos(self.head, Assoc::After),
172− ),
173− Ordering::Less => (
174− changes.map_pos(self.anchor, Assoc::After),
175− changes.map_pos(self.head, Assoc::Before),
176− ),
177− Ordering::Greater => (
178− changes.map_pos(self.anchor, Assoc::Before),
179− changes.map_pos(self.head, Assoc::After),
180− ),
181− };
182−
183− // We want to return a new `Range` with `horiz == None` every time,
184− // even if the anchor and head haven't changed, because we don't
185− // know if the *visual* position hasn't changed due to
186− // character-width or grapheme changes earlier in the text.
187− Self {
188− anchor,
189− head,
190− old_visual_position: None,
172+ if changes.is_empty() {
173+ return self;
191174 }
175+
176+ let positions_to_map = match self.anchor.cmp(&self.head) {
177+ Ordering::Equal => [
178+ (&mut self.anchor, Assoc::After),
179+ (&mut self.head, Assoc::After),
180+ ],
181+ Ordering::Less => [
182+ (&mut self.anchor, Assoc::After),
183+ (&mut self.head, Assoc::Before),
184+ ],
185+ Ordering::Greater => [
186+ (&mut self.head, Assoc::After),
187+ (&mut self.anchor, Assoc::Before),
188+ ],
189+ };
190+ changes.update_positions(positions_to_map.into_iter());
191+ self.old_visual_position = None;
192+ self
192193 }
193194
194195 /// Extend the range to cover at least `from` `to`.
@@ -451,17 +452,36 @@ impl Selection {
451452 /// Map selections over a set of changes. Useful for adjusting the selection position after
452453 /// applying changes to a document.
453454 pub fn map(self, changes: &ChangeSet) -> Self {
455+ self.map_no_normalize(changes).normalize()
456+ }
457+
458+ /// Map selections over a set of changes. Useful for adjusting the selection position after
459+ /// applying changes to a document. Doesn't normalize the selection
460+ pub fn map_no_normalize(mut self, changes: &ChangeSet) -> Self {
454461 if changes.is_empty() {
455462 return self;
456463 }
457464
458− Self::new(
459− self.ranges
460− .into_iter()
461− .map(|range| range.map(changes))
462− .collect(),
463− self.primary_index,
464− )
465+ let positions_to_map = self.ranges.iter_mut().flat_map(|range| {
466+ use std::cmp::Ordering;
467+ range.old_visual_position = None;
468+ match range.anchor.cmp(&range.head) {
469+ Ordering::Equal => [
470+ (&mut range.anchor, Assoc::After),
471+ (&mut range.head, Assoc::After),
472+ ],
473+ Ordering::Less => [
474+ (&mut range.anchor, Assoc::After),
475+ (&mut range.head, Assoc::Before),
476+ ],
477+ Ordering::Greater => [
478+ (&mut range.head, Assoc::After),
479+ (&mut range.anchor, Assoc::Before),
480+ ],
481+ }
482+ });
483+ changes.update_positions(positions_to_map);
484+ self
465485 }
466486
467487 pub fn ranges(&self) -> &[Range] {
@@ -497,6 +517,9 @@ impl Selection {
497517
498518 /// Normalizes a `Selection`.
499519 fn normalize(mut self) -> Self {
520+ if self.len() < 2 {
521+ return self;
522+ }
500523 let mut primary = self.ranges[self.primary_index];
501524 self.ranges.sort_unstable_by_key(Range::from);
502525
@@ -561,17 +584,12 @@ impl Selection {
561584 assert!(!ranges.is_empty());
562585 debug_assert!(primary_index < ranges.len());
563586
564− let mut selection = Self {
587+ let selection = Self {
565588 ranges,
566589 primary_index,
567590 };
568591
569− if selection.ranges.len() > 1 {
570− // TODO: only normalize if needed (any ranges out of order)
571− selection = selection.normalize();
572− }
573−
574− selection
592+ selection.normalize()
575593 }
576594
577595 /// Takes a closure and maps each `Range` over the closure.
@@ -612,11 +630,19 @@ impl Selection {
612630 self.transform(|range| Range::point(range.cursor(text)))
613631 }
614632
615− pub fn fragments<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = Cow<str>> + 'a {
633+ pub fn fragments<'a>(
634+ &'a self,
635+ text: RopeSlice<'a>,
636+ ) -> impl DoubleEndedIterator<Item = Cow<'a, str>> + ExactSizeIterator<Item = Cow<str>> + 'a
637+ {
616638 self.ranges.iter().map(move |range| range.fragment(text))
617639 }
618640
619− pub fn slices<'a>(&'a self, text: RopeSlice<'a>) -> impl Iterator<Item = RopeSlice> + 'a {
641+ pub fn slices<'a>(
642+ &'a self,
643+ text: RopeSlice<'a>,
644+ ) -> impl DoubleEndedIterator<Item = RopeSlice<'a>> + ExactSizeIterator<Item = RopeSlice<'a>> + 'a
645+ {
620646 self.ranges.iter().map(move |range| range.slice(text))
621647 }
622648
helix-core/src/syntax.rs+89−81
@@ -4,7 +4,7 @@ use crate::{
44 diagnostic::Severity,
55 regex::Regex,
66 transaction::{ChangeSet, Operation},
7− Rope, RopeSlice, Tendril,
7+ RopeSlice, Tendril,
88};
99
1010use ahash::RandomState;
@@ -101,7 +101,8 @@ pub struct LanguageConfiguration {
101101 pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
102102 #[serde(default)]
103103 pub shebangs: Vec<String>, // interpreter(s) associated with language
104− pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
104+ #[serde(default)]
105+ pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
105106 pub comment_token: Option<String>,
106107 pub text_width: Option<usize>,
107108 pub soft_wrap: Option<SoftWrap>,
@@ -154,6 +155,8 @@ pub struct LanguageConfiguration {
154155 /// Hardcoded LSP root directories relative to the workspace root, like `examples` or `tools/fuzz`.
155156 /// Falling back to the current working directory if none are configured.
156157 pub workspace_lsp_roots: Option<Vec<PathBuf>>,
158+ #[serde(default)]
159+ pub persistent_diagnostic_sources: Vec<String>,
157160}
158161
159162#[derive(Debug, PartialEq, Eq, Hash)]
@@ -211,10 +214,7 @@ impl<'de> Deserialize<'de> for FileType {
211214 {
212215 match map.next_entry::<String, String>()? {
213216 Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
214− // FIXME: use `suffix.replace('/', std::path::MAIN_SEPARATOR_STR)`
215− // if MSRV is updated to 1.68
216− let mut separator = [0; 1];
217− suffix.replace('/', std::path::MAIN_SEPARATOR.encode_utf8(&mut separator))
217+ suffix.replace('/', std::path::MAIN_SEPARATOR_STR)
218218 })),
219219 Some((key, _value)) => Err(serde::de::Error::custom(format!(
220220 "unknown key in `file-types` list: {}",
@@ -444,6 +444,22 @@ pub struct IndentationConfiguration {
444444 pub unit: String,
445445}
446446
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+
447463/// Configuration for auto pairs
448464#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
449465#[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
@@ -818,7 +834,10 @@ impl Loader {
818834 // TODO: content_regex handling conflict resolution
819835 }
820836
821− pub fn language_config_for_shebang(&self, source: &Rope) -> Option<Arc<LanguageConfiguration>> {
837+ pub fn language_config_for_shebang(
838+ &self,
839+ source: RopeSlice,
840+ ) -> Option<Arc<LanguageConfiguration>> {
822841 let line = Cow::from(source.line(0));
823842 static SHEBANG_REGEX: Lazy<Regex> =
824843 Lazy::new(|| Regex::new(&["^", SHEBANG].concat()).unwrap());
@@ -928,7 +947,7 @@ fn byte_range_to_str(range: std::ops::Range<usize>, source: RopeSlice) -> Cow<st
928947
929948impl Syntax {
930949 pub fn new(
931− source: &Rope,
950+ source: RopeSlice,
932951 config: Arc<HighlightConfiguration>,
933952 loader: Arc<Loader>,
934953 ) -> Option<Self> {
@@ -959,7 +978,7 @@ impl Syntax {
959978 let res = syntax.update(source, source, &ChangeSet::new(source));
960979
961980 if res.is_err() {
962− log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
981+ log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
963982 return None;
964983 }
965984 Some(syntax)
@@ -967,8 +986,8 @@ impl Syntax {
967986
968987 pub fn update(
969988 &mut self,
970− old_source: &Rope,
971− source: &Rope,
989+ old_source: RopeSlice,
990+ source: RopeSlice,
972991 changeset: &ChangeSet,
973992 ) -> Result<(), Error> {
974993 let mut queue = VecDeque::new();
@@ -1135,12 +1154,38 @@ impl Syntax {
11351154 layer.tree().root_node(),
11361155 RopeProvider(source_slice),
11371156 );
1157+ let mut combined_injections = vec![
1158+ (None, Vec::new(), IncludedChildren::default());
1159+ layer.config.combined_injections_patterns.len()
1160+ ];
11381161 let mut injections = Vec::new();
1162+ let mut last_injection_end = 0;
11391163 for mat in matches {
11401164 let (injection_capture, content_node, included_children) = layer
11411165 .config
11421166 .injection_for_match(&layer.config.injections_query, &mat, source_slice);
11431167
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+ }
1188+
11441189 // Explicitly remove this match so that none of its other captures will remain
11451190 // in the stream of captures.
11461191 mat.remove();
@@ -1155,49 +1200,23 @@ impl Syntax {
11551200 intersect_ranges(&layer.ranges, &[content_node], included_children);
11561201
11571202 if !ranges.is_empty() {
1203+ if content_node.start_byte() < last_injection_end {
1204+ continue;
1205+ }
1206+ last_injection_end = content_node.end_byte();
11581207 injections.push((config, ranges));
11591208 }
11601209 }
11611210 }
11621211 }
11631212
1164− // Process combined injections.
1165− if let Some(combined_injections_query) = &layer.config.combined_injections_query {
1166− let mut injections_by_pattern_index =
1167− vec![
1168− (None, Vec::new(), IncludedChildren::default());
1169− combined_injections_query.pattern_count()
1170− ];
1171− let matches = cursor.matches(
1172− combined_injections_query,
1173− layer.tree().root_node(),
1174− RopeProvider(source_slice),
1175− );
1176− for mat in matches {
1177− let entry = &mut injections_by_pattern_index[mat.pattern_index];
1178− let (injection_capture, content_node, included_children) = layer
1179− .config
1180− .injection_for_match(combined_injections_query, &mat, source_slice);
1181− if injection_capture.is_some() {
1182− entry.0 = injection_capture;
1183− }
1184− if let Some(content_node) = content_node {
1185− entry.1.push(content_node);
1186− }
1187− entry.2 = included_children;
1188− }
1189− for (lang_name, content_nodes, included_children) in injections_by_pattern_index
1190− {
1191− if let (Some(lang_name), false) = (lang_name, content_nodes.is_empty()) {
1192− if let Some(config) = (injection_callback)(&lang_name) {
1193− let ranges = intersect_ranges(
1194− &layer.ranges,
1195− &content_nodes,
1196− included_children,
1197− );
1198− if !ranges.is_empty() {
1199− injections.push((config, ranges));
1200− }
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));
12011220 }
12021221 }
12031222 }
@@ -1387,7 +1406,7 @@ impl LanguageLayer {
13871406 self.tree.as_ref().unwrap()
13881407 }
13891408
1390− fn parse(&mut self, parser: &mut Parser, source: &Rope) -> Result<(), Error> {
1409+ fn parse(&mut self, parser: &mut Parser, source: RopeSlice) -> Result<(), Error> {
13911410 parser
13921411 .set_included_ranges(&self.ranges)
13931412 .map_err(|_| Error::InvalidRanges)?;
@@ -1402,7 +1421,7 @@ impl LanguageLayer {
14021421 &mut |byte, _| {
14031422 if byte <= source.len_bytes() {
14041423 let (chunk, start_byte, _, _) = source.chunk_at_byte(byte);
1405− chunk[byte - start_byte..].as_bytes()
1424+ &chunk.as_bytes()[byte - start_byte..]
14061425 } else {
14071426 // out of range
14081427 &[]
@@ -1418,7 +1437,7 @@ impl LanguageLayer {
14181437}
14191438
14201439pub(crate) fn generate_edits(
1421− old_text: &Rope,
1440+ old_text: RopeSlice,
14221441 changeset: &ChangeSet,
14231442) -> Vec<tree_sitter::InputEdit> {
14241443 use Operation::*;
@@ -1434,7 +1453,7 @@ pub(crate) fn generate_edits(
14341453
14351454 // TODO; this is a lot easier with Change instead of Operation.
14361455
1437− fn point_at_pos(text: &Rope, pos: usize) -> (usize, Point) {
1456+ fn point_at_pos(text: RopeSlice, pos: usize) -> (usize, Point) {
14381457 let byte = text.char_to_byte(pos); // <- attempted to index past end
14391458 let line = text.char_to_line(pos);
14401459 let line_start_byte = text.line_to_byte(line);
@@ -1560,7 +1579,7 @@ pub struct HighlightConfiguration {
15601579 pub language: Grammar,
15611580 pub query: Query,
15621581 injections_query: Query,
1563− combined_injections_query: Option<Query>,
1582+ combined_injections_patterns: Vec<usize>,
15641583 highlights_pattern_index: usize,
15651584 highlight_indices: ArcSwap<Vec<Option<Highlight>>>,
15661585 non_local_variable_patterns: Vec<bool>,
@@ -1611,7 +1630,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
16111630}
16121631
16131632pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1614−impl<'a> TextProvider<'a> for RopeProvider<'a> {
1633+impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
16151634 type I = ChunksBytes<'a>;
16161635
16171636 fn text(&mut self, node: Node) -> Self::I {
@@ -1625,7 +1644,7 @@ impl<'a> TextProvider<'a> for RopeProvider<'a> {
16251644struct HighlightIterLayer<'a> {
16261645 _tree: Option<Tree>,
16271646 cursor: QueryCursor,
1628− captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
1647+ captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
16291648 config: &'a HighlightConfiguration,
16301649 highlight_end_stack: Vec<usize>,
16311650 scope_stack: Vec<LocalScope<'a>>,
@@ -1676,26 +1695,15 @@ impl HighlightConfiguration {
16761695 }
16771696 }
16781697
1679− let mut injections_query = Query::new(language, injection_query)?;
1680−
1681− // Construct a separate query just for dealing with the 'combined injections'.
1682− // Disable the combined injection patterns in the main query.
1683− let mut combined_injections_query = Query::new(language, injection_query)?;
1684− let mut has_combined_queries = false;
1685− for pattern_index in 0..injections_query.pattern_count() {
1686− let settings = injections_query.property_settings(pattern_index);
1687− if settings.iter().any(|s| &*s.key == "injection.combined") {
1688− has_combined_queries = true;
1689− injections_query.disable_pattern(pattern_index);
1690− } else {
1691− combined_injections_query.disable_pattern(pattern_index);
1692− }
1693− }
1694− let combined_injections_query = if has_combined_queries {
1695− Some(combined_injections_query)
1696− } else {
1697− None
1698− };
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();
16991707
17001708 // Find all of the highlighting patterns that are disabled for nodes that
17011709 // have been identified as local variables.
@@ -1744,7 +1752,7 @@ impl HighlightConfiguration {
17441752 language,
17451753 query,
17461754 injections_query,
1747− combined_injections_query,
1755+ combined_injections_patterns,
17481756 highlights_pattern_index,
17491757 highlight_indices,
17501758 non_local_variable_patterns,
@@ -2540,7 +2548,7 @@ mod test {
25402548 let mut cursor = QueryCursor::new();
25412549
25422550 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2543− let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
2551+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
25442552
25452553 let root = syntax.tree().root_node();
25462554 let mut test = |capture, range| {
@@ -2614,7 +2622,7 @@ mod test {
26142622 fn main() {}
26152623 ",
26162624 );
2617− let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
2625+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
26182626 let tree = syntax.tree();
26192627 let root = tree.root_node();
26202628 assert_eq!(root.kind(), "source_file");
@@ -2641,7 +2649,7 @@ mod test {
26412649 &doc,
26422650 vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
26432651 );
2644− let edits = generate_edits(&doc, transaction.changes());
2652+ let edits = generate_edits(doc.slice(..), transaction.changes());
26452653 // transaction.apply(&mut state);
26462654
26472655 assert_eq!(
@@ -2670,7 +2678,7 @@ mod test {
26702678 let mut doc = Rope::from("fn test() {}");
26712679 let transaction =
26722680 Transaction::change(&doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
2673− let edits = generate_edits(&doc, transaction.changes());
2681+ let edits = generate_edits(doc.slice(..), transaction.changes());
26742682 transaction.apply(&mut doc);
26752683
26762684 assert_eq!(doc, "fn test(a: u32) {}");
@@ -2704,7 +2712,7 @@ mod test {
27042712 let language = get_language(language_name).unwrap();
27052713
27062714 let config = HighlightConfiguration::new(language, "", "", "").unwrap();
2707− let syntax = Syntax::new(&source, Arc::new(config), Arc::new(loader)).unwrap();
2715+ let syntax = Syntax::new(source.slice(..), Arc::new(config), Arc::new(loader)).unwrap();
27082716
27092717 let root = syntax
27102718 .tree()
helix-core/src/transaction.rs+191−51
@@ -1,7 +1,8 @@
1+use ropey::RopeSlice;
12use smallvec::SmallVec;
23
3−use crate::{Range, Rope, Selection, Tendril};
4−use std::borrow::Cow;
4+use crate::{chars::char_is_word, Range, Rope, Selection, Tendril};
5+use std::{borrow::Cow, iter::once};
56
67/// (from, to, replacement)
78pub type Change = (usize, usize, Option<Tendril>);
@@ -22,6 +23,30 @@ pub enum Operation {
2223pub enum Assoc {
2324 Before,
2425 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+ }
2550}
2651
2752#[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -42,7 +67,7 @@ impl ChangeSet {
4267 }
4368
4469 #[must_use]
45− pub fn new(doc: &Rope) -> Self {
70+ pub fn new(doc: RopeSlice) -> Self {
4671 let len = doc.len_chars();
4772 Self {
4873 changes: Vec::new(),
@@ -326,20 +351,75 @@ impl ChangeSet {
326351 self.changes.is_empty() || self.changes == [Operation::Retain(self.len)]
327352 }
328353
329− /// Map a position through the changes.
354+ /// Map a (mostly) *sorted* list of positions through the changes.
330355 ///
331− /// `assoc` indicates which size to associate the position with. `Before` will keep the
332− /// position close to the character before, and will place it before insertions over that
333− /// range, or at that point. `After` will move it forward, placing it at the end of such
334− /// insertions.
335− pub fn map_pos(&self, pos: usize, assoc: Assoc) -> usize {
356+ /// This is equivalent to updating each position with `map_pos`:
357+ ///
358+ /// ``` no-compile
359+ /// for (pos, assoc) in positions {
360+ /// *pos = changes.map_pos(*pos, assoc);
361+ /// }
362+ /// ```
363+ /// However this function is significantly faster for sorted lists running
364+ /// in `O(N+M)` instead of `O(NM)`. This function also handles unsorted/
365+ /// partially sorted lists. However, in that case worst case complexity is
366+ /// again `O(MN)`. For lists that are often/mostly sorted (like the end of diagnostic ranges)
367+ /// performance is usally close to `O(N + M)`
368+ pub fn update_positions<'a>(&self, positions: impl Iterator<Item = (&'a mut usize, Assoc)>) {
336369 use Operation::*;
370+
371+ let mut positions = positions.peekable();
372+
337373 let mut old_pos = 0;
338374 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+ }
339414
340− let mut iter = self.changes.iter().peekable();
415+ let Some((i, change)) = iter.next() else {
416+ map!(
417+ |pos, _| (old_pos == pos).then_some(new_pos),
418+ self.changes.len()
419+ );
420+ break;
421+ };
341422
342− while let Some(change) = iter.next() {
343423 let len = match change {
344424 Delete(i) | Retain(i) => *i,
345425 Insert(_) => 0,
@@ -348,61 +428,65 @@ impl ChangeSet {
348428
349429 match change {
350430 Retain(_) => {
351− if old_end > pos {
352− return new_pos + (pos - old_pos);
353− }
431+ map!(
432+ |pos, _| (old_end > pos).then_some(new_pos + (pos - old_pos)),
433+ i
434+ );
354435 new_pos += len;
355436 }
356437 Delete(_) => {
357438 // in range
358− if old_end > pos {
359− return new_pos;
360− }
439+ map!(|pos, _| (old_end > pos).then_some(new_pos), i);
361440 }
362441 Insert(s) => {
363− let ins = s.chars().count();
364−
365442 // a subsequent delete means a replace, consume it
366− if let Some(Delete(len)) = iter.peek() {
443+ if let Some((_, Delete(len))) = iter.peek() {
367444 iter.next();
368445
369446 old_end = old_pos + len;
370447 // in range of replaced text
371− if old_end > pos {
372− // at point or tracking before
373− if pos == old_pos || assoc == Assoc::Before {
374− return new_pos;
375− } else {
376− // place to end of insert
377− return new_pos + ins;
378− }
379− }
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+ );
380460 } else {
381461 // at insert point
382− if old_pos == pos {
383− // return position before inserted text
384− if assoc == Assoc::Before {
385− return new_pos;
386− } else {
387− // after text
388− return new_pos + ins;
389− }
390− }
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+ );
391469 }
392470
393− new_pos += ins;
471+ new_pos += s.chars().count();
394472 }
395473 }
396474 old_pos = old_end;
397475 }
476+ let out_of_bounds: Vec<_> = positions.collect();
398477
399− if pos > old_pos {
400− panic!(
401− "Position {} is out of range for changeset len {}!",
402− pos, old_pos
403− )
404− }
405− new_pos
478+ panic!("Positions {out_of_bounds:?} are out of range for changeset len {old_pos}!",)
479+ }
480+
481+ /// Map a position through the changes.
482+ ///
483+ /// `assoc` indicates which side to associate the position with. `Before` will keep the
484+ /// position close to the character before, and will place it before insertions over that
485+ /// range, or at that point. `After` will move it forward, placing it at the end of such
486+ /// insertions.
487+ pub fn map_pos(&self, mut pos: usize, assoc: Assoc) -> usize {
488+ self.update_positions(once((&mut pos, assoc)));
489+ pos
406490 }
407491
408492 pub fn changes_iter(&self) -> ChangeIterator {
@@ -422,7 +506,7 @@ impl Transaction {
422506 /// Create a new, empty transaction.
423507 pub fn new(doc: &Rope) -> Self {
424508 Self {
425− changes: ChangeSet::new(doc),
509+ changes: ChangeSet::new(doc.slice(..)),
426510 selection: None,
427511 }
428512 }
@@ -803,6 +887,62 @@ mod test {
803887 };
804888 assert_eq!(cs.map_pos(2, Assoc::Before), 2);
805889 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);
806946 }
807947
808948 #[test]
@@ -869,9 +1009,9 @@ mod test {
8691009 #[test]
8701010 fn combine_with_empty() {
8711011 let empty = Rope::from("");
872− let a = ChangeSet::new(&empty);
1012+ let a = ChangeSet::new(empty.slice(..));
8731013
874− let mut b = ChangeSet::new(&empty);
1014+ let mut b = ChangeSet::new(empty.slice(..));
8751015 b.insert("a".into());
8761016
8771017 let changes = a.compose(b);
@@ -885,9 +1025,9 @@ mod test {
8851025 const TEST_CASE: &str = "Hello, これはヘリックスエディターです!";
8861026
8871027 let empty = Rope::from("");
888− let a = ChangeSet::new(&empty);
1028+ let a = ChangeSet::new(empty.slice(..));
8891029
890− let mut b = ChangeSet::new(&empty);
1030+ let mut b = ChangeSet::new(empty.slice(..));
8911031 b.insert(TEST_CASE.into());
8921032
8931033 let changes = a.compose(b);
helix-core/src/wrap.rs+3−1
@@ -1,7 +1,9 @@
11use smartstring::{LazyCompact, SmartString};
2+use textwrap::{Options, WordSplitter::NoHyphenation};
23
34/// Given a slice of text, return the text re-wrapped to fit it
45/// within the given width.
56pub fn reflow_hard_wrap(text: &str, text_width: usize) -> SmartString<LazyCompact> {
6− textwrap::refill(text, text_width).into()
7+ let options = Options::new(text_width).word_splitter(NoHyphenation);
8+ textwrap::refill(text, options).into()
79}
helix-core/tests/data/indent/cpp.cppnew file+48
@@ -0,0 +1,48 @@
1+std::vector<std::string>
2+fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
3+ char* parm5, bool parm6);
4+
5+std::vector<std::string>
6+fn_with_many_parameters(int parm1, long parm2, float parm3, double parm4,
7+ char* parm5, bool parm6) {
8+ auto lambda = []() {
9+ return 0;
10+ };
11+ auto lambda_with_a_really_long_name_that_uses_a_whole_line
12+ = [](int some_more_aligned_parameters,
13+ std::string parm2) {
14+ do_smth();
15+ };
16+ if (brace_on_same_line) {
17+ do_smth();
18+ } else if (brace_on_next_line)
19+ {
20+ do_smth();
21+ } else if (another_condition) {
22+ do_smth();
23+ }
24+ else {
25+ do_smth();
26+ }
27+ if (inline_if_statement)
28+ do_smth();
29+ if (another_inline_if_statement)
30+ return [](int parm1, char* parm2) {
31+ this_is_a_really_pointless_lambda();
32+ };
33+
34+ switch (var) {
35+ case true:
36+ return -1;
37+ case false:
38+ return 42;
39+ }
40+}
41+
42+class MyClass : public MyBaseClass {
43+public:
44+ MyClass();
45+ void public_fn();
46+private:
47+ super_secret_private_fn();
48+}
helix-core/tests/data/indent/indent.rsdeleted−1
@@ -1 +0,0 @@
1−../../../src/indent.rs
helix-core/tests/data/indent/languages.toml+13
@@ -11,3 +11,16 @@ indent = { tab-width = 4, unit = " " }
1111[[grammar]]
1212name = "rust"
1313source = { git = "https://github.com/tree-sitter/tree-sitter-rust", rev = "0431a2c60828731f27491ee9fdefe25e250ce9c9" }
14+
15+[[language]]
16+name = "cpp"
17+scope = "source.cpp"
18+injection-regex = "cpp"
19+file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H"]
20+roots = []
21+comment-token = "//"
22+indent = { tab-width = 2, unit = " " }
23+
24+[[grammar]]
25+name = "cpp"
26+source = { git = "https://github.com/tree-sitter/tree-sitter-cpp", rev = "2d2c4aee8672af4c7c8edff68e7dd4c07e88d2b1" }
helix-core/tests/indent.rs+153−25
@@ -1,20 +1,122 @@
11use helix_core::{
22 indent::{indent_level_for_line, treesitter_indent_for_pos, IndentStyle},
3− syntax::Loader,
3+ syntax::{Configuration, Loader},
44 Syntax,
55};
6−use std::path::PathBuf;
6+use ropey::Rope;
7+use std::{ops::Range, path::PathBuf, process::Command};
78
89#[test]
910fn test_treesitter_indent_rust() {
10− test_treesitter_indent("rust.rs", "source.rust");
11+ standard_treesitter_test("rust.rs", "source.rust");
1112}
13+
1214#[test]
13−fn test_treesitter_indent_rust_2() {
14− test_treesitter_indent("indent.rs", "source.rust");
15− // TODO Use commands.rs as indentation test.
16− // Currently this fails because we can't align the parameters of a closure yet
17− // test_treesitter_indent("commands.rs", "source.rust");
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+ }
18120}
19121
20122#[test]
@@ -50,20 +152,41 @@ fn test_indent_level_for_line_with_spaces_and_tabs() {
50152 assert_eq!(indent_level, 2)
51153}
52154
53−fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
155+fn indent_tests_dir() -> PathBuf {
54156 let mut test_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
55157 test_dir.push("tests/data/indent");
158+ test_dir
159+}
56160
57− let mut test_file = test_dir.clone();
58− test_file.push(file_name);
59− let test_file = std::fs::File::open(test_file).unwrap();
161+fn indent_test_path(name: &str) -> PathBuf {
162+ let mut path = indent_tests_dir();
163+ path.push(name);
164+ path
165+}
166+
167+fn indent_tests_config() -> Configuration {
168+ let mut config_path = indent_tests_dir();
169+ config_path.push("languages.toml");
170+ let config = std::fs::read_to_string(config_path).unwrap();
171+ toml::from_str(&config).unwrap()
172+}
173+
174+fn standard_treesitter_test(file_name: &str, lang_scope: &str) {
175+ let test_path = indent_test_path(file_name);
176+ let test_file = std::fs::File::open(test_path).unwrap();
60177 let doc = ropey::Rope::from_reader(test_file).unwrap();
178+ test_treesitter_indent(file_name, doc, lang_scope, Vec::new())
179+}
61180
62− let mut config_file = test_dir;
63− config_file.push("languages.toml");
64− let config = std::fs::read_to_string(config_file).unwrap();
65− let config = toml::from_str(&config).unwrap();
66− let loader = Loader::new(config);
181+/// Test that all the lines in the given file are indented as expected.
182+/// ignored_lines is a list of (1-indexed) line ranges that are excluded from this test.
183+fn test_treesitter_indent(
184+ test_name: &str,
185+ doc: Rope,
186+ lang_scope: &str,
187+ ignored_lines: Vec<std::ops::Range<usize>>,
188+) {
189+ let loader = Loader::new(indent_tests_config());
67190
68191 // set runtime path so we can find the queries
69192 let mut runtime = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
@@ -71,30 +194,35 @@ fn test_treesitter_indent(file_name: &str, lang_scope: &str) {
71194 std::env::set_var("HELIX_RUNTIME", runtime.to_str().unwrap());
72195
73196 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);
74198 let highlight_config = language_config.highlight_config(&[]).unwrap();
75− let syntax = Syntax::new(&doc, highlight_config, std::sync::Arc::new(loader)).unwrap();
76− let indent_query = language_config.indent_query().unwrap();
77199 let text = doc.slice(..);
200+ let syntax = Syntax::new(text, highlight_config, std::sync::Arc::new(loader)).unwrap();
201+ let indent_query = language_config.indent_query().unwrap();
78202
79203 for i in 0..doc.len_lines() {
80204 let line = text.line(i);
205+ if ignored_lines.iter().any(|range| range.contains(&(i + 1))) {
206+ continue;
207+ }
81208 if let Some(pos) = helix_core::find_first_non_whitespace_char(line) {
82− let tab_and_indent_width: usize = 4;
209+ let tab_width: usize = 4;
83210 let suggested_indent = treesitter_indent_for_pos(
84211 indent_query,
85212 &syntax,
86− &IndentStyle::Spaces(tab_and_indent_width as u8),
87− tab_and_indent_width,
88− tab_and_indent_width,
213+ tab_width,
214+ indent_style.indent_width(tab_width),
89215 text,
90216 i,
91217 text.line_to_char(i) + pos,
92218 false,
93219 )
94− .unwrap();
220+ .unwrap()
221+ .to_string(&indent_style, tab_width);
95222 assert!(
96223 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
97− "Wrong indentation on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
224+ "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
225+ test_name,
98226 i+1,
99227 line.slice(..line.len_chars()-1),
100228 suggested_indent,
helix-dap/Cargo.toml+11−9
@@ -1,25 +1,27 @@
11[package]
22name = "helix-dap"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2018"
6−license = "MPL-2.0"
73description = "DAP client implementation for Helix project"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
9+categories.workspace = true
10+repository.workspace = true
11+homepage.workspace = true
1112
1213# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1314
1415[dependencies]
15−helix-core = { version = "0.6", path = "../helix-core" }
16+helix-core = { path = "../helix-core" }
17+
1618anyhow = "1.0"
1719log = "0.4"
1820serde = { version = "1.0", features = ["derive"] }
1921serde_json = "1.0"
2022thiserror = "1.0"
2123tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
22−which = "4.4"
24+which = "5.0.0"
2325
2426[dev-dependencies]
2527fern = "0.6"
helix-event/Cargo.tomlnew file+16
@@ -0,0 +1,16 @@
1+[package]
2+name = "helix-event"
3+version.workspace = true
4+authors.workspace = true
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
8+categories.workspace = true
9+repository.workspace = true
10+homepage.workspace = true
11+
12+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13+
14+[dependencies]
15+tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot"] }
16+parking_lot = { version = "0.12", features = ["send_guard"] }
helix-event/src/lib.rsnew file+8
@@ -0,0 +1,8 @@
1+//! `helix-event` contains systems that allow (often async) communication between
2+//! different editor components without strongly coupling them. Currently this
3+//! crate only contains some smaller facilities but the intend is to add more
4+//! functionality in the future ( like a generic hook system)
5+
6+pub use redraw::{lock_frame, redraw_requested, request_redraw, start_frame, RenderLockGuard};
7+
8+mod redraw;
helix-event/src/redraw.rsnew file+49
@@ -0,0 +1,49 @@
1+//! Signals that control when/if the editor redraws
2+
3+use std::future::Future;
4+
5+use parking_lot::{RwLock, RwLockReadGuard};
6+use tokio::sync::Notify;
7+
8+/// A `Notify` instance that can be used to (asynchronously) request
9+/// the editor the render a new frame.
10+static REDRAW_NOTIFY: Notify = Notify::const_new();
11+
12+/// A `RwLock` that prevents the next frame from being
13+/// drawn until an exclusive (write) lock can be acquired.
14+/// This allows asynchsonous tasks to acquire `non-exclusive`
15+/// locks (read) to prevent the next frame from being drawn
16+/// until a certain computation has finished.
17+static RENDER_LOCK: RwLock<()> = RwLock::new(());
18+
19+pub type RenderLockGuard = RwLockReadGuard<'static, ()>;
20+
21+/// Requests that the editor is redrawn. The redraws are debounced (currently to
22+/// 30FPS) so this can be called many times without causing a ton of frames to
23+/// be rendered.
24+pub fn request_redraw() {
25+ REDRAW_NOTIFY.notify_one();
26+}
27+
28+/// Returns a future that will yield once a redraw has been asynchronously
29+/// requested using [`request_redraw`].
30+pub fn redraw_requested() -> impl Future<Output = ()> {
31+ REDRAW_NOTIFY.notified()
32+}
33+
34+/// Wait until all locks acquired with [`lock_frame`] have been released.
35+/// This function is called before rendering and is intended to allow the frame
36+/// to wait for async computations that should be included in the current frame.
37+pub fn start_frame() {
38+ drop(RENDER_LOCK.write());
39+ // exhaust any leftover redraw notifications
40+ let notify = REDRAW_NOTIFY.notified();
41+ tokio::pin!(notify);
42+ notify.enable();
43+}
44+
45+/// Acquires the render lock which will prevent the next frame from being drawn
46+/// until the returned guard is dropped.
47+pub fn lock_frame() -> RenderLockGuard {
48+ RENDER_LOCK.read()
49+}
helix-loader/Cargo.toml+14−12
@@ -1,13 +1,14 @@
11[package]
22name = "helix-loader"
3−version = "0.6.0"
4−description = "A post-modern text editor."
5−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
6−edition = "2021"
7−license = "MPL-2.0"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
3+description = "Build bootstrapping for Helix crates"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
9+categories.workspace = true
10+repository.workspace = true
11+homepage.workspace = true
1112
1213[[bin]]
1314name = "hx-loader"
@@ -18,17 +19,18 @@ anyhow = "1"
1819serde = { version = "1.0", features = ["derive"] }
1920toml = "0.7"
2021etcetera = "0.8"
21−tree-sitter = "0.20"
22−once_cell = "1.18"
22+tree-sitter.workspace = true
23+once_cell = "1.19"
2324log = "0.4"
24−which = "4.4"
25+which = "5.0.0"
2526
2627# TODO: these two should be on !wasm32 only
2728
2829# cloning/compiling tree-sitter grammars
2930cc = { version = "1" }
3031threadpool = { version = "1.0" }
31−tempfile = "3.6.0"
32+tempfile = "3.8.1"
33+dunce = "1.0.4"
3234
3335[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
3436libloading = "0.8"
helix-loader/build.rs+20−6
@@ -2,7 +2,17 @@ use std::borrow::Cow;
22use std::path::Path;
33use std::process::Command;
44
5−const VERSION: &str = include_str!("../VERSION");
5+const MAJOR: &str = env!("CARGO_PKG_VERSION_MAJOR");
6+const MINOR: &str = env!("CARGO_PKG_VERSION_MINOR");
7+const PATCH: &str = env!("CARGO_PKG_VERSION_PATCH");
8+
9+fn get_calver() -> String {
10+ if PATCH == "0" {
11+ format!("{MAJOR}.{MINOR}")
12+ } else {
13+ format!("{MAJOR}.{MINOR}.{PATCH}")
14+ }
15+}
616
717fn main() {
818 let git_hash = Command::new("git")
@@ -12,9 +22,10 @@ fn main() {
1222 .filter(|output| output.status.success())
1323 .and_then(|x| String::from_utf8(x.stdout).ok());
1424
25+ let calver = get_calver();
1526 let version: Cow<_> = match &git_hash {
16− Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
17− None => VERSION.into(),
27+ Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(),
28+ None => calver.into(),
1829 };
1930
2031 println!(
@@ -22,7 +33,6 @@ fn main() {
2233 std::env::var("TARGET").unwrap()
2334 );
2435
25− println!("cargo:rerun-if-changed=../VERSION");
2636 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
2737
2838 if git_hash.is_none() {
@@ -40,7 +50,9 @@ fn main() {
4050 .ok()
4151 .filter(|output| output.status.success())
4252 .and_then(|x| String::from_utf8(x.stdout).ok())
43− else{ return; };
53+ else {
54+ return;
55+ };
4456 // If heads starts pointing at something else (different branch)
4557 // we need to return
4658 let head = Path::new(&git_dir).join("HEAD");
@@ -55,7 +67,9 @@ fn main() {
5567 .ok()
5668 .filter(|output| output.status.success())
5769 .and_then(|x| String::from_utf8(x.stdout).ok())
58− else{ return; };
70+ else {
71+ return;
72+ };
5973 let head_ref = Path::new(&git_dir).join(head_ref);
6074 if head_ref.exists() {
6175 println!("cargo:rerun-if-changed={}", head_ref.display());
helix-loader/src/lib.rs+78−17
@@ -3,29 +3,56 @@ pub mod grammar;
33
44use etcetera::base_strategy::{choose_base_strategy, BaseStrategy};
55use std::path::{Path, PathBuf};
6+use std::sync::RwLock;
67
78pub const VERSION_AND_GIT_HASH: &str = env!("VERSION_AND_GIT_HASH");
89
10+static CWD: RwLock<Option<PathBuf>> = RwLock::new(None);
11+
912static RUNTIME_DIRS: once_cell::sync::Lazy<Vec<PathBuf>> =
1013 once_cell::sync::Lazy::new(prioritize_runtime_dirs);
1114
1215static CONFIG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
1316
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();
17+static LOG_FILE: once_cell::sync::OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
1718
18− if !config_dir.exists() {
19− std::fs::create_dir_all(&config_dir).ok();
20− }
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+ }
2126
22− config_dir.join("config.toml")
23− });
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());
2432
25− // We should only initialize this value once.
33+ path
34+}
35+
36+pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
37+ let path = dunce::canonicalize(path)?;
38+ std::env::set_current_dir(&path)?;
39+ let mut cwd = CWD.write().unwrap();
40+ *cwd = Some(path);
41+ Ok(())
42+}
43+
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);
2647 CONFIG_FILE.set(config_file).ok();
2748}
2849
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+
2956/// A list of runtime directories from highest to lowest priority
3057///
3158/// The priority is:
@@ -33,7 +60,8 @@ pub fn initialize_config_file(specified_file: Option<PathBuf>) {
3360/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
3461/// 2. subdirectory of user config directory (always included)
3562/// 3. `HELIX_RUNTIME` (if environment variable is set)
36−/// 4. subdirectory of path to helix executable (always included)
63+/// 4. `HELIX_DEFAULT_RUNTIME` (if environment variable is set *at build time*)
64+/// 5. subdirectory of path to helix executable (always included)
3765///
3866/// Postcondition: returns at least two paths (they might not exist).
3967fn prioritize_runtime_dirs() -> Vec<PathBuf> {
@@ -54,6 +82,14 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
5482 rt_dirs.push(dir.into());
5583 }
5684
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+
5793 // fallback to location of the executable being run
5894 // canonicalize the path in case the executable is symlinked
5995 let exe_rt_dir = std::env::current_exe()
@@ -122,10 +158,11 @@ pub fn cache_dir() -> PathBuf {
122158}
123159
124160pub fn config_file() -> PathBuf {
125− CONFIG_FILE
126− .get()
127− .map(|path| path.to_path_buf())
128− .unwrap_or_else(|| config_dir().join("config.toml"))
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()
129166}
130167
131168pub fn workspace_config_file() -> PathBuf {
@@ -136,7 +173,7 @@ pub fn lang_config_file() -> PathBuf {
136173 config_dir().join("languages.toml")
137174}
138175
139−pub fn log_file() -> PathBuf {
176+pub fn default_log_file() -> PathBuf {
140177 cache_dir().join("helix.log")
141178}
142179
@@ -217,7 +254,7 @@ pub fn merge_toml_values(left: toml::Value, right: toml::Value, merge_depth: usi
217254/// If no workspace was found returns (CWD, true).
218255/// Otherwise (workspace, false) is returned
219256pub fn find_workspace() -> (PathBuf, bool) {
220− let current_dir = std::env::current_dir().expect("unable to determine current directory");
257+ let current_dir = current_working_dir();
221258 for ancestor in current_dir.ancestors() {
222259 if ancestor.join(".git").exists() || ancestor.join(".helix").exists() {
223260 return (ancestor.to_owned(), false);
@@ -227,13 +264,37 @@ pub fn find_workspace() -> (PathBuf, bool) {
227264 (current_dir, true)
228265}
229266
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+
230279#[cfg(test)]
231280mod merge_toml_tests {
232281 use std::str;
233282
234− use super::merge_toml_values;
283+ use super::{current_working_dir, merge_toml_values, set_current_working_dir};
235284 use toml::Value;
236285
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+
237298 #[test]
238299 fn language_toml_map_merges() {
239300 const USER: &str = r#"
helix-lsp/Cargo.toml+15−13
@@ -1,30 +1,32 @@
11[package]
22name = "helix-lsp"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
73description = "LSP client implementation for Helix project"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
9+categories.workspace = true
10+repository.workspace = true
11+homepage.workspace = true
1112
1213# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1314
1415[dependencies]
15−helix-core = { version = "0.6", path = "../helix-core" }
16−helix-loader = { version = "0.6", path = "../helix-loader" }
17−helix-parsec = { version = "0.6", path = "../helix-parsec" }
16+helix-core = { path = "../helix-core" }
17+helix-loader = { path = "../helix-loader" }
18+helix-parsec = { path = "../helix-parsec" }
1819
1920anyhow = "1.0"
2021futures-executor = "0.3"
2122futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
23+globset = "0.4.14"
2224log = "0.4"
23−lsp-types = { version = "0.94" }
25+lsp-types = { version = "0.95" }
2426serde = { version = "1.0", features = ["derive"] }
2527serde_json = "1.0"
2628thiserror = "1.0"
27−tokio = { version = "1.28", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
29+tokio = { version = "1.35", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "sync"] }
2830tokio-stream = "0.1.14"
29−which = "4.4"
31+which = "5.0.0"
3032parking_lot = "0.12.1"
helix-lsp/src/client.rs+123−11
@@ -7,8 +7,9 @@ use crate::{
77use helix_core::{find_workspace, path, syntax::LanguageServerFeature, ChangeSet, Rope};
88use helix_loader::{self, VERSION_AND_GIT_HASH};
99use lsp::{
10− notification::DidChangeWorkspaceFolders, DidChangeWorkspaceFoldersParams, OneOf,
11− PositionEncodingKind, WorkspaceFolder, WorkspaceFoldersChangeEvent,
10+ notification::DidChangeWorkspaceFolders, CodeActionCapabilityResolveSupport,
11+ DidChangeWorkspaceFoldersParams, OneOf, PositionEncodingKind, WorkspaceFolder,
12+ WorkspaceFoldersChangeEvent,
1213};
1314use lsp_types as lsp;
1415use parking_lot::Mutex;
@@ -400,12 +401,22 @@ impl Client {
400401 &self,
401402 params: R::Params,
402403 ) -> 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>>
403415 where
404416 R::Params: serde::Serialize,
405417 {
406418 let server_tx = self.server_tx.clone();
407419 let id = self.next_request_id();
408− let timeout_secs = self.req_timeout;
409420
410421 async move {
411422 use std::time::Duration;
@@ -543,6 +554,15 @@ impl Client {
543554 normalizes_line_endings: Some(false),
544555 change_annotation_support: None,
545556 }),
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+ }),
546566 ..Default::default()
547567 }),
548568 text_document: Some(lsp::TextDocumentClientCapabilities {
@@ -609,6 +629,12 @@ impl Client {
609629 .collect(),
610630 },
611631 }),
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+ }),
612638 ..Default::default()
613639 }),
614640 publish_diagnostics: Some(lsp::PublishDiagnosticsClientCapabilities {
@@ -641,6 +667,7 @@ impl Client {
641667 version: Some(String::from(VERSION_AND_GIT_HASH)),
642668 }),
643669 locale: None, // TODO
670+ work_done_progress_params: lsp::WorkDoneProgressParams::default(),
644671 };
645672
646673 self.request::<lsp::request::Initialize>(params).await
@@ -689,6 +716,65 @@ impl Client {
689716 })
690717 }
691718
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+
692778 // -------------------------------------------------------------------------------------------
693779 // Text document
694780 // -------------------------------------------------------------------------------------------
@@ -884,20 +970,19 @@ impl Client {
884970 ) -> Option<impl Future<Output = Result<()>>> {
885971 let capabilities = self.capabilities.get().unwrap();
886972
887− let include_text = match &capabilities.text_document_sync {
888− Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
889− save: Some(options),
973+ let include_text = match &capabilities.text_document_sync.as_ref()? {
974+ lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
975+ save: options,
890976 ..
891− })) => match options {
977+ }) => match options.as_ref()? {
892978 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
893979 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
894980 include_text,
895981 }) => include_text.unwrap_or(false),
896− // Supported(false)
897− _ => return None,
982+ lsp::TextDocumentSyncSaveOptions::Supported(false) => return None,
898983 },
899− // unsupported
900− _ => return None,
984+ // see: https://github.com/microsoft/language-server-protocol/issues/288
985+ lsp::TextDocumentSyncCapability::Kind(..) => false,
901986 };
902987
903988 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
@@ -954,6 +1039,24 @@ impl Client {
9541039 Some(self.call::<lsp::request::ResolveCompletionItem>(completion_item))
9551040 }
9561041
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+
9571060 pub fn text_document_signature_help(
9581061 &self,
9591062 text_document: lsp::TextDocumentIdentifier,
@@ -1428,4 +1531,13 @@ impl Client {
14281531
14291532 Some(self.call::<lsp::request::ExecuteCommand>(params))
14301533 }
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+ }
14311543}
helix-lsp/src/file_event.rsnew file+193
@@ -0,0 +1,193 @@
1+use std::{collections::HashMap, path::PathBuf, sync::Weak};
2+
3+use globset::{GlobBuilder, GlobSetBuilder};
4+use tokio::sync::mpsc;
5+
6+use crate::{lsp, Client};
7+
8+enum Event {
9+ FileChanged {
10+ path: PathBuf,
11+ },
12+ Register {
13+ client_id: usize,
14+ client: Weak<Client>,
15+ registration_id: String,
16+ options: lsp::DidChangeWatchedFilesRegistrationOptions,
17+ },
18+ Unregister {
19+ client_id: usize,
20+ registration_id: String,
21+ },
22+ RemoveClient {
23+ client_id: usize,
24+ },
25+}
26+
27+#[derive(Default)]
28+struct ClientState {
29+ client: Weak<Client>,
30+ registered: HashMap<String, globset::GlobSet>,
31+}
32+
33+/// The Handler uses a dedicated tokio task to respond to file change events by
34+/// forwarding changes to LSPs that have registered for notifications with a
35+/// matching glob.
36+///
37+/// When an LSP registers for the DidChangeWatchedFiles notification, the
38+/// Handler is notified by sending the registration details in addition to a
39+/// weak reference to the LSP client. This is done so that the Handler can have
40+/// access to the client without preventing the client from being dropped if it
41+/// is closed and the Handler isn't properly notified.
42+#[derive(Clone, Debug)]
43+pub struct Handler {
44+ tx: mpsc::UnboundedSender<Event>,
45+}
46+
47+impl Default for Handler {
48+ fn default() -> Self {
49+ Self::new()
50+ }
51+}
52+
53+impl Handler {
54+ pub fn new() -> Self {
55+ let (tx, rx) = mpsc::unbounded_channel();
56+ tokio::spawn(Self::run(rx));
57+ Self { tx }
58+ }
59+
60+ pub fn register(
61+ &self,
62+ client_id: usize,
63+ client: Weak<Client>,
64+ registration_id: String,
65+ options: lsp::DidChangeWatchedFilesRegistrationOptions,
66+ ) {
67+ let _ = self.tx.send(Event::Register {
68+ client_id,
69+ client,
70+ registration_id,
71+ options,
72+ });
73+ }
74+
75+ pub fn unregister(&self, client_id: usize, registration_id: String) {
76+ let _ = self.tx.send(Event::Unregister {
77+ client_id,
78+ registration_id,
79+ });
80+ }
81+
82+ pub fn file_changed(&self, path: PathBuf) {
83+ let _ = self.tx.send(Event::FileChanged { path });
84+ }
85+
86+ pub fn remove_client(&self, client_id: usize) {
87+ let _ = self.tx.send(Event::RemoveClient { client_id });
88+ }
89+
90+ async fn run(mut rx: mpsc::UnboundedReceiver<Event>) {
91+ let mut state: HashMap<usize, ClientState> = HashMap::new();
92+ while let Some(event) = rx.recv().await {
93+ match event {
94+ Event::FileChanged { path } => {
95+ log::debug!("Received file event for {:?}", &path);
96+
97+ state.retain(|id, client_state| {
98+ if !client_state
99+ .registered
100+ .values()
101+ .any(|glob| glob.is_match(&path))
102+ {
103+ return true;
104+ }
105+ let Some(client) = client_state.client.upgrade() else {
106+ log::warn!("LSP client was dropped: {id}");
107+ return false;
108+ };
109+ let Ok(uri) = lsp::Url::from_file_path(&path) else {
110+ return true;
111+ };
112+ log::debug!(
113+ "Sending didChangeWatchedFiles notification to client '{}'",
114+ client.name()
115+ );
116+ if let Err(err) = crate::block_on(client
117+ .did_change_watched_files(vec![lsp::FileEvent {
118+ uri,
119+ // We currently always send the CHANGED state
120+ // since we don't actually have more context at
121+ // the moment.
122+ typ: lsp::FileChangeType::CHANGED,
123+ }]))
124+ {
125+ log::warn!("Failed to send didChangeWatchedFiles notification to client: {err}");
126+ }
127+ true
128+ });
129+ }
130+ Event::Register {
131+ client_id,
132+ client,
133+ registration_id,
134+ options: ops,
135+ } => {
136+ log::debug!(
137+ "Registering didChangeWatchedFiles for client '{}' with id '{}'",
138+ client_id,
139+ registration_id
140+ );
141+
142+ let entry = state.entry(client_id).or_insert_with(ClientState::default);
143+ entry.client = client;
144+
145+ let mut builder = GlobSetBuilder::new();
146+ for watcher in ops.watchers {
147+ if let lsp::GlobPattern::String(pattern) = watcher.glob_pattern {
148+ if let Ok(glob) = GlobBuilder::new(&pattern).build() {
149+ builder.add(glob);
150+ }
151+ }
152+ }
153+ match builder.build() {
154+ Ok(globset) => {
155+ entry.registered.insert(registration_id, globset);
156+ }
157+ Err(err) => {
158+ // Remove any old state for that registration id and
159+ // remove the entire client if it's now empty.
160+ entry.registered.remove(&registration_id);
161+ if entry.registered.is_empty() {
162+ state.remove(&client_id);
163+ }
164+ log::warn!(
165+ "Unable to build globset for LSP didChangeWatchedFiles {err}"
166+ )
167+ }
168+ }
169+ }
170+ Event::Unregister {
171+ client_id,
172+ registration_id,
173+ } => {
174+ log::debug!(
175+ "Unregistering didChangeWatchedFiles with id '{}' for client '{}'",
176+ registration_id,
177+ client_id
178+ );
179+ if let Some(client_state) = state.get_mut(&client_id) {
180+ client_state.registered.remove(&registration_id);
181+ if client_state.registered.is_empty() {
182+ state.remove(&client_id);
183+ }
184+ }
185+ }
186+ Event::RemoveClient { client_id } => {
187+ log::debug!("Removing LSP client: {client_id}");
188+ state.remove(&client_id);
189+ }
190+ }
191+ }
192+ }
193+}
helix-lsp/src/lib.rs+51−32
@@ -1,4 +1,5 @@
11mod client;
2+pub mod file_event;
23pub mod jsonrpc;
34pub mod snippet;
45mod transport;
@@ -377,7 +378,7 @@ pub mod util {
377378 .expect("transaction must be valid for primary selection");
378379 let removed_text = text.slice(removed_start..removed_end);
379380
380− let (transaction, selection) = Transaction::change_by_selection_ignore_overlapping(
381+ let (transaction, mut selection) = Transaction::change_by_selection_ignore_overlapping(
381382 doc,
382383 selection,
383384 |range| {
@@ -420,6 +421,11 @@ pub mod util {
420421 return transaction;
421422 }
422423
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);
423429 let mut mapped_selection = SmallVec::with_capacity(selection.len());
424430 let mut mapped_primary_idx = 0;
425431 let primary_range = selection.primary();
@@ -428,9 +434,8 @@ pub mod util {
428434 mapped_primary_idx = mapped_selection.len()
429435 }
430436
431− let range = range.map(changes);
432437 let tabstops = tabstops.first().filter(|tabstops| !tabstops.is_empty());
433− let Some(tabstops) = tabstops else{
438+ let Some(tabstops) = tabstops else {
434439 // no tabstop normal mapping
435440 mapped_selection.push(range);
436441 continue;
@@ -440,36 +445,36 @@ pub mod util {
440445 // the tabstop closest to the range simply replaces `head` while anchor remains in place
441446 // the remaining tabstops receive their own single-width cursor
442447 if range.head < range.anchor {
443− let first_tabstop = tabstop_anchor + tabstops[0].1;
448+ let last_idx = tabstops.len() - 1;
449+ let last_tabstop = tabstop_anchor + tabstops[last_idx].0;
444450
445451 // if selection is forward but was moved to the right it is
446452 // contained entirely in the replacement text, just do a point
447453 // selection (fallback below)
448− if range.anchor >= first_tabstop {
449− let range = Range::new(range.anchor, first_tabstop);
454+ if range.anchor > last_tabstop {
455+ let range = Range::new(range.anchor, last_tabstop);
450456 mapped_selection.push(range);
451− let rem_tabstops = tabstops[1..]
457+ let rem_tabstops = tabstops[..last_idx]
452458 .iter()
453− .map(|tabstop| Range::point(tabstop_anchor + tabstop.1));
459+ .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
454460 mapped_selection.extend(rem_tabstops);
455461 continue;
456462 }
457463 } else {
458− let last_idx = tabstops.len() - 1;
459− let last_tabstop = tabstop_anchor + tabstops[last_idx].1;
464+ let first_tabstop = tabstop_anchor + tabstops[0].0;
460465
461466 // if selection is forward but was moved to the right it is
462467 // contained entirely in the replacement text, just do a point
463468 // selection (fallback below)
464− if range.anchor <= last_tabstop {
469+ if range.anchor < first_tabstop {
465470 // we can't properly compute the the next grapheme
466471 // here because the transaction hasn't been applied yet
467472 // that is not a problem because the range gets grapheme aligned anyway
468473 // tough so just adding one will always cause head to be grapheme
469474 // aligned correctly when applied to the document
470− let range = Range::new(range.anchor, last_tabstop + 1);
475+ let range = Range::new(range.anchor, first_tabstop + 1);
471476 mapped_selection.push(range);
472− let rem_tabstops = tabstops[..last_idx]
477+ let rem_tabstops = tabstops[1..]
473478 .iter()
474479 .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
475480 mapped_selection.extend(rem_tabstops);
@@ -543,6 +548,7 @@ pub enum MethodCall {
543548 WorkspaceFolders,
544549 WorkspaceConfiguration(lsp::ConfigurationParams),
545550 RegisterCapability(lsp::RegistrationParams),
551+ UnregisterCapability(lsp::UnregistrationParams),
546552}
547553
548554impl MethodCall {
@@ -566,6 +572,10 @@ impl MethodCall {
566572 let params: lsp::RegistrationParams = params.parse()?;
567573 Self::RegisterCapability(params)
568574 }
575+ lsp::request::UnregisterCapability::METHOD => {
576+ let params: lsp::UnregistrationParams = params.parse()?;
577+ Self::UnregisterCapability(params)
578+ }
569579 _ => {
570580 return Err(Error::Unhandled);
571581 }
@@ -625,6 +635,7 @@ pub struct Registry {
625635 syn_loader: Arc<helix_core::syntax::Loader>,
626636 counter: usize,
627637 pub incoming: SelectAll<UnboundedReceiverStream<(usize, Call)>>,
638+ pub file_event_handler: file_event::Handler,
628639}
629640
630641impl Registry {
@@ -634,6 +645,7 @@ impl Registry {
634645 syn_loader,
635646 counter: 0,
636647 incoming: SelectAll::new(),
648+ file_event_handler: file_event::Handler::new(),
637649 }
638650 }
639651
@@ -646,6 +658,7 @@ impl Registry {
646658 }
647659
648660 pub fn remove_by_id(&mut self, id: usize) {
661+ self.file_event_handler.remove_client(id);
649662 self.inner.retain(|_, language_servers| {
650663 language_servers.retain(|ls| id != ls.id());
651664 !language_servers.is_empty()
@@ -711,6 +724,7 @@ impl Registry {
711724 .unwrap();
712725
713726 for old_client in old_clients {
727+ self.file_event_handler.remove_client(old_client.id());
714728 tokio::spawn(async move {
715729 let _ = old_client.force_shutdown().await;
716730 });
@@ -727,6 +741,7 @@ impl Registry {
727741 pub fn stop(&mut self, name: &str) {
728742 if let Some(clients) = self.inner.remove(name) {
729743 for client in clients {
744+ self.file_event_handler.remove_client(client.id());
730745 tokio::spawn(async move {
731746 let _ = client.force_shutdown().await;
732747 });
@@ -734,36 +749,40 @@ impl Registry {
734749 }
735750 }
736751
737− pub fn get(
738− &mut self,
739− language_config: &LanguageConfiguration,
740− doc_path: Option<&std::path::PathBuf>,
741− root_dirs: &[PathBuf],
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],
742757 enable_snippets: bool,
743− ) -> Result<HashMap<LanguageServerName, Arc<Client>>> {
744− language_config
745− .language_servers
746− .iter()
747− .map(|LanguageServerFeatures { name, .. }| {
758+ ) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {
759+ language_config.language_servers.iter().map(
760+ move |LanguageServerFeatures { name, .. }| {
748761 if let Some(clients) = self.inner.get(name) {
749762 if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
750763 client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
751764 }) {
752− return Ok((name.to_owned(), client.clone()));
765+ return (name.to_owned(), Ok(client.clone()));
753766 }
754767 }
755− let client = self.start_client(
768+ match self.start_client(
756769 name.clone(),
757770 language_config,
758771 doc_path,
759772 root_dirs,
760773 enable_snippets,
761− )?;
762− let clients = self.inner.entry(name.clone()).or_default();
763− clients.push(client.clone());
764− Ok((name.clone(), client))
765− })
766− .collect()
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+ )
767786 }
768787
769788 pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
@@ -927,7 +946,7 @@ pub fn find_lsp_workspace(
927946 let mut file = if file.is_absolute() {
928947 file.to_path_buf()
929948 } else {
930− let current_dir = std::env::current_dir().expect("unable to determine current directory");
949+ let current_dir = helix_loader::current_working_dir();
931950 current_dir.join(file)
932951 };
933952 file = path::get_normalized_path(&file);
helix-lsp/src/transport.rs+9−1
@@ -353,6 +353,11 @@ impl Transport {
353353 }
354354 }
355355
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+
356361 // TODO: events that use capabilities need to do the right thing
357362
358363 loop {
@@ -391,7 +396,10 @@ impl Transport {
391396 }
392397 msg = client_rx.recv() => {
393398 if let Some(msg) = msg {
394− if is_pending && !is_initialize(&msg) {
399+ if is_pending && is_shutdown(&msg) {
400+ log::info!("Language server not initialized, shutting down");
401+ break;
402+ } else if is_pending && !is_initialize(&msg) {
395403 // ignore notifications
396404 if let Payload::Notification(_) = msg {
397405 continue;
helix-parsec/Cargo.toml+8−7
@@ -1,13 +1,14 @@
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"
73description = "Parser combinators for Helix"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
114include = ["src/**/*", "README.md"]
5+version.workspace = true
6+authors.workspace = true
7+edition.workspace = true
8+license.workspace = true
9+rust-version.workspace = true
10+categories.workspace = true
11+repository.workspace = true
12+homepage.workspace = true
1213
1314[dependencies]
helix-term/Cargo.toml+33−25
@@ -1,16 +1,16 @@
11[package]
22name = "helix-term"
3−version = "0.6.0"
43description = "A post-modern text editor."
5−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
6−edition = "2021"
7−license = "MPL-2.0"
8−categories = ["editor", "command-line-utilities"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
114include = ["src/**/*", "README.md"]
125default-run = "hx"
13−rust-version = "1.65"
6+version.workspace = true
7+authors.workspace = true
8+edition.workspace = true
9+license.workspace = true
10+rust-version.workspace = true
11+categories.workspace = true
12+repository.workspace = true
13+homepage.workspace = true
1414
1515[features]
1616default = ["git"]
@@ -23,21 +23,22 @@ name = "hx"
2323path = "src/main.rs"
2424
2525[dependencies]
26−helix-core = { version = "0.6", path = "../helix-core" }
27−helix-view = { version = "0.6", path = "../helix-view" }
28−helix-lsp = { version = "0.6", path = "../helix-lsp" }
29−helix-dap = { version = "0.6", path = "../helix-dap" }
30−helix-vcs = { version = "0.6", path = "../helix-vcs" }
31−helix-loader = { version = "0.6", path = "../helix-loader" }
26+helix-core = { path = "../helix-core" }
27+helix-event = { path = "../helix-event" }
28+helix-view = { path = "../helix-view" }
29+helix-lsp = { path = "../helix-lsp" }
30+helix-dap = { path = "../helix-dap" }
31+helix-vcs = { path = "../helix-vcs" }
32+helix-loader = { path = "../helix-loader" }
3233
3334anyhow = "1"
34−once_cell = "1.18"
35+once_cell = "1.19"
3536
36−which = "4.4"
37+which = "5.0.0"
3738
3839tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
3940tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
40−crossterm = { version = "0.26", features = ["event-stream"] }
41+crossterm = { version = "0.27", features = ["event-stream"] }
4142signal-hook = "0.3"
4243tokio-stream = "0.1"
4344futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
@@ -49,13 +50,17 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
4950log = "0.4"
5051
5152# File picker
52−fuzzy-matcher = "0.3"
53+nucleo.workspace = true
5354ignore = "0.4"
5455# markdown doc rendering
5556pulldown-cmark = { version = "0.9", default-features = false }
5657# file type detection
5758content_inspector = "0.2.4"
5859
60+# opening URLs
61+open = "5.0.1"
62+url = "2.5.0"
63+
5964# config
6065toml = "0.7"
6166
@@ -63,17 +68,20 @@ serde_json = "1.0"
6368serde = { version = "1.0", features = ["derive"] }
6469
6570# ripgrep for global search
66−grep-regex = "0.1.11"
67−grep-searcher = "0.1.11"
71+grep-regex = "0.1.12"
72+grep-searcher = "0.1.13"
6873
6974[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
7075signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
71−libc = "0.2.146"
76+libc = "0.2.151"
77+
78+[target.'cfg(target_os = "macos")'.dependencies]
79+crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
7280
7381[build-dependencies]
74−helix-loader = { version = "0.6", path = "../helix-loader" }
82+helix-loader = { path = "../helix-loader" }
7583
7684[dev-dependencies]
77−smallvec = "1.10"
78−indoc = "2.0.1"
79−tempfile = "3.6.0"
85+smallvec = "1.11"
86+indoc = "2.0.4"
87+tempfile = "3.8.1"
helix-term/src/application.rs+206−121
@@ -1,11 +1,16 @@
11use arc_swap::{access::Map, ArcSwap};
22use futures_util::Stream;
33use helix_core::{
4+ chars::char_is_word,
45 diagnostic::{DiagnosticTag, NumberOrString},
56 path::get_relative_path,
67 pos_at_coords, syntax, Selection,
78};
8−use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
9+use helix_lsp::{
10+ lsp::{self, notification::Notification},
11+ util::lsp_pos_to_pos,
12+ LspProgressMap,
13+};
914use helix_view::{
1015 align_view,
1116 document::DocumentSavedEventResult,
@@ -29,13 +34,9 @@ use crate::{
2934};
3035
3136use log::{debug, error, warn};
32−use std::{
33− collections::btree_map::Entry,
34− io::{stdin, stdout},
35− path::Path,
36− sync::Arc,
37− time::{Duration, Instant},
38−};
37+#[cfg(not(feature = "integration"))]
38+use std::io::stdout;
39+use std::{collections::btree_map::Entry, io::stdin, path::Path, sync::Arc};
3940
4041use anyhow::{Context, Error};
4142
@@ -45,8 +46,6 @@ use {signal_hook::consts::signal, signal_hook_tokio::Signals};
4546#[cfg(windows)]
4647type Signals = futures_util::stream::Empty<()>;
4748
48−const LSP_DEADLINE: Duration = Duration::from_millis(16);
49−
5049#[cfg(not(feature = "integration"))]
5150use tui::backend::CrosstermBackend;
5251
@@ -76,7 +75,6 @@ pub struct Application {
7675 signals: Signals,
7776 jobs: Jobs,
7877 lsp_progress: LspProgressMap,
79− last_render: Instant,
8078}
8179
8280#[cfg(feature = "integration")]
@@ -163,17 +161,21 @@ impl Application {
163161 let path = helix_loader::runtime_file(Path::new("tutor"));
164162 editor.open(&path, Action::VerticalSplit)?;
165163 // Unset path to prevent accidentally saving to the original tutor file.
166− doc_mut!(editor).set_path(None)?;
164+ doc_mut!(editor).set_path(None);
167165 } else if !args.files.is_empty() {
168− let first = &args.files[0].0; // we know it's not empty
169− if first.is_dir() {
170− std::env::set_current_dir(first).context("set current dir")?;
171− editor.new_file(Action::VerticalSplit);
172− let picker = ui::file_picker(".".into(), &config.load().editor);
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);
173171 compositor.push(Box::new(overlaid(picker)));
174− } else {
175− let nr_of_files = args.files.len();
176− for (i, (file, pos)) in args.files.into_iter().enumerate() {
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;
177179 if file.is_dir() {
178180 return Err(anyhow::anyhow!(
179181 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
@@ -185,7 +187,7 @@ impl Application {
185187 // option. If neither of those two arguments are passed
186188 // in, just load the files normally.
187189 let action = match args.split {
188− _ if i == 0 => Action::VerticalSplit,
190+ _ if nr_of_files == 1 => Action::VerticalSplit,
189191 Some(Layout::Vertical) => Action::VerticalSplit,
190192 Some(Layout::Horizontal) => Action::HorizontalSplit,
191193 None => Action::Load,
@@ -212,14 +214,11 @@ impl Application {
212214 // does not affect views without pos since it is at the top
213215 let (view, doc) = current!(editor);
214216 align_view(doc, view, Align::Center);
217+ } else {
218+ editor.new_file(Action::VerticalSplit);
215219 }
216220 } else if stdin().is_tty() || cfg!(feature = "integration") {
217221 editor.new_file(Action::VerticalSplit);
218− } else if cfg!(target_os = "macos") {
219− // On Linux and Windows, we allow the output of a command to be piped into the new buffer.
220− // This doesn't currently work on macOS because of the following issue:
221− // https://github.com/crossterm-rs/crossterm/issues/500
222− anyhow::bail!("Piping into helix-term is currently not supported on macOS");
223222 } else {
224223 editor
225224 .new_file_from_stdin(Action::VerticalSplit)
@@ -253,29 +252,25 @@ impl Application {
253252 signals,
254253 jobs: Jobs::new(),
255254 lsp_progress: LspProgressMap::new(),
256− last_render: Instant::now(),
257255 };
258256
259257 Ok(app)
260258 }
261259
262260 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+
263266 let mut cx = crate::compositor::Context {
264267 editor: &mut self.editor,
265268 jobs: &mut self.jobs,
266269 scroll: None,
267270 };
268271
269− // Acquire mutable access to the redraw_handle lock
270− // to ensure that there are no tasks running that want to block rendering
271− drop(cx.editor.redraw_handle.1.write().await);
272+ helix_event::start_frame();
272273 cx.editor.needs_redraw = false;
273− {
274− // exhaust any leftover redraw notifications
275− let notify = cx.editor.redraw_handle.0.notified();
276− tokio::pin!(notify);
277− notify.enable();
278− }
279274
280275 let area = self
281276 .terminal
@@ -297,10 +292,9 @@ impl Application {
297292
298293 pub async fn event_loop<S>(&mut self, input_stream: &mut S)
299294 where
300− S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
295+ S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
301296 {
302297 self.render().await;
303− self.last_render = Instant::now();
304298
305299 loop {
306300 if !self.event_loop_until_idle(input_stream).await {
@@ -311,7 +305,7 @@ impl Application {
311305
312306 pub async fn event_loop_until_idle<S>(&mut self, input_stream: &mut S) -> bool
313307 where
314− S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
308+ S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
315309 {
316310 loop {
317311 if self.editor.should_close() {
@@ -564,16 +558,7 @@ impl Application {
564558 let bytes = doc_save_event.text.len_bytes();
565559
566560 if doc.path() != Some(&doc_save_event.path) {
567− if let Err(err) = doc.set_path(Some(&doc_save_event.path)) {
568− log::error!(
569− "error setting path for doc '{:?}': {}",
570− doc.path(),
571− err.to_string(),
572− );
573−
574− self.editor.set_error(err.to_string());
575− return;
576− }
561+ doc.set_path(Some(&doc_save_event.path));
577562
578563 let loader = self.editor.syn_loader.clone();
579564
@@ -609,12 +594,7 @@ impl Application {
609594 EditorEvent::LanguageServerMessage((id, call)) => {
610595 self.handle_language_server_message(call, id).await;
611596 // limit render calls for fast language server messages
612− let last = self.editor.language_servers.incoming.is_empty();
613−
614− if last || self.last_render.elapsed() > LSP_DEADLINE {
615− self.render().await;
616− self.last_render = Instant::now();
617− }
597+ helix_event::request_redraw();
618598 }
619599 EditorEvent::DebuggerEvent(payload) => {
620600 let needs_render = self.editor.handle_debugger_message(payload).await;
@@ -622,6 +602,9 @@ impl Application {
622602 self.render().await;
623603 }
624604 }
605+ EditorEvent::Redraw => {
606+ self.render().await;
607+ }
625608 EditorEvent::IdleTimer => {
626609 self.editor.clear_idle_timer();
627610 self.handle_idle_timeout().await;
@@ -636,10 +619,7 @@ impl Application {
636619 false
637620 }
638621
639− pub async fn handle_terminal_events(
640− &mut self,
641− event: Result<CrosstermEvent, crossterm::ErrorKind>,
642− ) {
622+ pub async fn handle_terminal_events(&mut self, event: std::io::Result<CrosstermEvent>) {
643623 let mut cx = crate::compositor::Context {
644624 editor: &mut self.editor,
645625 jobs: &mut self.jobs,
@@ -738,7 +718,7 @@ impl Application {
738718 ));
739719 }
740720 }
741− Notification::PublishDiagnostics(params) => {
721+ Notification::PublishDiagnostics(mut params) => {
742722 let path = match params.uri.to_file_path() {
743723 Ok(path) => path,
744724 Err(_) => {
@@ -746,32 +726,75 @@ impl Application {
746726 return;
747727 }
748728 };
749− let offset_encoding = language_server!().offset_encoding();
750− let doc = self.editor.document_by_path_mut(&path).filter(|doc| {
751− if let Some(version) = params.version {
752− if version != doc.version() {
753− log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
754− return false;
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+ }
755744 }
756− }
757−
758− true
759− });
745+ true
746+ });
760747
761748 if let Some(doc) = doc {
762− let lang_conf = doc.language_config();
763− let text = doc.text();
749+ let lang_conf = doc.language.clone();
750+ let text = doc.text().clone();
751+
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+ }
764782
765− let diagnostics = params
766− .diagnostics
767− .iter()
768− .filter_map(|diagnostic| {
783+ let unchaged_diag_sources = &unchaged_diag_sources_;
784+ let diagnostics =
785+ params.diagnostics.iter().filter_map(move |diagnostic| {
769786 use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
770787 use lsp::DiagnosticSeverity;
771788
789+ if diagnostic.source.as_ref().map_or(false, |source| {
790+ unchaged_diag_sources.contains(source)
791+ }) {
792+ return None;
793+ }
794+
772795 // TODO: convert inside server
773796 let start = if let Some(start) = lsp_pos_to_pos(
774− text,
797+ &text,
775798 diagnostic.range.start,
776799 offset_encoding,
777800 ) {
@@ -782,14 +805,13 @@ impl Application {
782805 };
783806
784807 let end = if let Some(end) =
785− lsp_pos_to_pos(text, diagnostic.range.end, offset_encoding)
808+ lsp_pos_to_pos(&text, diagnostic.range.end, offset_encoding)
786809 {
787810 end
788811 } else {
789812 log::warn!("lsp position out of bounds - {:?}", diagnostic);
790813 return None;
791814 };
792−
793815 let severity =
794816 diagnostic.severity.map(|severity| match severity {
795817 DiagnosticSeverity::ERROR => Error,
@@ -802,7 +824,7 @@ impl Application {
802824 ),
803825 });
804826
805− if let Some(lang_conf) = lang_conf {
827+ if let Some(lang_conf) = &lang_conf {
806828 if let Some(severity) = severity {
807829 if severity < lang_conf.diagnostic_severity {
808830 return None;
@@ -841,8 +863,17 @@ impl Application {
841863 Vec::new()
842864 };
843865
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+
844872 Some(Diagnostic {
845873 range: Range { start, end },
874+ ends_at_word,
875+ starts_at_word,
876+ zero_width: start == end,
846877 line: diagnostic.range.start.line as usize,
847878 message: diagnostic.message.clone(),
848879 severity,
@@ -852,38 +883,33 @@ impl Application {
852883 data: diagnostic.data.clone(),
853884 language_server_id: server_id,
854885 })
855− })
856− .collect();
886+ });
857887
858− doc.replace_diagnostics(diagnostics, server_id);
888+ doc.replace_diagnostics(diagnostics, unchaged_diag_sources, server_id);
859889 }
860890
861− let mut diagnostics = params
862− .diagnostics
863− .into_iter()
864− .map(|d| (d, server_id))
865− .collect();
891+ let diagnostics = params.diagnostics.into_iter().map(|d| (d, server_id));
866892
867893 // Insert the original lsp::Diagnostics here because we may have no open document
868894 // for diagnosic message and so we can't calculate the exact position.
869895 // When using them later in the diagnostics picker, we calculate them on-demand.
870− match self.editor.diagnostics.entry(params.uri) {
896+ let diagnostics = match self.editor.diagnostics.entry(params.uri) {
871897 Entry::Occupied(o) => {
872898 let current_diagnostics = o.into_mut();
873899 // there may entries of other language servers, which is why we can't overwrite the whole entry
874900 current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
875− current_diagnostics.append(&mut diagnostics);
876− // Sort diagnostics first by severity and then by line numbers.
877− // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
901+ current_diagnostics.extend(diagnostics);
878902 current_diagnostics
879− .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
880− }
881− Entry::Vacant(v) => {
882− diagnostics
883− .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
884− v.insert(diagnostics);
903+ // Sort diagnostics first by severity and then by line numbers.
885904 }
905+ Entry::Vacant(v) => v.insert(diagnostics.collect()),
886906 };
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+ });
887913 }
888914 Notification::ShowMessage(params) => {
889915 log::warn!("unhandled window/showMessage: {:?}", params);
@@ -1042,20 +1068,31 @@ impl Application {
10421068 Ok(serde_json::Value::Null)
10431069 }
10441070 Ok(MethodCall::ApplyWorkspaceEdit(params)) => {
1045− let res = apply_workspace_edit(
1046− &mut self.editor,
1047− helix_lsp::OffsetEncoding::Utf8,
1048− &params.edit,
1049− );
1050−
1051− Ok(json!(lsp::ApplyWorkspaceEditResponse {
1052− applied: res.is_ok(),
1053− failure_reason: res.as_ref().err().map(|err| err.kind.to_string()),
1054− failed_change: res
1055− .as_ref()
1056− .err()
1057− .map(|err| err.failed_change_idx as u32),
1058− }))
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+ }
10591096 }
10601097 Ok(MethodCall::WorkspaceFolders) => {
10611098 Ok(json!(&*language_server!().workspace_folders().await))
@@ -1080,17 +1117,65 @@ impl Application {
10801117 .collect();
10811118 Ok(json!(result))
10821119 }
1083− Ok(MethodCall::RegisterCapability(_params)) => {
1084− log::warn!("Ignoring a client/registerCapability request because dynamic capability registration is not enabled. Please report this upstream to the language server");
1085− // Language Servers based on the `vscode-languageserver-node` library often send
1086− // client/registerCapability even though we do not enable dynamic registration
1087− // for any capabilities. We should send a MethodNotFound JSONRPC error in this
1088− // case but that rejects the registration promise in the server which causes an
1089− // exit. So we work around this by ignoring the request and sending back an OK
1090− // response.
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+ }
10911160
10921161 Ok(serde_json::Value::Null)
10931162 }
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)
1178+ }
10941179 };
10951180
10961181 tokio::spawn(language_server!().reply(id, reply));
@@ -1116,7 +1201,7 @@ impl Application {
11161201
11171202 pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
11181203 where
1119− S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
1204+ S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
11201205 {
11211206 self.claim_term().await?;
11221207
helix-term/src/args.rs+29
@@ -17,12 +17,14 @@ 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>,
2021}
2122
2223impl Args {
2324 pub fn parse_args() -> Result<Args> {
2425 let mut args = Args::default();
2526 let mut argv = std::env::args().peekable();
27+ let mut line_number = 0;
2628
2729 argv.next(); // skip the program, we don't care about that
2830
@@ -59,6 +61,20 @@ impl Args {
5961 Some(path) => args.log_file = Some(path.into()),
6062 None => anyhow::bail!("--log must specify a path to write"),
6163 },
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+ },
6278 arg if arg.starts_with("--") => {
6379 anyhow::bail!("unexpected double dash argument: {}", arg)
6480 }
@@ -73,6 +89,13 @@ impl Args {
7389 }
7490 }
7591 }
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+ }
7699 arg => args.files.push(parse_file(arg)),
77100 }
78101 }
@@ -82,6 +105,12 @@ impl Args {
82105 args.files.push(parse_file(&arg));
83106 }
84107
108+ if let Some(file) = args.files.first_mut() {
109+ if line_number != 0 {
110+ file.1.row = line_number;
111+ }
112+ }
113+
85114 Ok(args)
86115 }
87116}
helix-term/src/commands.rs+700−411
@@ -29,12 +29,11 @@ use helix_core::{
2929 tree_sitter::Node,
3030 unicode::width::UnicodeWidthChar,
3131 visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
32− RopeSlice, Selection, SmallVec, Tendril, Transaction,
32+ RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
3333};
3434use helix_view::{
35− clipboard::ClipboardType,
3635 document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
37− editor::{Action, CompleteAction, Motion},
36+ editor::{Action, CompleteAction},
3837 info::Info,
3938 input::KeyEvent,
4039 keyboard::KeyCode,
@@ -44,7 +43,6 @@ use helix_view::{
4443};
4544
4645use anyhow::{anyhow, bail, ensure, Context as _};
47−use fuzzy_matcher::FuzzyMatcher;
4846use insert::*;
4947use movement::Movement;
5048
@@ -55,15 +53,20 @@ use crate::{
5553 job::Callback,
5654 keymap::ReverseKeymap,
5755 ui::{
58− self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem,
59− FilePicker, Picker, Popup, Prompt, PromptEvent,
56+ self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem, Picker,
57+ Popup, Prompt, PromptEvent,
6058 },
6159};
6260
6361use crate::job::{self, Jobs};
64−use futures_util::{stream::FuturesUnordered, StreamExt, TryStreamExt};
65−use std::{collections::HashMap, fmt, future::Future};
66−use std::{collections::HashSet, num::NonZeroUsize};
62+use futures_util::{stream::FuturesUnordered, TryStreamExt};
63+use std::{
64+ collections::{HashMap, HashSet},
65+ fmt,
66+ future::Future,
67+ io::Read,
68+ num::NonZeroUsize,
69+};
6770
6871use std::{
6972 borrow::Cow,
@@ -72,11 +75,11 @@ use std::{
7275
7376use once_cell::sync::Lazy;
7477use serde::de::{self, Deserialize, Deserializer};
78+use url::Url;
7579
7680use grep_regex::RegexMatcherBuilder;
7781use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
7882use ignore::{DirEntry, WalkBuilder, WalkState};
79−use tokio_stream::wrappers::UnboundedReceiverStream;
8083
8184pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
8285
@@ -248,6 +251,8 @@ impl MappableCommand {
248251 move_prev_long_word_start, "Move to start of previous long word",
249252 move_next_long_word_end, "Move to end of next long word",
250253 move_prev_long_word_end, "Move to end of previous long word",
254+ move_parent_node_end, "Move to end of the parent node",
255+ move_parent_node_start, "Move to beginning of the parent node",
251256 extend_next_word_start, "Extend to start of next word",
252257 extend_prev_word_start, "Extend to start of previous word",
253258 extend_next_word_end, "Extend to end of next word",
@@ -256,6 +261,8 @@ impl MappableCommand {
256261 extend_prev_long_word_start, "Extend to start of previous long word",
257262 extend_next_long_word_end, "Extend to end of next long word",
258263 extend_prev_long_word_end, "Extend to end of prev long word",
264+ extend_parent_node_end, "Extend to end of the parent node",
265+ extend_parent_node_start, "Extend to beginning of the parent node",
259266 find_till_char, "Move till next occurrence of char",
260267 find_next_char, "Move to next occurrence of char",
261268 extend_till_char, "Extend till next occurrence of char",
@@ -330,7 +337,7 @@ impl MappableCommand {
330337 goto_implementation, "Goto implementation",
331338 goto_file_start, "Goto line number <n> else file start",
332339 goto_file_end, "Goto file end",
333− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
334341 goto_file_hsplit, "Goto files in selection (hsplit)",
335342 goto_file_vsplit, "Goto files in selection (vsplit)",
336343 goto_reference, "Goto references",
@@ -362,6 +369,7 @@ impl MappableCommand {
362369 extend_to_line_end, "Extend to line end",
363370 extend_to_line_end_newline, "Extend to line end",
364371 signature_help, "Show signature help",
372+ smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
365373 insert_tab, "Insert tab char",
366374 insert_newline, "Insert newline char",
367375 delete_char_backward, "Delete previous char",
@@ -376,6 +384,9 @@ impl MappableCommand {
376384 later, "Move forward in history",
377385 commit_undo_checkpoint, "Commit changes to new checkpoint",
378386 yank, "Yank selection",
387+ yank_to_clipboard, "Yank selections to clipboard",
388+ yank_to_primary_clipboard, "Yank selections to primary clipboard",
389+ yank_joined, "Join and yank selections",
379390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
380391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
381392 yank_joined_to_primary_clipboard, "Join and yank selections to primary clipboard",
@@ -406,6 +417,7 @@ impl MappableCommand {
406417 rotate_selections_backward, "Rotate selections backward",
407418 rotate_selection_contents_forward, "Rotate selection contents forward",
408419 rotate_selection_contents_backward, "Rotate selections contents backward",
420+ reverse_selection_contents, "Reverse selections contents",
409421 expand_selection, "Expand selection to parent syntax node",
410422 shrink_selection, "Shrink selection to previously expanded syntax node",
411423 select_next_sibling, "Select next sibling in syntax tree",
@@ -978,6 +990,7 @@ fn align_selections(cx: &mut Context) {
978990
979991 let transaction = Transaction::change(doc.text(), changes.into_iter());
980992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
981994}
982995
983996fn goto_window(cx: &mut Context, align: Align) {
@@ -1097,8 +1110,7 @@ where
10971110 .transform(|range| move_fn(text, range, count, behavior));
10981111 doc.set_selection(view.id, selection);
10991112 };
1100− motion(cx.editor);
1101− cx.editor.last_motion = Some(Motion(Box::new(motion)));
1113+ cx.editor.apply_motion(motion)
11021114}
11031115
11041116fn goto_prev_paragraph(cx: &mut Context) {
@@ -1153,6 +1165,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11531165 let (view, doc) = current_ref!(cx.editor);
11541166 let text = doc.text();
11551167 let selections = doc.selection(view.id);
1168+ let rel_path = doc
1169+ .relative_path()
1170+ .map(|path| path.parent().unwrap().to_path_buf())
1171+ .unwrap_or_default();
11561172 let mut paths: Vec<_> = selections
11571173 .iter()
11581174 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1180,16 +1196,80 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11801196 .to_string(),
11811197 );
11821198 }
1199+
11831200 for sel in paths {
11841201 let p = sel.trim();
1185− if !p.is_empty() {
1186− if let Err(e) = cx.editor.open(&PathBuf::from(p), action) {
1202+ if p.is_empty() {
1203+ continue;
1204+ }
1205+
1206+ if let Ok(url) = Url::parse(p) {
1207+ return open_url(cx, url, action);
1208+ }
1209+
1210+ let path = &rel_path.join(p);
1211+ if path.is_dir() {
1212+ let picker = ui::file_picker(path.into(), &cx.editor.config());
1213+ cx.push_layer(Box::new(overlaid(picker)));
1214+ } else if let Err(e) = cx.editor.open(path, action) {
1215+ cx.editor.set_error(format!("Open file failed: {:?}", e));
1216+ }
1217+ }
1218+}
1219+
1220+/// Opens the given url. If the URL points to a valid textual file it is open in helix.
1221+// Otherwise, the file is open using external program.
1222+fn open_url(cx: &mut Context, url: Url, action: Action) {
1223+ let doc = doc!(cx.editor);
1224+ let rel_path = doc
1225+ .relative_path()
1226+ .map(|path| path.parent().unwrap().to_path_buf())
1227+ .unwrap_or_default();
1228+
1229+ if url.scheme() != "file" {
1230+ return open_external_url(cx, url);
1231+ }
1232+
1233+ let content_type = std::fs::File::open(url.path()).and_then(|file| {
1234+ // Read up to 1kb to detect the content type
1235+ let mut read_buffer = Vec::new();
1236+ let n = file.take(1024).read_to_end(&mut read_buffer)?;
1237+ Ok(content_inspector::inspect(&read_buffer[..n]))
1238+ });
1239+
1240+ // we attempt to open binary files - files that can't be open in helix - using external
1241+ // program as well, e.g. pdf files or images
1242+ match content_type {
1243+ Ok(content_inspector::ContentType::BINARY) => open_external_url(cx, url),
1244+ Ok(_) | Err(_) => {
1245+ let path = &rel_path.join(url.path());
1246+ if path.is_dir() {
1247+ let picker = ui::file_picker(path.into(), &cx.editor.config());
1248+ cx.push_layer(Box::new(overlaid(picker)));
1249+ } else if let Err(e) = cx.editor.open(path, action) {
11871250 cx.editor.set_error(format!("Open file failed: {:?}", e));
11881251 }
11891252 }
11901253 }
11911254}
11921255
1256+/// Opens URL in external program.
1257+fn open_external_url(cx: &mut Context, url: Url) {
1258+ let commands = open::commands(url.as_str());
1259+ cx.jobs.callback(async {
1260+ for cmd in commands {
1261+ let mut command = tokio::process::Command::new(cmd.get_program());
1262+ command.args(cmd.get_args());
1263+ if command.output().await.is_ok() {
1264+ return Ok(job::Callback::Editor(Box::new(|_| {})));
1265+ }
1266+ }
1267+ Ok(job::Callback::Editor(Box::new(move |editor| {
1268+ editor.set_error("Opening URL in external program failed")
1269+ })))
1270+ });
1271+}
1272+
11931273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
11941274where
11951275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1238,10 +1318,66 @@ fn extend_next_long_word_end(cx: &mut Context) {
12381318 extend_word_impl(cx, movement::move_next_long_word_end)
12391319}
12401320
1241−fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1242−where
1243− F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1244−{
1321+/// Separate branch to find_char designed only for `<ret>` char.
1322+//
1323+// This is necessary because the one document can have different line endings inside. And we
1324+// cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
1325+// but on the next line it can be `crlf`. That's why [`find_char_impl`] cannot be applied here.
1326+fn find_char_line_ending(
1327+ cx: &mut Context,
1328+ count: usize,
1329+ direction: Direction,
1330+ inclusive: bool,
1331+ extend: bool,
1332+) {
1333+ let (view, doc) = current!(cx.editor);
1334+ let text = doc.text().slice(..);
1335+
1336+ let selection = doc.selection(view.id).clone().transform(|range| {
1337+ let cursor = range.cursor(text);
1338+ let cursor_line = range.cursor_line(text);
1339+
1340+ // Finding the line where we're going to find <ret>. Depends mostly on
1341+ // `count`, but also takes into account edge cases where we're already at the end
1342+ // of a line or the beginning of a line
1343+ let find_on_line = match direction {
1344+ Direction::Forward => {
1345+ let on_edge = line_end_char_index(&text, cursor_line) == cursor;
1346+ let line = cursor_line + count - 1 + (on_edge as usize);
1347+ if line >= text.len_lines() - 1 {
1348+ return range;
1349+ } else {
1350+ line
1351+ }
1352+ }
1353+ Direction::Backward => {
1354+ let on_edge = text.line_to_char(cursor_line) == cursor && !inclusive;
1355+ let line = cursor_line as isize - (count as isize - 1 + on_edge as isize);
1356+ if line <= 0 {
1357+ return range;
1358+ } else {
1359+ line as usize
1360+ }
1361+ }
1362+ };
1363+
1364+ let pos = match (direction, inclusive) {
1365+ (Direction::Forward, true) => line_end_char_index(&text, find_on_line),
1366+ (Direction::Forward, false) => line_end_char_index(&text, find_on_line) - 1,
1367+ (Direction::Backward, true) => line_end_char_index(&text, find_on_line - 1),
1368+ (Direction::Backward, false) => text.line_to_char(find_on_line),
1369+ };
1370+
1371+ if extend {
1372+ range.put_cursor(text, pos, true)
1373+ } else {
1374+ Range::point(range.cursor(text)).put_cursor(text, pos, true)
1375+ }
1376+ });
1377+ doc.set_selection(view.id, selection);
1378+}
1379+
1380+fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bool) {
12451381 // TODO: count is reset to 1 before next key so we move it into the closure here.
12461382 // Would be nice to carry over.
12471383 let count = cx.count();
@@ -1254,13 +1390,9 @@ where
12541390 KeyEvent {
12551391 code: KeyCode::Enter,
12561392 ..
1257− } =>
1258− // TODO: this isn't quite correct when CRLF is involved.
1259− // This hack will work in most cases, since documents don't
1260− // usually mix line endings. But we should fix it eventually
1261− // anyway.
1262− {
1263− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1393+ } => {
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1395+ return;
12641396 }
12651397
12661398 KeyEvent {
@@ -1273,11 +1405,18 @@ where
12731405 } => ch,
12741406 _ => return,
12751407 };
1408+ let motion = move |editor: &mut Editor| {
1409+ match direction {
1410+ Direction::Forward => {
1411+ find_char_impl(editor, &find_next_char_impl, inclusive, extend, ch, count)
1412+ }
1413+ Direction::Backward => {
1414+ find_char_impl(editor, &find_prev_char_impl, inclusive, extend, ch, count)
1415+ }
1416+ };
1417+ };
12761418
1277− find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1278− cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1279− find_char_impl(editor, &search_fn, inclusive, extend, ch, 1);
1280− })));
1419+ cx.editor.apply_motion(motion);
12811420 })
12821421}
12831422
@@ -1356,46 +1495,39 @@ fn find_prev_char_impl(
13561495}
13571496
13581497fn find_till_char(cx: &mut Context) {
1359− will_find_char(cx, find_next_char_impl, false, false)
1498+ find_char(cx, Direction::Forward, false, false);
13601499}
13611500
13621501fn find_next_char(cx: &mut Context) {
1363− will_find_char(cx, find_next_char_impl, true, false)
1502+ find_char(cx, Direction::Forward, true, false)
13641503}
13651504
13661505fn extend_till_char(cx: &mut Context) {
1367− will_find_char(cx, find_next_char_impl, false, true)
1506+ find_char(cx, Direction::Forward, false, true)
13681507}
13691508
13701509fn extend_next_char(cx: &mut Context) {
1371− will_find_char(cx, find_next_char_impl, true, true)
1510+ find_char(cx, Direction::Forward, true, true)
13721511}
13731512
13741513fn till_prev_char(cx: &mut Context) {
1375− will_find_char(cx, find_prev_char_impl, false, false)
1514+ find_char(cx, Direction::Backward, false, false)
13761515}
13771516
13781517fn find_prev_char(cx: &mut Context) {
1379− will_find_char(cx, find_prev_char_impl, true, false)
1518+ find_char(cx, Direction::Backward, true, false)
13801519}
13811520
13821521fn extend_till_prev_char(cx: &mut Context) {
1383− will_find_char(cx, find_prev_char_impl, false, true)
1522+ find_char(cx, Direction::Backward, false, true)
13841523}
13851524
13861525fn extend_prev_char(cx: &mut Context) {
1387− will_find_char(cx, find_prev_char_impl, true, true)
1526+ find_char(cx, Direction::Backward, true, true)
13881527}
13891528
13901529fn repeat_last_motion(cx: &mut Context) {
1391− let count = cx.count();
1392− let last_motion = cx.editor.last_motion.take();
1393− if let Some(m) = &last_motion {
1394− for _ in 0..count {
1395− m.run(cx.editor);
1396− }
1397− cx.editor.last_motion = last_motion;
1398− }
1530+ cx.editor.repeat_last_motion(cx.count())
13991531}
14001532
14011533fn replace(cx: &mut Context) {
@@ -1462,6 +1594,7 @@ where
14621594 });
14631595
14641596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
14651598}
14661599
14671600fn switch_case(cx: &mut Context) {
@@ -1703,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
17031836 "select:".into(),
17041837 Some(reg),
17051838 ui::completers::none,
1706− move |editor, regex, event| {
1707− let (view, doc) = current!(editor);
1839+ move |cx, regex, event| {
1840+ let (view, doc) = current!(cx.editor);
17081841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17091842 return;
17101843 }
@@ -1725,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
17251858 "split:".into(),
17261859 Some(reg),
17271860 ui::completers::none,
1728− move |editor, regex, event| {
1729− let (view, doc) = current!(editor);
1861+ move |cx, regex, event| {
1862+ let (view, doc) = current!(cx.editor);
17301863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17311864 return;
17321865 }
@@ -1849,11 +1982,11 @@ fn search_impl(
18491982
18501983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
18511984 let mut items = reg
1852− .and_then(|reg| cx.editor.registers.get(reg))
1853− .map_or(Vec::new(), |reg| reg.read().iter().take(200).collect());
1985+ .and_then(|reg| cx.editor.registers.read(reg, cx.editor))
1986+ .map_or(Vec::new(), |reg| reg.take(200).collect());
18541987 items.sort_unstable();
18551988 items.dedup();
1856− items.into_iter().cloned().collect()
1989+ items.into_iter().map(|value| value.to_string()).collect()
18571990}
18581991
18591992fn search(cx: &mut Context) {
@@ -1890,12 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
18902023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
18912024 .collect()
18922025 },
1893− move |editor, regex, event| {
1894− if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
2026+ move |cx, regex, event| {
2027+ if event == PromptEvent::Validate {
2028+ cx.editor.registers.last_search_register = reg;
2029+ } else if event != PromptEvent::Update {
18952030 return;
18962031 }
18972032 search_impl(
1898− editor,
2033+ cx.editor,
18992034 &contents,
19002035 &regex,
19012036 Movement::Move,
@@ -1910,11 +2045,13 @@ fn searcher(cx: &mut Context, direction: Direction) {
19102045
19112046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
19122047 let count = cx.count();
2048+ let register = cx
2049+ .register
2050+ .unwrap_or(cx.editor.registers.last_search_register);
19132051 let config = cx.editor.config();
19142052 let scrolloff = config.scrolloff;
1915− let (_, doc) = current!(cx.editor);
1916− let registers = &cx.editor.registers;
1917− if let Some(query) = registers.read('/').and_then(|query| query.last()) {
2053+ if let Some(query) = cx.editor.registers.first(register, cx.editor) {
2054+ let doc = doc!(cx.editor);
19182055 let contents = doc.text().slice(..).to_string();
19192056 let search_config = &config.search;
19202057 let case_insensitive = if search_config.smart_case {
@@ -1923,7 +2060,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
19232060 false
19242061 };
19252062 let wrap_around = search_config.wrap_around;
1926− if let Ok(regex) = RegexBuilder::new(query)
2063+ if let Ok(regex) = RegexBuilder::new(&query)
19272064 .case_insensitive(case_insensitive)
19282065 .multi_line(true)
19292066 .build()
@@ -1963,6 +2100,7 @@ fn extend_search_prev(cx: &mut Context) {
19632100}
19642101
19652102fn search_selection(cx: &mut Context) {
2103+ let register = cx.register.unwrap_or('/');
19662104 let (view, doc) = current!(cx.editor);
19672105 let contents = doc.text().slice(..);
19682106
@@ -1975,13 +2113,24 @@ fn search_selection(cx: &mut Context) {
19752113 .collect::<Vec<_>>()
19762114 .join("|");
19772115
1978− let msg = format!("register '{}' set to '{}'", '/', &regex);
1979− cx.editor.registers.push('/', regex);
1980− cx.editor.set_status(msg);
2116+ let msg = format!("register '{}' set to '{}'", register, &regex);
2117+ match cx.editor.registers.push(register, regex) {
2118+ Ok(_) => {
2119+ cx.editor.registers.last_search_register = register;
2120+ cx.editor.set_status(msg)
2121+ }
2122+ Err(err) => cx.editor.set_error(err.to_string()),
2123+ }
19812124}
19822125
19832126fn make_search_word_bounded(cx: &mut Context) {
1984− let regex = match cx.editor.registers.last('/') {
2127+ // Defaults to the active search register instead `/` to be more ergonomic assuming most people
2128+ // would use this command following `search_selection`. This avoids selecting the register
2129+ // twice.
2130+ let register = cx
2131+ .register
2132+ .unwrap_or(cx.editor.registers.last_search_register);
2133+ let regex = match cx.editor.registers.first(register, cx.editor) {
19852134 Some(regex) => regex,
19862135 None => return,
19872136 };
@@ -1999,14 +2148,19 @@ fn make_search_word_bounded(cx: &mut Context) {
19992148 if !start_anchored {
20002149 new_regex.push_str("\\b");
20012150 }
2002− new_regex.push_str(regex);
2151+ new_regex.push_str(&regex);
20032152 if !end_anchored {
20042153 new_regex.push_str("\\b");
20052154 }
20062155
2007− let msg = format!("register '{}' set to '{}'", '/', &new_regex);
2008− cx.editor.registers.push('/', new_regex);
2009− cx.editor.set_status(msg);
2156+ let msg = format!("register '{}' set to '{}'", register, &new_regex);
2157+ match cx.editor.registers.push(register, new_regex) {
2158+ Ok(_) => {
2159+ cx.editor.registers.last_search_register = register;
2160+ cx.editor.set_status(msg)
2161+ }
2162+ Err(err) => cx.editor.set_error(err.to_string()),
2163+ }
20102164}
20112165
20122166fn global_search(cx: &mut Context) {
@@ -2045,13 +2199,11 @@ fn global_search(cx: &mut Context) {
20452199 }
20462200 }
20472201
2048− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
20492202 let config = cx.editor.config();
20502203 let smart_case = config.search.smart_case;
20512204 let file_picker_config = config.file_picker.clone();
20522205
20532206 let reg = cx.register.unwrap_or('/');
2054−
20552207 let completions = search_completions(cx, Some(reg));
20562208 ui::regex_prompt(
20572209 cx,
@@ -2064,43 +2216,67 @@ fn global_search(cx: &mut Context) {
20642216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
20652217 .collect()
20662218 },
2067− move |_editor, regex, event| {
2219+ move |cx, regex, event| {
20682220 if event != PromptEvent::Validate {
20692221 return;
20702222 }
2223+ cx.editor.registers.last_search_register = reg;
2224+
2225+ let current_path = doc_mut!(cx.editor).path().cloned();
2226+ let documents: Vec<_> = cx
2227+ .editor
2228+ .documents()
2229+ .map(|doc| (doc.path().cloned(), doc.text().to_owned()))
2230+ .collect();
20712231
20722232 if let Ok(matcher) = RegexMatcherBuilder::new()
20732233 .case_smart(smart_case)
20742234 .build(regex.as_str())
20752235 {
2076− let searcher = SearcherBuilder::new()
2077− .binary_detection(BinaryDetection::quit(b'\x00'))
2078− .build();
2236+ let search_root = helix_loader::current_working_dir();
2237+ if !search_root.exists() {
2238+ cx.editor
2239+ .set_error("Current working directory does not exist");
2240+ return;
2241+ }
2242+
2243+ let (picker, injector) = Picker::stream(current_path);
20792244
2080− let search_root = std::env::current_dir()
2081− .expect("Global search error: Failed to get current dir");
20822245 let dedup_symlinks = file_picker_config.deduplicate_links;
20832246 let absolute_root = search_root
20842247 .canonicalize()
20852248 .unwrap_or_else(|_| search_root.clone());
2086−
2087− WalkBuilder::new(search_root)
2088− .hidden(file_picker_config.hidden)
2089− .parents(file_picker_config.parents)
2090− .ignore(file_picker_config.ignore)
2091− .follow_links(file_picker_config.follow_symlinks)
2092− .git_ignore(file_picker_config.git_ignore)
2093− .git_global(file_picker_config.git_global)
2094− .git_exclude(file_picker_config.git_exclude)
2095− .max_depth(file_picker_config.max_depth)
2096− .filter_entry(move |entry| {
2097− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2098− })
2099− .build_parallel()
2100− .run(|| {
2249+ let injector_ = injector.clone();
2250+
2251+ std::thread::spawn(move || {
2252+ let searcher = SearcherBuilder::new()
2253+ .binary_detection(BinaryDetection::quit(b'\x00'))
2254+ .build();
2255+
2256+ let mut walk_builder = WalkBuilder::new(search_root);
2257+
2258+ walk_builder
2259+ .hidden(file_picker_config.hidden)
2260+ .parents(file_picker_config.parents)
2261+ .ignore(file_picker_config.ignore)
2262+ .follow_links(file_picker_config.follow_symlinks)
2263+ .git_ignore(file_picker_config.git_ignore)
2264+ .git_global(file_picker_config.git_global)
2265+ .git_exclude(file_picker_config.git_exclude)
2266+ .max_depth(file_picker_config.max_depth)
2267+ .filter_entry(move |entry| {
2268+ filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2269+ });
2270+
2271+ walk_builder
2272+ .add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
2273+ walk_builder.add_custom_ignore_filename(".helix/ignore");
2274+
2275+ walk_builder.build_parallel().run(|| {
21012276 let mut searcher = searcher.clone();
21022277 let matcher = matcher.clone();
2103− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
21042280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
21052281 let entry = match entry {
21062282 Ok(entry) => entry,
@@ -2113,17 +2289,39 @@ fn global_search(cx: &mut Context) {
21132289 _ => return WalkState::Continue,
21142290 };
21152291
2116− let result = searcher.search_path(
2117− &matcher,
2118− entry.path(),
2119− sinks::UTF8(|line_num, _| {
2120− all_matches_sx
2121− .send(FileResult::new(entry.path(), line_num as usize - 1))
2122− .unwrap();
2123−
2124− Ok(true)
2125− }),
2126− );
2292+ let mut stop = false;
2293+ let sink = sinks::UTF8(|line_num, _| {
2294+ stop = injector
2295+ .push(FileResult::new(entry.path(), line_num as usize - 1))
2296+ .is_err();
2297+
2298+ Ok(!stop)
2299+ });
2300+ let doc = documents.iter().find(|&(doc_path, _)| {
2301+ doc_path
2302+ .as_ref()
2303+ .map_or(false, |doc_path| doc_path == entry.path())
2304+ });
2305+
2306+ let result = if let Some((_, doc)) = doc {
2307+ // there is already a buffer for this file
2308+ // search the buffer instead of the file because it's faster
2309+ // and captures new edits without requiring a save
2310+ if searcher.multi_line_with_matcher(&matcher) {
2311+ // in this case a continous buffer is required
2312+ // convert the rope to a string
2313+ let text = doc.to_string();
2314+ searcher.search_slice(&matcher, text.as_bytes(), sink)
2315+ } else {
2316+ searcher.search_reader(
2317+ &matcher,
2318+ RopeReader::new(doc.slice(..)),
2319+ sink,
2320+ )
2321+ }
2322+ } else {
2323+ searcher.search_path(&matcher, entry.path(), sink)
2324+ };
21272325
21282326 if let Err(err) = result {
21292327 log::error!(
@@ -2132,67 +2330,66 @@ fn global_search(cx: &mut Context) {
21322330 err
21332331 );
21342332 }
2135− WalkState::Continue
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
21362338 })
21372339 });
2340+ });
2341+
2342+ cx.jobs.callback(async move {
2343+ let call = move |_: &mut Editor, compositor: &mut Compositor| {
2344+ let picker = Picker::with_stream(
2345+ picker,
2346+ injector,
2347+ move |cx, FileResult { path, line_num }, action| {
2348+ let doc = match cx.editor.open(path, action) {
2349+ Ok(id) => doc_mut!(cx.editor, &id),
2350+ Err(e) => {
2351+ cx.editor.set_error(format!(
2352+ "Failed to open file '{}': {}",
2353+ path.display(),
2354+ e
2355+ ));
2356+ return;
2357+ }
2358+ };
2359+
2360+ let line_num = *line_num;
2361+ let view = view_mut!(cx.editor);
2362+ let text = doc.text();
2363+ if line_num >= text.len_lines() {
2364+ cx.editor.set_error(
2365+ "The line you jumped to does not exist anymore because the file has changed.",
2366+ );
2367+ return;
2368+ }
2369+ let start = text.line_to_char(line_num);
2370+ let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2371+
2372+ doc.set_selection(view.id, Selection::single(start, end));
2373+ if action.align_view(view, doc.id()) {
2374+ align_view(doc, view, Align::Center);
2375+ }
2376+ },
2377+ )
2378+ .with_preview(
2379+ |_editor, FileResult { path, line_num }| {
2380+ Some((path.clone().into(), Some((*line_num, *line_num))))
2381+ },
2382+ );
2383+ compositor.push(Box::new(overlaid(picker)))
2384+ };
2385+ Ok(Callback::EditorCompositor(Box::new(call)))
2386+ })
21382387 } else {
21392388 // Otherwise do nothing
21402389 // log::warn!("Global Search Invalid Pattern")
21412390 }
21422391 },
21432392 );
2144−
2145− let current_path = doc_mut!(cx.editor).path().cloned();
2146−
2147− let show_picker = async move {
2148− let all_matches: Vec<FileResult> =
2149− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2150− let call: job::Callback = Callback::EditorCompositor(Box::new(
2151− move |editor: &mut Editor, compositor: &mut Compositor| {
2152− if all_matches.is_empty() {
2153− editor.set_status("No matches found");
2154− return;
2155− }
2156−
2157− let picker = FilePicker::new(
2158− all_matches,
2159− current_path,
2160− move |cx, FileResult { path, line_num }, action| {
2161− match cx.editor.open(path, action) {
2162− Ok(_) => {}
2163− Err(e) => {
2164− cx.editor.set_error(format!(
2165− "Failed to open file '{}': {}",
2166− path.display(),
2167− e
2168− ));
2169− return;
2170− }
2171− }
2172−
2173− let line_num = *line_num;
2174− let (view, doc) = current!(cx.editor);
2175− let text = doc.text();
2176− if line_num >= text.len_lines() {
2177− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2178− return;
2179− }
2180− let start = text.line_to_char(line_num);
2181− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2182−
2183− doc.set_selection(view.id, Selection::single(start, end));
2184− align_view(doc, view, Align::Center);
2185− },
2186− |_editor, FileResult { path, line_num }| {
2187− Some((path.clone().into(), Some((*line_num, *line_num))))
2188− },
2189− );
2190− compositor.push(Box::new(overlaid(picker)));
2191− },
2192− ));
2193− Ok(call)
2194− };
2195− cx.jobs.callback(show_picker);
21962393}
21972394
21982395enum Extend {
@@ -2315,17 +2512,35 @@ enum Operation {
23152512 Change,
23162513}
23172514
2515+fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
2516+ selection.ranges().iter().all(|range| {
2517+ let text = text.slice(..);
2518+ if range.slice(text).len_lines() < 2 {
2519+ return false;
2520+ }
2521+ // If the start of the selection is at the start of a line and the end at the end of a line.
2522+ let (start_line, end_line) = range.line_range(text);
2523+ let start = text.line_to_char(start_line);
2524+ let end = text.line_to_char((end_line + 1).min(text.len_lines()));
2525+ start == range.from() && end == range.to()
2526+ })
2527+}
2528+
23182529fn delete_selection_impl(cx: &mut Context, op: Operation) {
23192530 let (view, doc) = current!(cx.editor);
23202531
23212532 let selection = doc.selection(view.id);
2533+ let only_whole_lines = selection_is_linewise(selection, doc.text());
23222534
23232535 if cx.register != Some('_') {
23242536 // first yank the selection
23252537 let text = doc.text().slice(..);
23262538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
23272539 let reg_name = cx.register.unwrap_or('"');
2328− cx.editor.registers.write(reg_name, values);
2540+ if let Err(err) = cx.editor.registers.write(reg_name, values) {
2541+ cx.editor.set_error(err.to_string());
2542+ return;
2543+ }
23292544 };
23302545
23312546 // then delete
@@ -2339,7 +2554,11 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23392554 exit_select_mode(cx);
23402555 }
23412556 Operation::Change => {
2342− enter_insert_mode(cx);
2557+ if only_whole_lines {
2558+ open_above(cx);
2559+ } else {
2560+ enter_insert_mode(cx);
2561+ }
23432562 }
23442563 }
23452564}
@@ -2461,6 +2680,10 @@ fn insert_mode(cx: &mut Context) {
24612680 .transform(|range| Range::new(range.to(), range.from()));
24622681
24632682 doc.set_selection(view.id, selection);
2683+
2684+ // [TODO] temporary workaround until we're not using the idle timer to
2685+ // trigger auto completions any more
2686+ cx.editor.clear_idle_timer();
24642687}
24652688
24662689// inserts at the end of each selection
@@ -2497,6 +2720,10 @@ fn append_mode(cx: &mut Context) {
24972720
24982721fn file_picker(cx: &mut Context) {
24992722 let root = find_workspace().0;
2723+ if !root.exists() {
2724+ cx.editor.set_error("Workspace directory does not exist");
2725+ return;
2726+ }
25002727 let picker = ui::file_picker(root, &cx.editor.config());
25012728 cx.push_layer(Box::new(overlaid(picker)));
25022729}
@@ -2517,8 +2744,14 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
25172744 let picker = ui::file_picker(path, &cx.editor.config());
25182745 cx.push_layer(Box::new(overlaid(picker)));
25192746}
2747+
25202748fn file_picker_in_current_directory(cx: &mut Context) {
2521− let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("./"));
2749+ let cwd = helix_loader::current_working_dir();
2750+ if !cwd.exists() {
2751+ cx.editor
2752+ .set_error("Current working directory does not exist");
2753+ return;
2754+ }
25222755 let picker = ui::file_picker(cwd, &cx.editor.config());
25232756 cx.push_layer(Box::new(overlaid(picker)));
25242757}
@@ -2577,22 +2810,18 @@ fn buffer_picker(cx: &mut Context) {
25772810 // mru
25782811 items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
25792812
2580− let picker = FilePicker::new(
2581− items,
2582− (),
2583− |cx, meta, action| {
2584− cx.editor.switch(meta.id, action);
2585− },
2586− |editor, meta| {
2587− let doc = &editor.documents.get(&meta.id)?;
2588− let &view_id = doc.selections().keys().next()?;
2589− let line = doc
2590− .selection(view_id)
2591− .primary()
2592− .cursor_line(doc.text().slice(..));
2593− Some((meta.id.into(), Some((line, line))))
2594− },
2595− );
2813+ let picker = Picker::new(items, (), |cx, meta, action| {
2814+ cx.editor.switch(meta.id, action);
2815+ })
2816+ .with_preview(|editor, meta| {
2817+ let doc = &editor.documents.get(&meta.id)?;
2818+ let &view_id = doc.selections().keys().next()?;
2819+ let line = doc
2820+ .selection(view_id)
2821+ .primary()
2822+ .cursor_line(doc.text().slice(..));
2823+ Some((meta.id.into(), Some((line, line))))
2824+ });
25962825 cx.push_layer(Box::new(overlaid(picker)));
25972826}
25982827
@@ -2658,7 +2887,7 @@ fn jumplist_picker(cx: &mut Context) {
26582887 }
26592888 };
26602889
2661− let picker = FilePicker::new(
2890+ let picker = Picker::new(
26622891 cx.editor
26632892 .tree
26642893 .views()
@@ -2672,16 +2901,18 @@ fn jumplist_picker(cx: &mut Context) {
26722901 |cx, meta, action| {
26732902 cx.editor.switch(meta.id, action);
26742903 let config = cx.editor.config();
2675− let (view, doc) = current!(cx.editor);
2904+ let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
26762905 doc.set_selection(view.id, meta.selection.clone());
2677− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2678− },
2679− |editor, meta| {
2680− let doc = &editor.documents.get(&meta.id)?;
2681− let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2682− Some((meta.path.clone()?.into(), Some((line, line))))
2906+ if action.align_view(view, doc.id()) {
2907+ view.ensure_cursor_in_view_center(doc, config.scrolloff);
2908+ }
26832909 },
2684− );
2910+ )
2911+ .with_preview(|editor, meta| {
2912+ let doc = &editor.documents.get(&meta.id)?;
2913+ let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2914+ Some((meta.id.into(), Some((line, line))))
2915+ });
26852916 cx.push_layer(Box::new(overlaid(picker)));
26862917}
26872918
@@ -2822,6 +3053,7 @@ fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
28223053 let indent = indent::indent_for_newline(
28233054 language_config,
28243055 syntax,
3056+ &doc.config.load().indent_heuristic,
28253057 &doc.indent_style,
28263058 tab_width,
28273059 text,
@@ -2926,6 +3158,7 @@ fn open(cx: &mut Context, open: Open) {
29263158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
29273159 Open::Above => range.from(),
29283160 });
3161+
29293162 let new_line = match open {
29303163 // adjust position to the end of the line (next line - 1)
29313164 Open::Below => cursor_line + 1,
@@ -2933,13 +3166,15 @@ fn open(cx: &mut Context, open: Open) {
29333166 Open::Above => cursor_line,
29343167 };
29353168
3169+ let line_num = new_line.saturating_sub(1);
3170+
29363171 // Index to insert newlines after, as well as the char width
29373172 // to use to compensate for those inserted newlines.
29383173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
29393174 (0, 0)
29403175 } else {
29413176 (
2942− line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3177+ line_end_char_index(&text, line_num),
29433178 doc.line_ending.len_chars(),
29443179 )
29453180 };
@@ -2947,13 +3182,15 @@ fn open(cx: &mut Context, open: Open) {
29473182 let indent = indent::indent_for_newline(
29483183 doc.language_config(),
29493184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
29503186 &doc.indent_style,
29513187 doc.tab_width(),
29523188 text,
2953− new_line.saturating_sub(1),
3189+ line_num,
29543190 line_end_index,
29553191 cursor_line,
29563192 );
3193+
29573194 let indent_len = indent.len();
29583195 let mut text = String::with_capacity(1 + indent_len);
29593196 text.push_str(doc.line_ending.as_str());
@@ -3252,8 +3489,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
32523489
32533490 doc.set_selection(view.id, selection)
32543491 };
3255− motion(cx.editor);
3256− cx.editor.last_motion = Some(Motion(Box::new(motion)));
3492+ cx.editor.apply_motion(motion);
32573493}
32583494
32593495/// Returns the [Range] for a [Hunk] in the given text.
@@ -3380,6 +3616,7 @@ pub mod insert {
33803616 }
33813617
33823618 use helix_core::auto_pairs;
3619+ use helix_view::editor::SmartTabConfig;
33833620
33843621 pub fn insert_char(cx: &mut Context, c: char) {
33853622 let (view, doc) = current_ref!(cx.editor);
@@ -3405,6 +3642,31 @@ pub mod insert {
34053642 }
34063643 }
34073644
3645+ pub fn smart_tab(cx: &mut Context) {
3646+ let (view, doc) = current_ref!(cx.editor);
3647+ let view_id = view.id;
3648+
3649+ if matches!(
3650+ cx.editor.config().smart_tab,
3651+ Some(SmartTabConfig { enable: true, .. })
3652+ ) {
3653+ let cursors_after_whitespace = doc.selection(view_id).ranges().iter().all(|range| {
3654+ let cursor = range.cursor(doc.text().slice(..));
3655+ let current_line_num = doc.text().char_to_line(cursor);
3656+ let current_line_start = doc.text().line_to_char(current_line_num);
3657+ let left = doc.text().slice(current_line_start..cursor);
3658+ left.chars().all(|c| c.is_whitespace())
3659+ });
3660+
3661+ if !cursors_after_whitespace {
3662+ move_parent_node_end(cx);
3663+ return;
3664+ }
3665+ }
3666+
3667+ insert_tab(cx);
3668+ }
3669+
34083670 pub fn insert_tab(cx: &mut Context) {
34093671 let (view, doc) = current!(cx.editor);
34103672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3460,6 +3722,7 @@ pub mod insert {
34603722 let indent = indent::indent_for_newline(
34613723 doc.language_config(),
34623724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
34633726 &doc.indent_style,
34643727 doc.tab_width(),
34653728 text,
@@ -3700,34 +3963,21 @@ fn commit_undo_checkpoint(cx: &mut Context) {
37003963// Yank / Paste
37013964
37023965fn yank(cx: &mut Context) {
3703− let (view, doc) = current!(cx.editor);
3704− let text = doc.text().slice(..);
3705−
3706− let values: Vec<String> = doc
3707− .selection(view.id)
3708− .fragments(text)
3709− .map(Cow::into_owned)
3710− .collect();
3711−
3712− let msg = format!(
3713− "yanked {} selection(s) to register {}",
3714− values.len(),
3715− cx.register.unwrap_or('"')
3716− );
3966+ yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967+ exit_select_mode(cx);
3968+}
37173969
3718− cx.editor
3719− .registers
3720− .write(cx.register.unwrap_or('"'), values);
3970+fn yank_to_clipboard(cx: &mut Context) {
3971+ yank_impl(cx.editor, '+');
3972+ exit_select_mode(cx);
3973+}
37213974
3722− cx.editor.set_status(msg);
3975+fn yank_to_primary_clipboard(cx: &mut Context) {
3976+ yank_impl(cx.editor, '*');
37233977 exit_select_mode(cx);
37243978}
37253979
3726−fn yank_joined_to_clipboard_impl(
3727− editor: &mut Editor,
3728− separator: &str,
3729− clipboard_type: ClipboardType,
3730−) -> anyhow::Result<()> {
3980+fn yank_impl(editor: &mut Editor, register: char) {
37313981 let (view, doc) = current!(editor);
37323982 let text = doc.text().slice(..);
37333983
@@ -3736,74 +3986,79 @@ fn yank_joined_to_clipboard_impl(
37363986 .fragments(text)
37373987 .map(Cow::into_owned)
37383988 .collect();
3989+ let selections = values.len();
37393990
3740− let clipboard_text = match clipboard_type {
3741− ClipboardType::Clipboard => "system clipboard",
3742− ClipboardType::Selection => "primary clipboard",
3743− };
3744−
3745− let msg = format!(
3746− "joined and yanked {} selection(s) to {}",
3747− values.len(),
3748− clipboard_text,
3749− );
3991+ match editor.registers.write(register, values) {
3992+ Ok(_) => editor.set_status(format!(
3993+ "yanked {selections} selection{} to register {register}",
3994+ if selections == 1 { "" } else { "s" }
3995+ )),
3996+ Err(err) => editor.set_error(err.to_string()),
3997+ }
3998+}
37503999
3751− let joined = values.join(separator);
4000+fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
4001+ let (view, doc) = current!(editor);
4002+ let text = doc.text().slice(..);
37524003
3753− editor
3754− .clipboard_provider
3755− .set_contents(joined, clipboard_type)
3756− .context("Couldn't set system clipboard content")?;
4004+ let selection = doc.selection(view.id);
4005+ let selections = selection.len();
4006+ let joined = selection
4007+ .fragments(text)
4008+ .fold(String::new(), |mut acc, fragment| {
4009+ if !acc.is_empty() {
4010+ acc.push_str(separator);
4011+ }
4012+ acc.push_str(&fragment);
4013+ acc
4014+ });
37574015
3758− editor.set_status(msg);
4016+ match editor.registers.write(register, vec![joined]) {
4017+ Ok(_) => editor.set_status(format!(
4018+ "joined and yanked {selections} selection{} to register {register}",
4019+ if selections == 1 { "" } else { "s" }
4020+ )),
4021+ Err(err) => editor.set_error(err.to_string()),
4022+ }
4023+}
37594024
3760− Ok(())
4025+fn yank_joined(cx: &mut Context) {
4026+ let separator = doc!(cx.editor).line_ending.as_str();
4027+ yank_joined_impl(cx.editor, separator, cx.register.unwrap_or('"'));
4028+ exit_select_mode(cx);
37614029}
37624030
37634031fn yank_joined_to_clipboard(cx: &mut Context) {
37644032 let line_ending = doc!(cx.editor).line_ending;
3765− let _ =
3766− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
37674034 exit_select_mode(cx);
37684035}
37694036
3770−fn yank_main_selection_to_clipboard_impl(
3771− editor: &mut Editor,
3772− clipboard_type: ClipboardType,
3773−) -> anyhow::Result<()> {
4037+fn yank_joined_to_primary_clipboard(cx: &mut Context) {
4038+ let line_ending = doc!(cx.editor).line_ending;
4039+ yank_joined_impl(cx.editor, line_ending.as_str(), '*');
4040+ exit_select_mode(cx);
4041+}
4042+
4043+fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
37744044 let (view, doc) = current!(editor);
37754045 let text = doc.text().slice(..);
37764046
3777− let message_text = match clipboard_type {
3778− ClipboardType::Clipboard => "yanked main selection to system clipboard",
3779− ClipboardType::Selection => "yanked main selection to primary clipboard",
3780− };
4047+ let selection = doc.selection(view.id).primary().fragment(text).to_string();
37814048
3782− let value = doc.selection(view.id).primary().fragment(text);
3783−
3784− if let Err(e) = editor
3785− .clipboard_provider
3786− .set_contents(value.into_owned(), clipboard_type)
3787− {
3788− bail!("Couldn't set system clipboard content: {}", e);
4049+ match editor.registers.write(register, vec![selection]) {
4050+ Ok(_) => editor.set_status(format!("yanked primary selection to register {register}",)),
4051+ Err(err) => editor.set_error(err.to_string()),
37894052 }
3790−
3791− editor.set_status(message_text);
3792− Ok(())
37934053}
37944054
37954055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3796− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
3797−}
3798−
3799−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3800− let line_ending = doc!(cx.editor).line_ending;
3801− let _ =
3802− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Selection);
4056+ yank_primary_selection_impl(cx.editor, '+');
4057+ exit_select_mode(cx);
38034058}
38044059
38054060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3806− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4061+ yank_primary_selection_impl(cx.editor, '*');
38074062 exit_select_mode(cx);
38084063}
38094064
@@ -3901,146 +4156,99 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
39014156 };
39024157 let (view, doc) = current!(cx.editor);
39034158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3904−}
3905−
3906−fn paste_clipboard_impl(
3907− editor: &mut Editor,
3908− action: Paste,
3909− clipboard_type: ClipboardType,
3910− count: usize,
3911−) -> anyhow::Result<()> {
3912− let (view, doc) = current!(editor);
3913− match editor.clipboard_provider.get_contents(clipboard_type) {
3914− Ok(contents) => {
3915− paste_impl(&[contents], doc, view, action, count, editor.mode);
3916− Ok(())
3917− }
3918− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3919− }
4159+ exit_select_mode(cx);
39204160}
39214161
39224162fn paste_clipboard_after(cx: &mut Context) {
3923− let _ = paste_clipboard_impl(
3924− cx.editor,
3925− Paste::After,
3926− ClipboardType::Clipboard,
3927− cx.count(),
3928− );
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
39294165}
39304166
39314167fn paste_clipboard_before(cx: &mut Context) {
3932− let _ = paste_clipboard_impl(
3933− cx.editor,
3934− Paste::Before,
3935− ClipboardType::Clipboard,
3936− cx.count(),
3937− );
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
39384170}
39394171
39404172fn paste_primary_clipboard_after(cx: &mut Context) {
3941− let _ = paste_clipboard_impl(
3942− cx.editor,
3943− Paste::After,
3944− ClipboardType::Selection,
3945− cx.count(),
3946− );
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
39474175}
39484176
39494177fn paste_primary_clipboard_before(cx: &mut Context) {
3950− let _ = paste_clipboard_impl(
3951− cx.editor,
3952− Paste::Before,
3953− ClipboardType::Selection,
3954− cx.count(),
3955− );
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
39564180}
39574181
39584182fn replace_with_yanked(cx: &mut Context) {
3959− let count = cx.count();
3960− let reg_name = cx.register.unwrap_or('"');
3961− let (view, doc) = current!(cx.editor);
3962− let registers = &mut cx.editor.registers;
3963−
3964− if let Some(values) = registers.read(reg_name) {
3965− if !values.is_empty() {
3966− let repeat = std::iter::repeat(
3967− values
3968− .last()
3969− .map(|value| Tendril::from(&value.repeat(count)))
3970− .unwrap(),
3971− );
3972− let mut values = values
3973− .iter()
3974− .map(|value| Tendril::from(&value.repeat(count)))
3975− .chain(repeat);
3976− let selection = doc.selection(view.id);
3977− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3978− if !range.is_empty() {
3979− (range.from(), range.to(), Some(values.next().unwrap()))
3980− } else {
3981− (range.from(), range.to(), None)
3982− }
3983− });
3984−
3985− doc.apply(&transaction, view.id);
3986− exit_select_mode(cx);
3987− }
3988− }
4183+ replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
4184+ exit_select_mode(cx);
39894185}
39904186
3991−fn replace_selections_with_clipboard_impl(
3992− cx: &mut Context,
3993− clipboard_type: ClipboardType,
3994−) -> anyhow::Result<()> {
3995− let count = cx.count();
3996− let (view, doc) = current!(cx.editor);
3997−
3998− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
3999− Ok(contents) => {
4000− let selection = doc.selection(view.id);
4001− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4002− (
4003− range.from(),
4004− range.to(),
4005− Some(contents.repeat(count).as_str().into()),
4006− )
4007− });
4187+fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
4188+ let Some(values) = editor.registers
4189+ .read(register, editor)
4190+ .filter(|values| values.len() > 0) else { return };
4191+ let values: Vec<_> = values.map(|value| value.to_string()).collect();
40084192
4009− doc.apply(&transaction, view.id);
4010− doc.append_changes_to_history(view);
4193+ let (view, doc) = current!(editor);
4194+ let repeat = std::iter::repeat(
4195+ values
4196+ .last()
4197+ .map(|value| Tendril::from(&value.repeat(count)))
4198+ .unwrap(),
4199+ );
4200+ let mut values = values
4201+ .iter()
4202+ .map(|value| Tendril::from(&value.repeat(count)))
4203+ .chain(repeat);
4204+ let selection = doc.selection(view.id);
4205+ let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4206+ if !range.is_empty() {
4207+ (range.from(), range.to(), Some(values.next().unwrap()))
4208+ } else {
4209+ (range.from(), range.to(), None)
40114210 }
4012− Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
4013− }
4211+ });
40144212
4015− exit_select_mode(cx);
4016− Ok(())
4213+ doc.apply(&transaction, view.id);
40174214}
40184215
40194216fn replace_selections_with_clipboard(cx: &mut Context) {
4020− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
40214219}
40224220
40234221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
4024− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
40254224}
40264225
4027−fn paste(cx: &mut Context, pos: Paste) {
4028− let count = cx.count();
4029− let reg_name = cx.register.unwrap_or('"');
4030− let (view, doc) = current!(cx.editor);
4031− let registers = &mut cx.editor.registers;
4226+fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
4227+ let Some(values) = editor.registers.read(register, editor) else { return };
4228+ let values: Vec<_> = values.map(|value| value.to_string()).collect();
40324229
4033− if let Some(values) = registers.read(reg_name) {
4034− paste_impl(values, doc, view, pos, count, cx.editor.mode);
4035− }
4230+ let (view, doc) = current!(editor);
4231+ paste_impl(&values, doc, view, pos, count, editor.mode);
40364232}
40374233
40384234fn paste_after(cx: &mut Context) {
4039− paste(cx, Paste::After)
4235+ paste(
4236+ cx.editor,
4237+ cx.register.unwrap_or('"'),
4238+ Paste::After,
4239+ cx.count(),
4240+ );
4241+ exit_select_mode(cx);
40404242}
40414243
40424244fn paste_before(cx: &mut Context) {
4043− paste(cx, Paste::Before)
4245+ paste(
4246+ cx.editor,
4247+ cx.register.unwrap_or('"'),
4248+ Paste::Before,
4249+ cx.count(),
4250+ );
4251+ exit_select_mode(cx);
40444252}
40454253
40464254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4079,6 +4287,7 @@ fn indent(cx: &mut Context) {
40794287 }),
40804288 );
40814289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
40824291}
40834292
40844293fn unindent(cx: &mut Context) {
@@ -4118,6 +4327,7 @@ fn unindent(cx: &mut Context) {
41184327 let transaction = Transaction::change(doc.text(), changes.into_iter());
41194328
41204329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
41214331}
41224332
41234333fn format_selections(cx: &mut Context) {
@@ -4147,7 +4357,7 @@ fn format_selections(cx: &mut Context) {
41474357 })
41484358 else {
41494359 cx.editor
4150− .set_error("No configured language server does not support range formatting");
4360+ .set_error("No configured language server supports range formatting");
41514361 return;
41524362 };
41534363
@@ -4184,10 +4394,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41844394 use movement::skip_while;
41854395 let (view, doc) = current!(cx.editor);
41864396 let text = doc.text();
4187− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
41884398
41894399 let mut changes = Vec::new();
4190− let fragment = Tendril::from(" ");
41914400
41924401 for selection in doc.selection(view.id) {
41934402 let (start, mut end) = selection.line_range(slice);
@@ -4203,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
42034412 let mut end = text.line_to_char(line + 1);
42044413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
42054414
4206− // need to skip from start, not end
4207− let change = (start, end, Some(fragment.clone()));
4208− changes.push(change);
4415+ let separator = if end == line_end_char_index(&slice, line + 1) {
4416+ // the joining line contains only space-characters => don't include a whitespace when joining
4417+ None
4418+ } else {
4419+ Some(Tendril::from(" "))
4420+ };
4421+ changes.push((start, end, separator));
42094422 }
42104423 }
42114424
@@ -4217,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
42174430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
42184431 changes.dedup();
42194432
4220− // TODO: joining multiple empty lines should be replaced by a single space.
4221− // need to merge change ranges that touch
4222−
42234433 // select inserted spaces
42244434 let transaction = if select_space {
42254435 let ranges: SmallVec<_> = changes
@@ -4231,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
42314441 })
42324442 .collect();
42334443 let selection = Selection::new(ranges, 0);
4234− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
42354445 } else {
4236− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
42374447 };
42384448
42394449 doc.apply(&transaction, view.id);
@@ -4247,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
42474457 if remove { "remove:" } else { "keep:" }.into(),
42484458 Some(reg),
42494459 ui::completers::none,
4250− move |editor, regex, event| {
4251− let (view, doc) = current!(editor);
4460+ move |cx, regex, event| {
4461+ let (view, doc) = current!(cx.editor);
42524462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
42534463 return;
42544464 }
@@ -4482,7 +4692,13 @@ fn rotate_selections_backward(cx: &mut Context) {
44824692 rotate_selections(cx, Direction::Backward)
44834693}
44844694
4485−fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
4695+enum ReorderStrategy {
4696+ RotateForward,
4697+ RotateBackward,
4698+ Reverse,
4699+}
4700+
4701+fn reorder_selection_contents(cx: &mut Context, strategy: ReorderStrategy) {
44864702 let count = cx.count;
44874703 let (view, doc) = current!(cx.editor);
44884704 let text = doc.text().slice(..);
@@ -4500,9 +4716,10 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
45004716
45014717 for chunk in fragments.chunks_mut(group) {
45024718 // TODO: also modify main index
4503− match direction {
4504− Direction::Forward => chunk.rotate_right(1),
4505− Direction::Backward => chunk.rotate_left(1),
4719+ match strategy {
4720+ ReorderStrategy::RotateForward => chunk.rotate_right(1),
4721+ ReorderStrategy::RotateBackward => chunk.rotate_left(1),
4722+ ReorderStrategy::Reverse => chunk.reverse(),
45064723 };
45074724 }
45084725
@@ -4519,10 +4736,13 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
45194736}
45204737
45214738fn rotate_selection_contents_forward(cx: &mut Context) {
4522− rotate_selection_contents(cx, Direction::Forward)
4739+ reorder_selection_contents(cx, ReorderStrategy::RotateForward)
45234740}
45244741fn rotate_selection_contents_backward(cx: &mut Context) {
4525− rotate_selection_contents(cx, Direction::Backward)
4742+ reorder_selection_contents(cx, ReorderStrategy::RotateBackward)
4743+}
4744+fn reverse_selection_contents(cx: &mut Context) {
4745+ reorder_selection_contents(cx, ReorderStrategy::Reverse)
45264746}
45274747
45284748// tree sitter node selection
@@ -4546,8 +4766,7 @@ fn expand_selection(cx: &mut Context) {
45464766 }
45474767 }
45484768 };
4549− motion(cx.editor);
4550− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4769+ cx.editor.apply_motion(motion);
45514770}
45524771
45534772fn shrink_selection(cx: &mut Context) {
@@ -4571,8 +4790,7 @@ fn shrink_selection(cx: &mut Context) {
45714790 doc.set_selection(view.id, selection);
45724791 }
45734792 };
4574− motion(cx.editor);
4575− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4793+ cx.editor.apply_motion(motion);
45764794}
45774795
45784796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4590,8 +4808,7 @@ where
45904808 doc.set_selection(view.id, selection);
45914809 }
45924810 };
4593− motion(cx.editor);
4594− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4811+ cx.editor.apply_motion(motion);
45954812}
45964813
45974814fn select_next_sibling(cx: &mut Context) {
@@ -4602,6 +4819,49 @@ fn select_prev_sibling(cx: &mut Context) {
46024819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
46034820}
46044821
4822+fn move_node_bound_impl(cx: &mut Context, dir: Direction, movement: Movement) {
4823+ let motion = move |editor: &mut Editor| {
4824+ let (view, doc) = current!(editor);
4825+
4826+ if let Some(syntax) = doc.syntax() {
4827+ let text = doc.text().slice(..);
4828+ let current_selection = doc.selection(view.id);
4829+
4830+ let selection = movement::move_parent_node_end(
4831+ syntax,
4832+ text,
4833+ current_selection.clone(),
4834+ dir,
4835+ movement,
4836+ );
4837+
4838+ doc.set_selection(view.id, selection);
4839+
4840+ // [TODO] temporary workaround until we're not using the idle timer to
4841+ // trigger auto completions any more
4842+ editor.clear_idle_timer();
4843+ }
4844+ };
4845+
4846+ cx.editor.apply_motion(motion);
4847+}
4848+
4849+pub fn move_parent_node_end(cx: &mut Context) {
4850+ move_node_bound_impl(cx, Direction::Forward, Movement::Move)
4851+}
4852+
4853+pub fn move_parent_node_start(cx: &mut Context) {
4854+ move_node_bound_impl(cx, Direction::Backward, Movement::Move)
4855+}
4856+
4857+pub fn extend_parent_node_end(cx: &mut Context) {
4858+ move_node_bound_impl(cx, Direction::Forward, Movement::Extend)
4859+}
4860+
4861+pub fn extend_parent_node_start(cx: &mut Context) {
4862+ move_node_bound_impl(cx, Direction::Backward, Movement::Extend)
4863+}
4864+
46054865fn match_brackets(cx: &mut Context) {
46064866 let (view, doc) = current!(cx.editor);
46074867 let is_select = cx.editor.mode == Mode::Select;
@@ -4611,8 +4871,8 @@ fn match_brackets(cx: &mut Context) {
46114871 let selection = doc.selection(view.id).clone().transform(|range| {
46124872 let pos = range.cursor(text_slice);
46134873 if let Some(matched_pos) = doc.syntax().map_or_else(
4614− || match_brackets::find_matching_bracket_current_line_plaintext(text, pos),
4615− |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text, pos),
4874+ || match_brackets::find_matching_bracket_plaintext(text.slice(..), pos),
4875+ |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text.slice(..), pos),
46164876 ) {
46174877 range.put_cursor(text_slice, matched_pos, is_select)
46184878 } else {
@@ -4715,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
47154975 cx.editor.transpose_view()
47164976}
47174977
4718−// split helper, clear it later
4719−fn split(cx: &mut Context, action: Action) {
4720− let (view, doc) = current!(cx.editor);
4978+/// Open a new split in the given direction specified by the action.
4979+///
4980+/// Maintain the current view (both the cursor's position and view in document).
4981+fn split(editor: &mut Editor, action: Action) {
4982+ let (view, doc) = current!(editor);
47214983 let id = doc.id();
47224984 let selection = doc.selection(view.id).clone();
47234985 let offset = view.offset;
47244986
4725− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
47264988
47274989 // match the selection in the previous view
4728− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
47294991 doc.set_selection(view.id, selection);
47304992 // match the view scroll offset (switch doesn't handle this fully
47314993 // since the selection is only matched after the split)
@@ -4733,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
47334995}
47344996
47354997fn hsplit(cx: &mut Context) {
4736− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
47374999}
47385000
47395001fn hsplit_new(cx: &mut Context) {
@@ -4741,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
47415003}
47425004
47435005fn vsplit(cx: &mut Context) {
4744− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
47455007}
47465008
47475009fn vsplit_new(cx: &mut Context) {
@@ -4790,7 +5052,12 @@ fn insert_register(cx: &mut Context) {
47905052 if let Some(ch) = event.char() {
47915053 cx.editor.autoinfo = None;
47925054 cx.register = Some(ch);
4793− paste(cx, Paste::Cursor);
5055+ paste(
5056+ cx.editor,
5057+ cx.register.unwrap_or('"'),
5058+ Paste::Cursor,
5059+ cx.count(),
5060+ );
47945061 }
47955062 })
47965063}
@@ -4874,8 +5141,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
48745141 editor.set_status("Syntax-tree is not available in current buffer");
48755142 }
48765143 };
4877− motion(cx.editor);
4878− cx.editor.last_motion = Some(Motion(Box::new(motion)));
5144+ cx.editor.apply_motion(motion);
48795145}
48805146
48815147fn goto_next_function(cx: &mut Context) {
@@ -4996,8 +5262,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
49965262 });
49975263 doc.set_selection(view.id, selection);
49985264 };
4999− textobject(cx.editor);
5000− cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5265+ cx.editor.apply_motion(textobject);
50015266 }
50025267 });
50035268
@@ -5087,11 +5352,18 @@ fn surround_replace(cx: &mut Context) {
50875352 }
50885353 };
50895354
5355+ let selection = selection.clone();
5356+ let ranges: SmallVec<[Range; 1]> = change_pos.iter().map(|&p| Range::point(p)).collect();
5357+ doc.set_selection(
5358+ view.id,
5359+ Selection::new(ranges, selection.primary_index() * 2),
5360+ );
5361+
50905362 cx.on_next_key(move |cx, event| {
50915363 let (view, doc) = current!(cx.editor);
50925364 let to = match event.char() {
50935365 Some(to) => to,
5094− None => return,
5366+ None => return doc.set_selection(view.id, selection),
50955367 };
50965368 let (open, close) = surround::get_pair(to);
50975369 let transaction = Transaction::change(
@@ -5102,6 +5374,7 @@ fn surround_replace(cx: &mut Context) {
51025374 (pos, pos + 1, Some(t))
51035375 }),
51045376 );
5377+ doc.set_selection(view.id, selection);
51055378 doc.apply(&transaction, view.id);
51065379 exit_select_mode(cx);
51075380 });
@@ -5336,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
53365609 };
53375610
53385611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5339− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5340− // arithmetic to assert this.
5341− let anchor = (to as isize + offset - deleted_len as isize) as usize;
5612+ let anchor = to
5613+ .checked_add_signed(offset)
5614+ .expect("Selection ranges cannot overlap")
5615+ .checked_sub(deleted_len)
5616+ .expect("Selection ranges cannot overlap");
53425617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
53435618 ranges.push(new_range);
5344− offset = offset + output_len as isize - deleted_len as isize;
5619+ offset = offset
5620+ .checked_add_unsigned(output_len)
5621+ .expect("Selection ranges cannot overlap")
5622+ .checked_sub_unsigned(deleted_len)
5623+ .expect("Selection ranges cannot overlap");
53455624
53465625 changes.push((from, to, Some(output)));
53475626 }
@@ -5363,7 +5642,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
53635642 cx,
53645643 prompt,
53655644 Some('|'),
5366− ui::completers::none,
5645+ ui::completers::filename,
53675646 move |cx, input: &str, event: PromptEvent| {
53685647 if event != PromptEvent::Validate {
53695648 return;
@@ -5480,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
54805759 let transaction = Transaction::change(doc.text(), changes.into_iter());
54815760 let transaction = transaction.with_selection(new_selection);
54825761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
54835763 }
54845764}
54855765
@@ -5498,9 +5778,12 @@ fn record_macro(cx: &mut Context) {
54985778 }
54995779 })
55005780 .collect::<String>();
5501− cx.editor.registers.write(reg, vec![s]);
5502− cx.editor
5503− .set_status(format!("Recorded to register [{}]", reg));
5781+ match cx.editor.registers.write(reg, vec![s]) {
5782+ Ok(_) => cx
5783+ .editor
5784+ .set_status(format!("Recorded to register [{}]", reg)),
5785+ Err(err) => cx.editor.set_error(err.to_string()),
5786+ }
55045787 } else {
55055788 let reg = cx.register.take().unwrap_or('@');
55065789 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5520,8 +5803,14 @@ fn replay_macro(cx: &mut Context) {
55205803 return;
55215804 }
55225805
5523− let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5524− match helix_view::input::parse_macro(keys_str) {
5806+ let keys: Vec<KeyEvent> = if let Some(keys) = cx
5807+ .editor
5808+ .registers
5809+ .read(reg, cx.editor)
5810+ .filter(|values| values.len() == 1)
5811+ .map(|mut values| values.next().unwrap())
5812+ {
5813+ match helix_view::input::parse_macro(&keys) {
55255814 Ok(keys) => keys,
55265815 Err(err) => {
55275816 cx.editor.set_error(format!("Invalid macro: {}", err));
helix-term/src/commands/dap.rs+58−55
@@ -2,13 +2,13 @@ use super::{Context, Editor};
22use crate::{
33 compositor::{self, Compositor},
44 job::{Callback, Jobs},
5− ui::{self, overlay::overlaid, FilePicker, Picker, Popup, Prompt, PromptEvent, Text},
5+ ui::{self, overlay::overlaid, Picker, Popup, Prompt, PromptEvent, Text},
66};
77use dap::{StackFrame, Thread, ThreadStates};
88use helix_core::syntax::{DebugArgumentValue, DebugConfigCompletion, DebugTemplate};
99use helix_dap::{self as dap, Client};
1010use helix_lsp::block_on;
11−use helix_view::editor::Breakpoint;
11+use helix_view::{editor::Breakpoint, graphics::Margin};
1212
1313use serde_json::{to_value, Value};
1414use tokio_stream::wrappers::UnboundedReceiverStream;
@@ -73,21 +73,19 @@ fn thread_picker(
7373 let debugger = debugger!(editor);
7474
7575 let thread_states = debugger.thread_states.clone();
76− let picker = FilePicker::new(
77− threads,
78− thread_states,
79− move |cx, thread, _action| callback_fn(cx.editor, thread),
80− move |editor, thread| {
81− let frames = editor.debugger.as_ref()?.stack_frames.get(&thread.id)?;
82− let frame = frames.get(0)?;
83− let path = frame.source.as_ref()?.path.clone()?;
84− let pos = Some((
85− frame.line.saturating_sub(1),
86− frame.end_line.unwrap_or(frame.line).saturating_sub(1),
87− ));
88− Some((path.into(), pos))
89− },
90− );
76+ let picker = Picker::new(threads, thread_states, move |cx, thread, _action| {
77+ callback_fn(cx.editor, thread)
78+ })
79+ .with_preview(move |editor, thread| {
80+ let frames = editor.debugger.as_ref()?.stack_frames.get(&thread.id)?;
81+ let frame = frames.get(0)?;
82+ let path = frame.source.as_ref()?.path.clone()?;
83+ let pos = Some((
84+ frame.line.saturating_sub(1),
85+ frame.end_line.unwrap_or(frame.line).saturating_sub(1),
86+ ));
87+ Some((path.into(), pos))
88+ });
9189 compositor.push(Box::new(picker));
9290 },
9391 );
@@ -219,7 +217,7 @@ pub fn dap_start_impl(
219217 }
220218 }
221219
222− args.insert("cwd", to_value(std::env::current_dir().unwrap())?);
220+ args.insert("cwd", to_value(helix_loader::current_working_dir())?);
223221
224222 let args = to_value(args).unwrap();
225223
@@ -341,8 +339,12 @@ fn debug_parameter_prompt(
341339 .to_owned();
342340
343341 let completer = match field_type {
344− "filename" => ui::completers::filename,
345− "directory" => ui::completers::directory,
342+ "filename" => |editor: &Editor, input: &str| {
343+ ui::completers::filename_with_git_ignore(editor, input, false)
344+ },
345+ "directory" => |editor: &Editor, input: &str| {
346+ ui::completers::directory_with_git_ignore(editor, input, false)
347+ },
346348 _ => ui::completers::none,
347349 };
348350
@@ -579,7 +581,12 @@ pub fn dap_variables(cx: &mut Context) {
579581 }
580582
581583 let contents = Text::from(tui::text::Text::from(variables));
582− let popup = Popup::new("dap-variables", contents);
584+ let margin = if cx.editor.popup_border() {
585+ Margin::all(1)
586+ } else {
587+ Margin::none()
588+ };
589+ let popup = Popup::new("dap-variables", contents).margin(margin);
583590 cx.replace_or_push_layer("dap-variables", popup);
584591}
585592
@@ -728,39 +735,35 @@ pub fn dap_switch_stack_frame(cx: &mut Context) {
728735
729736 let frames = debugger.stack_frames[&thread_id].clone();
730737
731− let picker = FilePicker::new(
732− frames,
733− (),
734− move |cx, frame, _action| {
735− let debugger = debugger!(cx.editor);
736− // TODO: this should be simpler to find
737− let pos = debugger.stack_frames[&thread_id]
738− .iter()
739− .position(|f| f.id == frame.id);
740− debugger.active_frame = pos;
741−
742− let frame = debugger.stack_frames[&thread_id]
743− .get(pos.unwrap_or(0))
744− .cloned();
745− if let Some(frame) = &frame {
746− jump_to_stack_frame(cx.editor, frame);
747− }
748− },
749− move |_editor, frame| {
750− frame
751− .source
752− .as_ref()
753− .and_then(|source| source.path.clone())
754− .map(|path| {
755− (
756− path.into(),
757− Some((
758− frame.line.saturating_sub(1),
759− frame.end_line.unwrap_or(frame.line).saturating_sub(1),
760− )),
761− )
762− })
763− },
764− );
738+ let picker = Picker::new(frames, (), move |cx, frame, _action| {
739+ let debugger = debugger!(cx.editor);
740+ // TODO: this should be simpler to find
741+ let pos = debugger.stack_frames[&thread_id]
742+ .iter()
743+ .position(|f| f.id == frame.id);
744+ debugger.active_frame = pos;
745+
746+ let frame = debugger.stack_frames[&thread_id]
747+ .get(pos.unwrap_or(0))
748+ .cloned();
749+ if let Some(frame) = &frame {
750+ jump_to_stack_frame(cx.editor, frame);
751+ }
752+ })
753+ .with_preview(move |_editor, frame| {
754+ frame
755+ .source
756+ .as_ref()
757+ .and_then(|source| source.path.clone())
758+ .map(|path| {
759+ (
760+ path.into(),
761+ Some((
762+ frame.line.saturating_sub(1),
763+ frame.end_line.unwrap_or(frame.line).saturating_sub(1),
764+ )),
765+ )
766+ })
767+ });
765768 cx.push_layer(Box::new(picker))
766769}
helix-term/src/commands/lsp.rs+75−85
@@ -23,6 +23,7 @@ use helix_core::{
2323use helix_view::{
2424 document::{DocumentInlayHints, DocumentInlayHintsId, Mode},
2525 editor::Action,
26+ graphics::Margin,
2627 theme::Style,
2728 Document, View,
2829};
@@ -31,8 +32,8 @@ use crate::{
3132 compositor::{self, Compositor},
3233 job::Callback,
3334 ui::{
34− self, lsp::SignatureHelp, overlay::overlaid, DynamicPicker, FileLocation, FilePicker,
35− Popup, PromptEvent,
35+ self, lsp::SignatureHelp, overlay::overlaid, DynamicPicker, FileLocation, Picker, Popup,
36+ PromptEvent,
3637 },
3738};
3839
@@ -49,7 +50,7 @@ use std::{
4950/// If there is no configured language server that supports the feature, this displays a status message.
5051/// Using this macro in a context where the editor automatically queries the LSP
5152/// (instead of when the user explicitly does so via a keybind like `gd`)
52−/// will spam the "No configured language server supports <feature>" status message confusingly.
53+/// will spam the "No configured language server supports \<feature>" status message confusingly.
5354#[macro_export]
5455macro_rules! language_server_with_feature {
5556 ($editor:expr, $doc:expr, $feature:expr) => {{
@@ -195,7 +196,6 @@ fn location_to_file_location(location: &lsp::Location) -> FileLocation {
195196 (path.into(), line)
196197}
197198
198−// TODO: share with symbol picker(symbol.location)
199199fn jump_to_location(
200200 editor: &mut Editor,
201201 location: &lsp::Location,
@@ -213,15 +213,16 @@ fn jump_to_location(
213213 return;
214214 }
215215 };
216− match editor.open(&path, action) {
217− Ok(_) => (),
216+
217+ let doc = match editor.open(&path, action) {
218+ Ok(id) => doc_mut!(editor, &id),
218219 Err(err) => {
219220 let err = format!("failed to open path: {:?}: {:?}", location.uri, err);
220221 editor.set_error(err);
221222 return;
222223 }
223− }
224− let (view, doc) = current!(editor);
224+ };
225+ let view = view_mut!(editor);
225226 // TODO: convert inside server
226227 let new_range =
227228 if let Some(new_range) = lsp_range_to_range(doc.text(), location.range, offset_encoding) {
@@ -233,51 +234,24 @@ fn jump_to_location(
233234 // we flip the range so that the cursor sits on the start of the symbol
234235 // (for example start of the function).
235236 doc.set_selection(view.id, Selection::single(new_range.head, new_range.anchor));
236− align_view(doc, view, Align::Center);
237+ if action.align_view(view, doc.id()) {
238+ align_view(doc, view, Align::Center);
239+ }
237240}
238241
239−type SymbolPicker = FilePicker<SymbolInformationItem>;
242+type SymbolPicker = Picker<SymbolInformationItem>;
240243
241244fn sym_picker(symbols: Vec<SymbolInformationItem>, current_path: Option<lsp::Url>) -> SymbolPicker {
242245 // TODO: drop current_path comparison and instead use workspace: bool flag?
243− FilePicker::new(
244− symbols,
245− current_path.clone(),
246− move |cx, item, action| {
247− let (view, doc) = current!(cx.editor);
248− push_jump(view, doc);
249−
250− if current_path.as_ref() != Some(&item.symbol.location.uri) {
251− let uri = &item.symbol.location.uri;
252− let path = match uri.to_file_path() {
253− Ok(path) => path,
254− Err(_) => {
255− let err = format!("unable to convert URI to filepath: {}", uri);
256− cx.editor.set_error(err);
257− return;
258− }
259− };
260− if let Err(err) = cx.editor.open(&path, action) {
261− let err = format!("failed to open document: {}: {}", uri, err);
262− log::error!("{}", err);
263− cx.editor.set_error(err);
264− return;
265− }
266− }
267−
268− let (view, doc) = current!(cx.editor);
269−
270− if let Some(range) =
271− lsp_range_to_range(doc.text(), item.symbol.location.range, item.offset_encoding)
272− {
273− // we flip the range so that the cursor sits on the start of the symbol
274− // (for example start of the function).
275− doc.set_selection(view.id, Selection::single(range.head, range.anchor));
276− align_view(doc, view, Align::Center);
277− }
278− },
279− move |_editor, item| Some(location_to_file_location(&item.symbol.location)),
280− )
246+ Picker::new(symbols, current_path, move |cx, item, action| {
247+ jump_to_location(
248+ cx.editor,
249+ &item.symbol.location,
250+ item.offset_encoding,
251+ action,
252+ );
253+ })
254+ .with_preview(move |_editor, item| Some(location_to_file_location(&item.symbol.location)))
281255 .truncate_start(false)
282256}
283257
@@ -290,9 +264,9 @@ enum DiagnosticsFormat {
290264fn diag_picker(
291265 cx: &Context,
292266 diagnostics: BTreeMap<lsp::Url, Vec<(lsp::Diagnostic, usize)>>,
293− current_path: Option<lsp::Url>,
267+ _current_path: Option<lsp::Url>,
294268 format: DiagnosticsFormat,
295−) -> FilePicker<PickerDiagnostic> {
269+) -> Picker<PickerDiagnostic> {
296270 // TODO: drop current_path comparison and instead use workspace: bool flag?
297271
298272 // flatten the map to a vec of (url, diag) pairs
@@ -318,7 +292,7 @@ fn diag_picker(
318292 error: cx.editor.theme.get("error"),
319293 };
320294
321− FilePicker::new(
295+ Picker::new(
322296 flat_diag,
323297 (styles, format),
324298 move |cx,
@@ -328,28 +302,18 @@ fn diag_picker(
328302 offset_encoding,
329303 },
330304 action| {
331− if current_path.as_ref() == Some(url) {
332− let (view, doc) = current!(cx.editor);
333− push_jump(view, doc);
334− } else {
335− let path = url.to_file_path().unwrap();
336− cx.editor.open(&path, action).expect("editor.open failed");
337− }
338−
339− let (view, doc) = current!(cx.editor);
340−
341− if let Some(range) = lsp_range_to_range(doc.text(), diag.range, *offset_encoding) {
342− // we flip the range so that the cursor sits on the start of the symbol
343− // (for example start of the function).
344− doc.set_selection(view.id, Selection::single(range.head, range.anchor));
345− align_view(doc, view, Align::Center);
346− }
347− },
348− move |_editor, PickerDiagnostic { url, diag, .. }| {
349− let location = lsp::Location::new(url.clone(), diag.range);
350− Some(location_to_file_location(&location))
305+ jump_to_location(
306+ cx.editor,
307+ &lsp::Location::new(url.clone(), diag.range),
308+ *offset_encoding,
309+ action,
310+ )
351311 },
352312 )
313+ .with_preview(move |_editor, PickerDiagnostic { url, diag, .. }| {
314+ let location = lsp::Location::new(url.clone(), diag.range);
315+ Some(location_to_file_location(&location))
316+ })
353317 .truncate_start(false)
354318}
355319
@@ -734,7 +698,8 @@ pub fn code_action(cx: &mut Context) {
734698
735699 // always present here
736700 let action = action.unwrap();
737− let Some(language_server) = editor.language_server_by_id(action.language_server_id) else {
701+ let Some(language_server) = editor.language_server_by_id(action.language_server_id)
702+ else {
738703 editor.set_error("Language Server disappeared");
739704 return;
740705 };
@@ -747,7 +712,25 @@ pub fn code_action(cx: &mut Context) {
747712 }
748713 lsp::CodeActionOrCommand::CodeAction(code_action) => {
749714 log::debug!("code action: {:?}", code_action);
750− if let Some(ref workspace_edit) = code_action.edit {
715+ // we support lsp "codeAction/resolve" for `edit` and `command` fields
716+ let mut resolved_code_action = None;
717+ if code_action.edit.is_none() || code_action.command.is_none() {
718+ if let Some(future) =
719+ language_server.resolve_code_action(code_action.clone())
720+ {
721+ if let Ok(response) = helix_lsp::block_on(future) {
722+ if let Ok(code_action) =
723+ serde_json::from_value::<CodeAction>(response)
724+ {
725+ resolved_code_action = Some(code_action);
726+ }
727+ }
728+ }
729+ }
730+ let resolved_code_action =
731+ resolved_code_action.as_ref().unwrap_or(code_action);
732+
733+ if let Some(ref workspace_edit) = resolved_code_action.edit {
751734 log::debug!("edit: {:?}", workspace_edit);
752735 let _ = apply_workspace_edit(editor, offset_encoding, workspace_edit);
753736 }
@@ -762,7 +745,16 @@ pub fn code_action(cx: &mut Context) {
762745 });
763746 picker.move_down(); // pre-select the first item
764747
765− let popup = Popup::new("code-action", picker).with_scrollbar(false);
748+ let margin = if editor.menu_border() {
749+ Margin::vertical(1)
750+ } else {
751+ Margin::none()
752+ };
753+
754+ let popup = Popup::new("code-action", picker)
755+ .with_scrollbar(false)
756+ .margin(margin);
757+
766758 compositor.replace_or_push("code-action", popup);
767759 };
768760
@@ -1037,7 +1029,7 @@ fn goto_impl(
10371029 locations: Vec<lsp::Location>,
10381030 offset_encoding: OffsetEncoding,
10391031) {
1040− let cwdir = std::env::current_dir().unwrap_or_default();
1032+ let cwdir = helix_loader::current_working_dir();
10411033
10421034 match locations.as_slice() {
10431035 [location] => {
@@ -1047,14 +1039,10 @@ fn goto_impl(
10471039 editor.set_error("No definition found.");
10481040 }
10491041 _locations => {
1050− let picker = FilePicker::new(
1051− locations,
1052− cwdir,
1053− move |cx, location, action| {
1054− jump_to_location(cx.editor, location, offset_encoding, action)
1055− },
1056− move |_editor, location| Some(location_to_file_location(location)),
1057− );
1042+ let picker = Picker::new(locations, cwdir, move |cx, location, action| {
1043+ jump_to_location(cx.editor, location, offset_encoding, action)
1044+ })
1045+ .with_preview(move |_editor, location| Some(location_to_file_location(location)));
10581046 compositor.push(Box::new(overlaid(picker)));
10591047 }
10601048 }
@@ -1181,7 +1169,8 @@ pub fn signature_help_impl(cx: &mut Context, invoked: SignatureHelpInvoked) {
11811169 // Do not show the message if signature help was invoked
11821170 // automatically on backspace, trigger characters, etc.
11831171 if invoked == SignatureHelpInvoked::Manual {
1184− cx.editor.set_error("No configured language server supports signature-help");
1172+ cx.editor
1173+ .set_error("No configured language server supports signature-help");
11851174 }
11861175 return;
11871176 };
@@ -1406,7 +1395,8 @@ pub fn rename_symbol(cx: &mut Context) {
14061395 .language_servers_with_feature(LanguageServerFeature::RenameSymbol)
14071396 .find(|ls| language_server_id.map_or(true, |id| id == ls.id()))
14081397 else {
1409− cx.editor.set_error("No configured language server supports symbol renaming");
1398+ cx.editor
1399+ .set_error("No configured language server supports symbol renaming");
14101400 return;
14111401 };
14121402
helix-term/src/commands/typed.rs+946−692
@@ -5,7 +5,10 @@ use crate::job::Job;
55
66use super::*;
77
8−use helix_core::{encoding, shellwords::Shellwords};
8+use helix_core::fuzzy::fuzzy_match;
9+use helix_core::indent::MAX_INDENT;
10+use helix_core::{encoding, line_ending, path::get_canonicalized_path, shellwords::Shellwords};
11+use helix_lsp::{OffsetEncoding, Url};
912use helix_view::document::DEFAULT_LANGUAGE_NAME;
1013use helix_view::editor::{Action, CloseError, ConfigEvent};
1114use serde_json::Value;
@@ -329,12 +332,16 @@ fn write_impl(
329332 path: Option<&Cow<str>>,
330333 force: bool,
331334) -> anyhow::Result<()> {
332− let editor_auto_fmt = cx.editor.config().auto_format;
335+ let config = cx.editor.config();
333336 let jobs = &mut cx.jobs;
334337 let (view, doc) = current!(cx.editor);
335338 let path = path.map(AsRef::as_ref);
336339
337− let fmt = if editor_auto_fmt {
340+ if config.insert_final_newline {
341+ insert_final_newline(doc, view);
342+ }
343+
344+ let fmt = if config.auto_format {
338345 doc.auto_format().map(|fmt| {
339346 let callback = make_format_callback(
340347 doc.id(),
@@ -358,6 +365,16 @@ fn write_impl(
358365 Ok(())
359366}
360367
368+fn insert_final_newline(doc: &mut Document, view: &mut View) {
369+ let text = doc.text();
370+ if line_ending::get_line_ending(&text.slice(..)).is_none() {
371+ let eof = Selection::point(text.len_chars());
372+ let insert = Transaction::insert(text, &eof, doc.line_ending.as_str().into());
373+ doc.apply(&insert, view.id);
374+ doc.append_changes_to_history(view);
375+ }
376+}
377+
361378fn write(
362379 cx: &mut compositor::Context,
363380 args: &[Cow<str>],
@@ -460,8 +477,7 @@ fn set_indent_style(
460477 cx.editor.set_status(match style {
461478 Tabs => "tabs".to_owned(),
462479 Spaces(1) => "1 space".to_owned(),
463− Spaces(n) if (2..=8).contains(&n) => format!("{} spaces", n),
464− _ => unreachable!(), // Shouldn't happen.
480+ Spaces(n) => format!("{} spaces", n),
465481 });
466482 return Ok(());
467483 }
@@ -473,7 +489,7 @@ fn set_indent_style(
473489 Some(arg) => arg
474490 .parse::<u8>()
475491 .ok()
476− .filter(|n| (1..=8).contains(n))
492+ .filter(|n| (1..=MAX_INDENT).contains(n))
477493 .map(Spaces),
478494 _ => None,
479495 };
@@ -558,7 +574,6 @@ fn set_line_ending(
558574
559575 Ok(())
560576}
561−
562577fn earlier(
563578 cx: &mut compositor::Context,
564579 args: &[Cow<str>],
@@ -657,11 +672,10 @@ pub fn write_all_impl(
657672 write_scratch: bool,
658673) -> anyhow::Result<()> {
659674 let mut errors: Vec<&'static str> = Vec::new();
660− let auto_format = cx.editor.config().auto_format;
675+ let config = cx.editor.config();
661676 let jobs = &mut cx.jobs;
662677 let current_view = view!(cx.editor);
663678
664− // save all documents
665679 let saves: Vec<_> = cx
666680 .editor
667681 .documents
@@ -672,7 +686,7 @@ pub fn write_all_impl(
672686 }
673687 if doc.path().is_none() {
674688 if write_scratch {
675− errors.push("cannot write a buffer without a filename\n");
689+ errors.push("cannot write a buffer without a filename");
676690 }
677691 return None;
678692 }
@@ -692,32 +706,35 @@ pub fn write_all_impl(
692706 current_view.id
693707 };
694708
695− let fmt = if auto_format {
696− doc.auto_format().map(|fmt| {
697− let callback = make_format_callback(
698− doc.id(),
699− doc.version(),
700− target_view,
701− fmt,
702− Some((None, force)),
703− );
704− jobs.add(Job::with_callback(callback).wait_before_exiting());
705− })
706− } else {
707− None
708− };
709+ Some((doc.id(), target_view))
710+ })
711+ .collect();
709712
710− if fmt.is_none() {
711− return Some(doc.id());
712− }
713+ for (doc_id, target_view) in saves {
714+ let doc = doc_mut!(cx.editor, &doc_id);
715+
716+ if config.insert_final_newline {
717+ insert_final_newline(doc, view_mut!(cx.editor, target_view));
718+ }
713719
720+ let fmt = if config.auto_format {
721+ doc.auto_format().map(|fmt| {
722+ let callback = make_format_callback(
723+ doc_id,
724+ doc.version(),
725+ target_view,
726+ fmt,
727+ Some((None, force)),
728+ );
729+ jobs.add(Job::with_callback(callback).wait_before_exiting());
730+ })
731+ } else {
714732 None
715− })
716− .collect();
733+ };
717734
718− // manually call save for the rest of docs that don't have a formatter
719− for id in saves {
720− cx.editor.save::<PathBuf>(id, None, force)?;
735+ if fmt.is_none() {
736+ cx.editor.save::<PathBuf>(doc_id, None, force)?;
737+ }
721738 }
722739
723740 if !errors.is_empty() && !force {
@@ -739,6 +756,18 @@ fn write_all(
739756 write_all_impl(cx, false, true)
740757}
741758
759+fn force_write_all(
760+ cx: &mut compositor::Context,
761+ _args: &[Cow<str>],
762+ event: PromptEvent,
763+) -> anyhow::Result<()> {
764+ if event != PromptEvent::Validate {
765+ return Ok(());
766+ }
767+
768+ write_all_impl(cx, true, true)
769+}
770+
742771fn write_all_quit(
743772 cx: &mut compositor::Context,
744773 _args: &[Cow<str>],
@@ -892,7 +921,27 @@ fn yank_main_selection_to_clipboard(
892921 return Ok(());
893922 }
894923
895− yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard)
924+ yank_primary_selection_impl(cx.editor, '+');
925+ Ok(())
926+}
927+
928+fn yank_joined(
929+ cx: &mut compositor::Context,
930+ args: &[Cow<str>],
931+ event: PromptEvent,
932+) -> anyhow::Result<()> {
933+ if event != PromptEvent::Validate {
934+ return Ok(());
935+ }
936+
937+ ensure!(args.len() <= 1, ":yank-join takes at most 1 argument");
938+
939+ let doc = doc!(cx.editor);
940+ let default_sep = Cow::Borrowed(doc.line_ending.as_str());
941+ let separator = args.first().unwrap_or(&default_sep);
942+ let register = cx.editor.selected_register.unwrap_or('"');
943+ yank_joined_impl(cx.editor, separator, register);
944+ Ok(())
896945}
897946
898947fn yank_joined_to_clipboard(
@@ -907,7 +956,8 @@ fn yank_joined_to_clipboard(
907956 let doc = doc!(cx.editor);
908957 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
909958 let separator = args.first().unwrap_or(&default_sep);
910− yank_joined_to_clipboard_impl(cx.editor, separator, ClipboardType::Clipboard)
959+ yank_joined_impl(cx.editor, separator, '+');
960+ Ok(())
911961}
912962
913963fn yank_main_selection_to_primary_clipboard(
@@ -919,7 +969,8 @@ fn yank_main_selection_to_primary_clipboard(
919969 return Ok(());
920970 }
921971
922− yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection)
972+ yank_primary_selection_impl(cx.editor, '*');
973+ Ok(())
923974}
924975
925976fn yank_joined_to_primary_clipboard(
@@ -934,7 +985,8 @@ fn yank_joined_to_primary_clipboard(
934985 let doc = doc!(cx.editor);
935986 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
936987 let separator = args.first().unwrap_or(&default_sep);
937− yank_joined_to_clipboard_impl(cx.editor, separator, ClipboardType::Selection)
988+ yank_joined_impl(cx.editor, separator, '*');
989+ Ok(())
938990}
939991
940992fn paste_clipboard_after(
@@ -946,7 +998,8 @@ fn paste_clipboard_after(
946998 return Ok(());
947999 }
9481000
949− paste_clipboard_impl(cx.editor, Paste::After, ClipboardType::Clipboard, 1)
1001+ paste(cx.editor, '+', Paste::After, 1);
1002+ Ok(())
9501003}
9511004
9521005fn paste_clipboard_before(
@@ -958,7 +1011,8 @@ fn paste_clipboard_before(
9581011 return Ok(());
9591012 }
9601013
961− paste_clipboard_impl(cx.editor, Paste::Before, ClipboardType::Clipboard, 1)
1014+ paste(cx.editor, '+', Paste::Before, 1);
1015+ Ok(())
9621016}
9631017
9641018fn paste_primary_clipboard_after(
@@ -970,7 +1024,8 @@ fn paste_primary_clipboard_after(
9701024 return Ok(());
9711025 }
9721026
973− paste_clipboard_impl(cx.editor, Paste::After, ClipboardType::Selection, 1)
1027+ paste(cx.editor, '*', Paste::After, 1);
1028+ Ok(())
9741029}
9751030
9761031fn paste_primary_clipboard_before(
@@ -982,30 +1037,8 @@ fn paste_primary_clipboard_before(
9821037 return Ok(());
9831038 }
9841039
985− paste_clipboard_impl(cx.editor, Paste::Before, ClipboardType::Selection, 1)
986−}
987−
988−fn replace_selections_with_clipboard_impl(
989− cx: &mut compositor::Context,
990− clipboard_type: ClipboardType,
991−) -> anyhow::Result<()> {
992− let scrolloff = cx.editor.config().scrolloff;
993− let (view, doc) = current!(cx.editor);
994−
995− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
996− Ok(contents) => {
997− let selection = doc.selection(view.id);
998− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
999− (range.from(), range.to(), Some(contents.as_str().into()))
1000− });
1001−
1002− doc.apply(&transaction, view.id);
1003− doc.append_changes_to_history(view);
1004− view.ensure_cursor_in_view(doc, scrolloff);
1005− Ok(())
1006− }
1007− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
1008− }
1040+ paste(cx.editor, '*', Paste::Before, 1);
1041+ Ok(())
10091042}
10101043
10111044fn replace_selections_with_clipboard(
@@ -1017,7 +1050,8 @@ fn replace_selections_with_clipboard(
10171050 return Ok(());
10181051 }
10191052
1020− replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard)
1053+ replace_with_yanked_impl(cx.editor, '+', 1);
1054+ Ok(())
10211055}
10221056
10231057fn replace_selections_with_primary_clipboard(
@@ -1029,7 +1063,8 @@ fn replace_selections_with_primary_clipboard(
10291063 return Ok(());
10301064 }
10311065
1032− replace_selections_with_clipboard_impl(cx, ClipboardType::Selection)
1066+ replace_with_yanked_impl(cx.editor, '*', 1);
1067+ Ok(())
10331068}
10341069
10351070fn show_clipboard_provider(
@@ -1042,7 +1077,7 @@ fn show_clipboard_provider(
10421077 }
10431078
10441079 cx.editor
1045− .set_status(cx.editor.clipboard_provider.name().to_string());
1080+ .set_status(cx.editor.registers.clipboard_provider_name().to_string());
10461081 Ok(())
10471082}
10481083
@@ -1062,14 +1097,11 @@ fn change_current_directory(
10621097 .as_ref(),
10631098 );
10641099
1065− if let Err(e) = std::env::set_current_dir(dir) {
1066− bail!("Couldn't change the current working directory: {}", e);
1067− }
1100+ helix_loader::set_current_working_dir(dir)?;
10681101
1069− let cwd = std::env::current_dir().context("Couldn't get the new working directory")?;
10701102 cx.editor.set_status(format!(
10711103 "Current working directory is now {}",
1072− cwd.display()
1104+ helix_loader::current_working_dir().display()
10731105 ));
10741106 Ok(())
10751107}
@@ -1083,9 +1115,14 @@ fn show_current_directory(
10831115 return Ok(());
10841116 }
10851117
1086− let cwd = std::env::current_dir().context("Couldn't get the new working directory")?;
1087− cx.editor
1088− .set_status(format!("Current working directory is {}", cwd.display()));
1118+ let cwd = helix_loader::current_working_dir();
1119+ let message = format!("Current working directory is {}", cwd.display());
1120+
1121+ if cwd.exists() {
1122+ cx.editor.set_status(message);
1123+ } else {
1124+ cx.editor.set_error(format!("{} (deleted)", message));
1125+ }
10891126 Ok(())
10901127}
10911128
@@ -1245,12 +1282,17 @@ fn reload(
12451282 }
12461283
12471284 let scrolloff = cx.editor.config().scrolloff;
1248− let redraw_handle = cx.editor.redraw_handle.clone();
12491285 let (view, doc) = current!(cx.editor);
1250− doc.reload(view, &cx.editor.diff_providers, redraw_handle)
1251− .map(|_| {
1252− view.ensure_cursor_in_view(doc, scrolloff);
1253− })
1286+ doc.reload(view, &cx.editor.diff_providers).map(|_| {
1287+ view.ensure_cursor_in_view(doc, scrolloff);
1288+ })?;
1289+ if let Some(path) = doc.path() {
1290+ cx.editor
1291+ .language_servers
1292+ .file_event_handler
1293+ .file_changed(path.clone());
1294+ }
1295+ Ok(())
12541296}
12551297
12561298fn reload_all(
@@ -1289,8 +1331,13 @@ fn reload_all(
12891331 // Ensure that the view is synced with the document's history.
12901332 view.sync_changes(doc);
12911333
1292− let redraw_handle = cx.editor.redraw_handle.clone();
1293− doc.reload(view, &cx.editor.diff_providers, redraw_handle)?;
1334+ doc.reload(view, &cx.editor.diff_providers)?;
1335+ if let Some(path) = doc.path() {
1336+ cx.editor
1337+ .language_servers
1338+ .file_event_handler
1339+ .file_changed(path.clone());
1340+ }
12941341
12951342 for view_id in view_ids {
12961343 let view = view_mut!(cx.editor, view_id);
@@ -1339,9 +1386,8 @@ fn lsp_workspace_command(
13391386 .map(|options| (ls.id(), options))
13401387 })
13411388 else {
1342− cx.editor.set_status(
1343− "No active language servers for this document support workspace commands",
1344− );
1389+ cx.editor
1390+ .set_status("No active language servers for this document support workspace commands");
13451391 return Ok(());
13461392 };
13471393
@@ -1497,6 +1543,84 @@ fn tree_sitter_scopes(
14971543 Ok(())
14981544}
14991545
1546+fn tree_sitter_highlight_name(
1547+ cx: &mut compositor::Context,
1548+ _args: &[Cow<str>],
1549+ event: PromptEvent,
1550+) -> anyhow::Result<()> {
1551+ fn find_highlight_at_cursor(
1552+ cx: &mut compositor::Context<'_>,
1553+ ) -> Option<helix_core::syntax::Highlight> {
1554+ use helix_core::syntax::HighlightEvent;
1555+
1556+ let (view, doc) = current!(cx.editor);
1557+ let syntax = doc.syntax()?;
1558+ let text = doc.text().slice(..);
1559+ let cursor = doc.selection(view.id).primary().cursor(text);
1560+ let byte = text.char_to_byte(cursor);
1561+ let node = syntax
1562+ .tree()
1563+ .root_node()
1564+ .descendant_for_byte_range(byte, byte)?;
1565+ // Query the same range as the one used in syntax highlighting.
1566+ let range = {
1567+ // Calculate viewport byte ranges:
1568+ let row = text.char_to_line(view.offset.anchor.min(text.len_chars()));
1569+ // Saturating subs to make it inclusive zero indexing.
1570+ let last_line = text.len_lines().saturating_sub(1);
1571+ let height = view.inner_area(doc).height;
1572+ let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
1573+ let start = text.line_to_byte(row.min(last_line));
1574+ let end = text.line_to_byte(last_visible_line + 1);
1575+
1576+ start..end
1577+ };
1578+
1579+ let mut highlight = None;
1580+
1581+ for event in syntax.highlight_iter(text, Some(range), None) {
1582+ match event.unwrap() {
1583+ HighlightEvent::Source { start, end }
1584+ if start == node.start_byte() && end == node.end_byte() =>
1585+ {
1586+ return highlight;
1587+ }
1588+ HighlightEvent::HighlightStart(hl) => {
1589+ highlight = Some(hl);
1590+ }
1591+ _ => (),
1592+ }
1593+ }
1594+
1595+ None
1596+ }
1597+
1598+ if event != PromptEvent::Validate {
1599+ return Ok(());
1600+ }
1601+
1602+ let Some(highlight) = find_highlight_at_cursor(cx) else {
1603+ return Ok(());
1604+ };
1605+
1606+ let content = cx.editor.theme.scope(highlight.0).to_string();
1607+
1608+ let callback = async move {
1609+ let call: job::Callback = Callback::EditorCompositor(Box::new(
1610+ move |editor: &mut Editor, compositor: &mut Compositor| {
1611+ let content = ui::Markdown::new(content, editor.syn_loader.clone());
1612+ let popup = Popup::new("hover", content).auto_close(true);
1613+ compositor.replace_or_push("hover", popup);
1614+ },
1615+ ));
1616+ Ok(call)
1617+ };
1618+
1619+ cx.jobs.callback(callback);
1620+
1621+ Ok(())
1622+}
1623+
15001624fn vsplit(
15011625 cx: &mut compositor::Context,
15021626 args: &[Cow<str>],
@@ -1506,10 +1630,8 @@ fn vsplit(
15061630 return Ok(());
15071631 }
15081632
1509− let id = view!(cx.editor).doc;
1510−
15111633 if args.is_empty() {
1512− cx.editor.switch(id, Action::VerticalSplit);
1634+ split(cx.editor, Action::VerticalSplit);
15131635 } else {
15141636 for arg in args {
15151637 cx.editor
@@ -1529,10 +1651,8 @@ fn hsplit(
15291651 return Ok(());
15301652 }
15311653
1532− let id = view!(cx.editor).doc;
1533−
15341654 if args.is_empty() {
1535− cx.editor.switch(id, Action::HorizontalSplit);
1655+ split(cx.editor, Action::HorizontalSplit);
15361656 } else {
15371657 for arg in args {
15381658 cx.editor
@@ -1647,7 +1767,7 @@ fn tutor(
16471767 let path = helix_loader::runtime_file(Path::new("tutor"));
16481768 cx.editor.open(&path, Action::Replace)?;
16491769 // Unset path to prevent accidentally saving to the original tutor file.
1650− doc_mut!(cx.editor).set_path(None)?;
1770+ doc_mut!(cx.editor).set_path(None);
16511771 Ok(())
16521772}
16531773
@@ -1824,14 +1944,29 @@ fn toggle_option(
18241944 .to_string(),
18251945 )
18261946 }
1827− Value::Null | Value::Object(_) | Value::Array(_) | Value::Number(_) => {
1947+ Value::Number(ref value) => {
1948+ ensure!(
1949+ args.len() > 2,
1950+ "Bad arguments. For number configurations use: `:toggle key val1 val2 ...`",
1951+ );
1952+
1953+ Value::Number(
1954+ args[1..]
1955+ .iter()
1956+ .skip_while(|&e| value.to_string() != *e.to_string())
1957+ .nth(1)
1958+ .unwrap_or_else(|| &args[1])
1959+ .parse()?,
1960+ )
1961+ }
1962+ Value::Null | Value::Object(_) | Value::Array(_) => {
18281963 anyhow::bail!("Configuration {key} does not support toggle yet")
18291964 }
18301965 };
18311966
18321967 let status = format!("'{key}' is now set to {value}");
18331968 let config = serde_json::from_value(config)
1834− .map_err(|_| anyhow::anyhow!("Could not parse field: `{:?}`", &args))?;
1969+ .map_err(|err| anyhow::anyhow!("Cannot parse `{:?}`, {}", &args, err))?;
18351970
18361971 cx.editor
18371972 .config_events
@@ -2240,592 +2375,721 @@ fn clear_register(
22402375 format!("Invalid register {}", args[0])
22412376 );
22422377 let register = args[0].chars().next().unwrap_or_default();
2243− match cx.editor.registers.remove(register) {
2244− Some(_) => cx
2245− .editor
2246− .set_status(format!("Register {} cleared", register)),
2247− None => cx
2248− .editor
2249− .set_error(format!("Register {} not found", register)),
2378+ if cx.editor.registers.remove(register) {
2379+ cx.editor
2380+ .set_status(format!("Register {} cleared", register));
2381+ } else {
2382+ cx.editor
2383+ .set_error(format!("Register {} not found", register));
22502384 }
22512385 Ok(())
22522386}
22532387
2388+fn redraw(
2389+ cx: &mut compositor::Context,
2390+ _args: &[Cow<str>],
2391+ event: PromptEvent,
2392+) -> anyhow::Result<()> {
2393+ if event != PromptEvent::Validate {
2394+ return Ok(());
2395+ }
2396+
2397+ let callback = Box::pin(async move {
2398+ let call: job::Callback =
2399+ job::Callback::EditorCompositor(Box::new(|_editor, compositor| {
2400+ compositor.need_full_redraw();
2401+ }));
2402+
2403+ Ok(call)
2404+ });
2405+
2406+ cx.jobs.callback(callback);
2407+
2408+ Ok(())
2409+}
2410+
2411+fn move_buffer(
2412+ cx: &mut compositor::Context,
2413+ args: &[Cow<str>],
2414+ event: PromptEvent,
2415+) -> anyhow::Result<()> {
2416+ if event != PromptEvent::Validate {
2417+ return Ok(());
2418+ }
2419+
2420+ ensure!(args.len() == 1, format!(":move takes one argument"));
2421+ let doc = doc!(cx.editor);
2422+
2423+ let new_path = get_canonicalized_path(&PathBuf::from(args.first().unwrap().to_string()));
2424+ let old_path = doc
2425+ .path()
2426+ .ok_or_else(|| anyhow!("Scratch buffer cannot be moved. Use :write instead"))?
2427+ .clone();
2428+ let old_path_as_url = doc.url().unwrap();
2429+ let new_path_as_url = Url::from_file_path(&new_path).unwrap();
2430+
2431+ let edits: Vec<(
2432+ helix_lsp::Result<helix_lsp::lsp::WorkspaceEdit>,
2433+ OffsetEncoding,
2434+ String,
2435+ )> = doc
2436+ .language_servers()
2437+ .map(|lsp| {
2438+ (
2439+ lsp.prepare_file_rename(&old_path_as_url, &new_path_as_url),
2440+ lsp.offset_encoding(),
2441+ lsp.name().to_owned(),
2442+ )
2443+ })
2444+ .filter(|(f, _, _)| f.is_some())
2445+ .map(|(f, encoding, name)| (helix_lsp::block_on(f.unwrap()), encoding, name))
2446+ .collect();
2447+
2448+ for (lsp_reply, encoding, name) in edits {
2449+ match lsp_reply {
2450+ Ok(edit) => {
2451+ if let Err(e) = apply_workspace_edit(cx.editor, encoding, &edit) {
2452+ log::error!(
2453+ ":move command failed to apply edits from lsp {}: {:?}",
2454+ name,
2455+ e
2456+ );
2457+ };
2458+ }
2459+ Err(e) => {
2460+ log::error!("LSP {} failed to treat willRename request: {:?}", name, e);
2461+ }
2462+ };
2463+ }
2464+
2465+ let doc = doc_mut!(cx.editor);
2466+
2467+ doc.set_path(Some(new_path.as_path()));
2468+ if let Err(e) = std::fs::rename(&old_path, &new_path) {
2469+ doc.set_path(Some(old_path.as_path()));
2470+ bail!("Could not move file: {}", e);
2471+ };
2472+
2473+ doc.language_servers().for_each(|lsp| {
2474+ lsp.did_file_rename(&old_path_as_url, &new_path_as_url);
2475+ });
2476+
2477+ cx.editor
2478+ .language_servers
2479+ .file_event_handler
2480+ .file_changed(new_path);
2481+
2482+ Ok(())
2483+}
2484+
22542485pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2255− TypableCommand {
2256− name: "quit",
2257− aliases: &["q"],
2258− doc: "Close the current view.",
2259− fun: quit,
2260− signature: CommandSignature::none(),
2261− },
2262− TypableCommand {
2263− name: "quit!",
2264− aliases: &["q!"],
2265− doc: "Force close the current view, ignoring unsaved changes.",
2266− fun: force_quit,
2267− signature: CommandSignature::none(),
2268− },
2269− TypableCommand {
2270− name: "open",
2271− aliases: &["o"],
2272− doc: "Open a file from disk into the current view.",
2273− fun: open,
2274− signature: CommandSignature::all(completers::filename),
2275− },
2276− TypableCommand {
2277− name: "buffer-close",
2278− aliases: &["bc", "bclose"],
2279− doc: "Close the current buffer.",
2280− fun: buffer_close,
2281− signature: CommandSignature::all(completers::buffer),
2282− },
2283− TypableCommand {
2284− name: "buffer-close!",
2285− aliases: &["bc!", "bclose!"],
2286− doc: "Close the current buffer forcefully, ignoring unsaved changes.",
2287− fun: force_buffer_close,
2288− signature: CommandSignature::all(completers::buffer)
2289− },
2290− TypableCommand {
2291− name: "buffer-close-others",
2292− aliases: &["bco", "bcloseother"],
2293− doc: "Close all buffers but the currently focused one.",
2294− fun: buffer_close_others,
2295− signature: CommandSignature::none(),
2296− },
2297− TypableCommand {
2298− name: "buffer-close-others!",
2299− aliases: &["bco!", "bcloseother!"],
2300− doc: "Force close all buffers but the currently focused one.",
2301− fun: force_buffer_close_others,
2302− signature: CommandSignature::none(),
2303− },
2304− TypableCommand {
2305− name: "buffer-close-all",
2306− aliases: &["bca", "bcloseall"],
2307− doc: "Close all buffers without quitting.",
2308− fun: buffer_close_all,
2309− signature: CommandSignature::none(),
2310− },
2311− TypableCommand {
2312− name: "buffer-close-all!",
2313− aliases: &["bca!", "bcloseall!"],
2314− doc: "Force close all buffers ignoring unsaved changes without quitting.",
2315− fun: force_buffer_close_all,
2316− signature: CommandSignature::none(),
2317− },
2318− TypableCommand {
2319− name: "buffer-next",
2320− aliases: &["bn", "bnext"],
2321− doc: "Goto next buffer.",
2322− fun: buffer_next,
2323− signature: CommandSignature::none(),
2324− },
2325− TypableCommand {
2326− name: "buffer-previous",
2327− aliases: &["bp", "bprev"],
2328− doc: "Goto previous buffer.",
2329− fun: buffer_previous,
2330− signature: CommandSignature::none(),
2331− },
2332− TypableCommand {
2333− name: "write",
2334− aliases: &["w"],
2335− doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
2336− fun: write,
2337− signature: CommandSignature::positional(&[completers::filename]),
2338− },
2339− TypableCommand {
2340− name: "write!",
2341− aliases: &["w!"],
2342− doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",
2343− fun: force_write,
2344− signature: CommandSignature::positional(&[completers::filename]),
2345− },
2346− TypableCommand {
2347− name: "write-buffer-close",
2348− aliases: &["wbc"],
2349− doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",
2350− fun: write_buffer_close,
2351− signature: CommandSignature::positional(&[completers::filename]),
2352− },
2353− TypableCommand {
2354− name: "write-buffer-close!",
2355− aliases: &["wbc!"],
2356− doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",
2357− fun: force_write_buffer_close,
2358− signature: CommandSignature::positional(&[completers::filename]),
2359− },
2360− TypableCommand {
2361− name: "new",
2362− aliases: &["n"],
2363− doc: "Create a new scratch buffer.",
2364− fun: new_file,
2365− // TODO: This seems to complete with a filename, but doesn't use that filename to
2366− // set the path of the newly created buffer.
2367− signature: CommandSignature::positional(&[completers::filename]),
2368− },
2369− TypableCommand {
2370− name: "format",
2371− aliases: &["fmt"],
2372− doc: "Format the file using the LSP formatter.",
2373− fun: format,
2374− signature: CommandSignature::none(),
2375− },
2376− TypableCommand {
2377− name: "indent-style",
2378− aliases: &[],
2379− doc: "Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.)",
2380− fun: set_indent_style,
2381− signature: CommandSignature::none(),
2382− },
2383− TypableCommand {
2384− name: "line-ending",
2385− aliases: &[],
2386− #[cfg(not(feature = "unicode-lines"))]
2387− doc: "Set the document's default line ending. Options: crlf, lf.",
2388− #[cfg(feature = "unicode-lines")]
2389− doc: "Set the document's default line ending. Options: crlf, lf, cr, ff, nel.",
2390− fun: set_line_ending,
2391− signature: CommandSignature::none(),
2392− },
2393− TypableCommand {
2394− name: "earlier",
2395− aliases: &["ear"],
2396− doc: "Jump back to an earlier point in edit history. Accepts a number of steps or a time span.",
2397− fun: earlier,
2398− signature: CommandSignature::none(),
2399− },
2400− TypableCommand {
2401− name: "later",
2402− aliases: &["lat"],
2403− doc: "Jump to a later point in edit history. Accepts a number of steps or a time span.",
2404− fun: later,
2405− signature: CommandSignature::none(),
2406− },
2407− TypableCommand {
2408− name: "write-quit",
2409− aliases: &["wq", "x"],
2410− doc: "Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt)",
2411− fun: write_quit,
2412− signature: CommandSignature::positional(&[completers::filename]),
2413− },
2414− TypableCommand {
2415− name: "write-quit!",
2416− aliases: &["wq!", "x!"],
2417− doc: "Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt)",
2418− fun: force_write_quit,
2419− signature: CommandSignature::positional(&[completers::filename]),
2420− },
2421− TypableCommand {
2422− name: "write-all",
2423− aliases: &["wa"],
2424− doc: "Write changes from all buffers to disk.",
2425− fun: write_all,
2426− signature: CommandSignature::none(),
2427− },
2428− TypableCommand {
2429− name: "write-quit-all",
2430− aliases: &["wqa", "xa"],
2431− doc: "Write changes from all buffers to disk and close all views.",
2432− fun: write_all_quit,
2433− signature: CommandSignature::none(),
2434− },
2435− TypableCommand {
2436− name: "write-quit-all!",
2437− aliases: &["wqa!", "xa!"],
2438− doc: "Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes).",
2439− fun: force_write_all_quit,
2440− signature: CommandSignature::none(),
2441− },
2442− TypableCommand {
2443− name: "quit-all",
2444− aliases: &["qa"],
2445− doc: "Close all views.",
2446− fun: quit_all,
2447− signature: CommandSignature::none(),
2448− },
2449− TypableCommand {
2450− name: "quit-all!",
2451− aliases: &["qa!"],
2452− doc: "Force close all views ignoring unsaved changes.",
2453− fun: force_quit_all,
2454− signature: CommandSignature::none(),
2455− },
2456− TypableCommand {
2457− name: "cquit",
2458− aliases: &["cq"],
2459− doc: "Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2).",
2460− fun: cquit,
2461− signature: CommandSignature::none(),
2462− },
2463− TypableCommand {
2464− name: "cquit!",
2465− aliases: &["cq!"],
2466− doc: "Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2).",
2467− fun: force_cquit,
2468− signature: CommandSignature::none(),
2469− },
2470− TypableCommand {
2471− name: "theme",
2472− aliases: &[],
2473− doc: "Change the editor theme (show current theme if no name specified).",
2474− fun: theme,
2475− signature: CommandSignature::positional(&[completers::theme]),
2476− },
2477− TypableCommand {
2478− name: "clipboard-yank",
2479− aliases: &[],
2480− doc: "Yank main selection into system clipboard.",
2481− fun: yank_main_selection_to_clipboard,
2482− signature: CommandSignature::none(),
2483− },
2484− TypableCommand {
2485− name: "clipboard-yank-join",
2486− aliases: &[],
2487− doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2488− fun: yank_joined_to_clipboard,
2489− signature: CommandSignature::none(),
2490− },
2491− TypableCommand {
2492− name: "primary-clipboard-yank",
2493− aliases: &[],
2494− doc: "Yank main selection into system primary clipboard.",
2495− fun: yank_main_selection_to_primary_clipboard,
2496− signature: CommandSignature::none(),
2497− },
2498− TypableCommand {
2499− name: "primary-clipboard-yank-join",
2500− aliases: &[],
2501− doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2502− fun: yank_joined_to_primary_clipboard,
2503− signature: CommandSignature::none(),
2504− },
2505− TypableCommand {
2506− name: "clipboard-paste-after",
2507− aliases: &[],
2508− doc: "Paste system clipboard after selections.",
2509− fun: paste_clipboard_after,
2510− signature: CommandSignature::none(),
2511− },
2512− TypableCommand {
2513− name: "clipboard-paste-before",
2514− aliases: &[],
2515− doc: "Paste system clipboard before selections.",
2516− fun: paste_clipboard_before,
2517− signature: CommandSignature::none(),
2518− },
2519− TypableCommand {
2520− name: "clipboard-paste-replace",
2521− aliases: &[],
2522− doc: "Replace selections with content of system clipboard.",
2523− fun: replace_selections_with_clipboard,
2524− signature: CommandSignature::none(),
2525− },
2526− TypableCommand {
2527− name: "primary-clipboard-paste-after",
2528− aliases: &[],
2529− doc: "Paste primary clipboard after selections.",
2530− fun: paste_primary_clipboard_after,
2531− signature: CommandSignature::none(),
2532− },
2533− TypableCommand {
2534− name: "primary-clipboard-paste-before",
2535− aliases: &[],
2536− doc: "Paste primary clipboard before selections.",
2537− fun: paste_primary_clipboard_before,
2538− signature: CommandSignature::none(),
2539− },
2540− TypableCommand {
2541− name: "primary-clipboard-paste-replace",
2542− aliases: &[],
2543− doc: "Replace selections with content of system primary clipboard.",
2544− fun: replace_selections_with_primary_clipboard,
2545− signature: CommandSignature::none(),
2546− },
2547− TypableCommand {
2548− name: "show-clipboard-provider",
2549− aliases: &[],
2550− doc: "Show clipboard provider name in status bar.",
2551− fun: show_clipboard_provider,
2552− signature: CommandSignature::none(),
2553− },
2554− TypableCommand {
2555− name: "change-current-directory",
2556− aliases: &["cd"],
2557− doc: "Change the current working directory.",
2558− fun: change_current_directory,
2559− signature: CommandSignature::positional(&[completers::directory]),
2560− },
2561− TypableCommand {
2562− name: "show-directory",
2563− aliases: &["pwd"],
2564− doc: "Show the current working directory.",
2565− fun: show_current_directory,
2566− signature: CommandSignature::none(),
2567− },
2568− TypableCommand {
2569− name: "encoding",
2570− aliases: &[],
2571− doc: "Set encoding. Based on `https://encoding.spec.whatwg.org`.",
2572− fun: set_encoding,
2573− signature: CommandSignature::none(),
2574− },
2575− TypableCommand {
2576− name: "character-info",
2577− aliases: &["char"],
2578− doc: "Get info about the character under the primary cursor.",
2579− fun: get_character_info,
2580− signature: CommandSignature::none(),
2581− },
2582− TypableCommand {
2583− name: "reload",
2584− aliases: &[],
2585− doc: "Discard changes and reload from the source file.",
2586− fun: reload,
2587− signature: CommandSignature::none(),
2588− },
2589− TypableCommand {
2590− name: "reload-all",
2591− aliases: &[],
2592− doc: "Discard changes and reload all documents from the source files.",
2593− fun: reload_all,
2594− signature: CommandSignature::none(),
2595− },
2596− TypableCommand {
2597− name: "update",
2598− aliases: &["u"],
2599− doc: "Write changes only if the file has been modified.",
2600− fun: update,
2601− signature: CommandSignature::none(),
2602− },
2603− TypableCommand {
2604− name: "lsp-workspace-command",
2605− aliases: &[],
2606− doc: "Open workspace command picker",
2607− fun: lsp_workspace_command,
2608− signature: CommandSignature::positional(&[completers::lsp_workspace_command]),
2609− },
2610− TypableCommand {
2611− name: "lsp-restart",
2612− aliases: &[],
2613− doc: "Restarts the language servers used by the current doc",
2614− fun: lsp_restart,
2615− signature: CommandSignature::none(),
2616− },
2617− TypableCommand {
2618− name: "lsp-stop",
2619− aliases: &[],
2620− doc: "Stops the language servers that are used by the current doc",
2621− fun: lsp_stop,
2622− signature: CommandSignature::none(),
2623− },
2624− TypableCommand {
2625− name: "tree-sitter-scopes",
2626− aliases: &[],
2627− doc: "Display tree sitter scopes, primarily for theming and development.",
2628− fun: tree_sitter_scopes,
2629− signature: CommandSignature::none(),
2630− },
2631− TypableCommand {
2632− name: "debug-start",
2633− aliases: &["dbg"],
2634− doc: "Start a debug session from a given template with given parameters.",
2635− fun: debug_start,
2636− signature: CommandSignature::none(),
2637− },
2638− TypableCommand {
2639− name: "debug-remote",
2640− aliases: &["dbg-tcp"],
2641− doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
2642− fun: debug_remote,
2643− signature: CommandSignature::none(),
2644− },
2645− TypableCommand {
2646− name: "debug-eval",
2647− aliases: &[],
2648− doc: "Evaluate expression in current debug context.",
2649− fun: debug_eval,
2650− signature: CommandSignature::none(),
2651− },
2652− TypableCommand {
2653− name: "vsplit",
2654− aliases: &["vs"],
2655− doc: "Open the file in a vertical split.",
2656− fun: vsplit,
2657− signature: CommandSignature::all(completers::filename)
2658− },
2659− TypableCommand {
2660− name: "vsplit-new",
2661− aliases: &["vnew"],
2662− doc: "Open a scratch buffer in a vertical split.",
2663− fun: vsplit_new,
2664− signature: CommandSignature::none(),
2665− },
2666− TypableCommand {
2667− name: "hsplit",
2668− aliases: &["hs", "sp"],
2669− doc: "Open the file in a horizontal split.",
2670− fun: hsplit,
2671− signature: CommandSignature::all(completers::filename)
2672− },
2673− TypableCommand {
2674− name: "hsplit-new",
2675− aliases: &["hnew"],
2676− doc: "Open a scratch buffer in a horizontal split.",
2677− fun: hsplit_new,
2678− signature: CommandSignature::none(),
2679− },
2680− TypableCommand {
2681− name: "tutor",
2682− aliases: &[],
2683− doc: "Open the tutorial.",
2684− fun: tutor,
2685− signature: CommandSignature::none(),
2686− },
2687− TypableCommand {
2688− name: "goto",
2689− aliases: &["g"],
2690− doc: "Goto line number.",
2691− fun: goto_line_number,
2692− signature: CommandSignature::none(),
2693− },
2694− TypableCommand {
2695− name: "set-language",
2696− aliases: &["lang"],
2697− doc: "Set the language of current buffer (show current language if no value specified).",
2698− fun: language,
2699− signature: CommandSignature::positional(&[completers::language]),
2700− },
2701− TypableCommand {
2702− name: "set-option",
2703− aliases: &["set"],
2704− doc: "Set a config option at runtime.\nFor example to disable smart case search, use `:set search.smart-case false`.",
2705− fun: set_option,
2706− // TODO: Add support for completion of the options value(s), when appropriate.
2707− signature: CommandSignature::positional(&[completers::setting]),
2708− },
2709− TypableCommand {
2710− name: "toggle-option",
2711− aliases: &["toggle"],
2712− doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
2713− fun: toggle_option,
2714− signature: CommandSignature::positional(&[completers::setting]),
2715− },
2716− TypableCommand {
2717− name: "get-option",
2718− aliases: &["get"],
2719− doc: "Get the current value of a config option.",
2720− fun: get_option,
2721− signature: CommandSignature::positional(&[completers::setting]),
2722− },
2723− TypableCommand {
2724− name: "sort",
2725− aliases: &[],
2726− doc: "Sort ranges in selection.",
2727− fun: sort,
2728− signature: CommandSignature::none(),
2729− },
2730− TypableCommand {
2731− name: "rsort",
2732− aliases: &[],
2733− doc: "Sort ranges in selection in reverse order.",
2734− fun: sort_reverse,
2735− signature: CommandSignature::none(),
2736− },
2737− TypableCommand {
2738− name: "reflow",
2739− aliases: &[],
2740− doc: "Hard-wrap the current selection of lines to a given width.",
2741− fun: reflow,
2742− signature: CommandSignature::none(),
2743− },
2744− TypableCommand {
2745− name: "tree-sitter-subtree",
2746− aliases: &["ts-subtree"],
2747− doc: "Display tree sitter subtree under cursor, primarily for debugging queries.",
2748− fun: tree_sitter_subtree,
2749− signature: CommandSignature::none(),
2750− },
2751− TypableCommand {
2752− name: "config-reload",
2753− aliases: &[],
2754− doc: "Refresh user config.",
2755− fun: refresh_config,
2756− signature: CommandSignature::none(),
2757− },
2758− TypableCommand {
2759− name: "config-open",
2760− aliases: &[],
2761− doc: "Open the user config.toml file.",
2762− fun: open_config,
2763− signature: CommandSignature::none(),
2764− },
2765− TypableCommand {
2766− name: "config-open-workspace",
2767− aliases: &[],
2768− doc: "Open the workspace config.toml file.",
2769− fun: open_workspace_config,
2770− signature: CommandSignature::none(),
2771− },
2772− TypableCommand {
2773− name: "log-open",
2774− aliases: &[],
2775− doc: "Open the helix log file.",
2776− fun: open_log,
2777− signature: CommandSignature::none(),
2778− },
2779− TypableCommand {
2780− name: "insert-output",
2781− aliases: &[],
2782− doc: "Run shell command, inserting output before each selection.",
2783− fun: insert_output,
2784− signature: CommandSignature::none(),
2785− },
2786− TypableCommand {
2787− name: "append-output",
2788− aliases: &[],
2789− doc: "Run shell command, appending output after each selection.",
2790− fun: append_output,
2791− signature: CommandSignature::none(),
2792− },
2793− TypableCommand {
2794− name: "pipe",
2795− aliases: &[],
2796− doc: "Pipe each selection to the shell command.",
2797− fun: pipe,
2798− signature: CommandSignature::none(),
2799− },
2800− TypableCommand {
2801− name: "pipe-to",
2802− aliases: &[],
2803− doc: "Pipe each selection to the shell command, ignoring output.",
2804− fun: pipe_to,
2805− signature: CommandSignature::none(),
2806− },
2807− TypableCommand {
2808− name: "run-shell-command",
2809− aliases: &["sh"],
2810− doc: "Run a shell command",
2811− fun: run_shell_command,
2812− signature: CommandSignature::all(completers::filename)
2813− },
2814− TypableCommand {
2815− name: "reset-diff-change",
2816− aliases: &["diffget", "diffg"],
2817− doc: "Reset the diff change at the cursor position.",
2818− fun: reset_diff_change,
2819− signature: CommandSignature::none(),
2820− },
2821− TypableCommand {
2822− name: "clear-register",
2823− aliases: &[],
2824− doc: "Clear given register. If no argument is provided, clear all registers.",
2825− fun: clear_register,
2826− signature: CommandSignature::none(),
2827− },
2828− ];
2486+ TypableCommand {
2487+ name: "quit",
2488+ aliases: &["q"],
2489+ doc: "Close the current view.",
2490+ fun: quit,
2491+ signature: CommandSignature::none(),
2492+ },
2493+ TypableCommand {
2494+ name: "quit!",
2495+ aliases: &["q!"],
2496+ doc: "Force close the current view, ignoring unsaved changes.",
2497+ fun: force_quit,
2498+ signature: CommandSignature::none(),
2499+ },
2500+ TypableCommand {
2501+ name: "open",
2502+ aliases: &["o"],
2503+ doc: "Open a file from disk into the current view.",
2504+ fun: open,
2505+ signature: CommandSignature::all(completers::filename),
2506+ },
2507+ TypableCommand {
2508+ name: "buffer-close",
2509+ aliases: &["bc", "bclose"],
2510+ doc: "Close the current buffer.",
2511+ fun: buffer_close,
2512+ signature: CommandSignature::all(completers::buffer),
2513+ },
2514+ TypableCommand {
2515+ name: "buffer-close!",
2516+ aliases: &["bc!", "bclose!"],
2517+ doc: "Close the current buffer forcefully, ignoring unsaved changes.",
2518+ fun: force_buffer_close,
2519+ signature: CommandSignature::all(completers::buffer)
2520+ },
2521+ TypableCommand {
2522+ name: "buffer-close-others",
2523+ aliases: &["bco", "bcloseother"],
2524+ doc: "Close all buffers but the currently focused one.",
2525+ fun: buffer_close_others,
2526+ signature: CommandSignature::none(),
2527+ },
2528+ TypableCommand {
2529+ name: "buffer-close-others!",
2530+ aliases: &["bco!", "bcloseother!"],
2531+ doc: "Force close all buffers but the currently focused one.",
2532+ fun: force_buffer_close_others,
2533+ signature: CommandSignature::none(),
2534+ },
2535+ TypableCommand {
2536+ name: "buffer-close-all",
2537+ aliases: &["bca", "bcloseall"],
2538+ doc: "Close all buffers without quitting.",
2539+ fun: buffer_close_all,
2540+ signature: CommandSignature::none(),
2541+ },
2542+ TypableCommand {
2543+ name: "buffer-close-all!",
2544+ aliases: &["bca!", "bcloseall!"],
2545+ doc: "Force close all buffers ignoring unsaved changes without quitting.",
2546+ fun: force_buffer_close_all,
2547+ signature: CommandSignature::none(),
2548+ },
2549+ TypableCommand {
2550+ name: "buffer-next",
2551+ aliases: &["bn", "bnext"],
2552+ doc: "Goto next buffer.",
2553+ fun: buffer_next,
2554+ signature: CommandSignature::none(),
2555+ },
2556+ TypableCommand {
2557+ name: "buffer-previous",
2558+ aliases: &["bp", "bprev"],
2559+ doc: "Goto previous buffer.",
2560+ fun: buffer_previous,
2561+ signature: CommandSignature::none(),
2562+ },
2563+ TypableCommand {
2564+ name: "write",
2565+ aliases: &["w"],
2566+ doc: "Write changes to disk. Accepts an optional path (:write some/path.txt)",
2567+ fun: write,
2568+ signature: CommandSignature::positional(&[completers::filename]),
2569+ },
2570+ TypableCommand {
2571+ name: "write!",
2572+ aliases: &["w!"],
2573+ doc: "Force write changes to disk creating necessary subdirectories. Accepts an optional path (:write! some/path.txt)",
2574+ fun: force_write,
2575+ signature: CommandSignature::positional(&[completers::filename]),
2576+ },
2577+ TypableCommand {
2578+ name: "write-buffer-close",
2579+ aliases: &["wbc"],
2580+ doc: "Write changes to disk and closes the buffer. Accepts an optional path (:write-buffer-close some/path.txt)",
2581+ fun: write_buffer_close,
2582+ signature: CommandSignature::positional(&[completers::filename]),
2583+ },
2584+ TypableCommand {
2585+ name: "write-buffer-close!",
2586+ aliases: &["wbc!"],
2587+ doc: "Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt)",
2588+ fun: force_write_buffer_close,
2589+ signature: CommandSignature::positional(&[completers::filename]),
2590+ },
2591+ TypableCommand {
2592+ name: "new",
2593+ aliases: &["n"],
2594+ doc: "Create a new scratch buffer.",
2595+ fun: new_file,
2596+ signature: CommandSignature::none(),
2597+ },
2598+ TypableCommand {
2599+ name: "format",
2600+ aliases: &["fmt"],
2601+ doc: "Format the file using the LSP formatter.",
2602+ fun: format,
2603+ signature: CommandSignature::none(),
2604+ },
2605+ TypableCommand {
2606+ name: "indent-style",
2607+ aliases: &[],
2608+ doc: "Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.)",
2609+ fun: set_indent_style,
2610+ signature: CommandSignature::none(),
2611+ },
2612+ TypableCommand {
2613+ name: "line-ending",
2614+ aliases: &[],
2615+ #[cfg(not(feature = "unicode-lines"))]
2616+ doc: "Set the document's default line ending. Options: crlf, lf.",
2617+ #[cfg(feature = "unicode-lines")]
2618+ doc: "Set the document's default line ending. Options: crlf, lf, cr, ff, nel.",
2619+ fun: set_line_ending,
2620+ signature: CommandSignature::none(),
2621+ },
2622+ TypableCommand {
2623+ name: "earlier",
2624+ aliases: &["ear"],
2625+ doc: "Jump back to an earlier point in edit history. Accepts a number of steps or a time span.",
2626+ fun: earlier,
2627+ signature: CommandSignature::none(),
2628+ },
2629+ TypableCommand {
2630+ name: "later",
2631+ aliases: &["lat"],
2632+ doc: "Jump to a later point in edit history. Accepts a number of steps or a time span.",
2633+ fun: later,
2634+ signature: CommandSignature::none(),
2635+ },
2636+ TypableCommand {
2637+ name: "write-quit",
2638+ aliases: &["wq", "x"],
2639+ doc: "Write changes to disk and close the current view. Accepts an optional path (:wq some/path.txt)",
2640+ fun: write_quit,
2641+ signature: CommandSignature::positional(&[completers::filename]),
2642+ },
2643+ TypableCommand {
2644+ name: "write-quit!",
2645+ aliases: &["wq!", "x!"],
2646+ doc: "Write changes to disk and close the current view forcefully. Accepts an optional path (:wq! some/path.txt)",
2647+ fun: force_write_quit,
2648+ signature: CommandSignature::positional(&[completers::filename]),
2649+ },
2650+ TypableCommand {
2651+ name: "write-all",
2652+ aliases: &["wa"],
2653+ doc: "Write changes from all buffers to disk.",
2654+ fun: write_all,
2655+ signature: CommandSignature::none(),
2656+ },
2657+ TypableCommand {
2658+ name: "write-all!",
2659+ aliases: &["wa!"],
2660+ doc: "Forcefully write changes from all buffers to disk creating necessary subdirectories.",
2661+ fun: force_write_all,
2662+ signature: CommandSignature::none(),
2663+ },
2664+ TypableCommand {
2665+ name: "write-quit-all",
2666+ aliases: &["wqa", "xa"],
2667+ doc: "Write changes from all buffers to disk and close all views.",
2668+ fun: write_all_quit,
2669+ signature: CommandSignature::none(),
2670+ },
2671+ TypableCommand {
2672+ name: "write-quit-all!",
2673+ aliases: &["wqa!", "xa!"],
2674+ doc: "Write changes from all buffers to disk and close all views forcefully (ignoring unsaved changes).",
2675+ fun: force_write_all_quit,
2676+ signature: CommandSignature::none(),
2677+ },
2678+ TypableCommand {
2679+ name: "quit-all",
2680+ aliases: &["qa"],
2681+ doc: "Close all views.",
2682+ fun: quit_all,
2683+ signature: CommandSignature::none(),
2684+ },
2685+ TypableCommand {
2686+ name: "quit-all!",
2687+ aliases: &["qa!"],
2688+ doc: "Force close all views ignoring unsaved changes.",
2689+ fun: force_quit_all,
2690+ signature: CommandSignature::none(),
2691+ },
2692+ TypableCommand {
2693+ name: "cquit",
2694+ aliases: &["cq"],
2695+ doc: "Quit with exit code (default 1). Accepts an optional integer exit code (:cq 2).",
2696+ fun: cquit,
2697+ signature: CommandSignature::none(),
2698+ },
2699+ TypableCommand {
2700+ name: "cquit!",
2701+ aliases: &["cq!"],
2702+ doc: "Force quit with exit code (default 1) ignoring unsaved changes. Accepts an optional integer exit code (:cq! 2).",
2703+ fun: force_cquit,
2704+ signature: CommandSignature::none(),
2705+ },
2706+ TypableCommand {
2707+ name: "theme",
2708+ aliases: &[],
2709+ doc: "Change the editor theme (show current theme if no name specified).",
2710+ fun: theme,
2711+ signature: CommandSignature::positional(&[completers::theme]),
2712+ },
2713+ TypableCommand {
2714+ name: "yank-join",
2715+ aliases: &[],
2716+ doc: "Yank joined selections. A separator can be provided as first argument. Default value is newline.",
2717+ fun: yank_joined,
2718+ signature: CommandSignature::none(),
2719+ },
2720+ TypableCommand {
2721+ name: "clipboard-yank",
2722+ aliases: &[],
2723+ doc: "Yank main selection into system clipboard.",
2724+ fun: yank_main_selection_to_clipboard,
2725+ signature: CommandSignature::none(),
2726+ },
2727+ TypableCommand {
2728+ name: "clipboard-yank-join",
2729+ aliases: &[],
2730+ doc: "Yank joined selections into system clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2731+ fun: yank_joined_to_clipboard,
2732+ signature: CommandSignature::none(),
2733+ },
2734+ TypableCommand {
2735+ name: "primary-clipboard-yank",
2736+ aliases: &[],
2737+ doc: "Yank main selection into system primary clipboard.",
2738+ fun: yank_main_selection_to_primary_clipboard,
2739+ signature: CommandSignature::none(),
2740+ },
2741+ TypableCommand {
2742+ name: "primary-clipboard-yank-join",
2743+ aliases: &[],
2744+ doc: "Yank joined selections into system primary clipboard. A separator can be provided as first argument. Default value is newline.", // FIXME: current UI can't display long doc.
2745+ fun: yank_joined_to_primary_clipboard,
2746+ signature: CommandSignature::none(),
2747+ },
2748+ TypableCommand {
2749+ name: "clipboard-paste-after",
2750+ aliases: &[],
2751+ doc: "Paste system clipboard after selections.",
2752+ fun: paste_clipboard_after,
2753+ signature: CommandSignature::none(),
2754+ },
2755+ TypableCommand {
2756+ name: "clipboard-paste-before",
2757+ aliases: &[],
2758+ doc: "Paste system clipboard before selections.",
2759+ fun: paste_clipboard_before,
2760+ signature: CommandSignature::none(),
2761+ },
2762+ TypableCommand {
2763+ name: "clipboard-paste-replace",
2764+ aliases: &[],
2765+ doc: "Replace selections with content of system clipboard.",
2766+ fun: replace_selections_with_clipboard,
2767+ signature: CommandSignature::none(),
2768+ },
2769+ TypableCommand {
2770+ name: "primary-clipboard-paste-after",
2771+ aliases: &[],
2772+ doc: "Paste primary clipboard after selections.",
2773+ fun: paste_primary_clipboard_after,
2774+ signature: CommandSignature::none(),
2775+ },
2776+ TypableCommand {
2777+ name: "primary-clipboard-paste-before",
2778+ aliases: &[],
2779+ doc: "Paste primary clipboard before selections.",
2780+ fun: paste_primary_clipboard_before,
2781+ signature: CommandSignature::none(),
2782+ },
2783+ TypableCommand {
2784+ name: "primary-clipboard-paste-replace",
2785+ aliases: &[],
2786+ doc: "Replace selections with content of system primary clipboard.",
2787+ fun: replace_selections_with_primary_clipboard,
2788+ signature: CommandSignature::none(),
2789+ },
2790+ TypableCommand {
2791+ name: "show-clipboard-provider",
2792+ aliases: &[],
2793+ doc: "Show clipboard provider name in status bar.",
2794+ fun: show_clipboard_provider,
2795+ signature: CommandSignature::none(),
2796+ },
2797+ TypableCommand {
2798+ name: "change-current-directory",
2799+ aliases: &["cd"],
2800+ doc: "Change the current working directory.",
2801+ fun: change_current_directory,
2802+ signature: CommandSignature::positional(&[completers::directory]),
2803+ },
2804+ TypableCommand {
2805+ name: "show-directory",
2806+ aliases: &["pwd"],
2807+ doc: "Show the current working directory.",
2808+ fun: show_current_directory,
2809+ signature: CommandSignature::none(),
2810+ },
2811+ TypableCommand {
2812+ name: "encoding",
2813+ aliases: &[],
2814+ doc: "Set encoding. Based on `https://encoding.spec.whatwg.org`.",
2815+ fun: set_encoding,
2816+ signature: CommandSignature::none(),
2817+ },
2818+ TypableCommand {
2819+ name: "character-info",
2820+ aliases: &["char"],
2821+ doc: "Get info about the character under the primary cursor.",
2822+ fun: get_character_info,
2823+ signature: CommandSignature::none(),
2824+ },
2825+ TypableCommand {
2826+ name: "reload",
2827+ aliases: &["rl"],
2828+ doc: "Discard changes and reload from the source file.",
2829+ fun: reload,
2830+ signature: CommandSignature::none(),
2831+ },
2832+ TypableCommand {
2833+ name: "reload-all",
2834+ aliases: &["rla"],
2835+ doc: "Discard changes and reload all documents from the source files.",
2836+ fun: reload_all,
2837+ signature: CommandSignature::none(),
2838+ },
2839+ TypableCommand {
2840+ name: "update",
2841+ aliases: &["u"],
2842+ doc: "Write changes only if the file has been modified.",
2843+ fun: update,
2844+ signature: CommandSignature::none(),
2845+ },
2846+ TypableCommand {
2847+ name: "lsp-workspace-command",
2848+ aliases: &[],
2849+ doc: "Open workspace command picker",
2850+ fun: lsp_workspace_command,
2851+ signature: CommandSignature::positional(&[completers::lsp_workspace_command]),
2852+ },
2853+ TypableCommand {
2854+ name: "lsp-restart",
2855+ aliases: &[],
2856+ doc: "Restarts the language servers used by the current doc",
2857+ fun: lsp_restart,
2858+ signature: CommandSignature::none(),
2859+ },
2860+ TypableCommand {
2861+ name: "lsp-stop",
2862+ aliases: &[],
2863+ doc: "Stops the language servers that are used by the current doc",
2864+ fun: lsp_stop,
2865+ signature: CommandSignature::none(),
2866+ },
2867+ TypableCommand {
2868+ name: "tree-sitter-scopes",
2869+ aliases: &[],
2870+ doc: "Display tree sitter scopes, primarily for theming and development.",
2871+ fun: tree_sitter_scopes,
2872+ signature: CommandSignature::none(),
2873+ },
2874+ TypableCommand {
2875+ name: "tree-sitter-highlight-name",
2876+ aliases: &[],
2877+ doc: "Display name of tree-sitter highlight scope under the cursor.",
2878+ fun: tree_sitter_highlight_name,
2879+ signature: CommandSignature::none(),
2880+ },
2881+ TypableCommand {
2882+ name: "debug-start",
2883+ aliases: &["dbg"],
2884+ doc: "Start a debug session from a given template with given parameters.",
2885+ fun: debug_start,
2886+ signature: CommandSignature::none(),
2887+ },
2888+ TypableCommand {
2889+ name: "debug-remote",
2890+ aliases: &["dbg-tcp"],
2891+ doc: "Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters.",
2892+ fun: debug_remote,
2893+ signature: CommandSignature::none(),
2894+ },
2895+ TypableCommand {
2896+ name: "debug-eval",
2897+ aliases: &[],
2898+ doc: "Evaluate expression in current debug context.",
2899+ fun: debug_eval,
2900+ signature: CommandSignature::none(),
2901+ },
2902+ TypableCommand {
2903+ name: "vsplit",
2904+ aliases: &["vs"],
2905+ doc: "Open the file in a vertical split.",
2906+ fun: vsplit,
2907+ signature: CommandSignature::all(completers::filename)
2908+ },
2909+ TypableCommand {
2910+ name: "vsplit-new",
2911+ aliases: &["vnew"],
2912+ doc: "Open a scratch buffer in a vertical split.",
2913+ fun: vsplit_new,
2914+ signature: CommandSignature::none(),
2915+ },
2916+ TypableCommand {
2917+ name: "hsplit",
2918+ aliases: &["hs", "sp"],
2919+ doc: "Open the file in a horizontal split.",
2920+ fun: hsplit,
2921+ signature: CommandSignature::all(completers::filename)
2922+ },
2923+ TypableCommand {
2924+ name: "hsplit-new",
2925+ aliases: &["hnew"],
2926+ doc: "Open a scratch buffer in a horizontal split.",
2927+ fun: hsplit_new,
2928+ signature: CommandSignature::none(),
2929+ },
2930+ TypableCommand {
2931+ name: "tutor",
2932+ aliases: &[],
2933+ doc: "Open the tutorial.",
2934+ fun: tutor,
2935+ signature: CommandSignature::none(),
2936+ },
2937+ TypableCommand {
2938+ name: "goto",
2939+ aliases: &["g"],
2940+ doc: "Goto line number.",
2941+ fun: goto_line_number,
2942+ signature: CommandSignature::none(),
2943+ },
2944+ TypableCommand {
2945+ name: "set-language",
2946+ aliases: &["lang"],
2947+ doc: "Set the language of current buffer (show current language if no value specified).",
2948+ fun: language,
2949+ signature: CommandSignature::positional(&[completers::language]),
2950+ },
2951+ TypableCommand {
2952+ name: "set-option",
2953+ aliases: &["set"],
2954+ doc: "Set a config option at runtime.\nFor example to disable smart case search, use `:set search.smart-case false`.",
2955+ fun: set_option,
2956+ // TODO: Add support for completion of the options value(s), when appropriate.
2957+ signature: CommandSignature::positional(&[completers::setting]),
2958+ },
2959+ TypableCommand {
2960+ name: "toggle-option",
2961+ aliases: &["toggle"],
2962+ doc: "Toggle a boolean config option at runtime.\nFor example to toggle smart case search, use `:toggle search.smart-case`.",
2963+ fun: toggle_option,
2964+ signature: CommandSignature::positional(&[completers::setting]),
2965+ },
2966+ TypableCommand {
2967+ name: "get-option",
2968+ aliases: &["get"],
2969+ doc: "Get the current value of a config option.",
2970+ fun: get_option,
2971+ signature: CommandSignature::positional(&[completers::setting]),
2972+ },
2973+ TypableCommand {
2974+ name: "sort",
2975+ aliases: &[],
2976+ doc: "Sort ranges in selection.",
2977+ fun: sort,
2978+ signature: CommandSignature::none(),
2979+ },
2980+ TypableCommand {
2981+ name: "rsort",
2982+ aliases: &[],
2983+ doc: "Sort ranges in selection in reverse order.",
2984+ fun: sort_reverse,
2985+ signature: CommandSignature::none(),
2986+ },
2987+ TypableCommand {
2988+ name: "reflow",
2989+ aliases: &[],
2990+ doc: "Hard-wrap the current selection of lines to a given width.",
2991+ fun: reflow,
2992+ signature: CommandSignature::none(),
2993+ },
2994+ TypableCommand {
2995+ name: "tree-sitter-subtree",
2996+ aliases: &["ts-subtree"],
2997+ doc: "Display tree sitter subtree under cursor, primarily for debugging queries.",
2998+ fun: tree_sitter_subtree,
2999+ signature: CommandSignature::none(),
3000+ },
3001+ TypableCommand {
3002+ name: "config-reload",
3003+ aliases: &[],
3004+ doc: "Refresh user config.",
3005+ fun: refresh_config,
3006+ signature: CommandSignature::none(),
3007+ },
3008+ TypableCommand {
3009+ name: "config-open",
3010+ aliases: &[],
3011+ doc: "Open the user config.toml file.",
3012+ fun: open_config,
3013+ signature: CommandSignature::none(),
3014+ },
3015+ TypableCommand {
3016+ name: "config-open-workspace",
3017+ aliases: &[],
3018+ doc: "Open the workspace config.toml file.",
3019+ fun: open_workspace_config,
3020+ signature: CommandSignature::none(),
3021+ },
3022+ TypableCommand {
3023+ name: "log-open",
3024+ aliases: &[],
3025+ doc: "Open the helix log file.",
3026+ fun: open_log,
3027+ signature: CommandSignature::none(),
3028+ },
3029+ TypableCommand {
3030+ name: "insert-output",
3031+ aliases: &[],
3032+ doc: "Run shell command, inserting output before each selection.",
3033+ fun: insert_output,
3034+ signature: CommandSignature::none(),
3035+ },
3036+ TypableCommand {
3037+ name: "append-output",
3038+ aliases: &[],
3039+ doc: "Run shell command, appending output after each selection.",
3040+ fun: append_output,
3041+ signature: CommandSignature::none(),
3042+ },
3043+ TypableCommand {
3044+ name: "pipe",
3045+ aliases: &[],
3046+ doc: "Pipe each selection to the shell command.",
3047+ fun: pipe,
3048+ signature: CommandSignature::none(),
3049+ },
3050+ TypableCommand {
3051+ name: "pipe-to",
3052+ aliases: &[],
3053+ doc: "Pipe each selection to the shell command, ignoring output.",
3054+ fun: pipe_to,
3055+ signature: CommandSignature::none(),
3056+ },
3057+ TypableCommand {
3058+ name: "run-shell-command",
3059+ aliases: &["sh"],
3060+ doc: "Run a shell command",
3061+ fun: run_shell_command,
3062+ signature: CommandSignature::all(completers::filename)
3063+ },
3064+ TypableCommand {
3065+ name: "reset-diff-change",
3066+ aliases: &["diffget", "diffg"],
3067+ doc: "Reset the diff change at the cursor position.",
3068+ fun: reset_diff_change,
3069+ signature: CommandSignature::none(),
3070+ },
3071+ TypableCommand {
3072+ name: "clear-register",
3073+ aliases: &[],
3074+ doc: "Clear given register. If no argument is provided, clear all registers.",
3075+ fun: clear_register,
3076+ signature: CommandSignature::none(),
3077+ },
3078+ TypableCommand {
3079+ name: "redraw",
3080+ aliases: &[],
3081+ doc: "Clear and re-render the whole UI",
3082+ fun: redraw,
3083+ signature: CommandSignature::none(),
3084+ },
3085+ TypableCommand {
3086+ name: "move",
3087+ aliases: &[],
3088+ doc: "Move the current buffer and its corresponding file to a different path",
3089+ fun: move_buffer,
3090+ signature: CommandSignature::positional(&[completers::filename]),
3091+ },
3092+];
28293093
28303094pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
28313095 Lazy::new(|| {
@@ -2844,28 +3108,18 @@ pub(super) fn command_mode(cx: &mut Context) {
28443108 ":".into(),
28453109 Some(':'),
28463110 |editor: &Editor, input: &str| {
2847− static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
2848− Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
2849−
28503111 let shellwords = Shellwords::from(input);
28513112 let words = shellwords.words();
28523113
28533114 if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
2854− // If the command has not been finished yet, complete commands.
2855− let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
2856− .iter()
2857− .filter_map(|command| {
2858− FUZZY_MATCHER
2859− .fuzzy_match(command.name, input)
2860− .map(|score| (command.name, score))
2861− })
2862− .collect();
2863−
2864− matches.sort_unstable_by_key(|(_file, score)| std::cmp::Reverse(*score));
2865− matches
2866− .into_iter()
2867− .map(|(name, _)| (0.., name.into()))
2868− .collect()
3115+ fuzzy_match(
3116+ input,
3117+ TYPABLE_COMMAND_LIST.iter().map(|command| command.name),
3118+ false,
3119+ )
3120+ .into_iter()
3121+ .map(|(name, _)| (0.., name.into()))
3122+ .collect()
28693123 } else {
28703124 // Otherwise, use the command's completer and the last shellword
28713125 // as completion input.
helix-term/src/compositor.rs+12
@@ -16,6 +16,7 @@ pub enum EventResult {
1616}
1717
1818use crate::job::Jobs;
19+use crate::ui::picker;
1920use helix_view::Editor;
2021
2122pub use helix_view::input::Event;
@@ -79,6 +80,7 @@ pub struct Compositor {
7980 area: Rect,
8081
8182 pub(crate) last_picker: Option<Box<dyn Component>>,
83+ pub(crate) full_redraw: bool,
8284}
8385
8486impl Compositor {
@@ -87,6 +89,7 @@ impl Compositor {
8789 layers: Vec::new(),
8890 area,
8991 last_picker: None,
92+ full_redraw: false,
9093 }
9194 }
9295
@@ -100,6 +103,11 @@ impl Compositor {
100103
101104 /// Add a layer to be rendered in front of all existing layers.
102105 pub fn push(&mut self, mut layer: Box<dyn Component>) {
106+ // immediately clear last_picker field to avoid excessive memory
107+ // consumption for picker with many items
108+ if layer.id() == Some(picker::ID) {
109+ self.last_picker = None;
110+ }
103111 let size = self.size();
104112 // trigger required_size on init
105113 layer.required_size((size.width, size.height));
@@ -200,6 +208,10 @@ impl Compositor {
200208 .find(|component| component.id() == Some(id))
201209 .and_then(|component| component.as_any_mut().downcast_mut())
202210 }
211+
212+ pub fn need_full_redraw(&mut self) {
213+ self.full_redraw = true;
214+ }
203215}
204216
205217// View casting, taken straight from Cursive
helix-term/src/config.rs+1
@@ -109,6 +109,7 @@ impl Config {
109109 )?,
110110 }
111111 }
112+
112113 // these are just two io errors return the one for the global config
113114 (Err(err), Err(_)) => return Err(err),
114115 };
helix-term/src/health.rs+44−16
@@ -181,8 +181,8 @@ pub fn languages_all() -> std::io::Result<()> {
181181 .language
182182 .sort_unstable_by_key(|l| l.language_id.clone());
183183
184− let check_binary = |cmd: Option<String>| match cmd {
185− Some(cmd) => match which::which(&cmd) {
184+ let check_binary = |cmd: Option<&str>| match cmd {
185+ Some(cmd) => match which::which(cmd) {
186186 Ok(_) => column(&format!("✓ {}", cmd), Color::Green),
187187 Err(_) => column(&format!("✘ {}", cmd), Color::Red),
188188 },
@@ -192,17 +192,15 @@ pub fn languages_all() -> std::io::Result<()> {
192192 for lang in &syn_loader_conf.language {
193193 column(&lang.language_id, Color::Reset);
194194
195− // TODO multiple language servers (check binary for each supported language server, not just the first)
196−
197− let lsp = lang.language_servers.first().and_then(|ls| {
195+ let mut cmds = lang.language_servers.iter().filter_map(|ls| {
198196 syn_loader_conf
199197 .language_server
200198 .get(&ls.name)
201− .map(|config| config.command.clone())
199+ .map(|config| config.command.as_str())
202200 });
203− check_binary(lsp);
201+ check_binary(cmds.next());
204202
205− let dap = lang.debugger.as_ref().map(|dap| dap.command.to_string());
203+ let dap = lang.debugger.as_ref().map(|dap| dap.command.as_str());
206204 check_binary(dap);
207205
208206 for ts_feat in TsFeature::all() {
@@ -213,6 +211,12 @@ pub fn languages_all() -> std::io::Result<()> {
213211 }
214212
215213 writeln!(stdout)?;
214+
215+ for cmd in cmds {
216+ column("", Color::Reset);
217+ check_binary(Some(cmd));
218+ writeln!(stdout)?;
219+ }
216220 }
217221
218222 Ok(())
@@ -268,15 +272,12 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
268272 }
269273 };
270274
271− // TODO multiple language servers
272− probe_protocol(
275+ probe_protocols(
273276 "language server",
274− lang.language_servers.first().and_then(|ls| {
275− syn_loader_conf
276− .language_server
277− .get(&ls.name)
278− .map(|config| config.command.clone())
279− }),
277+ lang.language_servers
278+ .iter()
279+ .filter_map(|ls| syn_loader_conf.language_server.get(&ls.name))
280+ .map(|config| config.command.as_str()),
280281 )?;
281282
282283 probe_protocol(
@@ -291,6 +292,33 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
291292 Ok(())
292293}
293294
295+/// Display diagnostics about multiple LSPs and DAPs.
296+fn probe_protocols<'a, I: Iterator<Item = &'a str> + 'a>(
297+ protocol_name: &str,
298+ server_cmds: I,
299+) -> std::io::Result<()> {
300+ let stdout = std::io::stdout();
301+ let mut stdout = stdout.lock();
302+ let mut server_cmds = server_cmds.peekable();
303+
304+ write!(stdout, "Configured {}s:", protocol_name)?;
305+ if server_cmds.peek().is_none() {
306+ writeln!(stdout, "{}", " None".yellow())?;
307+ return Ok(());
308+ }
309+ writeln!(stdout)?;
310+
311+ for cmd in server_cmds {
312+ let (path, icon) = match which::which(cmd) {
313+ Ok(path) => (path.display().to_string().green(), "✓".green()),
314+ Err(_) => (format!("'{}' not found in $PATH", cmd).red(), "✘".red()),
315+ };
316+ writeln!(stdout, " {} {}: {}", icon, cmd, path)?;
317+ }
318+
319+ Ok(())
320+}
321+
294322/// Display diagnostics about LSP and DAP.
295323fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::Result<()> {
296324 let stdout = std::io::stdout();
helix-term/src/keymap.rs+14−14
@@ -401,14 +401,14 @@ mod tests {
401401 fn merge_partial_keys() {
402402 let keymap = hashmap! {
403403 Mode::Normal => keymap!({ "Normal mode"
404− "i" => normal_mode,
405− "无" => insert_mode,
406− "z" => jump_backward,
407− "g" => { "Merge into goto mode"
408− "$" => goto_line_end,
409− "g" => delete_char_forward,
410− },
411− })
404+ "i" => normal_mode,
405+ "无" => insert_mode,
406+ "z" => jump_backward,
407+ "g" => { "Merge into goto mode"
408+ "$" => goto_line_end,
409+ "g" => delete_char_forward,
410+ },
411+ })
412412 };
413413 let mut merged_keyamp = default();
414414 merge_keys(&mut merged_keyamp, keymap.clone());
@@ -474,13 +474,13 @@ mod tests {
474474 fn order_should_be_set() {
475475 let keymap = hashmap! {
476476 Mode::Normal => keymap!({ "Normal mode"
477− "space" => { ""
478− "s" => { ""
479− "v" => vsplit,
480− "c" => hsplit,
481− },
477+ "space" => { ""
478+ "s" => { ""
479+ "v" => vsplit,
480+ "c" => hsplit,
482481 },
483− })
482+ },
483+ })
484484 };
485485 let mut merged_keyamp = default();
486486 merge_keys(&mut merged_keyamp, keymap.clone());
helix-term/src/keymap/default.rs+8−2
@@ -88,6 +88,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
8888 "A-i" | "A-down" => shrink_selection,
8989 "A-p" | "A-left" => select_prev_sibling,
9090 "A-n" | "A-right" => select_next_sibling,
91+ "A-e" => move_parent_node_end,
92+ "A-b" => move_parent_node_start,
9193
9294 "%" => select_all,
9395 "x" => extend_line_below,
@@ -265,7 +267,7 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
265267 "C-v" | "v" => vsplit_new,
266268 },
267269 },
268− "y" => yank_joined_to_clipboard,
270+ "y" => yank_to_clipboard,
269271 "Y" => yank_main_selection_to_clipboard,
270272 "p" => paste_clipboard_after,
271273 "P" => paste_clipboard_before,
@@ -336,6 +338,9 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
336338 "B" => extend_prev_long_word_start,
337339 "E" => extend_next_long_word_end,
338340
341+ "A-e" => extend_parent_node_end,
342+ "A-b" => extend_parent_node_start,
343+
339344 "n" => extend_search_next,
340345 "N" => extend_search_prev,
341346
@@ -368,7 +373,8 @@ pub fn default() -> HashMap<Mode, KeyTrie> {
368373 "C-h" | "backspace" | "S-backspace" => delete_char_backward,
369374 "C-d" | "del" => delete_char_forward,
370375 "C-j" | "ret" => insert_newline,
371− "tab" => insert_tab,
376+ "tab" => smart_tab,
377+ "S-tab" => insert_tab,
372378
373379 "up" => move_visual_line_up,
374380 "down" => move_visual_line_down,
helix-term/src/main.rs+21−17
@@ -4,9 +4,8 @@ use helix_loader::VERSION_AND_GIT_HASH;
44use helix_term::application::Application;
55use helix_term::args::Args;
66use helix_term::config::{Config, ConfigLoadError};
7−use std::path::PathBuf;
87
9−fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
8+fn setup_logging(verbosity: u64) -> Result<()> {
109 let mut base_config = fern::Dispatch::new();
1110
1211 base_config = match verbosity {
@@ -27,7 +26,7 @@ fn setup_logging(logpath: PathBuf, verbosity: u64) -> Result<()> {
2726 message
2827 ))
2928 })
30− .chain(fern::log_file(logpath)?);
29+ .chain(fern::log_file(helix_loader::log_file())?);
3130
3231 base_config.chain(file_config).apply()?;
3332
@@ -41,12 +40,6 @@ fn main() -> Result<()> {
4140
4241#[tokio::main]
4342async fn main_impl() -> Result<i32> {
44− let logpath = helix_loader::log_file();
45− let parent = logpath.parent().unwrap();
46− if !parent.exists() {
47− std::fs::create_dir_all(parent).ok();
48− }
49−
5043 let help = format!(
5144 "\
5245{} {}
@@ -73,15 +66,20 @@ FLAGS:
7366 -V, --version Prints version information
7467 --vsplit Splits all given files vertically into different windows
7568 --hsplit Splits all given files horizontally into different windows
69+ -w, --working-dir <path> Specify an initial working directory
70+ +N Open the first given file at line number N
7671",
7772 env!("CARGO_PKG_NAME"),
7873 VERSION_AND_GIT_HASH,
7974 env!("CARGO_PKG_AUTHORS"),
8075 env!("CARGO_PKG_DESCRIPTION"),
81− logpath.display(),
76+ helix_loader::default_log_file().display(),
8277 );
8378
84− let args = Args::parse_args().context("could not parse arguments")?;
79+ let mut args = Args::parse_args().context("could not parse arguments")?;
80+
81+ helix_loader::initialize_config_file(args.config_file.clone());
82+ helix_loader::initialize_log_file(args.log_file.clone());
8583
8684 // Help has a higher priority and should be handled separately.
8785 if args.display_help {
@@ -116,15 +114,21 @@ FLAGS:
116114 return Ok(0);
117115 }
118116
119− let logpath = args.log_file.as_ref().cloned().unwrap_or(logpath);
120− setup_logging(logpath, args.verbosity).context("failed to initialize logging")?;
117+ setup_logging(args.verbosity).context("failed to initialize logging")?;
121118
122− let config_dir = helix_loader::config_dir();
123− if !config_dir.exists() {
124− std::fs::create_dir_all(&config_dir).ok();
119+ // Before setting the working directory, resolve all the paths in args.files
120+ for (path, _) in args.files.iter_mut() {
121+ *path = helix_core::path::get_canonicalized_path(path);
125122 }
126123
127− helix_loader::initialize_config_file(args.config_file.clone());
124+ // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
125+ // Application::new() depends on this logic so it must be updated if this changes.
126+ if let Some(path) = &args.working_directory {
127+ helix_loader::set_current_working_dir(path)?;
128+ } else if let Some((path, _)) = args.files.first().filter(|p| p.0.is_dir()) {
129+ // If the first file is a directory, it will be the working directory unless -w was specified
130+ helix_loader::set_current_working_dir(path)?;
131+ }
128132
129133 let config = match Config::load_default() {
130134 Ok(config) => config,
helix-term/src/ui/completion.rs+32−4
@@ -2,6 +2,7 @@ use crate::compositor::{Component, Context, Event, EventResult};
22use helix_view::{
33 document::SavePoint,
44 editor::CompleteAction,
5+ graphics::Margin,
56 theme::{Modifier, Style},
67 ViewId,
78};
@@ -144,7 +145,9 @@ impl Completion {
144145 }
145146 };
146147
147− let Some(range) = util::lsp_range_to_range(doc.text(), edit.range, offset_encoding) else{
148+ let Some(range) =
149+ util::lsp_range_to_range(doc.text(), edit.range, offset_encoding)
150+ else {
148151 return Transaction::new(doc.text());
149152 };
150153
@@ -292,6 +295,8 @@ impl Completion {
292295 };
293296 // if more text was entered, remove it
294297 doc.restore(view, &savepoint, true);
298+ // save an undo checkpoint before the completion
299+ doc.append_changes_to_history(view);
295300 let transaction = item_to_transaction(
296301 doc,
297302 view.id,
@@ -322,9 +327,18 @@ impl Completion {
322327 }
323328 };
324329 });
330+
331+ let margin = if editor.menu_border() {
332+ Margin::vertical(1)
333+ } else {
334+ Margin::none()
335+ };
336+
325337 let popup = Popup::new(Self::ID, menu)
326338 .with_scrollbar(false)
327− .ignore_escape_key(true);
339+ .ignore_escape_key(true)
340+ .margin(margin);
341+
328342 let mut completion = Self {
329343 popup,
330344 start_offset,
@@ -411,10 +425,18 @@ impl Completion {
411425 _ => return false,
412426 };
413427
414− let Some(language_server) = cx.editor.language_server_by_id(current_item.language_server_id) else { return false; };
428+ let Some(language_server) = cx
429+ .editor
430+ .language_server_by_id(current_item.language_server_id)
431+ else {
432+ return false;
433+ };
415434
416435 // This method should not block the compositor so we handle the response asynchronously.
417− let Some(future) = language_server.resolve_completion_item(current_item.item.clone()) else { return false; };
436+ let Some(future) = language_server.resolve_completion_item(current_item.item.clone())
437+ else {
438+ return false;
439+ };
418440
419441 cx.callback(
420442 future,
@@ -557,6 +579,12 @@ impl Component for Completion {
557579 // clear area
558580 let background = cx.editor.theme.get("ui.popup");
559581 surface.clear_with(doc_area, background);
582+
583+ if cx.editor.popup_border() {
584+ use tui::widgets::{Block, Borders, Widget};
585+ Widget::render(Block::default().borders(Borders::ALL), doc_area, surface);
586+ }
587+
560588 markdown_doc.render(doc_area, surface, cx);
561589 }
562590}
helix-term/src/ui/document.rs+60−24
@@ -97,7 +97,8 @@ pub fn render_document(
9797 doc: &Document,
9898 offset: ViewPosition,
9999 doc_annotations: &TextAnnotations,
100− highlight_iter: impl Iterator<Item = HighlightEvent>,
100+ syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
101+ overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
101102 theme: &Theme,
102103 line_decoration: &mut [Box<dyn LineDecoration + '_>],
103104 translated_positions: &mut [TranslatedPosition],
@@ -109,7 +110,8 @@ pub fn render_document(
109110 offset,
110111 &doc.text_format(viewport.width, Some(theme)),
111112 doc_annotations,
112− highlight_iter,
113+ syntax_highlight_iter,
114+ overlay_highlight_iter,
113115 theme,
114116 line_decoration,
115117 translated_positions,
@@ -157,7 +159,8 @@ pub fn render_text<'t>(
157159 offset: ViewPosition,
158160 text_fmt: &TextFormat,
159161 text_annotations: &TextAnnotations,
160− highlight_iter: impl Iterator<Item = HighlightEvent>,
162+ syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
163+ overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
161164 theme: &Theme,
162165 line_decorations: &mut [Box<dyn LineDecoration + '_>],
163166 translated_positions: &mut [TranslatedPosition],
@@ -178,10 +181,16 @@ pub fn render_text<'t>(
178181
179182 let (mut formatter, mut first_visible_char_idx) =
180183 DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
181− let mut styles = StyleIter {
184+ let mut syntax_styles = StyleIter {
182185 text_style: renderer.text_style,
183186 active_highlights: Vec::with_capacity(64),
184− highlight_iter,
187+ highlight_iter: syntax_highlight_iter,
188+ theme,
189+ };
190+ let mut overlay_styles = StyleIter {
191+ text_style: Style::default(),
192+ active_highlights: Vec::with_capacity(64),
193+ highlight_iter: overlay_highlight_iter,
185194 theme,
186195 };
187196
@@ -193,7 +202,10 @@ pub fn render_text<'t>(
193202 };
194203 let mut is_in_indent_area = true;
195204 let mut last_line_indent_level = 0;
196− let mut style_span = styles
205+ let mut syntax_style_span = syntax_styles
206+ .next()
207+ .unwrap_or_else(|| (Style::default(), usize::MAX));
208+ let mut overlay_style_span = overlay_styles
197209 .next()
198210 .unwrap_or_else(|| (Style::default(), usize::MAX));
199211
@@ -221,9 +233,16 @@ pub fn render_text<'t>(
221233
222234 // skip any graphemes on visual lines before the block start
223235 if pos.row < row_off {
224− if char_pos >= style_span.1 {
225− style_span = if let Some(style_span) = styles.next() {
226− style_span
236+ if char_pos >= syntax_style_span.1 {
237+ syntax_style_span = if let Some(syntax_style_span) = syntax_styles.next() {
238+ syntax_style_span
239+ } else {
240+ break;
241+ }
242+ }
243+ if char_pos >= overlay_style_span.1 {
244+ overlay_style_span = if let Some(overlay_style_span) = overlay_styles.next() {
245+ overlay_style_span
227246 } else {
228247 break;
229248 }
@@ -260,8 +279,15 @@ pub fn render_text<'t>(
260279 }
261280
262281 // acquire the correct grapheme style
263− if char_pos >= style_span.1 {
264− style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
282+ if char_pos >= syntax_style_span.1 {
283+ syntax_style_span = syntax_styles
284+ .next()
285+ .unwrap_or((Style::default(), usize::MAX));
286+ }
287+ if char_pos >= overlay_style_span.1 {
288+ overlay_style_span = overlay_styles
289+ .next()
290+ .unwrap_or((Style::default(), usize::MAX));
265291 }
266292 char_pos += grapheme.doc_chars();
267293
@@ -275,22 +301,25 @@ pub fn render_text<'t>(
275301 pos,
276302 );
277303
278− let grapheme_style = if let GraphemeSource::VirtualText { highlight } = grapheme.source {
279− let style = renderer.text_style;
280− if let Some(highlight) = highlight {
281− style.patch(theme.highlight(highlight.0))
304+ let (syntax_style, overlay_style) =
305+ if let GraphemeSource::VirtualText { highlight } = grapheme.source {
306+ let mut style = renderer.text_style;
307+ if let Some(highlight) = highlight {
308+ style = style.patch(theme.highlight(highlight.0))
309+ }
310+ (style, Style::default())
282311 } else {
283− style
284− }
285− } else {
286− style_span.0
287− };
312+ (syntax_style_span.0, overlay_style_span.0)
313+ };
288314
289− let virt = grapheme.is_virtual();
315+ let is_virtual = grapheme.is_virtual();
290316 renderer.draw_grapheme(
291317 grapheme.grapheme,
292− grapheme_style,
293− virt,
318+ GraphemeStyle {
319+ syntax_style,
320+ overlay_style,
321+ },
322+ is_virtual,
294323 &mut last_line_indent_level,
295324 &mut is_in_indent_area,
296325 pos,
@@ -322,6 +351,11 @@ pub struct TextRenderer<'a> {
322351 pub viewport: Rect,
323352}
324353
354+pub struct GraphemeStyle {
355+ syntax_style: Style,
356+ overlay_style: Style,
357+}
358+
325359impl<'a> TextRenderer<'a> {
326360 pub fn new(
327361 surface: &'a mut Surface,
@@ -395,7 +429,7 @@ impl<'a> TextRenderer<'a> {
395429 pub fn draw_grapheme(
396430 &mut self,
397431 grapheme: Grapheme,
398− mut style: Style,
432+ grapheme_style: GraphemeStyle,
399433 is_virtual: bool,
400434 last_indent_level: &mut usize,
401435 is_in_indent_area: &mut bool,
@@ -405,9 +439,11 @@ impl<'a> TextRenderer<'a> {
405439 let is_whitespace = grapheme.is_whitespace();
406440
407441 // TODO is it correct to apply the whitespace style to all unicode white spaces?
442+ let mut style = grapheme_style.syntax_style;
408443 if is_whitespace {
409444 style = style.patch(self.whitespace_style);
410445 }
446+ style = style.patch(grapheme_style.overlay_style);
411447
412448 let width = grapheme.width();
413449 let space = if is_virtual { " " } else { &self.space };
helix-term/src/ui/editor.rs+105−55
@@ -43,6 +43,8 @@ pub struct EditorView {
4343 pub(crate) last_insert: (commands::MappableCommand, Vec<InsertEvent>),
4444 pub(crate) completion: Option<Completion>,
4545 spinners: ProgressSpinners,
46+ /// Tracks if the terminal window is focused by reaction to terminal focus events
47+ terminal_focused: bool,
4648}
4749
4850#[derive(Debug, Clone)]
@@ -71,6 +73,7 @@ impl EditorView {
7173 last_insert: (commands::MappableCommand::normal_mode, Vec::new()),
7274 completion: None,
7375 spinners: ProgressSpinners::default(),
76+ terminal_focused: true,
7477 }
7578 }
7679
@@ -121,16 +124,20 @@ impl EditorView {
121124 line_decorations.push(Box::new(line_decoration));
122125 }
123126
124− let mut highlights =
127+ let syntax_highlights =
125128 Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
126− let overlay_highlights = Self::overlay_syntax_highlights(
129+
130+ let mut overlay_highlights =
131+ Self::empty_highlight_iter(doc, view.offset.anchor, inner.height);
132+ let overlay_syntax_highlights = Self::overlay_syntax_highlights(
127133 doc,
128134 view.offset.anchor,
129135 inner.height,
130136 &text_annotations,
131137 );
132− if !overlay_highlights.is_empty() {
133− highlights = Box::new(syntax::merge(highlights, overlay_highlights));
138+ if !overlay_syntax_highlights.is_empty() {
139+ overlay_highlights =
140+ Box::new(syntax::merge(overlay_highlights, overlay_syntax_highlights));
134141 }
135142
136143 for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
@@ -139,39 +146,41 @@ impl EditorView {
139146 if diagnostic.is_empty() {
140147 continue;
141148 }
142− highlights = Box::new(syntax::merge(highlights, diagnostic));
149+ overlay_highlights = Box::new(syntax::merge(overlay_highlights, diagnostic));
143150 }
144151
145− let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
152+ if is_focused {
146153 let highlights = syntax::merge(
147− highlights,
154+ overlay_highlights,
148155 Self::doc_selection_highlights(
149156 editor.mode(),
150157 doc,
151158 view,
152159 theme,
153160 &config.cursor_shape,
161+ self.terminal_focused,
154162 ),
155163 );
156164 let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
157165 if focused_view_elements.is_empty() {
158− Box::new(highlights)
166+ overlay_highlights = Box::new(highlights)
159167 } else {
160− Box::new(syntax::merge(highlights, focused_view_elements))
168+ overlay_highlights = Box::new(syntax::merge(highlights, focused_view_elements))
161169 }
162− } else {
163− Box::new(highlights)
164− };
170+ }
165171
166− Self::render_gutter(
167− editor,
168− doc,
169− view,
170− view.area,
171− theme,
172− is_focused,
173− &mut line_decorations,
174− );
172+ let gutter_overflow = view.gutter_offset(doc) == 0;
173+ if !gutter_overflow {
174+ Self::render_gutter(
175+ editor,
176+ doc,
177+ view,
178+ view.area,
179+ theme,
180+ is_focused & self.terminal_focused,
181+ &mut line_decorations,
182+ );
183+ }
175184
176185 if is_focused {
177186 let cursor = doc
@@ -191,7 +200,8 @@ impl EditorView {
191200 doc,
192201 view.offset,
193202 &text_annotations,
194− highlights,
203+ syntax_highlights,
204+ overlay_highlights,
195205 theme,
196206 &mut line_decorations,
197207 &mut translated_positions,
@@ -251,27 +261,39 @@ impl EditorView {
251261 .for_each(|area| surface.set_style(area, ruler_theme))
252262 }
253263
254− pub fn overlay_syntax_highlights(
264+ fn viewport_byte_range(
265+ text: helix_core::RopeSlice,
266+ row: usize,
267+ height: u16,
268+ ) -> std::ops::Range<usize> {
269+ // Calculate viewport byte ranges:
270+ // Saturating subs to make it inclusive zero indexing.
271+ let last_line = text.len_lines().saturating_sub(1);
272+ let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
273+ let start = text.line_to_byte(row.min(last_line));
274+ let end = text.line_to_byte(last_visible_line + 1);
275+
276+ start..end
277+ }
278+
279+ pub fn empty_highlight_iter(
255280 doc: &Document,
256281 anchor: usize,
257282 height: u16,
258− text_annotations: &TextAnnotations,
259− ) -> Vec<(usize, std::ops::Range<usize>)> {
283+ ) -> Box<dyn Iterator<Item = HighlightEvent>> {
260284 let text = doc.text().slice(..);
261285 let row = text.char_to_line(anchor.min(text.len_chars()));
262286
263− let range = {
264− // Calculate viewport byte ranges:
265− // Saturating subs to make it inclusive zero indexing.
266− let last_line = text.len_lines().saturating_sub(1);
267− let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
268− let start = text.line_to_byte(row.min(last_line));
269− let end = text.line_to_byte(last_visible_line + 1);
270−
271− start..end
272− };
273−
274− text_annotations.collect_overlay_highlights(range)
287+ // Calculate viewport byte ranges:
288+ // Saturating subs to make it inclusive zero indexing.
289+ let range = Self::viewport_byte_range(text, row, height);
290+ Box::new(
291+ [HighlightEvent::Source {
292+ start: text.byte_to_char(range.start),
293+ end: text.byte_to_char(range.end),
294+ }]
295+ .into_iter(),
296+ )
275297 }
276298
277299 /// Get syntax highlights for a document in a view represented by the first line
@@ -286,16 +308,7 @@ impl EditorView {
286308 let text = doc.text().slice(..);
287309 let row = text.char_to_line(anchor.min(text.len_chars()));
288310
289− let range = {
290− // Calculate viewport byte ranges:
291− // Saturating subs to make it inclusive zero indexing.
292− let last_line = text.len_lines().saturating_sub(1);
293− let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
294− let start = text.line_to_byte(row.min(last_line));
295− let end = text.line_to_byte(last_visible_line + 1);
296−
297− start..end
298− };
311+ let range = Self::viewport_byte_range(text, row, height);
299312
300313 match doc.syntax() {
301314 Some(syntax) => {
@@ -328,6 +341,20 @@ impl EditorView {
328341 }
329342 }
330343
344+ pub fn overlay_syntax_highlights(
345+ doc: &Document,
346+ anchor: usize,
347+ height: u16,
348+ text_annotations: &TextAnnotations,
349+ ) -> Vec<(usize, std::ops::Range<usize>)> {
350+ let text = doc.text().slice(..);
351+ let row = text.char_to_line(anchor.min(text.len_chars()));
352+
353+ let range = Self::viewport_byte_range(text, row, height);
354+
355+ text_annotations.collect_overlay_highlights(range)
356+ }
357+
331358 /// Get highlight spans for document diagnostics
332359 pub fn doc_diagnostics_highlights(
333360 doc: &Document,
@@ -359,7 +386,7 @@ impl EditorView {
359386 let mut warning_vec = Vec::new();
360387 let mut error_vec = Vec::new();
361388
362− for diagnostic in doc.diagnostics() {
389+ for diagnostic in doc.shown_diagnostics() {
363390 // Separate diagnostics into different Vecs by severity.
364391 let (vec, scope) = match diagnostic.severity {
365392 Some(Severity::Info) => (&mut info_vec, info),
@@ -394,6 +421,7 @@ impl EditorView {
394421 view: &View,
395422 theme: &Theme,
396423 cursor_shape_config: &CursorShapeConfig,
424+ is_terminal_focused: bool,
397425 ) -> Vec<(usize, std::ops::Range<usize>)> {
398426 let text = doc.text().slice(..);
399427 let selection = doc.selection(view.id);
@@ -441,7 +469,7 @@ impl EditorView {
441469
442470 // Special-case: cursor at end of the rope.
443471 if range.head == range.anchor && range.head == text.len_chars() {
444− if !selection_is_primary || cursor_is_block {
472+ if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
445473 // Bar and underline cursors are drawn by the terminal
446474 // BUG: If the editor area loses focus while having a bar or
447475 // underline cursor (eg. when a regex prompt has focus) then
@@ -464,13 +492,17 @@ impl EditorView {
464492 cursor_start
465493 };
466494 spans.push((selection_scope, range.anchor..selection_end));
467− if !selection_is_primary || cursor_is_block {
495+ // add block cursors
496+ // skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
497+ if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
468498 spans.push((cursor_scope, cursor_start..range.head));
469499 }
470500 } else {
471501 // Reverse case.
472502 let cursor_end = next_grapheme_boundary(text, range.head);
473− if !selection_is_primary || cursor_is_block {
503+ // add block cursors
504+ // skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
505+ if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
474506 spans.push((cursor_scope, range.head..cursor_end));
475507 }
476508 // non block cursors look like they exclude the cursor
@@ -501,7 +533,9 @@ impl EditorView {
501533 use helix_core::match_brackets;
502534 let pos = doc.selection(view.id).primary().cursor(text);
503535
504− if let Some(pos) = match_brackets::find_matching_bracket(syntax, doc.text(), pos) {
536+ if let Some(pos) =
537+ match_brackets::find_matching_bracket(syntax, doc.text().slice(..), pos)
538+ {
505539 // ensure col is on screen
506540 if let Some(highlight) = theme.find_scope_index_exact("ui.cursor.match") {
507541 return vec![(highlight, pos..pos + 1)];
@@ -1065,6 +1099,7 @@ impl EditorView {
10651099 let editor = &mut cxt.editor;
10661100
10671101 if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) {
1102+ let prev_view_id = view!(editor).id;
10681103 let doc = doc_mut!(editor, &view!(editor, view_id).doc);
10691104
10701105 if modifiers == KeyModifiers::ALT {
@@ -1074,6 +1109,10 @@ impl EditorView {
10741109 doc.set_selection(view_id, Selection::point(pos));
10751110 }
10761111
1112+ if view_id != prev_view_id {
1113+ self.clear_completion(editor);
1114+ }
1115+
10771116 editor.focus(view_id);
10781117 editor.ensure_cursor_in_view(view_id);
10791118
@@ -1367,13 +1406,17 @@ impl Component for EditorView {
13671406
13681407 Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
13691408 Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
1370− Event::FocusGained => EventResult::Ignored(None),
1409+ Event::FocusGained => {
1410+ self.terminal_focused = true;
1411+ EventResult::Consumed(None)
1412+ }
13711413 Event::FocusLost => {
13721414 if context.editor.config().auto_save {
13731415 if let Err(e) = commands::typed::write_all_impl(context, false, false) {
13741416 context.editor.set_error(format!("{}", e));
13751417 }
13761418 }
1419+ self.terminal_focused = false;
13771420 EventResult::Consumed(None)
13781421 }
13791422 }
@@ -1483,8 +1526,15 @@ impl Component for EditorView {
14831526
14841527 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
14851528 match editor.cursor() {
1486− // All block cursors are drawn manually
1487− (pos, CursorKind::Block) => (pos, CursorKind::Hidden),
1529+ // all block cursors are drawn manually
1530+ (pos, CursorKind::Block) => {
1531+ if self.terminal_focused {
1532+ (pos, CursorKind::Hidden)
1533+ } else {
1534+ // use crossterm cursor when terminal loses focus
1535+ (pos, CursorKind::Underline)
1536+ }
1537+ }
14881538 cursor => cursor,
14891539 }
14901540 }
helix-term/src/ui/fuzzy_match.rsdeleted−239
@@ -1,239 +0,0 @@
1−use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
2−use fuzzy_matcher::FuzzyMatcher;
3−
4−#[cfg(test)]
5−mod test;
6−
7−struct QueryAtom {
8− kind: QueryAtomKind,
9− atom: String,
10− ignore_case: bool,
11− inverse: bool,
12−}
13−impl QueryAtom {
14− fn new(atom: &str) -> Option<QueryAtom> {
15− let mut atom = atom.to_string();
16− let inverse = atom.starts_with('!');
17− if inverse {
18− atom.remove(0);
19− }
20−
21− let mut kind = match atom.chars().next() {
22− Some('^') => QueryAtomKind::Prefix,
23− Some('\'') => QueryAtomKind::Substring,
24− _ if inverse => QueryAtomKind::Substring,
25− _ => QueryAtomKind::Fuzzy,
26− };
27−
28− if atom.starts_with(['^', '\'']) {
29− atom.remove(0);
30− }
31−
32− if atom.is_empty() {
33− return None;
34− }
35−
36− if atom.ends_with('$') && !atom.ends_with("\\$") {
37− atom.pop();
38− kind = if kind == QueryAtomKind::Prefix {
39− QueryAtomKind::Exact
40− } else {
41− QueryAtomKind::Postfix
42− }
43− }
44−
45− Some(QueryAtom {
46− kind,
47− atom: atom.replace('\\', ""),
48− // not ideal but fuzzy_matches only knows ascii uppercase so more consistent
49− // to behave the same
50− ignore_case: kind != QueryAtomKind::Fuzzy
51− && atom.chars().all(|c| c.is_ascii_lowercase()),
52− inverse,
53− })
54− }
55−
56− fn indices(&self, matcher: &Matcher, item: &str, indices: &mut Vec<usize>) -> bool {
57− // for inverse there are no indices to return
58− // just return whether we matched
59− if self.inverse {
60− return self.matches(matcher, item);
61− }
62− let buf;
63− let item = if self.ignore_case {
64− buf = item.to_ascii_lowercase();
65− &buf
66− } else {
67− item
68− };
69− let off = match self.kind {
70− QueryAtomKind::Fuzzy => {
71− if let Some((_, fuzzy_indices)) = matcher.fuzzy_indices(item, &self.atom) {
72− indices.extend_from_slice(&fuzzy_indices);
73− return true;
74− } else {
75− return false;
76− }
77− }
78− QueryAtomKind::Substring => {
79− if let Some(off) = item.find(&self.atom) {
80− off
81− } else {
82− return false;
83− }
84− }
85− QueryAtomKind::Prefix if item.starts_with(&self.atom) => 0,
86− QueryAtomKind::Postfix if item.ends_with(&self.atom) => item.len() - self.atom.len(),
87− QueryAtomKind::Exact if item == self.atom => 0,
88− _ => return false,
89− };
90−
91− indices.extend(off..(off + self.atom.len()));
92− true
93− }
94−
95− fn matches(&self, matcher: &Matcher, item: &str) -> bool {
96− let buf;
97− let item = if self.ignore_case {
98− buf = item.to_ascii_lowercase();
99− &buf
100− } else {
101− item
102− };
103− let mut res = match self.kind {
104− QueryAtomKind::Fuzzy => matcher.fuzzy_match(item, &self.atom).is_some(),
105− QueryAtomKind::Substring => item.contains(&self.atom),
106− QueryAtomKind::Prefix => item.starts_with(&self.atom),
107− QueryAtomKind::Postfix => item.ends_with(&self.atom),
108− QueryAtomKind::Exact => item == self.atom,
109− };
110− if self.inverse {
111− res = !res;
112− }
113− res
114− }
115−}
116−
117−#[derive(Debug, PartialEq, Eq, Clone, Copy)]
118−enum QueryAtomKind {
119− /// Item is a fuzzy match of this behaviour
120− ///
121− /// Usage: `foo`
122− Fuzzy,
123− /// Item contains query atom as a continuous substring
124− ///
125− /// Usage `'foo`
126− Substring,
127− /// Item starts with query atom
128− ///
129− /// Usage: `^foo`
130− Prefix,
131− /// Item ends with query atom
132− ///
133− /// Usage: `foo$`
134− Postfix,
135− /// Item is equal to query atom
136− ///
137− /// Usage `^foo$`
138− Exact,
139−}
140−
141−#[derive(Default)]
142−pub struct FuzzyQuery {
143− first_fuzzy_atom: Option<String>,
144− query_atoms: Vec<QueryAtom>,
145−}
146−
147−fn query_atoms(query: &str) -> impl Iterator<Item = &str> + '_ {
148− let mut saw_backslash = false;
149− query.split(move |c| {
150− saw_backslash = match c {
151− ' ' if !saw_backslash => return true,
152− '\\' => true,
153− _ => false,
154− };
155− false
156− })
157−}
158−
159−impl FuzzyQuery {
160− pub fn refine(&self, query: &str, old_query: &str) -> (FuzzyQuery, bool) {
161− // TODO: we could be a lot smarter about this
162− let new_query = Self::new(query);
163− let mut is_refinement = query.starts_with(old_query);
164−
165− // if the last atom is an inverse atom adding more text to it
166− // will actually increase the number of matches and we can not refine
167− // the matches.
168− if is_refinement && !self.query_atoms.is_empty() {
169− let last_idx = self.query_atoms.len() - 1;
170− if self.query_atoms[last_idx].inverse
171− && self.query_atoms[last_idx].atom != new_query.query_atoms[last_idx].atom
172− {
173− is_refinement = false;
174− }
175− }
176−
177− (new_query, is_refinement)
178− }
179−
180− pub fn new(query: &str) -> FuzzyQuery {
181− let mut first_fuzzy_query = None;
182− let query_atoms = query_atoms(query)
183− .filter_map(|atom| {
184− let atom = QueryAtom::new(atom)?;
185− if atom.kind == QueryAtomKind::Fuzzy && first_fuzzy_query.is_none() {
186− first_fuzzy_query = Some(atom.atom);
187− None
188− } else {
189− Some(atom)
190− }
191− })
192− .collect();
193− FuzzyQuery {
194− first_fuzzy_atom: first_fuzzy_query,
195− query_atoms,
196− }
197− }
198−
199− pub fn fuzzy_match(&self, item: &str, matcher: &Matcher) -> Option<i64> {
200− // use the rank of the first fuzzzy query for the rank, because merging ranks is not really possible
201− // this behaviour matches fzf and skim
202− let score = self
203− .first_fuzzy_atom
204− .as_ref()
205− .map_or(Some(0), |atom| matcher.fuzzy_match(item, atom))?;
206− if self
207− .query_atoms
208− .iter()
209− .any(|atom| !atom.matches(matcher, item))
210− {
211− return None;
212− }
213− Some(score)
214− }
215−
216− pub fn fuzzy_indices(&self, item: &str, matcher: &Matcher) -> Option<(i64, Vec<usize>)> {
217− let (score, mut indices) = self.first_fuzzy_atom.as_ref().map_or_else(
218− || Some((0, Vec::new())),
219− |atom| matcher.fuzzy_indices(item, atom),
220− )?;
221−
222− // fast path for the common case of just a single atom
223− if self.query_atoms.is_empty() {
224− return Some((score, indices));
225− }
226−
227− for atom in &self.query_atoms {
228− if !atom.indices(matcher, item, &mut indices) {
229− return None;
230− }
231− }
232−
233− // deadup and remove duplicate matches
234− indices.sort_unstable();
235− indices.dedup();
236−
237− Some((score, indices))
238− }
239−}
helix-term/src/ui/fuzzy_match/test.rsdeleted−47
@@ -1,47 +0,0 @@
1−use crate::ui::fuzzy_match::FuzzyQuery;
2−use crate::ui::fuzzy_match::Matcher;
3−
4−fn run_test<'a>(query: &str, items: &'a [&'a str]) -> Vec<String> {
5− let query = FuzzyQuery::new(query);
6− let matcher = Matcher::default();
7− items
8− .iter()
9− .filter_map(|item| {
10− let (_, indices) = query.fuzzy_indices(item, &matcher)?;
11− let matched_string = indices
12− .iter()
13− .map(|&pos| item.chars().nth(pos).unwrap())
14− .collect();
15− Some(matched_string)
16− })
17− .collect()
18−}
19−
20−#[test]
21−fn match_single_value() {
22− let matches = run_test("foo", &["foobar", "foo", "bar"]);
23− assert_eq!(matches, &["foo", "foo"])
24−}
25−
26−#[test]
27−fn match_multiple_values() {
28− let matches = run_test(
29− "foo bar",
30− &["foo bar", "foo bar", "bar foo", "bar", "foo"],
31− );
32− assert_eq!(matches, &["foobar", "foobar", "barfoo"])
33−}
34−
35−#[test]
36−fn space_escape() {
37− let matches = run_test(r"foo\ bar", &["bar foo", "foo bar", "foobar"]);
38− assert_eq!(matches, &["foo bar"])
39−}
40−
41−#[test]
42−fn trim() {
43− let matches = run_test(r" foo bar ", &["bar foo", "foo bar", "foobar"]);
44− assert_eq!(matches, &["barfoo", "foobar", "foobar"]);
45− let matches = run_test(r" foo bar\ ", &["bar foo", "foo bar", "foobar"]);
46− assert_eq!(matches, &["bar foo"])
47−}
helix-term/src/ui/lsp.rs+5−3
@@ -62,7 +62,7 @@ impl Component for SignatureHelp {
6262 });
6363
6464 let sig_text = crate::ui::markdown::highlighted_code_block(
65− self.signature.clone(),
65+ &self.signature,
6666 &self.language,
6767 Some(&cx.editor.theme),
6868 Arc::clone(&self.config_loader),
@@ -92,7 +92,9 @@ impl Component for SignatureHelp {
9292 Some(doc) => Markdown::new(doc.clone(), Arc::clone(&self.config_loader)),
9393 };
9494 let sig_doc = sig_doc.parse(Some(&cx.editor.theme));
95− let sig_doc_area = area.clip_top(sig_text_area.height + 2);
95+ let sig_doc_area = area
96+ .clip_top(sig_text_area.height + 2)
97+ .clip_bottom(u16::from(cx.editor.popup_border()));
9698 let sig_doc_para = Paragraph::new(sig_doc)
9799 .wrap(Wrap { trim: false })
98100 .scroll((cx.scroll.unwrap_or_default() as u16, 0));
@@ -109,7 +111,7 @@ impl Component for SignatureHelp {
109111 let max_text_width = (viewport.0 - PADDING).min(120);
110112
111113 let signature_text = crate::ui::markdown::highlighted_code_block(
112− self.signature.clone(),
114+ &self.signature,
113115 &self.language,
114116 None,
115117 Arc::clone(&self.config_loader),
helix-term/src/ui/markdown.rs+19−12
@@ -10,14 +10,15 @@ use pulldown_cmark::{CodeBlockKind, Event, HeadingLevel, Options, Parser, Tag};
1010
1111use helix_core::{
1212 syntax::{self, HighlightEvent, InjectionLanguageMarker, Syntax},
13− Rope,
13+ RopeSlice,
1414};
1515use helix_view::{
1616 graphics::{Margin, Rect, Style},
17+ theme::Modifier,
1718 Theme,
1819};
1920
20−fn styled_multiline_text<'a>(text: String, style: Style) -> Text<'a> {
21+fn styled_multiline_text<'a>(text: &str, style: Style) -> Text<'a> {
2122 let spans: Vec<_> = text
2223 .lines()
2324 .map(|line| Span::styled(line.to_string(), style))
@@ -27,7 +28,7 @@ fn styled_multiline_text<'a>(text: String, style: Style) -> Text<'a> {
2728}
2829
2930pub fn highlighted_code_block<'a>(
30− text: String,
31+ text: &str,
3132 language: &str,
3233 theme: Option<&Theme>,
3334 config_loader: Arc<syntax::Loader>,
@@ -45,13 +46,13 @@ pub fn highlighted_code_block<'a>(
4546 None => return styled_multiline_text(text, code_style),
4647 };
4748
48− let rope = Rope::from(text.as_ref());
49+ let ropeslice = RopeSlice::from(text);
4950 let syntax = config_loader
5051 .language_configuration_for_injection_string(&InjectionLanguageMarker::Name(
5152 language.into(),
5253 ))
5354 .and_then(|config| config.highlight_config(theme.scopes()))
54− .and_then(|config| Syntax::new(&rope, config, Arc::clone(&config_loader)));
55+ .and_then(|config| Syntax::new(ropeslice, config, Arc::clone(&config_loader)));
5556
5657 let syntax = match syntax {
5758 Some(s) => s,
@@ -59,7 +60,7 @@ pub fn highlighted_code_block<'a>(
5960 };
6061
6162 let highlight_iter = syntax
62− .highlight_iter(rope.slice(..), None, None)
63+ .highlight_iter(ropeslice, None, None)
6364 .map(|e| e.unwrap());
6465 let highlight_iter: Box<dyn Iterator<Item = HighlightEvent>> =
6566 if let Some(spans) = additional_highlight_spans {
@@ -183,7 +184,9 @@ impl Markdown {
183184 // Transform text in `<code>` blocks into `Event::Code`
184185 let mut in_code = false;
185186 let parser = parser.filter_map(|event| match event {
186− Event::Html(tag) if *tag == *"<code>" => {
187+ Event::Html(tag)
188+ if tag.starts_with("<code") && matches!(tag.chars().nth(5), Some(' ' | '>')) =>
189+ {
187190 in_code = true;
188191 None
189192 }
@@ -267,7 +270,7 @@ impl Markdown {
267270 CodeBlockKind::Indented => "",
268271 };
269272 let tui_text = highlighted_code_block(
270− text.to_string(),
273+ &text,
271274 language,
272275 theme,
273276 Arc::clone(&self.config_loader),
@@ -275,17 +278,21 @@ impl Markdown {
275278 );
276279 lines.extend(tui_text.lines.into_iter());
277280 } else {
278− let style = if let Some(Tag::Heading(level, ..)) = tags.last() {
279− match level {
281+ let style = match tags.last() {
282+ Some(Tag::Heading(level, ..)) => match level {
280283 HeadingLevel::H1 => heading_styles[0],
281284 HeadingLevel::H2 => heading_styles[1],
282285 HeadingLevel::H3 => heading_styles[2],
283286 HeadingLevel::H4 => heading_styles[3],
284287 HeadingLevel::H5 => heading_styles[4],
285288 HeadingLevel::H6 => heading_styles[5],
289+ },
290+ Some(Tag::Emphasis) => text_style.add_modifier(Modifier::ITALIC),
291+ Some(Tag::Strong) => text_style.add_modifier(Modifier::BOLD),
292+ Some(Tag::Strikethrough) => {
293+ text_style.add_modifier(Modifier::CROSSED_OUT)
286294 }
287− } else {
288− text_style
295+ _ => text_style,
289296 };
290297 spans.push(Span::styled(text, style));
291298 }
helix-term/src/ui/menu.rs+73−40
@@ -1,22 +1,29 @@
1−use std::{borrow::Cow, path::PathBuf};
1+use std::{borrow::Cow, cmp::Reverse, path::PathBuf};
22
33use crate::{
44 compositor::{Callback, Component, Compositor, Context, Event, EventResult},
55 ctrl, key, shift,
66};
7−use tui::{buffer::Buffer as Surface, widgets::Table};
7+use helix_core::fuzzy::MATCHER;
8+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
9+use nucleo::{Config, Utf32Str};
10+use tui::{
11+ buffer::Buffer as Surface,
12+ widgets::{Block, Borders, Table, Widget},
13+};
814
915pub use tui::widgets::{Cell, Row};
1016
11−use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
12−use fuzzy_matcher::FuzzyMatcher;
13−
14−use helix_view::{graphics::Rect, Editor};
17+use helix_view::{
18+ editor::SmartTabConfig,
19+ graphics::{Margin, Rect},
20+ Editor,
21+};
1522use tui::layout::Constraint;
1623
17−pub trait Item {
24+pub trait Item: Sync + Send + 'static {
1825 /// Additional editor state that is used for label calculation.
19− type Data;
26+ type Data: Sync + Send + 'static;
2027
2128 fn format(&self, data: &Self::Data) -> Row;
2229
@@ -51,9 +58,8 @@ pub struct Menu<T: Item> {
5158
5259 cursor: Option<usize>,
5360
54− matcher: Box<Matcher>,
5561 /// (index, score)
56− matches: Vec<(usize, i64)>,
62+ matches: Vec<(u32, u32)>,
5763
5864 widths: Vec<Constraint>,
5965
@@ -75,11 +81,10 @@ impl<T: Item> Menu<T> {
7581 editor_data: <T as Item>::Data,
7682 callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
7783 ) -> Self {
78− let matches = (0..options.len()).map(|i| (i, 0)).collect();
84+ let matches = (0..options.len() as u32).map(|i| (i, 0)).collect();
7985 Self {
8086 options,
8187 editor_data,
82− matcher: Box::new(Matcher::default().ignore_case()),
8388 matches,
8489 cursor: None,
8590 widths: Vec::new(),
@@ -94,20 +99,19 @@ impl<T: Item> Menu<T> {
9499 pub fn score(&mut self, pattern: &str) {
95100 // reuse the matches allocation
96101 self.matches.clear();
97− self.matches.extend(
98− self.options
99− .iter()
100− .enumerate()
101− .filter_map(|(index, option)| {
102− let text = option.filter_text(&self.editor_data);
103− // TODO: using fuzzy_indices could give us the char idx for match highlighting
104− self.matcher
105− .fuzzy_match(&text, pattern)
106− .map(|score| (index, score))
107− }),
108− );
109− // Order of equal elements needs to be preserved as LSP preselected items come in order of high to low priority
110− self.matches.sort_by_key(|(_, score)| -score);
102+ let mut matcher = MATCHER.lock();
103+ matcher.config = Config::DEFAULT;
104+ let pattern = Atom::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy, false);
105+ let mut buf = Vec::new();
106+ let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
107+ let text = option.filter_text(&self.editor_data);
108+ pattern
109+ .score(Utf32Str::new(&text, &mut buf), &mut matcher)
110+ .map(|score| (i as u32, score as u32))
111+ });
112+ self.matches.extend(matches);
113+ self.matches
114+ .sort_unstable_by_key(|&(i, score)| (Reverse(score), i));
111115
112116 // reset cursor position
113117 self.cursor = None;
@@ -201,7 +205,7 @@ impl<T: Item> Menu<T> {
201205 self.cursor.and_then(|cursor| {
202206 self.matches
203207 .get(cursor)
204− .map(|(index, _score)| &self.options[*index])
208+ .map(|(index, _score)| &self.options[*index as usize])
205209 })
206210 }
207211
@@ -209,7 +213,7 @@ impl<T: Item> Menu<T> {
209213 self.cursor.and_then(|cursor| {
210214 self.matches
211215 .get(cursor)
212− .map(|(index, _score)| &mut self.options[*index])
216+ .map(|(index, _score)| &mut self.options[*index as usize])
213217 })
214218 }
215219
@@ -247,6 +251,21 @@ impl<T: Item + 'static> Component for Menu<T> {
247251 compositor.pop();
248252 }));
249253
254+ // Ignore tab key when supertab is turned on in order not to interfere
255+ // with it. (Is there a better way to do this?)
256+ if (event == key!(Tab) || event == shift!(Tab))
257+ && cx.editor.config().auto_completion
258+ && matches!(
259+ cx.editor.config().smart_tab,
260+ Some(SmartTabConfig {
261+ enable: true,
262+ supersede_menu: true,
263+ })
264+ )
265+ {
266+ return EventResult::Ignored(None);
267+ }
268+
250269 match event {
251270 // esc or ctrl-c aborts the completion and closes the menu
252271 key!(Esc) | ctrl!('c') => {
@@ -310,6 +329,15 @@ impl<T: Item + 'static> Component for Menu<T> {
310329 let selected = theme.get("ui.menu.selected");
311330 surface.clear_with(area, style);
312331
332+ let render_borders = cx.editor.menu_border();
333+
334+ let area = if render_borders {
335+ Widget::render(Block::default().borders(Borders::ALL), area, surface);
336+ area.inner(&Margin::vertical(1))
337+ } else {
338+ area
339+ };
340+
313341 let scroll = self.scroll;
314342
315343 let options: Vec<_> = self
@@ -317,7 +345,7 @@ impl<T: Item + 'static> Component for Menu<T> {
317345 .iter()
318346 .map(|(index, _score)| {
319347 // (index, self.options.get(*index).unwrap()) // get_unchecked
320− &self.options[*index] // get_unchecked
348+ &self.options[*index as usize] // get_unchecked
321349 })
322350 .collect();
323351
@@ -350,15 +378,19 @@ impl<T: Item + 'static> Component for Menu<T> {
350378 false,
351379 );
352380
353− if let Some(cursor) = self.cursor {
354− let offset_from_top = cursor - scroll;
355− let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
356− left.set_style(selected);
357− let right = &mut surface[(
358− area.right().saturating_sub(1),
359− area.y + offset_from_top as u16,
360− )];
361− right.set_style(selected);
381+ let render_borders = cx.editor.menu_border();
382+
383+ if !render_borders {
384+ if let Some(cursor) = self.cursor {
385+ let offset_from_top = cursor - scroll;
386+ let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
387+ left.set_style(selected);
388+ let right = &mut surface[(
389+ area.right().saturating_sub(1),
390+ area.y + offset_from_top as u16,
391+ )];
392+ right.set_style(selected);
393+ }
362394 }
363395
364396 let fits = len <= win_height;
@@ -373,12 +405,13 @@ impl<T: Item + 'static> Component for Menu<T> {
373405 for i in 0..win_height {
374406 cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
375407
376− cell.set_symbol("▐"); // right half block
408+ let half_block = if render_borders { "▌" } else { "▐" };
377409
378410 if scroll_line <= i && i < scroll_line + scroll_height {
379411 // Draw scroll thumb
412+ cell.set_symbol(half_block);
380413 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
381− } else {
414+ } else if !render_borders {
382415 // Draw scroll track
383416 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
384417 }
helix-term/src/ui/mod.rs+101−164
@@ -1,13 +1,12 @@
11mod completion;
22mod document;
33pub(crate) mod editor;
4−mod fuzzy_match;
54mod info;
65pub mod lsp;
76mod markdown;
87pub mod menu;
98pub mod overlay;
10−mod picker;
9+pub mod picker;
1110pub mod popup;
1211mod prompt;
1312mod spinner;
@@ -21,7 +20,7 @@ pub use completion::{Completion, CompletionItem};
2120pub use editor::EditorView;
2221pub use markdown::Markdown;
2322pub use menu::Menu;
24−pub use picker::{DynamicPicker, FileLocation, FilePicker, Picker};
23+pub use picker::{DynamicPicker, FileLocation, Picker};
2524pub use popup::Popup;
2625pub use prompt::{Prompt, PromptEvent};
2726pub use spinner::{ProgressSpinners, Spinner};
@@ -64,7 +63,7 @@ pub fn regex_prompt(
6463 prompt: std::borrow::Cow<'static, str>,
6564 history_register: Option<char>,
6665 completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
67− fun: impl Fn(&mut Editor, Regex, PromptEvent) + 'static,
66+ fun: impl Fn(&mut crate::compositor::Context, Regex, PromptEvent) + 'static,
6867) {
6968 let (view, doc) = current!(cx.editor);
7069 let doc_id = view.doc;
@@ -111,7 +110,7 @@ pub fn regex_prompt(
111110 view.jumps.push((doc_id, snapshot.clone()));
112111 }
113112
114− fun(cx.editor, regex, event);
113+ fun(cx, regex, event);
115114
116115 let (view, doc) = current!(cx.editor);
117116 view.ensure_cursor_in_view(doc, config.scrolloff);
@@ -142,23 +141,21 @@ pub fn regex_prompt(
142141 };
143142
144143 cx.jobs.callback(callback);
145− } else {
146− // Update
147− // TODO: mark command line as error
148144 }
149145 }
150146 }
151147 }
152148 }
153149 },
154− );
150+ )
151+ .with_language("regex", std::sync::Arc::clone(&cx.editor.syn_loader));
155152 // Calculate initial completion
156153 prompt.recalculate_completion(cx.editor);
157154 // prompt
158155 cx.push_layer(Box::new(prompt));
159156}
160157
161−pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePicker<PathBuf> {
158+pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker<PathBuf> {
162159 use ignore::{types::TypesBuilder, WalkBuilder};
163160 use std::time::Instant;
164161
@@ -176,9 +173,13 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
176173 .git_ignore(config.file_picker.git_ignore)
177174 .git_global(config.file_picker.git_global)
178175 .git_exclude(config.file_picker.git_exclude)
176+ .sort_by_file_name(|name1, name2| name1.cmp(name2))
179177 .max_depth(config.file_picker.max_depth)
180178 .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
181179
180+ walk_builder.add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
181+ walk_builder.add_custom_ignore_filename(".helix/ignore");
182+
182183 // We want to exclude files that the editor can't handle yet
183184 let mut type_builder = TypesBuilder::new();
184185 type_builder
@@ -192,59 +193,60 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> FilePi
192193 .build()
193194 .expect("failed to build excluded_types");
194195 walk_builder.types(excluded_types);
195−
196− // We want files along with their modification date for sorting
197− let files = walk_builder.build().filter_map(|entry| {
196+ let mut files = walk_builder.build().filter_map(|entry| {
198197 let entry = entry.ok()?;
199− // This is faster than entry.path().is_dir() since it uses cached fs::Metadata fetched by ignore/walkdir
200− if entry.file_type()?.is_file() {
201− Some(entry.into_path())
202− } else {
203− None
198+ if !entry.file_type()?.is_file() {
199+ return None;
204200 }
201+ Some(entry.into_path())
205202 });
206−
207− // Cap the number of files if we aren't in a git project, preventing
208− // hangs when using the picker in your home directory
209− let mut files: Vec<PathBuf> = if root.join(".git").exists() {
210− files.collect()
211− } else {
212− // const MAX: usize = 8192;
213− const MAX: usize = 100_000;
214− files.take(MAX).collect()
215− };
216− files.sort();
217−
218203 log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
219204
220− FilePicker::new(
221− files,
222− root,
223− move |cx, path: &PathBuf, action| {
224− if let Err(e) = cx.editor.open(path, action) {
225− let err = if let Some(err) = e.source() {
226− format!("{}", err)
227− } else {
228− format!("unable to open \"{}\"", path.display())
229− };
230− cx.editor.set_error(err);
205+ let picker = Picker::new(Vec::new(), root, move |cx, path: &PathBuf, action| {
206+ if let Err(e) = cx.editor.open(path, action) {
207+ let err = if let Some(err) = e.source() {
208+ format!("{}", err)
209+ } else {
210+ format!("unable to open \"{}\"", path.display())
211+ };
212+ cx.editor.set_error(err);
213+ }
214+ })
215+ .with_preview(|_editor, path| Some((path.clone().into(), None)));
216+ let injector = picker.injector();
217+ let timeout = std::time::Instant::now() + std::time::Duration::from_millis(30);
218+
219+ let mut hit_timeout = false;
220+ for file in &mut files {
221+ if injector.push(file).is_err() {
222+ break;
223+ }
224+ if std::time::Instant::now() >= timeout {
225+ hit_timeout = true;
226+ break;
227+ }
228+ }
229+ if hit_timeout {
230+ std::thread::spawn(move || {
231+ for file in files {
232+ if injector.push(file).is_err() {
233+ break;
234+ }
231235 }
232− },
233− |_editor, path| Some((path.clone().into(), None)),
234− )
236+ });
237+ }
238+ picker
235239}
236240
237241pub mod completers {
238242 use crate::ui::prompt::Completion;
239− use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
240− use fuzzy_matcher::FuzzyMatcher;
243+ use helix_core::fuzzy::fuzzy_match;
241244 use helix_core::syntax::LanguageServerFeature;
242245 use helix_view::document::SCRATCH_BUFFER_NAME;
243246 use helix_view::theme;
244247 use helix_view::{editor::Config, Editor};
245248 use once_cell::sync::Lazy;
246249 use std::borrow::Cow;
247− use std::cmp::Reverse;
248250
249251 pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
250252
@@ -253,31 +255,16 @@ pub mod completers {
253255 }
254256
255257 pub fn buffer(editor: &Editor, input: &str) -> Vec<Completion> {
256− let mut names: Vec<_> = editor
257− .documents
258− .values()
259− .map(|doc| {
260− let name = doc
261− .relative_path()
262− .map(|p| p.display().to_string())
263− .unwrap_or_else(|| String::from(SCRATCH_BUFFER_NAME));
264− ((0..), Cow::from(name))
265− })
266− .collect();
267−
268− let matcher = Matcher::default();
269−
270− let mut matches: Vec<_> = names
271− .into_iter()
272− .filter_map(|(_range, name)| {
273− matcher.fuzzy_match(&name, input).map(|score| (name, score))
274− })
275− .collect();
276−
277− matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
278− names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
258+ let names = editor.documents.values().map(|doc| {
259+ doc.relative_path()
260+ .map(|p| p.display().to_string().into())
261+ .unwrap_or_else(|| Cow::from(SCRATCH_BUFFER_NAME))
262+ });
279263
280− names
264+ fuzzy_match(input, names, true)
265+ .into_iter()
266+ .map(|(name, _)| ((0..), name))
267+ .collect()
281268 }
282269
283270 pub fn theme(_editor: &Editor, input: &str) -> Vec<Completion> {
@@ -290,26 +277,10 @@ pub mod completers {
290277 names.sort();
291278 names.dedup();
292279
293− let mut names: Vec<_> = names
294− .into_iter()
295− .map(|name| ((0..), Cow::from(name)))
296− .collect();
297−
298− let matcher = Matcher::default();
299−
300− let mut matches: Vec<_> = names
280+ fuzzy_match(input, names, false)
301281 .into_iter()
302− .filter_map(|(_range, name)| {
303− matcher.fuzzy_match(&name, input).map(|score| (name, score))
304− })
305− .collect();
306−
307− matches.sort_unstable_by(|(name1, score1), (name2, score2)| {
308− (Reverse(*score1), name1).cmp(&(Reverse(*score2), name2))
309− });
310− names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
311−
312− names
282+ .map(|(name, _)| ((0..), name.into()))
283+ .collect()
313284 }
314285
315286 /// Recursive function to get all keys from this value and add them to vec
@@ -336,22 +307,22 @@ pub mod completers {
336307 keys
337308 });
338309
339− let matcher = Matcher::default();
340−
341− let mut matches: Vec<_> = KEYS
342− .iter()
343− .filter_map(|name| matcher.fuzzy_match(name, input).map(|score| (name, score)))
344− .collect();
345−
346− matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
347− matches
310+ fuzzy_match(input, &*KEYS, false)
348311 .into_iter()
349312 .map(|(name, _)| ((0..), name.into()))
350313 .collect()
351314 }
352315
353316 pub fn filename(editor: &Editor, input: &str) -> Vec<Completion> {
354− filename_impl(editor, input, |entry| {
317+ filename_with_git_ignore(editor, input, true)
318+ }
319+
320+ pub fn filename_with_git_ignore(
321+ editor: &Editor,
322+ input: &str,
323+ git_ignore: bool,
324+ ) -> Vec<Completion> {
325+ filename_impl(editor, input, git_ignore, |entry| {
355326 let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
356327
357328 if is_dir {
@@ -363,8 +334,6 @@ pub mod completers {
363334 }
364335
365336 pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
366− let matcher = Matcher::default();
367−
368337 let text: String = "text".into();
369338
370339 let language_ids = editor
@@ -373,27 +342,13 @@ pub mod completers {
373342 .map(|config| &config.language_id)
374343 .chain(std::iter::once(&text));
375344
376− let mut matches: Vec<_> = language_ids
377− .filter_map(|language_id| {
378− matcher
379− .fuzzy_match(language_id, input)
380− .map(|score| (language_id, score))
381− })
382− .collect();
383−
384− matches.sort_unstable_by(|(language1, score1), (language2, score2)| {
385− (Reverse(*score1), language1).cmp(&(Reverse(*score2), language2))
386− });
387−
388− matches
345+ fuzzy_match(input, language_ids, false)
389346 .into_iter()
390− .map(|(language, _score)| ((0..), language.clone().into()))
347+ .map(|(name, _)| ((0..), name.to_owned().into()))
391348 .collect()
392349 }
393350
394351 pub fn lsp_workspace_command(editor: &Editor, input: &str) -> Vec<Completion> {
395− let matcher = Matcher::default();
396−
397352 let Some(options) = doc!(editor)
398353 .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)
399354 .find_map(|ls| ls.capabilities().execute_command_provider.as_ref())
@@ -401,28 +356,22 @@ pub mod completers {
401356 return vec![];
402357 };
403358
404− let mut matches: Vec<_> = options
405− .commands
406− .iter()
407− .filter_map(|command| {
408− matcher
409− .fuzzy_match(command, input)
410− .map(|score| (command, score))
411− })
412− .collect();
413−
414− matches.sort_unstable_by(|(command1, score1), (command2, score2)| {
415− (Reverse(*score1), command1).cmp(&(Reverse(*score2), command2))
416− });
417−
418− matches
359+ fuzzy_match(input, &options.commands, false)
419360 .into_iter()
420− .map(|(command, _score)| ((0..), command.clone().into()))
361+ .map(|(name, _)| ((0..), name.to_owned().into()))
421362 .collect()
422363 }
423364
424365 pub fn directory(editor: &Editor, input: &str) -> Vec<Completion> {
425− filename_impl(editor, input, |entry| {
366+ directory_with_git_ignore(editor, input, true)
367+ }
368+
369+ pub fn directory_with_git_ignore(
370+ editor: &Editor,
371+ input: &str,
372+ git_ignore: bool,
373+ ) -> Vec<Completion> {
374+ filename_impl(editor, input, git_ignore, |entry| {
426375 let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
427376
428377 if is_dir {
@@ -445,7 +394,12 @@ pub mod completers {
445394 }
446395
447396 // TODO: we could return an iter/lazy thing so it can fetch as many as it needs.
448− fn filename_impl<F>(_editor: &Editor, input: &str, filter_fn: F) -> Vec<Completion>
397+ fn filename_impl<F>(
398+ _editor: &Editor,
399+ input: &str,
400+ git_ignore: bool,
401+ filter_fn: F,
402+ ) -> Vec<Completion>
449403 where
450404 F: Fn(&ignore::DirEntry) -> FileMatch,
451405 {
@@ -476,7 +430,7 @@ pub mod completers {
476430 match path.parent() {
477431 Some(path) if !path.as_os_str().is_empty() => path.to_path_buf(),
478432 // Path::new("h")'s parent is Some("")...
479− _ => std::env::current_dir().expect("couldn't determine current directory"),
433+ _ => helix_loader::current_working_dir(),
480434 }
481435 };
482436
@@ -485,9 +439,10 @@ pub mod completers {
485439
486440 let end = input.len()..;
487441
488− let mut files: Vec<_> = WalkBuilder::new(&dir)
442+ let files = WalkBuilder::new(&dir)
489443 .hidden(false)
490444 .follow_links(false) // We're scanning over depth 1
445+ .git_ignore(git_ignore)
491446 .max_depth(Some(1))
492447 .build()
493448 .filter_map(|file| {
@@ -516,43 +471,25 @@ pub mod completers {
516471 path.push("");
517472 }
518473
519− let path = path.to_str()?.to_owned();
520− Some((end.clone(), Cow::from(path)))
474+ let path = path.into_os_string().into_string().ok()?;
475+ Some(Cow::from(path))
521476 })
522477 }) // TODO: unwrap or skip
523− .filter(|(_, path)| !path.is_empty()) // TODO
524− .collect();
478+ .filter(|path| !path.is_empty());
525479
526480 // if empty, return a list of dirs and files in current dir
527481 if let Some(file_name) = file_name {
528− let matcher = Matcher::default();
529−
530− // inefficient, but we need to calculate the scores, filter out None, then sort.
531− let mut matches: Vec<_> = files
532− .into_iter()
533− .filter_map(|(_range, file)| {
534− matcher
535− .fuzzy_match(&file, &file_name)
536− .map(|score| (file, score))
537− })
538− .collect();
539−
540482 let range = (input.len().saturating_sub(file_name.len()))..;
541−
542− matches.sort_unstable_by(|(file1, score1), (file2, score2)| {
543− (Reverse(*score1), file1).cmp(&(Reverse(*score2), file2))
544− });
545−
546− files = matches
483+ fuzzy_match(&file_name, files, true)
547484 .into_iter()
548− .map(|(file, _)| (range.clone(), file))
549− .collect();
485+ .map(|(name, _)| (range.clone(), name))
486+ .collect()
550487
551488 // TODO: complete to longest common match
552489 } else {
490+ let mut files: Vec<_> = files.map(|file| (end.clone(), file)).collect();
553491 files.sort_unstable_by(|(_, path1), (_, path2)| path1.cmp(path2));
492+ files
554493 }
555−
556− files
557494 }
558495}
helix-term/src/ui/picker.rs+572−577
@@ -7,11 +7,12 @@ use crate::{
77 ui::{
88 self,
99 document::{render_document, LineDecoration, LinePos, TextRenderer},
10− fuzzy_match::FuzzyQuery,
1110 EditorView,
1211 },
1312};
1413use futures_util::{future::BoxFuture, FutureExt};
14+use nucleo::pattern::CaseMatching;
15+use nucleo::{Config, Nucleo, Utf32String};
1516use tui::{
1617 buffer::Buffer as Surface,
1718 layout::Constraint,
@@ -19,16 +20,23 @@ use tui::{
1920 widgets::{Block, BorderType, Borders, Cell, Table},
2021};
2122
22−use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
2323use tui::widgets::Widget;
2424
25−use std::cmp::{self, Ordering};
26−use std::{collections::HashMap, io::Read, path::PathBuf};
25+use std::{
26+ collections::HashMap,
27+ io::Read,
28+ path::PathBuf,
29+ sync::{
30+ atomic::{self, AtomicBool},
31+ Arc,
32+ },
33+};
2734
2835use crate::ui::{Prompt, PromptEvent};
2936use helix_core::{
30− movement::Direction, text_annotations::TextAnnotations,
31− unicode::segmentation::UnicodeSegmentation, Position, Syntax,
37+ char_idx_at_visual_offset, fuzzy::MATCHER, movement::Direction,
38+ text_annotations::TextAnnotations, unicode::segmentation::UnicodeSegmentation, Position,
39+ Syntax,
3240};
3341use helix_view::{
3442 editor::Action,
@@ -38,6 +46,7 @@ use helix_view::{
3846 Document, DocumentId, Editor,
3947};
4048
49+pub const ID: &str = "picker";
4150use super::{menu::Item, overlay::Overlay};
4251
4352pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
@@ -51,12 +60,12 @@ pub enum PathOrId {
5160}
5261
5362impl PathOrId {
54− fn get_canonicalized(self) -> std::io::Result<Self> {
63+ fn get_canonicalized(self) -> Self {
5564 use PathOrId::*;
56− Ok(match self {
57− Path(path) => Path(helix_core::path::get_canonicalized_path(&path)?),
65+ match self {
66+ Path(path) => Path(helix_core::path::get_canonicalized_path(&path)),
5867 Id(id) => Id(id),
59− })
68+ }
6069 }
6170}
6271
@@ -77,16 +86,6 @@ type FileCallback<T> = Box<dyn Fn(&Editor, &T) -> Option<FileLocation>>;
7786/// File path and range of lines (used to align and highlight lines)
7887pub type FileLocation = (PathOrId, Option<(usize, usize)>);
7988
80−pub struct FilePicker<T: Item> {
81− picker: Picker<T>,
82− pub truncate_start: bool,
83− /// Caches paths to documents
84− preview_cache: HashMap<PathBuf, CachedPreview>,
85− read_buffer: Vec<u8>,
86− /// Given an item in the picker, return the file path and line number to display.
87− file_fn: FileCallback<T>,
88−}
89−
9089pub enum CachedPreview {
9190 Document(Box<Document>),
9291 Binary,
@@ -113,9 +112,9 @@ impl Preview<'_, '_> {
113112 /// Alternate text to show for the preview.
114113 fn placeholder(&self) -> &str {
115114 match *self {
116− Self::EditorDocument(_) => "<File preview>",
115+ Self::EditorDocument(_) => "<Invalid file location>",
117116 Self::Cached(preview) => match preview {
118− CachedPreview::Document(_) => "<File preview>",
117+ CachedPreview::Document(_) => "<Invalid file location>",
119118 CachedPreview::Binary => "<Binary file>",
120119 CachedPreview::LargeFile => "<File too large to preview>",
121120 CachedPreview::NotFound => "<File not found>",
@@ -124,37 +123,275 @@ impl Preview<'_, '_> {
124123 }
125124}
126125
127−impl<T: Item + 'static> FilePicker<T> {
126+fn item_to_nucleo<T: Item>(item: T, editor_data: &T::Data) -> Option<(T, Utf32String)> {
127+ let row = item.format(editor_data);
128+ let mut cells = row.cells.iter();
129+ let mut text = String::with_capacity(row.cell_text().map(|cell| cell.len()).sum());
130+ let cell = cells.next()?;
131+ if let Some(cell) = cell.content.lines.first() {
132+ for span in &cell.0 {
133+ text.push_str(&span.content);
134+ }
135+ }
136+
137+ for cell in cells {
138+ text.push(' ');
139+ if let Some(cell) = cell.content.lines.first() {
140+ for span in &cell.0 {
141+ text.push_str(&span.content);
142+ }
143+ }
144+ }
145+ Some((item, text.into()))
146+}
147+
148+pub struct Injector<T: Item> {
149+ dst: nucleo::Injector<T>,
150+ editor_data: Arc<T::Data>,
151+ shutown: Arc<AtomicBool>,
152+}
153+
154+impl<T: Item> Clone for Injector<T> {
155+ fn clone(&self) -> Self {
156+ Injector {
157+ dst: self.dst.clone(),
158+ editor_data: self.editor_data.clone(),
159+ shutown: self.shutown.clone(),
160+ }
161+ }
162+}
163+
164+pub struct InjectorShutdown;
165+
166+impl<T: Item> Injector<T> {
167+ pub fn push(&self, item: T) -> Result<(), InjectorShutdown> {
168+ if self.shutown.load(atomic::Ordering::Relaxed) {
169+ return Err(InjectorShutdown);
170+ }
171+
172+ if let Some((item, matcher_text)) = item_to_nucleo(item, &self.editor_data) {
173+ self.dst.push(item, |dst| dst[0] = matcher_text);
174+ }
175+ Ok(())
176+ }
177+}
178+
179+pub struct Picker<T: Item> {
180+ editor_data: Arc<T::Data>,
181+ shutdown: Arc<AtomicBool>,
182+ matcher: Nucleo<T>,
183+
184+ /// Current height of the completions box
185+ completion_height: u16,
186+
187+ cursor: u32,
188+ prompt: Prompt,
189+ previous_pattern: String,
190+
191+ /// Whether to show the preview panel (default true)
192+ show_preview: bool,
193+ /// Constraints for tabular formatting
194+ widths: Vec<Constraint>,
195+
196+ callback_fn: PickerCallback<T>,
197+
198+ pub truncate_start: bool,
199+ /// Caches paths to documents
200+ preview_cache: HashMap<PathBuf, CachedPreview>,
201+ read_buffer: Vec<u8>,
202+ /// Given an item in the picker, return the file path and line number to display.
203+ file_fn: Option<FileCallback<T>>,
204+}
205+
206+impl<T: Item + 'static> Picker<T> {
207+ pub fn stream(editor_data: T::Data) -> (Nucleo<T>, Injector<T>) {
208+ let matcher = Nucleo::new(
209+ Config::DEFAULT,
210+ Arc::new(helix_event::request_redraw),
211+ None,
212+ 1,
213+ );
214+ let streamer = Injector {
215+ dst: matcher.injector(),
216+ editor_data: Arc::new(editor_data),
217+ shutown: Arc::new(AtomicBool::new(false)),
218+ };
219+ (matcher, streamer)
220+ }
221+
128222 pub fn new(
129223 options: Vec<T>,
130224 editor_data: T::Data,
131225 callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
132− preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
133226 ) -> Self {
134− let truncate_start = true;
135− let mut picker = Picker::new(options, editor_data, callback_fn);
136− picker.truncate_start = truncate_start;
227+ let matcher = Nucleo::new(
228+ Config::DEFAULT,
229+ Arc::new(helix_event::request_redraw),
230+ None,
231+ 1,
232+ );
233+ let injector = matcher.injector();
234+ for item in options {
235+ if let Some((item, matcher_text)) = item_to_nucleo(item, &editor_data) {
236+ injector.push(item, |dst| dst[0] = matcher_text);
237+ }
238+ }
239+ Self::with(
240+ matcher,
241+ Arc::new(editor_data),
242+ Arc::new(AtomicBool::new(false)),
243+ callback_fn,
244+ )
245+ }
246+
247+ pub fn with_stream(
248+ matcher: Nucleo<T>,
249+ injector: Injector<T>,
250+ callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
251+ ) -> Self {
252+ Self::with(matcher, injector.editor_data, injector.shutown, callback_fn)
253+ }
254+
255+ fn with(
256+ matcher: Nucleo<T>,
257+ editor_data: Arc<T::Data>,
258+ shutdown: Arc<AtomicBool>,
259+ callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
260+ ) -> Self {
261+ let prompt = Prompt::new(
262+ "".into(),
263+ None,
264+ ui::completers::none,
265+ |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
266+ );
137267
138268 Self {
139− picker,
140− truncate_start,
269+ matcher,
270+ editor_data,
271+ shutdown,
272+ cursor: 0,
273+ prompt,
274+ previous_pattern: String::new(),
275+ truncate_start: true,
276+ show_preview: true,
277+ callback_fn: Box::new(callback_fn),
278+ completion_height: 0,
279+ widths: Vec::new(),
141280 preview_cache: HashMap::new(),
142281 read_buffer: Vec::with_capacity(1024),
143− file_fn: Box::new(preview_fn),
282+ file_fn: None,
283+ }
284+ }
285+
286+ pub fn injector(&self) -> Injector<T> {
287+ Injector {
288+ dst: self.matcher.injector(),
289+ editor_data: self.editor_data.clone(),
290+ shutown: self.shutdown.clone(),
144291 }
145292 }
146293
147294 pub fn truncate_start(mut self, truncate_start: bool) -> Self {
148295 self.truncate_start = truncate_start;
149− self.picker.truncate_start = truncate_start;
150296 self
151297 }
152298
299+ pub fn with_preview(
300+ mut self,
301+ preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
302+ ) -> Self {
303+ self.file_fn = Some(Box::new(preview_fn));
304+ // assumption: if we have a preview we are matching paths... If this is ever
305+ // not true this could be a separate builder function
306+ self.matcher.update_config(Config::DEFAULT.match_paths());
307+ self
308+ }
309+
310+ pub fn set_options(&mut self, new_options: Vec<T>) {
311+ self.matcher.restart(false);
312+ let injector = self.matcher.injector();
313+ for item in new_options {
314+ if let Some((item, matcher_text)) = item_to_nucleo(item, &self.editor_data) {
315+ injector.push(item, |dst| dst[0] = matcher_text);
316+ }
317+ }
318+ }
319+
320+ /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
321+ pub fn move_by(&mut self, amount: u32, direction: Direction) {
322+ let len = self.matcher.snapshot().matched_item_count();
323+
324+ if len == 0 {
325+ // No results, can't move.
326+ return;
327+ }
328+
329+ match direction {
330+ Direction::Forward => {
331+ self.cursor = self.cursor.saturating_add(amount) % len;
332+ }
333+ Direction::Backward => {
334+ self.cursor = self.cursor.saturating_add(len).saturating_sub(amount) % len;
335+ }
336+ }
337+ }
338+
339+ /// Move the cursor down by exactly one page. After the last page comes the first page.
340+ pub fn page_up(&mut self) {
341+ self.move_by(self.completion_height as u32, Direction::Backward);
342+ }
343+
344+ /// Move the cursor up by exactly one page. After the first page comes the last page.
345+ pub fn page_down(&mut self) {
346+ self.move_by(self.completion_height as u32, Direction::Forward);
347+ }
348+
349+ /// Move the cursor to the first entry
350+ pub fn to_start(&mut self) {
351+ self.cursor = 0;
352+ }
353+
354+ /// Move the cursor to the last entry
355+ pub fn to_end(&mut self) {
356+ self.cursor = self
357+ .matcher
358+ .snapshot()
359+ .matched_item_count()
360+ .saturating_sub(1);
361+ }
362+
363+ pub fn selection(&self) -> Option<&T> {
364+ self.matcher
365+ .snapshot()
366+ .get_matched_item(self.cursor)
367+ .map(|item| item.data)
368+ }
369+
370+ pub fn toggle_preview(&mut self) {
371+ self.show_preview = !self.show_preview;
372+ }
373+
374+ fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
375+ if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
376+ let pattern = self.prompt.line();
377+ // TODO: better track how the pattern has changed
378+ if pattern != &self.previous_pattern {
379+ self.matcher.pattern.reparse(
380+ 0,
381+ pattern,
382+ CaseMatching::Smart,
383+ pattern.starts_with(&self.previous_pattern),
384+ );
385+ self.previous_pattern = pattern.clone();
386+ }
387+ }
388+ EventResult::Consumed(None)
389+ }
390+
153391 fn current_file(&self, editor: &Editor) -> Option<FileLocation> {
154− self.picker
155− .selection()
156− .and_then(|current| (self.file_fn)(editor, current))
157− .and_then(|(path_or_id, line)| path_or_id.get_canonicalized().ok().zip(Some(line)))
392+ self.selection()
393+ .and_then(|current| (self.file_fn.as_ref()?)(editor, current))
394+ .map(|(path_or_id, line)| (path_or_id.get_canonicalized(), line))
158395 }
159396
160397 /// Get (cached) preview for a given path. If a document corresponding
@@ -190,12 +427,9 @@ impl<T: Item + 'static> FilePicker<T> {
190427 (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
191428 CachedPreview::LargeFile
192429 }
193− _ => {
194− // TODO: enable syntax highlighting; blocked by async rendering
195− Document::open(path, None, None, editor.config.clone())
196− .map(|doc| CachedPreview::Document(Box::new(doc)))
197− .unwrap_or(CachedPreview::NotFound)
198− }
430+ _ => Document::open(path, None, None, editor.config.clone())
431+ .map(|doc| CachedPreview::Document(Box::new(doc)))
432+ .unwrap_or(CachedPreview::NotFound),
199433 },
200434 )
201435 .unwrap_or(CachedPreview::NotFound);
@@ -211,7 +445,7 @@ impl<T: Item + 'static> FilePicker<T> {
211445
212446 fn handle_idle_timeout(&mut self, cx: &mut Context) -> EventResult {
213447 let Some((current_file, _)) = self.current_file(cx.editor) else {
214− return EventResult::Consumed(None)
448+ return EventResult::Consumed(None);
215449 };
216450
217451 // Try to find a document in the cache
@@ -232,17 +466,24 @@ impl<T: Item + 'static> FilePicker<T> {
232466 let text = doc.text().clone();
233467 let loader = cx.editor.syn_loader.clone();
234468 let job = tokio::task::spawn_blocking(move || {
235− let syntax = language_config
236− .highlight_config(&loader.scopes())
237− .and_then(|highlight_config| Syntax::new(&text, highlight_config, loader));
469+ let syntax = language_config.highlight_config(&loader.scopes()).and_then(
470+ |highlight_config| Syntax::new(text.slice(..), highlight_config, loader),
471+ );
238472 let callback = move |editor: &mut Editor, compositor: &mut Compositor| {
239473 let Some(syntax) = syntax else {
240474 log::info!("highlighting picker item failed");
241− return
475+ return;
242476 };
243− let Some(Overlay { content: picker, .. }) = compositor.find::<Overlay<Self>>() else {
477+ let picker = match compositor.find::<Overlay<Self>>() {
478+ Some(Overlay { content, .. }) => Some(content),
479+ None => compositor
480+ .find::<Overlay<DynamicPicker<T>>>()
481+ .map(|overlay| &mut overlay.content.file_picker),
482+ };
483+ let Some(picker) = picker
484+ else {
244485 log::info!("picker closed before syntax highlighting finished");
245− return
486+ return;
246487 };
247488 // Try to find a document in the cache
248489 let doc = match current_file {
@@ -269,54 +510,197 @@ impl<T: Item + 'static> FilePicker<T> {
269510
270511 EventResult::Consumed(callback)
271512 }
272−}
273513
274−impl<T: Item + 'static> Component for FilePicker<T> {
275− fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
276− // +---------+ +---------+
277− // |prompt | |preview |
278− // +---------+ | |
279− // |picker | | |
280− // | | | |
281− // +---------+ +---------+
514+ fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
515+ let status = self.matcher.tick(10);
516+ let snapshot = self.matcher.snapshot();
517+ if status.changed {
518+ self.cursor = self
519+ .cursor
520+ .min(snapshot.matched_item_count().saturating_sub(1))
521+ }
522+
523+ let text_style = cx.editor.theme.get("ui.text");
524+ let selected = cx.editor.theme.get("ui.text.focus");
525+ let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
282526
283− let render_preview = self.picker.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
284527 // -- Render the frame:
285528 // clear area
286529 let background = cx.editor.theme.get("ui.background");
287− let text = cx.editor.theme.get("ui.text");
288530 surface.clear_with(area, background);
289531
290− let picker_width = if render_preview {
291− area.width / 2
292− } else {
293− area.width
294− };
532+ // don't like this but the lifetime sucks
533+ let block = Block::default().borders(Borders::ALL);
295534
296− let picker_area = area.with_width(picker_width);
297− self.picker.render(picker_area, surface, cx);
535+ // calculate the inner area inside the box
536+ let inner = block.inner(area);
298537
299− if !render_preview {
300− return;
538+ block.render(area, surface);
539+
540+ // -- Render the input bar:
541+
542+ let area = inner.clip_left(1).with_height(1);
543+ // render the prompt first since it will clear its background
544+ self.prompt.render(area, surface, cx);
545+
546+ let count = format!(
547+ "{}{}/{}",
548+ if status.running { "(running) " } else { "" },
549+ snapshot.matched_item_count(),
550+ snapshot.item_count(),
551+ );
552+ surface.set_stringn(
553+ (area.x + area.width).saturating_sub(count.len() as u16 + 1),
554+ area.y,
555+ &count,
556+ (count.len()).min(area.width as usize),
557+ text_style,
558+ );
559+
560+ // -- Separator
561+ let sep_style = cx.editor.theme.get("ui.background.separator");
562+ let borders = BorderType::line_symbols(BorderType::Plain);
563+ for x in inner.left()..inner.right() {
564+ if let Some(cell) = surface.get_mut(x, inner.y + 1) {
565+ cell.set_symbol(borders.horizontal).set_style(sep_style);
566+ }
567+ }
568+
569+ // -- Render the contents:
570+ // subtract area of prompt from top
571+ let inner = inner.clip_top(2);
572+ let rows = inner.height as u32;
573+ let offset = self.cursor - (self.cursor % std::cmp::max(1, rows));
574+ let cursor = self.cursor.saturating_sub(offset);
575+ let end = offset
576+ .saturating_add(rows)
577+ .min(snapshot.matched_item_count());
578+ let mut indices = Vec::new();
579+ let mut matcher = MATCHER.lock();
580+ matcher.config = Config::DEFAULT;
581+ if self.file_fn.is_some() {
582+ matcher.config.set_match_paths()
301583 }
302584
303− let preview_area = area.clip_left(picker_width);
585+ let options = snapshot.matched_items(offset..end).map(|item| {
586+ snapshot.pattern().column_pattern(0).indices(
587+ item.matcher_columns[0].slice(..),
588+ &mut matcher,
589+ &mut indices,
590+ );
591+ indices.sort_unstable();
592+ indices.dedup();
593+ let mut row = item.data.format(&self.editor_data);
594+
595+ let mut grapheme_idx = 0u32;
596+ let mut indices = indices.drain(..);
597+ let mut next_highlight_idx = indices.next().unwrap_or(u32::MAX);
598+ if self.widths.len() < row.cells.len() {
599+ self.widths.resize(row.cells.len(), Constraint::Length(0));
600+ }
601+ let mut widths = self.widths.iter_mut();
602+ for cell in &mut row.cells {
603+ let Some(Constraint::Length(max_width)) = widths.next() else {
604+ unreachable!();
605+ };
606+
607+ // merge index highlights on top of existing hightlights
608+ let mut span_list = Vec::new();
609+ let mut current_span = String::new();
610+ let mut current_style = Style::default();
611+ let mut width = 0;
612+
613+ let spans: &[Span] = cell.content.lines.first().map_or(&[], |it| it.0.as_slice());
614+ for span in spans {
615+ // this looks like a bug on first glance, we are iterating
616+ // graphemes but treating them as char indices. The reason that
617+ // this is correct is that nucleo will only ever consider the first char
618+ // of a grapheme (and discard the rest of the grapheme) so the indices
619+ // returned by nucleo are essentially grapheme indecies
620+ for grapheme in span.content.graphemes(true) {
621+ let style = if grapheme_idx == next_highlight_idx {
622+ next_highlight_idx = indices.next().unwrap_or(u32::MAX);
623+ span.style.patch(highlight_style)
624+ } else {
625+ span.style
626+ };
627+ if style != current_style {
628+ if !current_span.is_empty() {
629+ span_list.push(Span::styled(current_span, current_style))
630+ }
631+ current_span = String::new();
632+ current_style = style;
633+ }
634+ current_span.push_str(grapheme);
635+ grapheme_idx += 1;
636+ }
637+ width += span.width();
638+ }
639+
640+ span_list.push(Span::styled(current_span, current_style));
641+ if width as u16 > *max_width {
642+ *max_width = width as u16;
643+ }
644+ *cell = Cell::from(Spans::from(span_list));
645+
646+ // spacer
647+ if grapheme_idx == next_highlight_idx {
648+ next_highlight_idx = indices.next().unwrap_or(u32::MAX);
649+ }
650+ grapheme_idx += 1;
651+ }
652+
653+ row
654+ });
655+
656+ let table = Table::new(options)
657+ .style(text_style)
658+ .highlight_style(selected)
659+ .highlight_symbol(" > ")
660+ .column_spacing(1)
661+ .widths(&self.widths);
662+
663+ use tui::widgets::TableState;
664+
665+ table.render_table(
666+ inner,
667+ surface,
668+ &mut TableState {
669+ offset: 0,
670+ selected: Some(cursor as usize),
671+ },
672+ self.truncate_start,
673+ );
674+ }
675+
676+ fn render_preview(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
677+ // -- Render the frame:
678+ // clear area
679+ let background = cx.editor.theme.get("ui.background");
680+ let text = cx.editor.theme.get("ui.text");
681+ surface.clear_with(area, background);
304682
305683 // don't like this but the lifetime sucks
306684 let block = Block::default().borders(Borders::ALL);
307685
308686 // calculate the inner area inside the box
309− let inner = block.inner(preview_area);
687+ let inner = block.inner(area);
310688 // 1 column gap on either side
311689 let margin = Margin::horizontal(1);
312690 let inner = inner.inner(&margin);
313− block.render(preview_area, surface);
691+ block.render(area, surface);
314692
315693 if let Some((path, range)) = self.current_file(cx.editor) {
316694 let preview = self.get_preview(path, cx.editor);
317695 let doc = match preview.document() {
318− Some(doc) => doc,
319− None => {
696+ Some(doc)
697+ if range.map_or(true, |(start, end)| {
698+ start <= end && end <= doc.text().len_lines()
699+ }) =>
700+ {
701+ doc
702+ }
703+ _ => {
320704 let alt_text = preview.placeholder();
321705 let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2;
322706 let y = inner.y + inner.height / 2;
@@ -325,32 +709,47 @@ impl<T: Item + 'static> Component for FilePicker<T> {
325709 }
326710 };
327711
328− // align to middle
329− let first_line = range
330− .map(|(start, end)| {
331− let height = end.saturating_sub(start) + 1;
332− let middle = start + (height.saturating_sub(1) / 2);
333− middle.saturating_sub(inner.height as usize / 2).min(start)
334− })
335− .unwrap_or(0);
336−
337− let offset = ViewPosition {
338− anchor: doc.text().line_to_char(first_line),
339− horizontal_offset: 0,
340− vertical_offset: 0,
341− };
712+ let mut offset = ViewPosition::default();
713+ if let Some((start_line, end_line)) = range {
714+ let height = end_line - start_line;
715+ let text = doc.text().slice(..);
716+ let start = text.line_to_char(start_line);
717+ let middle = text.line_to_char(start_line + height / 2);
718+ if height < inner.height as usize {
719+ let text_fmt = doc.text_format(inner.width, None);
720+ let annotations = TextAnnotations::default();
721+ (offset.anchor, offset.vertical_offset) = char_idx_at_visual_offset(
722+ text,
723+ middle,
724+ // align to middle
725+ -(inner.height as isize / 2),
726+ 0,
727+ &text_fmt,
728+ &annotations,
729+ );
730+ if start < offset.anchor {
731+ offset.anchor = start;
732+ offset.vertical_offset = 0;
733+ }
734+ } else {
735+ offset.anchor = start;
736+ }
737+ }
342738
343− let mut highlights = EditorView::doc_syntax_highlights(
739+ let syntax_highlights = EditorView::doc_syntax_highlights(
344740 doc,
345741 offset.anchor,
346742 area.height,
347743 &cx.editor.theme,
348744 );
745+
746+ let mut overlay_highlights =
747+ EditorView::empty_highlight_iter(doc, offset.anchor, area.height);
349748 for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
350749 if spans.is_empty() {
351750 continue;
352751 }
353− highlights = Box::new(helix_core::syntax::merge(highlights, spans));
752+ overlay_highlights = Box::new(helix_core::syntax::merge(overlay_highlights, spans));
354753 }
355754 let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
356755
@@ -381,332 +780,81 @@ impl<T: Item + 'static> Component for FilePicker<T> {
381780 offset,
382781 // TODO: compute text annotations asynchronously here (like inlay hints)
383782 &TextAnnotations::default(),
384− highlights,
783+ syntax_highlights,
784+ overlay_highlights,
385785 &cx.editor.theme,
386786 &mut decorations,
387787 &mut [],
388788 );
389789 }
390790 }
391−
392− fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
393− if let Event::IdleTimeout = event {
394− return self.handle_idle_timeout(ctx);
395− }
396− // TODO: keybinds for scrolling preview
397− self.picker.handle_event(event, ctx)
398− }
399−
400− fn cursor(&self, area: Rect, ctx: &Editor) -> (Option<Position>, CursorKind) {
401− self.picker.cursor(area, ctx)
402− }
403−
404− fn required_size(&mut self, (width, height): (u16, u16)) -> Option<(u16, u16)> {
405− let picker_width = if width > MIN_AREA_WIDTH_FOR_PREVIEW {
406− width / 2
407− } else {
408− width
409− };
410− self.picker.required_size((picker_width, height))?;
411− Some((width, height))
412− }
413−
414− fn id(&self) -> Option<&'static str> {
415− Some("file-picker")
416− }
417−}
418−
419−#[derive(PartialEq, Eq, Debug)]
420−struct PickerMatch {
421− score: i64,
422− index: usize,
423− len: usize,
424−}
425−
426−impl PickerMatch {
427− fn key(&self) -> impl Ord {
428− (cmp::Reverse(self.score), self.len, self.index)
429− }
430−}
431−
432−impl PartialOrd for PickerMatch {
433− fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
434− Some(self.cmp(other))
435− }
436−}
437−
438−impl Ord for PickerMatch {
439− fn cmp(&self, other: &Self) -> Ordering {
440− self.key().cmp(&other.key())
441− }
442−}
443−
444−type PickerCallback<T> = Box<dyn Fn(&mut Context, &T, Action)>;
445−
446−pub struct Picker<T: Item> {
447− options: Vec<T>,
448− editor_data: T::Data,
449− // filter: String,
450− matcher: Box<Matcher>,
451− matches: Vec<PickerMatch>,
452−
453− /// Current height of the completions box
454− completion_height: u16,
455−
456− cursor: usize,
457− // pattern: String,
458− prompt: Prompt,
459− previous_pattern: (String, FuzzyQuery),
460− /// Whether to truncate the start (default true)
461− pub truncate_start: bool,
462− /// Whether to show the preview panel (default true)
463− show_preview: bool,
464− /// Constraints for tabular formatting
465− widths: Vec<Constraint>,
466−
467− callback_fn: PickerCallback<T>,
468791}
469792
470−impl<T: Item> Picker<T> {
471− pub fn new(
472− options: Vec<T>,
473− editor_data: T::Data,
474− callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
475− ) -> Self {
476− let prompt = Prompt::new(
477− "".into(),
478− None,
479− ui::completers::none,
480− |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
481− );
482−
483− let mut picker = Self {
484− options,
485− editor_data,
486− matcher: Box::default(),
487− matches: Vec::new(),
488− cursor: 0,
489− prompt,
490− previous_pattern: (String::new(), FuzzyQuery::default()),
491− truncate_start: true,
492− show_preview: true,
493− callback_fn: Box::new(callback_fn),
494− completion_height: 0,
495− widths: Vec::new(),
496− };
497−
498− picker.calculate_column_widths();
499−
500− // scoring on empty input
501− // TODO: just reuse score()
502− picker
503− .matches
504− .extend(picker.options.iter().enumerate().map(|(index, option)| {
505− let text = option.filter_text(&picker.editor_data);
506− PickerMatch {
507− index,
508− score: 0,
509− len: text.chars().count(),
510− }
511− }));
512−
513− picker
514− }
515−
516− pub fn set_options(&mut self, new_options: Vec<T>) {
517− self.options = new_options;
518− self.cursor = 0;
519− self.force_score();
520− self.calculate_column_widths();
521− }
522−
523− /// Calculate the width constraints using the maximum widths of each column
524− /// for the current options.
525− fn calculate_column_widths(&mut self) {
526− let n = self
527− .options
528− .first()
529− .map(|option| option.format(&self.editor_data).cells.len())
530− .unwrap_or_default();
531− let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
532− let row = option.format(&self.editor_data);
533− // maintain max for each column
534− for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
535− let width = cell.content.width();
536− if width > *acc {
537− *acc = width;
538− }
539− }
540− acc
541− });
542− self.widths = max_lens
543− .into_iter()
544− .map(|len| Constraint::Length(len as u16))
545− .collect();
546− }
547−
548− pub fn score(&mut self) {
549− let pattern = self.prompt.line();
550−
551− if pattern == &self.previous_pattern.0 {
552− return;
553− }
793+impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
794+ fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
795+ // +---------+ +---------+
796+ // |prompt | |preview |
797+ // +---------+ | |
798+ // |picker | | |
799+ // | | | |
800+ // +---------+ +---------+
554801
555− let (query, is_refined) = self
556− .previous_pattern
557− .1
558− .refine(pattern, &self.previous_pattern.0);
559−
560− if pattern.is_empty() {
561− // Fast path for no pattern.
562− self.matches.clear();
563− self.matches
564− .extend(self.options.iter().enumerate().map(|(index, option)| {
565− let text = option.filter_text(&self.editor_data);
566− PickerMatch {
567− index,
568− score: 0,
569− len: text.chars().count(),
570− }
571− }));
572− } else if is_refined {
573− // optimization: if the pattern is a more specific version of the previous one
574− // then we can score the filtered set.
575− self.matches.retain_mut(|pmatch| {
576− let option = &self.options[pmatch.index];
577− let text = option.sort_text(&self.editor_data);
578−
579− match query.fuzzy_match(&text, &self.matcher) {
580− Some(s) => {
581− // Update the score
582− pmatch.score = s;
583− true
584− }
585− None => false,
586− }
587− });
802+ let render_preview =
803+ self.show_preview && self.file_fn.is_some() && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
588804
589− self.matches.sort_unstable();
805+ let picker_width = if render_preview {
806+ area.width / 2
590807 } else {
591− self.force_score();
592− }
593−
594− // reset cursor position
595− self.cursor = 0;
596− let pattern = self.prompt.line();
597− self.previous_pattern.0.clone_from(pattern);
598− self.previous_pattern.1 = query;
599− }
600−
601− pub fn force_score(&mut self) {
602− let pattern = self.prompt.line();
603−
604− let query = FuzzyQuery::new(pattern);
605− self.matches.clear();
606− self.matches.extend(
607− self.options
608− .iter()
609− .enumerate()
610− .filter_map(|(index, option)| {
611− let text = option.filter_text(&self.editor_data);
612−
613− query
614− .fuzzy_match(&text, &self.matcher)
615− .map(|score| PickerMatch {
616− index,
617− score,
618− len: text.chars().count(),
619− })
620− }),
621− );
622−
623− self.matches.sort_unstable();
624− }
808+ area.width
809+ };
625810
626− /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
627− pub fn move_by(&mut self, amount: usize, direction: Direction) {
628− let len = self.matches.len();
811+ let picker_area = area.with_width(picker_width);
812+ self.render_picker(picker_area, surface, cx);
629813
630− if len == 0 {
631− // No results, can't move.
632− return;
633− }
634−
635− match direction {
636− Direction::Forward => {
637− self.cursor = self.cursor.saturating_add(amount) % len;
638− }
639− Direction::Backward => {
640− self.cursor = self.cursor.saturating_add(len).saturating_sub(amount) % len;
641− }
814+ if render_preview {
815+ let preview_area = area.clip_left(picker_width);
816+ self.render_preview(preview_area, surface, cx);
642817 }
643818 }
644819
645− /// Move the cursor down by exactly one page. After the last page comes the first page.
646− pub fn page_up(&mut self) {
647− self.move_by(self.completion_height as usize, Direction::Backward);
648− }
649−
650− /// Move the cursor up by exactly one page. After the first page comes the last page.
651− pub fn page_down(&mut self) {
652− self.move_by(self.completion_height as usize, Direction::Forward);
653− }
654−
655− /// Move the cursor to the first entry
656− pub fn to_start(&mut self) {
657− self.cursor = 0;
658− }
659−
660− /// Move the cursor to the last entry
661− pub fn to_end(&mut self) {
662− self.cursor = self.matches.len().saturating_sub(1);
663− }
664−
665− pub fn selection(&self) -> Option<&T> {
666− self.matches
667− .get(self.cursor)
668− .map(|pmatch| &self.options[pmatch.index])
669− }
670−
671− pub fn toggle_preview(&mut self) {
672− self.show_preview = !self.show_preview;
673− }
674−
675− fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
676− if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
677− // TODO: recalculate only if pattern changed
678− self.score();
820+ fn handle_event(&mut self, event: &Event, ctx: &mut Context) -> EventResult {
821+ if let Event::IdleTimeout = event {
822+ return self.handle_idle_timeout(ctx);
679823 }
680− EventResult::Consumed(None)
681− }
682−}
683−
684−// process:
685−// - read all the files into a list, maxed out at a large value
686−// - on input change:
687−// - score all the names in relation to input
688−
689−impl<T: Item + 'static> Component for Picker<T> {
690− fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
691− self.completion_height = viewport.1.saturating_sub(4);
692− Some(viewport)
693− }
824+ // TODO: keybinds for scrolling preview
694825
695− fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
696826 let key_event = match event {
697827 Event::Key(event) => *event,
698− Event::Paste(..) => return self.prompt_handle_event(event, cx),
828+ Event::Paste(..) => return self.prompt_handle_event(event, ctx),
699829 Event::Resize(..) => return EventResult::Consumed(None),
700830 _ => return EventResult::Ignored(None),
701831 };
702832
703− let close_fn = EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor, _cx| {
704− // remove the layer
705− compositor.last_picker = compositor.pop();
706− })));
833+ let close_fn = |picker: &mut Self| {
834+ // if the picker is very large don't store it as last_picker to avoid
835+ // excessive memory consumption
836+ let callback: compositor::Callback = if picker.matcher.snapshot().item_count() > 100_000
837+ {
838+ Box::new(|compositor: &mut Compositor, _ctx| {
839+ // remove the layer
840+ compositor.pop();
841+ })
842+ } else {
843+ // stop streaming in new items in the background, really we should
844+ // be restarting the stream somehow once the picker gets
845+ // reopened instead (like for an FS crawl) that would also remove the
846+ // need for the special case above but that is pretty tricky
847+ picker.shutdown.store(true, atomic::Ordering::Relaxed);
848+ Box::new(|compositor: &mut Compositor, _ctx| {
849+ // remove the layer
850+ compositor.last_picker = compositor.pop();
851+ })
852+ };
853+ EventResult::Consumed(Some(callback))
854+ };
707855
708856 // So that idle timeout retriggers
709− cx.editor.reset_idle_timer();
857+ ctx.editor.reset_idle_timer();
710858
711859 match key_event {
712860 shift!(Tab) | key!(Up) | ctrl!('p') => {
@@ -727,209 +875,41 @@ impl<T: Item + 'static> Component for Picker<T> {
727875 key!(End) => {
728876 self.to_end();
729877 }
730− key!(Esc) | ctrl!('c') => {
731− return close_fn;
732− }
878+ key!(Esc) | ctrl!('c') => return close_fn(self),
733879 alt!(Enter) => {
734880 if let Some(option) = self.selection() {
735− (self.callback_fn)(cx, option, Action::Load);
881+ (self.callback_fn)(ctx, option, Action::Load);
736882 }
737883 }
738884 key!(Enter) => {
739885 if let Some(option) = self.selection() {
740− (self.callback_fn)(cx, option, Action::Replace);
886+ (self.callback_fn)(ctx, option, Action::Replace);
741887 }
742− return close_fn;
888+ return close_fn(self);
743889 }
744890 ctrl!('s') => {
745891 if let Some(option) = self.selection() {
746− (self.callback_fn)(cx, option, Action::HorizontalSplit);
892+ (self.callback_fn)(ctx, option, Action::HorizontalSplit);
747893 }
748− return close_fn;
894+ return close_fn(self);
749895 }
750896 ctrl!('v') => {
751897 if let Some(option) = self.selection() {
752− (self.callback_fn)(cx, option, Action::VerticalSplit);
898+ (self.callback_fn)(ctx, option, Action::VerticalSplit);
753899 }
754− return close_fn;
900+ return close_fn(self);
755901 }
756902 ctrl!('t') => {
757903 self.toggle_preview();
758904 }
759905 _ => {
760− self.prompt_handle_event(event, cx);
906+ self.prompt_handle_event(event, ctx);
761907 }
762908 }
763909
764910 EventResult::Consumed(None)
765911 }
766912
767− fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
768− let text_style = cx.editor.theme.get("ui.text");
769− let selected = cx.editor.theme.get("ui.text.focus");
770− let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
771−
772− // -- Render the frame:
773− // clear area
774− let background = cx.editor.theme.get("ui.background");
775− surface.clear_with(area, background);
776−
777− // don't like this but the lifetime sucks
778− let block = Block::default().borders(Borders::ALL);
779−
780− // calculate the inner area inside the box
781− let inner = block.inner(area);
782−
783− block.render(area, surface);
784−
785− // -- Render the input bar:
786−
787− let area = inner.clip_left(1).with_height(1);
788−
789− let count = format!("{}/{}", self.matches.len(), self.options.len());
790− surface.set_stringn(
791− (area.x + area.width).saturating_sub(count.len() as u16 + 1),
792− area.y,
793− &count,
794− (count.len()).min(area.width as usize),
795− text_style,
796− );
797−
798− self.prompt.render(area, surface, cx);
799−
800− // -- Separator
801− let sep_style = cx.editor.theme.get("ui.background.separator");
802− let borders = BorderType::line_symbols(BorderType::Plain);
803− for x in inner.left()..inner.right() {
804− if let Some(cell) = surface.get_mut(x, inner.y + 1) {
805− cell.set_symbol(borders.horizontal).set_style(sep_style);
806− }
807− }
808−
809− // -- Render the contents:
810− // subtract area of prompt from top
811− let inner = inner.clip_top(2);
812−
813− let rows = inner.height;
814− let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));
815− let cursor = self.cursor.saturating_sub(offset);
816−
817− let options = self
818− .matches
819− .iter()
820− .skip(offset)
821− .take(rows as usize)
822− .map(|pmatch| &self.options[pmatch.index])
823− .map(|option| option.format(&self.editor_data))
824− .map(|mut row| {
825− const TEMP_CELL_SEP: &str = " ";
826−
827− let line = row.cell_text().fold(String::new(), |mut s, frag| {
828− s.push_str(&frag);
829− s.push_str(TEMP_CELL_SEP);
830− s
831− });
832−
833− // Items are filtered by using the text returned by menu::Item::filter_text
834− // but we do highlighting here using the text in Row and therefore there
835− // might be inconsistencies. This is the best we can do since only the
836− // text in Row is displayed to the end user.
837− let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
838− .fuzzy_indices(&line, &self.matcher)
839− .unwrap_or_default();
840−
841− let highlight_byte_ranges: Vec<_> = line
842− .char_indices()
843− .enumerate()
844− .filter_map(|(char_idx, (byte_offset, ch))| {
845− highlights
846− .contains(&char_idx)
847− .then(|| byte_offset..byte_offset + ch.len_utf8())
848− })
849− .collect();
850−
851− // The starting byte index of the current (iterating) cell
852− let mut cell_start_byte_offset = 0;
853− for cell in row.cells.iter_mut() {
854− let spans = match cell.content.lines.get(0) {
855− Some(s) => s,
856− None => {
857− cell_start_byte_offset += TEMP_CELL_SEP.len();
858− continue;
859− }
860− };
861−
862− let mut cell_len = 0;
863−
864− let graphemes_with_style: Vec<_> = spans
865− .0
866− .iter()
867− .flat_map(|span| {
868− span.content
869− .grapheme_indices(true)
870− .zip(std::iter::repeat(span.style))
871− })
872− .map(|((grapheme_byte_offset, grapheme), style)| {
873− cell_len += grapheme.len();
874− let start = cell_start_byte_offset;
875−
876− let grapheme_byte_range =
877− grapheme_byte_offset..grapheme_byte_offset + grapheme.len();
878−
879− if highlight_byte_ranges.iter().any(|hl_rng| {
880− hl_rng.start >= start + grapheme_byte_range.start
881− && hl_rng.end <= start + grapheme_byte_range.end
882− }) {
883− (grapheme, style.patch(highlight_style))
884− } else {
885− (grapheme, style)
886− }
887− })
888− .collect();
889−
890− let mut span_list: Vec<(String, Style)> = Vec::new();
891− for (grapheme, style) in graphemes_with_style {
892− if span_list.last().map(|(_, sty)| sty) == Some(&style) {
893− let (string, _) = span_list.last_mut().unwrap();
894− string.push_str(grapheme);
895− } else {
896− span_list.push((String::from(grapheme), style))
897− }
898− }
899−
900− let spans: Vec<Span> = span_list
901− .into_iter()
902− .map(|(string, style)| Span::styled(string, style))
903− .collect();
904− let spans: Spans = spans.into();
905− *cell = Cell::from(spans);
906−
907− cell_start_byte_offset += cell_len + TEMP_CELL_SEP.len();
908− }
909−
910− row
911− });
912−
913− let table = Table::new(options)
914− .style(text_style)
915− .highlight_style(selected)
916− .highlight_symbol(" > ")
917− .column_spacing(1)
918− .widths(&self.widths);
919−
920− use tui::widgets::TableState;
921−
922− table.render_table(
923− inner,
924− surface,
925− &mut TableState {
926− offset: 0,
927− selected: Some(cursor),
928− },
929− self.truncate_start,
930− );
931− }
932−
933913 fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
934914 let block = Block::default().borders(Borders::ALL);
935915 // calculate the inner area inside the box
@@ -940,8 +920,25 @@ impl<T: Item + 'static> Component for Picker<T> {
940920
941921 self.prompt.cursor(area, editor)
942922 }
923+
924+ fn required_size(&mut self, (width, height): (u16, u16)) -> Option<(u16, u16)> {
925+ self.completion_height = height.saturating_sub(4);
926+ Some((width, height))
927+ }
928+
929+ fn id(&self) -> Option<&'static str> {
930+ Some(ID)
931+ }
932+}
933+impl<T: Item> Drop for Picker<T> {
934+ fn drop(&mut self) {
935+ // ensure we cancel any ongoing background threads streaming into the picker
936+ self.shutdown.store(true, atomic::Ordering::Relaxed)
937+ }
943938}
944939
940+type PickerCallback<T> = Box<dyn Fn(&mut Context, &T, Action)>;
941+
945942/// Returns a new list of options to replace the contents of the picker
946943/// when called with the current picker query,
947944pub type DynQueryCallback<T> =
@@ -949,16 +946,14 @@ pub type DynQueryCallback<T> =
949946
950947/// A picker that updates its contents via a callback whenever the
951948/// query string changes. Useful for live grep, workspace symbols, etc.
952−pub struct DynamicPicker<T: ui::menu::Item + Send> {
953− file_picker: FilePicker<T>,
949+pub struct DynamicPicker<T: ui::menu::Item + Send + Sync> {
950+ file_picker: Picker<T>,
954951 query_callback: DynQueryCallback<T>,
955952 query: String,
956953}
957954
958−impl<T: ui::menu::Item + Send> DynamicPicker<T> {
959− pub const ID: &'static str = "dynamic-picker";
960−
961− pub fn new(file_picker: FilePicker<T>, query_callback: DynQueryCallback<T>) -> Self {
955+impl<T: ui::menu::Item + Send + Sync> DynamicPicker<T> {
956+ pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
962957 Self {
963958 file_picker,
964959 query_callback,
@@ -967,14 +962,14 @@ impl<T: ui::menu::Item + Send> DynamicPicker<T> {
967962 }
968963}
969964
970−impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
965+impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
971966 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
972967 self.file_picker.render(area, surface, cx);
973968 }
974969
975970 fn handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
976971 let event_result = self.file_picker.handle_event(event, cx);
977− let current_query = self.file_picker.picker.prompt.line();
972+ let current_query = self.file_picker.prompt.line();
978973
979974 if !matches!(event, Event::IdleTimeout) || self.query == *current_query {
980975 return event_result;
@@ -989,8 +984,8 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
989984 let callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
990985 // Wrapping of pickers in overlay is done outside the picker code,
991986 // so this is fragile and will break if wrapped in some other widget.
992− let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(Self::ID) {
993− Some(overlay) => &mut overlay.content.file_picker.picker,
987+ let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(ID) {
988+ Some(overlay) => &mut overlay.content.file_picker,
994989 None => return,
995990 };
996991 picker.set_options(new_options);
@@ -1010,6 +1005,6 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
10101005 }
10111006
10121007 fn id(&self) -> Option<&'static str> {
1013− Some(Self::ID)
1008+ Some(ID)
10141009 }
10151010}
helix-term/src/ui/popup.rs+27−7
@@ -3,7 +3,10 @@ use crate::{
33 compositor::{Callback, Component, Context, Event, EventResult},
44 ctrl, key,
55};
6−use tui::buffer::Buffer as Surface;
6+use tui::{
7+ buffer::Buffer as Surface,
8+ widgets::{Block, Borders, Widget},
9+};
710
811use helix_core::Position;
912use helix_view::{
@@ -252,13 +255,29 @@ impl<T: Component> Component for Popup<T> {
252255 let background = cx.editor.theme.get("ui.popup");
253256 surface.clear_with(area, background);
254257
255− let inner = area.inner(&self.margin);
258+ let render_borders = cx.editor.popup_border();
259+
260+ let inner = if self
261+ .contents
262+ .type_name()
263+ .starts_with("helix_term::ui::menu::Menu")
264+ {
265+ area
266+ } else {
267+ area.inner(&self.margin)
268+ };
269+
270+ let border = usize::from(render_borders);
271+ if render_borders {
272+ Widget::render(Block::default().borders(Borders::ALL), area, surface);
273+ }
274+
256275 self.contents.render(inner, surface, cx);
257276
258277 // render scrollbar if contents do not fit
259278 if self.has_scrollbar {
260− let win_height = inner.height as usize;
261− let len = self.child_size.1 as usize;
279+ let win_height = (inner.height as usize).saturating_sub(2 * border);
280+ let len = (self.child_size.1 as usize).saturating_sub(2 * border);
262281 let fits = len <= win_height;
263282 let scroll = self.scroll;
264283 let scroll_style = cx.editor.theme.get("ui.menu.scroll");
@@ -274,14 +293,15 @@ impl<T: Component> Component for Popup<T> {
274293
275294 let mut cell;
276295 for i in 0..win_height {
277− cell = &mut surface[(inner.right() - 1, inner.top() + i as u16)];
296+ cell = &mut surface[(inner.right() - 1, inner.top() + (border + i) as u16)];
278297
279− cell.set_symbol("▐"); // right half block
298+ let half_block = if render_borders { "▌" } else { "▐" };
280299
281300 if scroll_line <= i && i < scroll_line + scroll_height {
282301 // Draw scroll thumb
302+ cell.set_symbol(half_block);
283303 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
284− } else {
304+ } else if !render_borders {
285305 // Draw scroll track
286306 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
287307 }
helix-term/src/ui/prompt.rs+55−48
@@ -1,7 +1,9 @@
11use crate::compositor::{Component, Compositor, Context, Event, EventResult};
22use crate::{alt, ctrl, key, shift, ui};
3+use helix_core::syntax;
34use helix_view::input::KeyEvent;
45use helix_view::keyboard::KeyCode;
6+use std::sync::Arc;
57use std::{borrow::Cow, ops::RangeFrom};
68use tui::buffer::Buffer as Surface;
79use tui::widgets::{Block, Borders, Widget};
@@ -32,6 +34,7 @@ pub struct Prompt {
3234 callback_fn: CallbackFn,
3335 pub doc_fn: DocFn,
3436 next_char_handler: Option<PromptCharHandler>,
37+ language: Option<(&'static str, Arc<syntax::Loader>)>,
3538}
3639
3740#[derive(Clone, Copy, PartialEq, Eq)]
@@ -83,6 +86,7 @@ impl Prompt {
8386 callback_fn: Box::new(callback_fn),
8487 doc_fn: Box::new(|_| None),
8588 next_char_handler: None,
89+ language: None,
8690 }
8791 }
8892
@@ -94,6 +98,11 @@ impl Prompt {
9498 self
9599 }
96100
101+ pub fn with_language(mut self, language: &'static str, loader: Arc<syntax::Loader>) -> Self {
102+ self.language = Some((language, loader));
103+ self
104+ }
105+
97106 pub fn line(&self) -> &String {
98107 &self.line
99108 }
@@ -297,8 +306,8 @@ impl Prompt {
297306 direction: CompletionDirection,
298307 ) {
299308 (self.callback_fn)(cx, &self.line, PromptEvent::Abort);
300− let values = match cx.editor.registers.read(register) {
301− Some(values) if !values.is_empty() => values,
309+ let mut values = match cx.editor.registers.read(register, cx.editor) {
310+ Some(values) if values.len() > 0 => values.rev(),
302311 _ => return,
303312 };
304313
@@ -306,13 +315,16 @@ impl Prompt {
306315
307316 let index = match direction {
308317 CompletionDirection::Forward => self.history_pos.map_or(0, |i| i + 1),
309− CompletionDirection::Backward => {
310− self.history_pos.unwrap_or(values.len()).saturating_sub(1)
311− }
318+ CompletionDirection::Backward => self
319+ .history_pos
320+ .unwrap_or_else(|| values.len())
321+ .saturating_sub(1),
312322 }
313323 .min(end);
314324
315− self.line = values[index].clone();
325+ self.line = values.nth(index).unwrap().to_string();
326+ // Appease the borrow checker.
327+ drop(values);
316328
317329 self.history_pos = Some(index);
318330
@@ -356,6 +368,7 @@ impl Prompt {
356368 let completion_color = theme.get("ui.menu");
357369 let selected_color = theme.get("ui.menu.selected");
358370 let suggestion_color = theme.get("ui.text.inactive");
371+ let background = theme.get("ui.background");
359372 // completion
360373
361374 let max_len = self
@@ -451,33 +464,32 @@ impl Prompt {
451464 }
452465
453466 let line = area.height - 1;
467+ surface.clear_with(area.clip_top(line), background);
454468 // render buffer text
455469 surface.set_string(area.x, area.y + line, &self.prompt, prompt_color);
456470
457− let (input, is_suggestion): (Cow<str>, bool) = if self.line.is_empty() {
458− // latest value in the register list
459− match self
471+ let line_area = area.clip_left(self.prompt.len() as u16).clip_top(line);
472+ if self.line.is_empty() {
473+ // Show the most recently entered value as a suggestion.
474+ if let Some(suggestion) = self
460475 .history_register
461− .and_then(|reg| cx.editor.registers.last(reg))
462− .map(|entry| entry.into())
476+ .and_then(|reg| cx.editor.registers.first(reg, cx.editor))
463477 {
464− Some(value) => (value, true),
465− None => (Cow::from(""), false),
478+ surface.set_string(line_area.x, line_area.y, suggestion, suggestion_color);
466479 }
480+ } else if let Some((language, loader)) = self.language.as_ref() {
481+ let mut text: ui::text::Text = crate::ui::markdown::highlighted_code_block(
482+ &self.line,
483+ language,
484+ Some(&cx.editor.theme),
485+ loader.clone(),
486+ None,
487+ )
488+ .into();
489+ text.render(line_area, surface, cx);
467490 } else {
468− (self.line.as_str().into(), false)
469− };
470−
471− surface.set_string(
472− area.x + self.prompt.len() as u16,
473− area.y + line,
474− &input,
475− if is_suggestion {
476− suggestion_color
477− } else {
478− prompt_color
479− },
480− );
491+ surface.set_string(line_area.x, line_area.y, self.line.clone(), prompt_color);
492+ }
481493 }
482494}
483495
@@ -558,25 +570,29 @@ impl Component for Prompt {
558570 } else {
559571 let last_item = self
560572 .history_register
561− .and_then(|reg| cx.editor.registers.last(reg).cloned())
562− .map(|entry| entry.into())
563− .unwrap_or_else(|| Cow::from(""));
573+ .and_then(|reg| cx.editor.registers.first(reg, cx.editor))
574+ .map(|entry| entry.to_string())
575+ .unwrap_or_else(|| String::from(""));
564576
565577 // handle executing with last command in history if nothing entered
566− let input: Cow<str> = if self.line.is_empty() {
567− last_item
578+ let input = if self.line.is_empty() {
579+ &last_item
568580 } else {
569581 if last_item != self.line {
570582 // store in history
571583 if let Some(register) = self.history_register {
572− cx.editor.registers.push(register, self.line.clone());
584+ if let Err(err) =
585+ cx.editor.registers.push(register, self.line.clone())
586+ {
587+ cx.editor.set_error(err.to_string());
588+ }
573589 };
574590 }
575591
576− self.line.as_str().into()
592+ &self.line
577593 };
578594
579− (self.callback_fn)(cx, &input, PromptEvent::Validate);
595+ (self.callback_fn)(cx, input, PromptEvent::Validate);
580596
581597 return close_fn;
582598 }
@@ -608,25 +624,16 @@ impl Component for Prompt {
608624 self.completion = cx
609625 .editor
610626 .registers
611− .inner()
612− .iter()
613− .map(|(ch, reg)| {
614− let content = reg
615− .read()
616− .get(0)
617− .and_then(|s| s.lines().next().to_owned())
618− .unwrap_or_default();
619− (0.., format!("{} {}", ch, &content).into())
620− })
627+ .iter_preview()
628+ .map(|(ch, preview)| (0.., format!("{} {}", ch, &preview).into()))
621629 .collect();
622630 self.next_char_handler = Some(Box::new(|prompt, c, context| {
623631 prompt.insert_str(
624− context
632+ &context
625633 .editor
626634 .registers
627− .read(c)
628− .and_then(|r| r.first())
629− .map_or("", |r| r.as_str()),
635+ .first(c, context.editor)
636+ .unwrap_or_default(),
630637 context.editor,
631638 );
632639 }));
helix-term/src/ui/statusline.rs+14
@@ -145,6 +145,7 @@ where
145145 helix_view::editor::StatusLineElement::FileModificationIndicator => {
146146 render_file_modification_indicator
147147 }
148+ helix_view::editor::StatusLineElement::ReadOnlyIndicator => render_read_only_indicator,
148149 helix_view::editor::StatusLineElement::FileEncoding => render_file_encoding,
149150 helix_view::editor::StatusLineElement::FileLineEnding => render_file_line_ending,
150151 helix_view::editor::StatusLineElement::FileType => render_file_type,
@@ -442,6 +443,19 @@ where
442443 write(context, title, None);
443444}
444445
446+fn render_read_only_indicator<F>(context: &mut RenderContext, write: F)
447+where
448+ F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
449+{
450+ let title = if context.doc.readonly {
451+ " [readonly] "
452+ } else {
453+ ""
454+ }
455+ .to_string();
456+ write(context, title, None);
457+}
458+
445459fn render_file_base_name<F>(context: &mut RenderContext, write: F)
446460where
447461 F: Fn(&mut RenderContext, String, Option<Style>) + Copy,
helix-term/tests/integration.rs+1
@@ -18,6 +18,7 @@ mod test {
1818 mod auto_indent;
1919 mod auto_pairs;
2020 mod commands;
21+ mod languages;
2122 mod movement;
2223 mod prompt;
2324 mod splits;
helix-term/tests/test/auto_pairs.rs+1−1
@@ -2,7 +2,7 @@ use helix_core::{auto_pairs::DEFAULT_PAIRS, hashmap};
22
33use super::*;
44
5−const LINE_END: &str = helix_core::DEFAULT_LINE_ENDING.as_str();
5+const LINE_END: &str = helix_core::NATIVE_LINE_ENDING.as_str();
66
77fn differing_pairs() -> impl Iterator<Item = &'static (char, char)> {
88 DEFAULT_PAIRS.iter().filter(|(open, close)| open != close)
helix-term/tests/test/commands.rs+47
@@ -2,6 +2,7 @@ use helix_term::application::Application;
22
33use super::*;
44
5+mod movement;
56mod write;
67
78#[tokio::test(flavor = "multi_thread")]
@@ -479,3 +480,49 @@ fn bar() {#(\n|)#\
479480
480481 Ok(())
481482}
483+
484+#[tokio::test(flavor = "multi_thread")]
485+async fn test_join_selections() -> anyhow::Result<()> {
486+ // normal join
487+ test((
488+ platform_line(indoc! {"\
489+ #[a|]#bc
490+ def
491+ "}),
492+ "J",
493+ platform_line(indoc! {"\
494+ #[a|]#bc def
495+ "}),
496+ ))
497+ .await?;
498+
499+ // join with empty line
500+ test((
501+ platform_line(indoc! {"\
502+ #[a|]#bc
503+
504+ def
505+ "}),
506+ "JJ",
507+ platform_line(indoc! {"\
508+ #[a|]#bc def
509+ "}),
510+ ))
511+ .await?;
512+
513+ // join with additional space in non-empty line
514+ test((
515+ platform_line(indoc! {"\
516+ #[a|]#bc
517+
518+ def
519+ "}),
520+ "JJ",
521+ platform_line(indoc! {"\
522+ #[a|]#bc def
523+ "}),
524+ ))
525+ .await?;
526+
527+ Ok(())
528+}
helix-term/tests/test/commands/movement.rsnew file+452
@@ -0,0 +1,452 @@
1+use super::*;
2+
3+#[tokio::test(flavor = "multi_thread")]
4+async fn test_move_parent_node_end() -> anyhow::Result<()> {
5+ let tests = vec![
6+ // single cursor stays single cursor, first goes to end of current
7+ // node, then parent
8+ (
9+ helpers::platform_line(indoc! {r##"
10+ fn foo() {
11+ let result = if true {
12+ "yes"
13+ } else {
14+ "no#["|]#
15+ }
16+ }
17+ "##}),
18+ "<A-e>",
19+ helpers::platform_line(indoc! {"\
20+ fn foo() {
21+ let result = if true {
22+ \"yes\"
23+ } else {
24+ \"no\"#[\n|]#
25+ }
26+ }
27+ "}),
28+ ),
29+ (
30+ helpers::platform_line(indoc! {"\
31+ fn foo() {
32+ let result = if true {
33+ \"yes\"
34+ } else {
35+ \"no\"#[\n|]#
36+ }
37+ }
38+ "}),
39+ "<A-e>",
40+ helpers::platform_line(indoc! {"\
41+ fn foo() {
42+ let result = if true {
43+ \"yes\"
44+ } else {
45+ \"no\"
46+ }#[\n|]#
47+ }
48+ "}),
49+ ),
50+ // select mode extends
51+ (
52+ helpers::platform_line(indoc! {r##"
53+ fn foo() {
54+ let result = if true {
55+ "yes"
56+ } else {
57+ #["no"|]#
58+ }
59+ }
60+ "##}),
61+ "v<A-e><A-e>",
62+ helpers::platform_line(indoc! {"\
63+ fn foo() {
64+ let result = if true {
65+ \"yes\"
66+ } else {
67+ #[\"no\"
68+ }\n|]#
69+ }
70+ "}),
71+ ),
72+ ];
73+
74+ for test in tests {
75+ test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
76+ }
77+
78+ Ok(())
79+}
80+
81+#[tokio::test(flavor = "multi_thread")]
82+async fn test_move_parent_node_start() -> anyhow::Result<()> {
83+ let tests = vec![
84+ // single cursor stays single cursor, first goes to end of current
85+ // node, then parent
86+ (
87+ helpers::platform_line(indoc! {r##"
88+ fn foo() {
89+ let result = if true {
90+ "yes"
91+ } else {
92+ "no#["|]#
93+ }
94+ }
95+ "##}),
96+ "<A-b>",
97+ helpers::platform_line(indoc! {"\
98+ fn foo() {
99+ let result = if true {
100+ \"yes\"
101+ } else {
102+ #[\"|]#no\"
103+ }
104+ }
105+ "}),
106+ ),
107+ (
108+ helpers::platform_line(indoc! {"\
109+ fn foo() {
110+ let result = if true {
111+ \"yes\"
112+ } else {
113+ \"no\"#[\n|]#
114+ }
115+ }
116+ "}),
117+ "<A-b>",
118+ helpers::platform_line(indoc! {"\
119+ fn foo() {
120+ let result = if true {
121+ \"yes\"
122+ } else #[{|]#
123+ \"no\"
124+ }
125+ }
126+ "}),
127+ ),
128+ (
129+ helpers::platform_line(indoc! {"\
130+ fn foo() {
131+ let result = if true {
132+ \"yes\"
133+ } else #[{|]#
134+ \"no\"
135+ }
136+ }
137+ "}),
138+ "<A-b>",
139+ helpers::platform_line(indoc! {"\
140+ fn foo() {
141+ let result = if true {
142+ \"yes\"
143+ } #[e|]#lse {
144+ \"no\"
145+ }
146+ }
147+ "}),
148+ ),
149+ // select mode extends
150+ (
151+ helpers::platform_line(indoc! {r##"
152+ fn foo() {
153+ let result = if true {
154+ "yes"
155+ } else {
156+ #["no"|]#
157+ }
158+ }
159+ "##}),
160+ "v<A-b><A-b>",
161+ helpers::platform_line(indoc! {"\
162+ fn foo() {
163+ let result = if true {
164+ \"yes\"
165+ } else #[|{
166+ ]#\"no\"
167+ }
168+ }
169+ "}),
170+ ),
171+ (
172+ helpers::platform_line(indoc! {r##"
173+ fn foo() {
174+ let result = if true {
175+ "yes"
176+ } else {
177+ #["no"|]#
178+ }
179+ }
180+ "##}),
181+ "v<A-b><A-b><A-b>",
182+ helpers::platform_line(indoc! {"\
183+ fn foo() {
184+ let result = if true {
185+ \"yes\"
186+ } #[|else {
187+ ]#\"no\"
188+ }
189+ }
190+ "}),
191+ ),
192+ ];
193+
194+ for test in tests {
195+ test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
196+ }
197+
198+ Ok(())
199+}
200+
201+#[tokio::test(flavor = "multi_thread")]
202+async fn test_smart_tab_move_parent_node_end() -> anyhow::Result<()> {
203+ let tests = vec![
204+ // single cursor stays single cursor, first goes to end of current
205+ // node, then parent
206+ (
207+ helpers::platform_line(indoc! {r##"
208+ fn foo() {
209+ let result = if true {
210+ "yes"
211+ } else {
212+ "no#["|]#
213+ }
214+ }
215+ "##}),
216+ "i<tab>",
217+ helpers::platform_line(indoc! {"\
218+ fn foo() {
219+ let result = if true {
220+ \"yes\"
221+ } else {
222+ \"no\"#[|\n]#
223+ }
224+ }
225+ "}),
226+ ),
227+ (
228+ helpers::platform_line(indoc! {"\
229+ fn foo() {
230+ let result = if true {
231+ \"yes\"
232+ } else {
233+ \"no\"#[\n|]#
234+ }
235+ }
236+ "}),
237+ "i<tab>",
238+ helpers::platform_line(indoc! {"\
239+ fn foo() {
240+ let result = if true {
241+ \"yes\"
242+ } else {
243+ \"no\"
244+ }#[|\n]#
245+ }
246+ "}),
247+ ),
248+ // appending to the end of a line should still look at the current
249+ // line, not the next one
250+ (
251+ helpers::platform_line(indoc! {"\
252+ fn foo() {
253+ let result = if true {
254+ \"yes\"
255+ } else {
256+ \"no#[\"|]#
257+ }
258+ }
259+ "}),
260+ "a<tab>",
261+ helpers::platform_line(indoc! {"\
262+ fn foo() {
263+ let result = if true {
264+ \"yes\"
265+ } else {
266+ \"no\"
267+ }#[\n|]#
268+ }
269+ "}),
270+ ),
271+ // before cursor is all whitespace, so insert tab
272+ (
273+ helpers::platform_line(indoc! {"\
274+ fn foo() {
275+ let result = if true {
276+ \"yes\"
277+ } else {
278+ #[\"no\"|]#
279+ }
280+ }
281+ "}),
282+ "i<tab>",
283+ helpers::platform_line(indoc! {"\
284+ fn foo() {
285+ let result = if true {
286+ \"yes\"
287+ } else {
288+ #[|\"no\"]#
289+ }
290+ }
291+ "}),
292+ ),
293+ // if selection spans multiple lines, it should still only look at the
294+ // line on which the head is
295+ (
296+ helpers::platform_line(indoc! {"\
297+ fn foo() {
298+ let result = if true {
299+ #[\"yes\"
300+ } else {
301+ \"no\"|]#
302+ }
303+ }
304+ "}),
305+ "a<tab>",
306+ helpers::platform_line(indoc! {"\
307+ fn foo() {
308+ let result = if true {
309+ \"yes\"
310+ } else {
311+ \"no\"
312+ }#[\n|]#
313+ }
314+ "}),
315+ ),
316+ (
317+ helpers::platform_line(indoc! {"\
318+ fn foo() {
319+ let result = if true {
320+ #[\"yes\"
321+ } else {
322+ \"no\"|]#
323+ }
324+ }
325+ "}),
326+ "i<tab>",
327+ helpers::platform_line(indoc! {"\
328+ fn foo() {
329+ let result = if true {
330+ #[|\"yes\"
331+ } else {
332+ \"no\"]#
333+ }
334+ }
335+ "}),
336+ ),
337+ (
338+ helpers::platform_line(indoc! {"\
339+ fn foo() {
340+ #[l|]#et result = if true {
341+ #(\"yes\"
342+ } else {
343+ \"no\"|)#
344+ }
345+ }
346+ "}),
347+ "i<tab>",
348+ helpers::platform_line(indoc! {"\
349+ fn foo() {
350+ #[|l]#et result = if true {
351+ #(|\"yes\"
352+ } else {
353+ \"no\")#
354+ }
355+ }
356+ "}),
357+ ),
358+ (
359+ helpers::platform_line(indoc! {"\
360+ fn foo() {
361+ let result = if true {
362+ \"yes\"#[\n|]#
363+ } else {
364+ \"no\"#(\n|)#
365+ }
366+ }
367+ "}),
368+ "i<tab>",
369+ helpers::platform_line(indoc! {"\
370+ fn foo() {
371+ let result = if true {
372+ \"yes\"
373+ }#[| ]#else {
374+ \"no\"
375+ }#(|\n)#
376+ }
377+ "}),
378+ ),
379+ (
380+ helpers::platform_line(indoc! {"\
381+ fn foo() {
382+ let result = if true {
383+ #[\"yes\"|]#
384+ } else {
385+ #(\"no\"|)#
386+ }
387+ }
388+ "}),
389+ "i<tab>",
390+ helpers::platform_line(indoc! {"\
391+ fn foo() {
392+ let result = if true {
393+ #[|\"yes\"]#
394+ } else {
395+ #(|\"no\")#
396+ }
397+ }
398+ "}),
399+ ),
400+ // if any cursors are not preceded by all whitespace, then do the
401+ // smart_tab action
402+ (
403+ helpers::platform_line(indoc! {"\
404+ fn foo() {
405+ let result = if true {
406+ #[\"yes\"\n|]#
407+ } else {
408+ \"no#(\"\n|)#
409+ }
410+ }
411+ "}),
412+ "i<tab>",
413+ helpers::platform_line(indoc! {"\
414+ fn foo() {
415+ let result = if true {
416+ \"yes\"
417+ }#[| ]#else {
418+ \"no\"
419+ }#(|\n)#
420+ }
421+ "}),
422+ ),
423+ // Ctrl-tab always inserts a tab
424+ (
425+ helpers::platform_line(indoc! {"\
426+ fn foo() {
427+ let result = if true {
428+ #[\"yes\"\n|]#
429+ } else {
430+ \"no#(\"\n|)#
431+ }
432+ }
433+ "}),
434+ "i<S-tab>",
435+ helpers::platform_line(indoc! {"\
436+ fn foo() {
437+ let result = if true {
438+ #[|\"yes\"\n]#
439+ } else {
440+ \"no #(|\"\n)#
441+ }
442+ }
443+ "}),
444+ ),
445+ ];
446+
447+ for test in tests {
448+ test_with_config(AppBuilder::new().with_file("foo.rs", None), test).await?;
449+ }
450+
451+ Ok(())
452+}
helix-term/tests/test/commands/write.rs+122−3

This diff is too big to show here.

helix-term/tests/test/helpers.rs+10−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

helix-term/tests/test/movement.rs+39

This diff is too big to show here.

helix-term/tests/test/splits.rs+3−3

This diff is too big to show here.

helix-tui/Cargo.toml+15−15

This diff is too big to show here.

helix-tui/src/backend/crossterm.rs+51−33

This diff is too big to show here.

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

This diff is too big to show here.

helix-tui/src/terminal.rs−14

This diff is too big to show here.

helix-vcs/Cargo.toml+12−10

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

helix-vcs/src/git.rs+5−5

This diff is too big to show here.

helix-view/Cargo.toml+22−18

This diff is too big to show here.

helix-view/src/clipboard.rs+7−2

This diff is too big to show here.

helix-view/src/document.rs+220−76

This diff is too big to show here.

helix-view/src/editor.rs+231−91

This diff is too big to show here.

helix-view/src/gutter.rs+4−5

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/src/info.rs+4−11

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/src/lib.rs+1

This diff is too big to show here.

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

This diff is too big to show here.

helix-view/src/theme.rs+25−4

This diff is too big to show here.

helix-view/src/view.rs+8−2

This diff is too big to show here.

languages.toml+592−210

This diff is too big to show here.

logo.svg+1−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/bash/indents.scm+1

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/blueprint/highlights.scm+5

This diff is too big to show here.

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

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/forth/highlights.scm+1−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/go/locals.scm+10−2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/haskell/injections.scm+8

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/nix/injections.scm+14

This diff is too big to show here.

runtime/queries/nu/folds.scmdeleted−4

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/nu/locals.scmdeleted−13

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/ocaml/highlights.scm+2

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/python/highlights.scm+6

This diff is too big to show here.

runtime/queries/python/indents.scm+9

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/robot/highlights.scm+51−13

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/rust/highlights.scm+7

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/rust/injections.scm+6

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/scheme/highlights.scm+5

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/svelte/injections.scm+10

This diff is too big to show here.

runtime/queries/t32/highlights.scm+108−26

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/v/highlights.scm+85−51

This diff is too big to show here.

runtime/queries/v/indents.scm+2−3

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/queries/yaml/injections.scm+52

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/README.md+8

This diff is too big to show here.

runtime/themes/autumn.toml+62−65

This diff is too big to show here.

runtime/themes/autumn_night.toml+6−6

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+11

This diff is too big to show here.

runtime/themes/cyan_light.tomlnew file+154

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/darcula.toml+10−4

This diff is too big to show here.

runtime/themes/dark_plus.toml+2−1

This diff is too big to show here.

runtime/themes/dracula.toml+2

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+4

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/gruvbox.toml+1

This diff is too big to show here.

runtime/themes/gruvbox_dark_hard.toml−2

This diff is too big to show here.

runtime/themes/gruvbox_light.toml−2

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/jellybeans.toml+1−1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/material_darker.tomlnew file+20

This diff is too big to show here.

runtime/themes/material_deep_ocean.tomlnew file+123

This diff is too big to show here.

runtime/themes/material_oceanic.tomlnew file+21

This diff is too big to show here.

runtime/themes/material_palenight.tomlnew file+19

This diff is too big to show here.

runtime/themes/merionette.tomlnew file+98

This diff is too big to show here.

runtime/themes/modus_operandi.tomlnew file+194

This diff is too big to show here.

runtime/themes/modus_operandi_deuteranopia.tomlnew file+46

This diff is too big to show here.

runtime/themes/modus_operandi_tinted.tomlnew file+45

This diff is too big to show here.

runtime/themes/modus_operandi_tritanopia.tomlnew file+73

This diff is too big to show here.

runtime/themes/modus_vivendi.tomlnew file+242

This diff is too big to show here.

runtime/themes/modus_vivendi_deuteranopia.tomlnew file+158

This diff is too big to show here.

runtime/themes/modus_vivendi_tinted.tomlnew file+144

This diff is too big to show here.

runtime/themes/modus_vivendi_tritanopia.tomlnew file+186

This diff is too big to show here.

runtime/themes/molokai.toml+1−1

This diff is too big to show here.

runtime/themes/monokai.toml+5

This diff is too big to show here.

runtime/themes/naysayer.tomlnew file+91

This diff is too big to show here.

runtime/themes/new_moon.tomlnew file+124

This diff is too big to show here.

runtime/themes/nightfox.toml+2−2

This diff is too big to show here.

runtime/themes/noctis.toml+26−26

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/nord.toml+162−105

This diff is too big to show here.

runtime/themes/onedark.toml+1

This diff is too big to show here.

runtime/themes/onedarker.toml+1

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

runtime/themes/poimandres.tomlnew file+113

This diff is too big to show here.

runtime/themes/poimandres_storm.tomlnew file+19

This diff is too big to show here.

runtime/themes/pop-dark.toml+4−4

This diff is too big to show here.

runtime/themes/rose_pine.toml+31−29

This diff is too big to show here.

runtime/themes/starlight.tomlnew file+113

This diff is too big to show here.

runtime/themes/vim_dark_high_contrast.tomlnew file+72

This diff is too big to show here.

runtime/themes/yellowed.tomlnew file+135

This diff is too big to show here.

runtime/themes/zed_onedark.tomlnew file+110

This diff is too big to show here.

runtime/themes/zed_onelight.tomlnew file+55

This diff is too big to show here.

runtime/themes/zenburn.toml+1−1

This diff is too big to show here.

runtime/tutor+157−3

This diff is too big to show here.

rust-toolchain.toml+2−2

This diff is too big to show here.

xtask/Cargo.toml+12−6

This diff is too big to show here.