on master help sign in
152 files changed+5663−1603
since splitsnapshots
unifiedsplit
.envrc+1 .github/ISSUE_TEMPLATE/bug_report.yaml+10 .github/workflows/build.yml+11−3 .github/workflows/cachix.yml+2−2 .github/workflows/gh-pages.yml+4−4 .github/workflows/release.yml+10−10 CHANGELOG.md+260 Cargo.lock+396−587 Cargo.toml+11 README.md+1−1 VERSION−1 book/src/configuration.md+26−9 book/src/generated/lang-support.md+16−7 book/src/generated/typable-cmd.md+2−1 book/src/guides/adding_languages.md+2 book/src/guides/indent.md+9 book/src/install.md+30−6 book/src/keymap.md+1−1 book/src/languages.md+2 book/src/themes.md+5−1 book/src/usage.md+2−2 contrib/Helix.appdata.xml+3 docs/releases.md+12−5 flake.lock+12−35 flake.nix+12−14 grammars.nix+24−21 helix-core/Cargo.toml+13−12 helix-core/src/diagnostic.rs+4 helix-core/src/indent.rs+316−103 helix-core/src/syntax.rs+21−5 helix-core/src/transaction.rs+73−14 helix-core/src/wrap.rs+3−1 helix-core/tests/indent.rs+2−2 helix-dap/Cargo.toml+11−9 helix-event/Cargo.toml+8−7 helix-loader/Cargo.toml+12−11 helix-loader/build.rs+14−4 helix-loader/src/lib.rs+10−1 helix-lsp/Cargo.toml+15−14 helix-lsp/src/client.rs+83−9 helix-parsec/Cargo.toml+8−7 helix-term/Cargo.toml+26−22 helix-term/src/application.rs+95−47 helix-term/src/commands.rs+193−97 helix-term/src/commands/dap.rs+7−2 helix-term/src/commands/lsp.rs+12−2 helix-term/src/commands/typed.rs+97−16 helix-term/src/health.rs+44−16 helix-term/src/main.rs+9−3 helix-term/src/ui/completion.rs+17−1 helix-term/src/ui/document.rs+60−24 helix-term/src/ui/editor.rs+77−44 helix-term/src/ui/lsp.rs+3−1 helix-term/src/ui/menu.rs+34−13 helix-term/src/ui/mod.rs+3 helix-term/src/ui/picker.rs+9−4 helix-term/src/ui/popup.rs+27−7 helix-term/tests/test/commands.rs+46 helix-term/tests/test/helpers.rs+8 helix-tui/Cargo.toml+13−13 helix-tui/src/backend/crossterm.rs+18−2 helix-tui/src/buffer.rs+2−2 helix-vcs/Cargo.toml+12−11 helix-vcs/src/git.rs+5−5 helix-view/Cargo.toml+19−17 helix-view/src/document.rs+57−20 helix-view/src/editor.rs+31−11 helix-view/src/gutter.rs+1−2 helix-view/src/handlers/dap.rs+1−3 helix-view/src/register.rs+10−10 languages.toml+175−167 logo.svg+1−1 runtime/queries/_typescript/highlights.scm+5−3 runtime/queries/_typescript/locals.scm+17 runtime/queries/agda/highlights.scm+124 runtime/queries/bash/indents.scm+1 runtime/queries/c/indents.scm+13 runtime/queries/comment/highlights.scm+8−8 runtime/queries/common-lisp/indents.scm+1 runtime/queries/dbml/highlights.scm+44 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+12−4 runtime/queries/go/locals.scm+10−2 runtime/queries/haskell/highlights.scm+24−11 runtime/queries/janet/highlights.scm+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/ocaml/highlights.scm+2 runtime/queries/purescript/highlights.scm+52−10 runtime/queries/python/highlights.scm+6 runtime/queries/racket/indents.scm+1 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/injections.scm+6 runtime/queries/rust/locals.scm+14−1 runtime/queries/scheme/indents.scm+43 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+42−4 runtime/queries/templ/highlights.scm+99 runtime/queries/templ/injections.scm+4 runtime/queries/typst/highlights.scm+77 runtime/queries/typst/injections.scm+6 runtime/queries/yuck/highlights.scm+1−1 runtime/themes/README.md+8 runtime/themes/cyan_light.toml+9−6 runtime/themes/darcula.toml+6−2 runtime/themes/everblush.toml+1 runtime/themes/gruber-darker.toml+114 runtime/themes/horizon-dark.toml+80 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/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/naysayer.toml+2−2 runtime/themes/noctis.toml+25−25 runtime/themes/nord-night.toml+23 runtime/themes/nord.toml+9 runtime/themes/papercolor-light.toml+4 runtime/themes/poimandres.toml+113 runtime/themes/poimandres_storm.toml+19 runtime/themes/rose_pine.toml+30−28 runtime/themes/starlight.toml+113 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+11−3
@@ -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
@@ -37,9 +39,11 @@ jobs:
3739 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
@@ -66,11 +70,13 @@ jobs:
6670 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
@@ -91,9 +97,11 @@ jobs:
9197 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+2−2
@@ -14,10 +14,10 @@ jobs:
1414 uses: actions/checkout@v4
1515
1616 - name: Install nix
17− uses: cachix/install-nix-action@v23
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+4−4
@@ -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+10−10
@@ -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
@@ -106,7 +106,7 @@ jobs:
106106 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')"
@@ -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
@@ -233,7 +233,7 @@ jobs:
233233 - name: Checkout sources
234234 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
@@ -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
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+396−587
@@ -19,30 +19,22 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
1919
2020[[package]]
2121name = "ahash"
22−version = "0.8.3"
22+version = "0.8.6"
2323source = "registry+https://github.com/rust-lang/crates.io-index"
24−checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
24+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
2525dependencies = [
2626 "cfg-if",
2727 "getrandom",
2828 "once_cell",
2929 "version_check",
30+ "zerocopy",
3031]
3132
3233[[package]]
3334name = "aho-corasick"
34−version = "0.7.20"
35−source = "registry+https://github.com/rust-lang/crates.io-index"
36−checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
37−dependencies = [
38− "memchr",
39−]
40−
41−[[package]]
42−name = "aho-corasick"
43−version = "1.0.2"
35+version = "1.1.2"
4436source = "registry+https://github.com/rust-lang/crates.io-index"
45−checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
37+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
4638dependencies = [
4739 "memchr",
4840]
@@ -70,9 +62,9 @@ dependencies = [
7062
7163[[package]]
7264name = "anyhow"
73−version = "1.0.75"
65+version = "1.0.76"
7466source = "registry+https://github.com/rust-lang/crates.io-index"
75−checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
67+checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
7668
7769[[package]]
7870name = "arc-swap"
@@ -109,15 +101,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
109101
110102[[package]]
111103name = "bitflags"
112−version = "2.4.0"
104+version = "2.4.1"
113105source = "registry+https://github.com/rust-lang/crates.io-index"
114−checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
106+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
115107
116108[[package]]
117109name = "bstr"
118−version = "1.6.0"
110+version = "1.8.0"
119111source = "registry+https://github.com/rust-lang/crates.io-index"
120−checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
112+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
121113dependencies = [
122114 "memchr",
123115 "regex-automata",
@@ -139,12 +131,6 @@ version = "3.12.0"
139131source = "registry+https://github.com/rust-lang/crates.io-index"
140132checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
141133
142−[[package]]
143−name = "bytecount"
144−version = "0.6.3"
145−source = "registry+https://github.com/rust-lang/crates.io-index"
146−checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
147−
148134[[package]]
149135name = "bytes"
150136version = "1.4.0"
@@ -159,9 +145,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
159145
160146[[package]]
161147name = "cc"
162−version = "1.0.83"
148+version = "1.0.84"
163149source = "registry+https://github.com/rust-lang/crates.io-index"
164−checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
150+checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
165151dependencies = [
166152 "libc",
167153]
@@ -197,13 +183,11 @@ dependencies = [
197183
198184[[package]]
199185name = "clipboard-win"
200−version = "4.5.0"
186+version = "5.0.0"
201187source = "registry+https://github.com/rust-lang/crates.io-index"
202−checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
188+checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
203189dependencies = [
204190 "error-code",
205− "str-buf",
206− "winapi",
207191]
208192
209193[[package]]
@@ -301,7 +285,7 @@ version = "0.27.0"
301285source = "registry+https://github.com/rust-lang/crates.io-index"
302286checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
303287dependencies = [
304− "bitflags 2.4.0",
288+ "bitflags 2.4.1",
305289 "crossterm_winapi",
306290 "filedescriptor",
307291 "futures-core",
@@ -346,7 +330,7 @@ dependencies = [
346330 "proc-macro2",
347331 "quote",
348332 "scratch",
349− "syn 2.0.28",
333+ "syn 2.0.38",
350334]
351335
352336[[package]]
@@ -363,28 +347,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
363347dependencies = [
364348 "proc-macro2",
365349 "quote",
366− "syn 2.0.28",
367−]
368−
369−[[package]]
370−name = "dirs"
371−version = "5.0.1"
372−source = "registry+https://github.com/rust-lang/crates.io-index"
373−checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
374−dependencies = [
375− "dirs-sys",
376−]
377−
378−[[package]]
379−name = "dirs-sys"
380−version = "0.4.1"
381−source = "registry+https://github.com/rust-lang/crates.io-index"
382−checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
383−dependencies = [
384− "libc",
385− "option-ext",
386− "redox_users",
387− "windows-sys 0.48.0",
350+ "syn 2.0.38",
388351]
389352
390353[[package]]
@@ -425,34 +388,19 @@ checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
425388
426389[[package]]
427390name = "errno"
428−version = "0.3.1"
429−source = "registry+https://github.com/rust-lang/crates.io-index"
430−checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
431−dependencies = [
432− "errno-dragonfly",
433− "libc",
434− "windows-sys 0.48.0",
435−]
436−
437−[[package]]
438−name = "errno-dragonfly"
439−version = "0.1.2"
391+version = "0.3.8"
440392source = "registry+https://github.com/rust-lang/crates.io-index"
441−checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
393+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
442394dependencies = [
443− "cc",
444395 "libc",
396+ "windows-sys 0.52.0",
445397]
446398
447399[[package]]
448400name = "error-code"
449−version = "2.3.1"
401+version = "3.0.0"
450402source = "registry+https://github.com/rust-lang/crates.io-index"
451−checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
452−dependencies = [
453− "libc",
454− "str-buf",
455−]
403+checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
456404
457405[[package]]
458406name = "etcetera"
@@ -465,6 +413,15 @@ dependencies = [
465413 "windows-sys 0.48.0",
466414]
467415
416+[[package]]
417+name = "faster-hex"
418+version = "0.9.0"
419+source = "registry+https://github.com/rust-lang/crates.io-index"
420+checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183"
421+dependencies = [
422+ "serde",
423+]
424+
468425[[package]]
469426name = "fastrand"
470427version = "2.0.0"
@@ -491,18 +448,6 @@ dependencies = [
491448 "winapi",
492449]
493450
494−[[package]]
495−name = "filetime"
496−version = "0.2.21"
497−source = "registry+https://github.com/rust-lang/crates.io-index"
498−checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
499−dependencies = [
500− "cfg-if",
501− "libc",
502− "redox_syscall 0.2.16",
503− "windows-sys 0.48.0",
504−]
505−
506451[[package]]
507452name = "flate2"
508453version = "1.0.27"
@@ -513,32 +458,26 @@ dependencies = [
513458 "miniz_oxide",
514459]
515460
516−[[package]]
517−name = "fnv"
518−version = "1.0.7"
519−source = "registry+https://github.com/rust-lang/crates.io-index"
520−checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
521−
522461[[package]]
523462name = "form_urlencoded"
524−version = "1.2.0"
463+version = "1.2.1"
525464source = "registry+https://github.com/rust-lang/crates.io-index"
526−checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
465+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
527466dependencies = [
528467 "percent-encoding",
529468]
530469
531470[[package]]
532471name = "futures-core"
533−version = "0.3.28"
472+version = "0.3.30"
534473source = "registry+https://github.com/rust-lang/crates.io-index"
535−checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
474+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
536475
537476[[package]]
538477name = "futures-executor"
539−version = "0.3.28"
478+version = "0.3.29"
540479source = "registry+https://github.com/rust-lang/crates.io-index"
541−checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
480+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
542481dependencies = [
543482 "futures-core",
544483 "futures-task",
@@ -547,15 +486,15 @@ dependencies = [
547486
548487[[package]]
549488name = "futures-task"
550−version = "0.3.28"
489+version = "0.3.30"
551490source = "registry+https://github.com/rust-lang/crates.io-index"
552−checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
491+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
553492
554493[[package]]
555494name = "futures-util"
556−version = "0.3.28"
495+version = "0.3.30"
557496source = "registry+https://github.com/rust-lang/crates.io-index"
558−checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
497+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
559498dependencies = [
560499 "futures-core",
561500 "futures-task",
@@ -583,15 +522,13 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
583522
584523[[package]]
585524name = "gix"
586−version = "0.48.0"
525+version = "0.57.0"
587526source = "registry+https://github.com/rust-lang/crates.io-index"
588−checksum = "c1e74cea676de7f53a79f3c0365812b11f6814b81e671b8ee4abae6ca09c7881"
527+checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
589528dependencies = [
590529 "gix-actor",
591− "gix-attributes",
592530 "gix-commitgraph",
593531 "gix-config",
594− "gix-credentials",
595532 "gix-date",
596533 "gix-diff",
597534 "gix-discover",
@@ -600,19 +537,16 @@ dependencies = [
600537 "gix-glob",
601538 "gix-hash",
602539 "gix-hashtable",
603− "gix-ignore",
604− "gix-index",
605540 "gix-lock",
606− "gix-mailmap",
607− "gix-negotiate",
541+ "gix-macros",
608542 "gix-object",
609543 "gix-odb",
610544 "gix-pack",
611545 "gix-path",
612− "gix-prompt",
613546 "gix-ref",
614547 "gix-refspec",
615548 "gix-revision",
549+ "gix-revwalk",
616550 "gix-sec",
617551 "gix-tempfile",
618552 "gix-trace",
@@ -620,10 +554,8 @@ dependencies = [
620554 "gix-url",
621555 "gix-utils",
622556 "gix-validate",
623− "gix-worktree",
624− "log",
625557 "once_cell",
626− "signal-hook",
558+ "parking_lot",
627559 "smallvec",
628560 "thiserror",
629561 "unicode-normalization",
@@ -631,81 +563,46 @@ dependencies = [
631563
632564[[package]]
633565name = "gix-actor"
634−version = "0.23.0"
566+version = "0.29.0"
635567source = "registry+https://github.com/rust-lang/crates.io-index"
636−checksum = "1969b77b9ee4cc1755c841987ec6f7622aaca95e952bcafb76973ae59d1b8716"
568+checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
637569dependencies = [
638570 "bstr",
639571 "btoi",
640572 "gix-date",
641573 "itoa",
642− "nom",
643− "thiserror",
644−]
645−
646−[[package]]
647−name = "gix-attributes"
648−version = "0.14.1"
649−source = "registry+https://github.com/rust-lang/crates.io-index"
650−checksum = "e3772b0129dcd1fc73e985bbd08a1482d082097d2915cb1ee31ce8092b8e4434"
651−dependencies = [
652− "bstr",
653− "gix-glob",
654− "gix-path",
655− "gix-quote",
656− "kstring",
657− "log",
658− "smallvec",
659− "thiserror",
660− "unicode-bom",
661−]
662−
663−[[package]]
664−name = "gix-bitmap"
665−version = "0.2.5"
666−source = "registry+https://github.com/rust-lang/crates.io-index"
667−checksum = "311e2fa997be6560c564b070c5da2d56d038b645a94e1e5796d5d85a350da33c"
668−dependencies = [
669574 "thiserror",
575+ "winnow 0.5.28",
670576]
671577
672578[[package]]
673579name = "gix-chunk"
674−version = "0.4.3"
580+version = "0.4.6"
675581source = "registry+https://github.com/rust-lang/crates.io-index"
676−checksum = "39db5ed0fc0a2e9b1b8265993f7efdbc30379dec268f3b91b7af0c2de4672fdd"
582+checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
677583dependencies = [
678584 "thiserror",
679585]
680586
681−[[package]]
682−name = "gix-command"
683−version = "0.2.6"
684−source = "registry+https://github.com/rust-lang/crates.io-index"
685−checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb"
686−dependencies = [
687− "bstr",
688−]
689−
690587[[package]]
691588name = "gix-commitgraph"
692−version = "0.17.1"
589+version = "0.23.0"
693590source = "registry+https://github.com/rust-lang/crates.io-index"
694−checksum = "ed42baa50075d41c1a0931074ce1a97c5797c7c6fe7591d9f1f2dcd448532c26"
591+checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
695592dependencies = [
696593 "bstr",
697594 "gix-chunk",
698595 "gix-features",
699596 "gix-hash",
700− "memmap2 0.7.1",
597+ "memmap2",
701598 "thiserror",
702599]
703600
704601[[package]]
705602name = "gix-config"
706−version = "0.25.1"
603+version = "0.33.0"
707604source = "registry+https://github.com/rust-lang/crates.io-index"
708−checksum = "817688c7005a716d9363e267913526adea402dabd947f4ba63842d10cc5132af"
605+checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
709606dependencies = [
710607 "bstr",
711608 "gix-config-value",
@@ -714,49 +611,32 @@ dependencies = [
714611 "gix-path",
715612 "gix-ref",
716613 "gix-sec",
717− "log",
718614 "memchr",
719− "nom",
720615 "once_cell",
721616 "smallvec",
722617 "thiserror",
723618 "unicode-bom",
619+ "winnow 0.5.28",
724620]
725621
726622[[package]]
727623name = "gix-config-value"
728−version = "0.12.3"
624+version = "0.14.2"
729625source = "registry+https://github.com/rust-lang/crates.io-index"
730−checksum = "83960be5e99266bcf55dae5a24731bbd39f643bfb68f27e939d6b06836b5b87d"
626+checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
731627dependencies = [
732− "bitflags 2.4.0",
628+ "bitflags 2.4.1",
733629 "bstr",
734630 "gix-path",
735631 "libc",
736632 "thiserror",
737633]
738634
739−[[package]]
740−name = "gix-credentials"
741−version = "0.16.1"
742−source = "registry+https://github.com/rust-lang/crates.io-index"
743−checksum = "75a75565e0e6e7f80cfa4eb1b05cc448c6846ddd48dcf413a28875fbc11ee9af"
744−dependencies = [
745− "bstr",
746− "gix-command",
747− "gix-config-value",
748− "gix-path",
749− "gix-prompt",
750− "gix-sec",
751− "gix-url",
752− "thiserror",
753−]
754−
755635[[package]]
756636name = "gix-date"
757−version = "0.7.0"
637+version = "0.8.2"
758638source = "registry+https://github.com/rust-lang/crates.io-index"
759−checksum = "8e9a04a1d2387c955ec91059d56b673000dd24f3c07cad08ed253e36381782bf"
639+checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
760640dependencies = [
761641 "bstr",
762642 "itoa",
@@ -766,21 +646,21 @@ dependencies = [
766646
767647[[package]]
768648name = "gix-diff"
769−version = "0.32.0"
649+version = "0.39.0"
770650source = "registry+https://github.com/rust-lang/crates.io-index"
771−checksum = "aaf5d9b9b521b284ebe53ee69eee33341835ec70edc314f36b2100ea81396121"
651+checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
772652dependencies = [
653+ "bstr",
773654 "gix-hash",
774655 "gix-object",
775− "imara-diff",
776656 "thiserror",
777657]
778658
779659[[package]]
780660name = "gix-discover"
781−version = "0.21.1"
661+version = "0.28.0"
782662source = "registry+https://github.com/rust-lang/crates.io-index"
783−checksum = "272aad20dc63dedba76615373dd8885fb5aebe4795e5b5b0aa2a24e63c82085c"
663+checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
784664dependencies = [
785665 "bstr",
786666 "dunce",
@@ -793,9 +673,9 @@ dependencies = [
793673
794674[[package]]
795675name = "gix-features"
796−version = "0.31.1"
676+version = "0.37.0"
797677source = "registry+https://github.com/rust-lang/crates.io-index"
798−checksum = "06142d8cff5d17509399b04052b64d2f9b3a311d5cff0b1a32b220f62cd0d595"
678+checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
799679dependencies = [
800680 "crc32fast",
801681 "flate2",
@@ -811,20 +691,20 @@ dependencies = [
811691
812692[[package]]
813693name = "gix-fs"
814−version = "0.3.0"
694+version = "0.9.0"
815695source = "registry+https://github.com/rust-lang/crates.io-index"
816−checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496"
696+checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
817697dependencies = [
818698 "gix-features",
819699]
820700
821701[[package]]
822702name = "gix-glob"
823−version = "0.9.1"
703+version = "0.15.0"
824704source = "registry+https://github.com/rust-lang/crates.io-index"
825−checksum = "c18bdff83143d61e7d60da6183b87542a870d026b2a2d0b30170b8e9c0cd321a"
705+checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
826706dependencies = [
827− "bitflags 2.4.0",
707+ "bitflags 2.4.1",
828708 "bstr",
829709 "gix-features",
830710 "gix-path",
@@ -832,64 +712,30 @@ dependencies = [
832712
833713[[package]]
834714name = "gix-hash"
835−version = "0.11.3"
715+version = "0.14.0"
836716source = "registry+https://github.com/rust-lang/crates.io-index"
837−checksum = "a0dd58cdbe7ffa4032fc111864c80d5f8cecd9a2c9736c97ae7e5be834188272"
717+checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
838718dependencies = [
839− "hex",
719+ "faster-hex",
840720 "thiserror",
841721]
842722
843723[[package]]
844724name = "gix-hashtable"
845−version = "0.2.3"
725+version = "0.5.0"
846726source = "registry+https://github.com/rust-lang/crates.io-index"
847−checksum = "9e133bc56d938eaec1c675af7c681a51de9662b0ada779f45607b967a10da77a"
727+checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
848728dependencies = [
849729 "gix-hash",
850− "hashbrown 0.14.1",
730+ "hashbrown 0.14.3",
851731 "parking_lot",
852732]
853733
854−[[package]]
855−name = "gix-ignore"
856−version = "0.4.1"
857−source = "registry+https://github.com/rust-lang/crates.io-index"
858−checksum = "ca801f2d0535210f77b33e2c067d565aedecacc82f1b3dbce26da1388ebc4634"
859−dependencies = [
860− "bstr",
861− "gix-glob",
862− "gix-path",
863− "unicode-bom",
864−]
865−
866−[[package]]
867−name = "gix-index"
868−version = "0.20.0"
869−source = "registry+https://github.com/rust-lang/crates.io-index"
870−checksum = "68099abdf6ee50ae3c897e8b05de96871cbe54d52a37cdf559101f911b883562"
871−dependencies = [
872− "bitflags 2.4.0",
873− "bstr",
874− "btoi",
875− "filetime",
876− "gix-bitmap",
877− "gix-features",
878− "gix-hash",
879− "gix-lock",
880− "gix-object",
881− "gix-traverse",
882− "itoa",
883− "memmap2 0.7.1",
884− "smallvec",
885− "thiserror",
886−]
887−
888734[[package]]
889735name = "gix-lock"
890−version = "7.0.0"
736+version = "12.0.0"
891737source = "registry+https://github.com/rust-lang/crates.io-index"
892−checksum = "328f50aad713ab606caeaf834459ef915ccdfbb9133ac6cd54616d601aa9249f"
738+checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
893739dependencies = [
894740 "gix-tempfile",
895741 "gix-utils",
@@ -897,38 +743,21 @@ dependencies = [
897743]
898744
899745[[package]]
900−name = "gix-mailmap"
901−version = "0.15.0"
902−source = "registry+https://github.com/rust-lang/crates.io-index"
903−checksum = "1787e3c37fc43b1f7c0e3be6196c6837b3ba5f869190dfeaa444b816f0a7f34b"
904−dependencies = [
905− "bstr",
906− "gix-actor",
907− "gix-date",
908− "thiserror",
909−]
910−
911−[[package]]
912−name = "gix-negotiate"
913−version = "0.4.0"
746+name = "gix-macros"
747+version = "0.1.2"
914748source = "registry+https://github.com/rust-lang/crates.io-index"
915−checksum = "4e7bce64d4452dd609f44d04b14b29da2e0ad2c45fcdf4ce1472a5f5f8ec21c2"
749+checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
916750dependencies = [
917− "bitflags 2.4.0",
918− "gix-commitgraph",
919− "gix-date",
920− "gix-hash",
921− "gix-object",
922− "gix-revwalk",
923− "smallvec",
924− "thiserror",
751+ "proc-macro2",
752+ "quote",
753+ "syn 2.0.38",
925754]
926755
927756[[package]]
928757name = "gix-object"
929−version = "0.32.0"
758+version = "0.40.0"
930759source = "registry+https://github.com/rust-lang/crates.io-index"
931−checksum = "a953f3d7ffad16734aa3ab1d05807972c80e339d1bd9dde03e0198716b99e2a6"
760+checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
932761dependencies = [
933762 "bstr",
934763 "btoi",
@@ -937,18 +766,17 @@ dependencies = [
937766 "gix-features",
938767 "gix-hash",
939768 "gix-validate",
940− "hex",
941769 "itoa",
942− "nom",
943770 "smallvec",
944771 "thiserror",
772+ "winnow 0.5.28",
945773]
946774
947775[[package]]
948776name = "gix-odb"
949−version = "0.49.1"
777+version = "0.56.0"
950778source = "registry+https://github.com/rust-lang/crates.io-index"
951−checksum = "f6418cff00ecc2713b58c8e04bff30dda808fbba1a080e7248b299d069894a01"
779+checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
952780dependencies = [
953781 "arc-swap",
954782 "gix-date",
@@ -965,21 +793,19 @@ dependencies = [
965793
966794[[package]]
967795name = "gix-pack"
968−version = "0.39.1"
796+version = "0.46.0"
969797source = "registry+https://github.com/rust-lang/crates.io-index"
970−checksum = "414935138d90043ea5898de7a93f02c2558e52652492719470e203ef26a8fd0a"
798+checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
971799dependencies = [
972800 "clru",
973801 "gix-chunk",
974− "gix-diff",
975802 "gix-features",
976803 "gix-hash",
977804 "gix-hashtable",
978805 "gix-object",
979806 "gix-path",
980807 "gix-tempfile",
981− "gix-traverse",
982− "memmap2 0.7.1",
808+ "memmap2",
983809 "parking_lot",
984810 "smallvec",
985811 "thiserror",
@@ -987,9 +813,9 @@ dependencies = [
987813
988814[[package]]
989815name = "gix-path"
990−version = "0.8.3"
816+version = "0.10.2"
991817source = "registry+https://github.com/rust-lang/crates.io-index"
992−checksum = "dfca182d2575ded2ed38280f1ebf75cd5d3790b77e0872de07854cf085821fbe"
818+checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
993819dependencies = [
994820 "bstr",
995821 "gix-trace",
@@ -998,24 +824,11 @@ dependencies = [
998824 "thiserror",
999825]
1000826
1001−[[package]]
1002−name = "gix-prompt"
1003−version = "0.5.2"
1004−source = "registry+https://github.com/rust-lang/crates.io-index"
1005−checksum = "8dfd363fd89a40c1e7bff9c9c1b136cd2002480f724b0c627c1bc771cd5480ec"
1006−dependencies = [
1007− "gix-command",
1008− "gix-config-value",
1009− "parking_lot",
1010− "rustix 0.37.15",
1011− "thiserror",
1012−]
1013−
1014827[[package]]
1015828name = "gix-quote"
1016−version = "0.4.5"
829+version = "0.4.9"
1017830source = "registry+https://github.com/rust-lang/crates.io-index"
1018−checksum = "3874de636c2526de26a3405b8024b23ef1a327bebf4845d770d00d48700b6a40"
831+checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
1019832dependencies = [
1020833 "bstr",
1021834 "btoi",
@@ -1024,9 +837,9 @@ dependencies = [
1024837
1025838[[package]]
1026839name = "gix-ref"
1027−version = "0.32.1"
840+version = "0.40.0"
1028841source = "registry+https://github.com/rust-lang/crates.io-index"
1029−checksum = "39453f4e5f23cddc2e6e4cca2ba20adfdbec29379e3ca829714dfe98ae068ccd"
842+checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
1030843dependencies = [
1031844 "gix-actor",
1032845 "gix-date",
@@ -1038,16 +851,16 @@ dependencies = [
1038851 "gix-path",
1039852 "gix-tempfile",
1040853 "gix-validate",
1041− "memmap2 0.7.1",
1042− "nom",
854+ "memmap2",
1043855 "thiserror",
856+ "winnow 0.5.28",
1044857]
1045858
1046859[[package]]
1047860name = "gix-refspec"
1048−version = "0.13.0"
861+version = "0.21.0"
1049862source = "registry+https://github.com/rust-lang/crates.io-index"
1050−checksum = "b8e76ff1f82fba295a121e31ab02f69642994e532c45c0c899aa393f4b740302"
863+checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
1051864dependencies = [
1052865 "bstr",
1053866 "gix-hash",
@@ -1059,9 +872,9 @@ dependencies = [
1059872
1060873[[package]]
1061874name = "gix-revision"
1062−version = "0.17.0"
875+version = "0.25.0"
1063876source = "registry+https://github.com/rust-lang/crates.io-index"
1064−checksum = "237428a7d3978e8572964e1e45d984027c2acc94df47e594baa6c4b0da7c9922"
877+checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
1065878dependencies = [
1066879 "bstr",
1067880 "gix-date",
@@ -1069,14 +882,15 @@ dependencies = [
1069882 "gix-hashtable",
1070883 "gix-object",
1071884 "gix-revwalk",
885+ "gix-trace",
1072886 "thiserror",
1073887]
1074888
1075889[[package]]
1076890name = "gix-revwalk"
1077−version = "0.3.0"
891+version = "0.11.0"
1078892source = "registry+https://github.com/rust-lang/crates.io-index"
1079−checksum = "028d50fcaf8326a8f79a359490d9ca9fb4e2b51ac9ac86503560d0bcc888d2eb"
893+checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
1080894dependencies = [
1081895 "gix-commitgraph",
1082896 "gix-date",
@@ -1089,42 +903,40 @@ dependencies = [
1089903
1090904[[package]]
1091905name = "gix-sec"
1092−version = "0.8.3"
906+version = "0.10.2"
1093907source = "registry+https://github.com/rust-lang/crates.io-index"
1094−checksum = "ede298863db2a0574a14070991710551e76d1f47c9783b62d4fcbca17f56371c"
908+checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
1095909dependencies = [
1096− "bitflags 2.4.0",
910+ "bitflags 2.4.1",
1097911 "gix-path",
1098912 "libc",
1099− "windows",
913+ "windows 0.52.0",
1100914]
1101915
1102916[[package]]
1103917name = "gix-tempfile"
1104−version = "7.0.0"
918+version = "12.0.0"
1105919source = "registry+https://github.com/rust-lang/crates.io-index"
1106−checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2"
920+checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
1107921dependencies = [
1108922 "gix-fs",
1109923 "libc",
1110924 "once_cell",
1111925 "parking_lot",
1112− "signal-hook",
1113− "signal-hook-registry",
1114926 "tempfile",
1115927]
1116928
1117929[[package]]
1118930name = "gix-trace"
1119−version = "0.1.2"
931+version = "0.1.5"
1120932source = "registry+https://github.com/rust-lang/crates.io-index"
1121−checksum = "103eac621617be3ebe0605c9065ca51a223279a23218aaf67d10daa6e452f663"
933+checksum = "bda62acb44dd86a40c7c3762a5403cfc1ac789ea559df54085cedf79864f809e"
1122934
1123935[[package]]
1124936name = "gix-traverse"
1125−version = "0.29.0"
937+version = "0.36.0"
1126938source = "registry+https://github.com/rust-lang/crates.io-index"
1127−checksum = "e3cdfd54598db4fae57d5ae6f52958422b2d13382d2745796bfe5c8015ffa86e"
939+checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
1128940dependencies = [
1129941 "gix-commitgraph",
1130942 "gix-date",
@@ -1138,9 +950,9 @@ dependencies = [
1138950
1139951[[package]]
1140952name = "gix-url"
1141−version = "0.20.1"
953+version = "0.26.0"
1142954source = "registry+https://github.com/rust-lang/crates.io-index"
1143−checksum = "beaede6dbc83f408b19adfd95bb52f1dbf01fb8862c3faf6c6243e2e67fcdfa1"
955+checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
1144956dependencies = [
1145957 "bstr",
1146958 "gix-features",
@@ -1152,94 +964,71 @@ dependencies = [
1152964
1153965[[package]]
1154966name = "gix-utils"
1155−version = "0.1.4"
967+version = "0.1.7"
1156968source = "registry+https://github.com/rust-lang/crates.io-index"
1157−checksum = "7058c94f4164fcf5b8457d35f6d8f6e1007f9f7f938c9c7684a7e01d23c6ddde"
969+checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
1158970dependencies = [
1159971 "fastrand",
1160972]
1161973
1162974[[package]]
1163975name = "gix-validate"
1164−version = "0.7.6"
1165−source = "registry+https://github.com/rust-lang/crates.io-index"
1166−checksum = "8d092b594c8af00a3a31fe526d363ee8a51a6f29d8496cdb991ed2f01ec0ec13"
1167−dependencies = [
1168− "bstr",
1169− "thiserror",
1170−]
1171−
1172−[[package]]
1173−name = "gix-worktree"
1174−version = "0.21.1"
976+version = "0.8.2"
1175977source = "registry+https://github.com/rust-lang/crates.io-index"
1176−checksum = "c1363b9aa66b9e14412ac04e1f759827203f491729d92172535a8ce6cde02efa"
978+checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
1177979dependencies = [
1178980 "bstr",
1179− "filetime",
1180− "gix-attributes",
1181− "gix-features",
1182− "gix-fs",
1183− "gix-glob",
1184− "gix-hash",
1185− "gix-ignore",
1186− "gix-index",
1187− "gix-object",
1188− "gix-path",
1189− "io-close",
1190981 "thiserror",
1191982]
1192983
1193984[[package]]
1194985name = "globset"
1195−version = "0.4.13"
986+version = "0.4.14"
1196987source = "registry+https://github.com/rust-lang/crates.io-index"
1197−checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
988+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
1198989dependencies = [
1199− "aho-corasick 1.0.2",
990+ "aho-corasick",
1200991 "bstr",
1201− "fnv",
1202992 "log",
1203− "regex",
993+ "regex-automata",
994+ "regex-syntax",
1204995]
1205996
1206997[[package]]
1207998name = "grep-matcher"
1208−version = "0.1.6"
999+version = "0.1.7"
12091000source = "registry+https://github.com/rust-lang/crates.io-index"
1210−checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319"
1001+checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"
12111002dependencies = [
12121003 "memchr",
12131004]
12141005
12151006[[package]]
12161007name = "grep-regex"
1217−version = "0.1.11"
1008+version = "0.1.12"
12181009source = "registry+https://github.com/rust-lang/crates.io-index"
1219−checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
1010+checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"
12201011dependencies = [
1221− "aho-corasick 0.7.20",
12221012 "bstr",
12231013 "grep-matcher",
12241014 "log",
1225− "regex",
1226− "regex-syntax 0.6.29",
1227− "thread_local",
1015+ "regex-automata",
1016+ "regex-syntax",
12281017]
12291018
12301019[[package]]
12311020name = "grep-searcher"
1232−version = "0.1.11"
1021+version = "0.1.13"
12331022source = "registry+https://github.com/rust-lang/crates.io-index"
1234−checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f"
1023+checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"
12351024dependencies = [
12361025 "bstr",
1237− "bytecount",
12381026 "encoding_rs",
12391027 "encoding_rs_io",
12401028 "grep-matcher",
12411029 "log",
1242− "memmap2 0.5.10",
1030+ "memchr",
1031+ "memmap2",
12431032]
12441033
12451034[[package]]
@@ -1250,9 +1039,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
12501039
12511040[[package]]
12521041name = "hashbrown"
1253−version = "0.14.1"
1042+version = "0.14.3"
12541043source = "registry+https://github.com/rust-lang/crates.io-index"
1255−checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
1044+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
12561045dependencies = [
12571046 "ahash",
12581047 "allocator-api2",
@@ -1260,16 +1049,16 @@ dependencies = [
12601049
12611050[[package]]
12621051name = "helix-core"
1263−version = "0.6.0"
1052+version = "23.10.0"
12641053dependencies = [
12651054 "ahash",
12661055 "arc-swap",
1267− "bitflags 2.4.0",
1056+ "bitflags 2.4.1",
12681057 "chrono",
12691058 "dunce",
12701059 "encoding_rs",
12711060 "etcetera",
1272− "hashbrown 0.14.1",
1061+ "hashbrown 0.14.3",
12731062 "helix-loader",
12741063 "imara-diff",
12751064 "indoc",
@@ -1295,7 +1084,7 @@ dependencies = [
12951084
12961085[[package]]
12971086name = "helix-dap"
1298−version = "0.6.0"
1087+version = "23.10.0"
12991088dependencies = [
13001089 "anyhow",
13011090 "fern",
@@ -1310,7 +1099,7 @@ dependencies = [
13101099
13111100[[package]]
13121101name = "helix-event"
1313−version = "0.6.0"
1102+version = "23.10.0"
13141103dependencies = [
13151104 "parking_lot",
13161105 "tokio",
@@ -1318,7 +1107,7 @@ dependencies = [
13181107
13191108[[package]]
13201109name = "helix-loader"
1321−version = "0.6.0"
1110+version = "23.10.0"
13221111dependencies = [
13231112 "anyhow",
13241113 "cc",
@@ -1337,7 +1126,7 @@ dependencies = [
13371126
13381127[[package]]
13391128name = "helix-lsp"
1340−version = "0.6.0"
1129+version = "23.10.0"
13411130dependencies = [
13421131 "anyhow",
13431132 "futures-executor",
@@ -1359,11 +1148,11 @@ dependencies = [
13591148
13601149[[package]]
13611150name = "helix-parsec"
1362−version = "0.6.0"
1151+version = "23.10.0"
13631152
13641153[[package]]
13651154name = "helix-term"
1366−version = "0.6.0"
1155+version = "23.10.0"
13671156dependencies = [
13681157 "anyhow",
13691158 "arc-swap",
@@ -1388,6 +1177,7 @@ dependencies = [
13881177 "log",
13891178 "nucleo",
13901179 "once_cell",
1180+ "open",
13911181 "pulldown-cmark",
13921182 "serde",
13931183 "serde_json",
@@ -1398,14 +1188,15 @@ dependencies = [
13981188 "tokio",
13991189 "tokio-stream",
14001190 "toml",
1191+ "url",
14011192 "which",
14021193]
14031194
14041195[[package]]
14051196name = "helix-tui"
1406−version = "0.6.0"
1197+version = "23.10.0"
14071198dependencies = [
1408− "bitflags 2.4.0",
1199+ "bitflags 2.4.1",
14091200 "cassowary",
14101201 "crossterm",
14111202 "helix-core",
@@ -1419,7 +1210,7 @@ dependencies = [
14191210
14201211[[package]]
14211212name = "helix-vcs"
1422−version = "0.6.0"
1213+version = "23.10.0"
14231214dependencies = [
14241215 "anyhow",
14251216 "arc-swap",
@@ -1435,11 +1226,11 @@ dependencies = [
14351226
14361227[[package]]
14371228name = "helix-view"
1438−version = "0.6.0"
1229+version = "23.10.0"
14391230dependencies = [
14401231 "anyhow",
14411232 "arc-swap",
1442− "bitflags 2.4.0",
1233+ "bitflags 2.4.1",
14431234 "chardetng",
14441235 "clipboard-win",
14451236 "crossterm",
@@ -1455,7 +1246,7 @@ dependencies = [
14551246 "log",
14561247 "once_cell",
14571248 "parking_lot",
1458− "rustix 0.38.18",
1249+ "rustix",
14591250 "serde",
14601251 "serde_json",
14611252 "slotmap",
@@ -1475,25 +1266,13 @@ dependencies = [
14751266 "libc",
14761267]
14771268
1478−[[package]]
1479−name = "hermit-abi"
1480−version = "0.3.2"
1481−source = "registry+https://github.com/rust-lang/crates.io-index"
1482−checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
1483−
1484−[[package]]
1485−name = "hex"
1486−version = "0.4.3"
1487−source = "registry+https://github.com/rust-lang/crates.io-index"
1488−checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
1489−
14901269[[package]]
14911270name = "home"
1492−version = "0.5.4"
1271+version = "0.5.5"
14931272source = "registry+https://github.com/rust-lang/crates.io-index"
1494−checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
1273+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
14951274dependencies = [
1496− "winapi",
1275+ "windows-sys 0.48.0",
14971276]
14981277
14991278[[package]]
@@ -1507,7 +1286,7 @@ dependencies = [
15071286 "iana-time-zone-haiku",
15081287 "js-sys",
15091288 "wasm-bindgen",
1510− "windows",
1289+ "windows 0.48.0",
15111290]
15121291
15131292[[package]]
@@ -1522,9 +1301,9 @@ dependencies = [
15221301
15231302[[package]]
15241303name = "idna"
1525−version = "0.4.0"
1304+version = "0.5.0"
15261305source = "registry+https://github.com/rust-lang/crates.io-index"
1527−checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
1306+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
15281307dependencies = [
15291308 "unicode-bidi",
15301309 "unicode-normalization",
@@ -1532,17 +1311,16 @@ dependencies = [
15321311
15331312[[package]]
15341313name = "ignore"
1535−version = "0.4.20"
1314+version = "0.4.21"
15361315source = "registry+https://github.com/rust-lang/crates.io-index"
1537−checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
1316+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
15381317dependencies = [
1318+ "crossbeam-deque",
15391319 "globset",
1540− "lazy_static",
15411320 "log",
15421321 "memchr",
1543− "regex",
1322+ "regex-automata",
15441323 "same-file",
1545− "thread_local",
15461324 "walkdir",
15471325 "winapi-util",
15481326]
@@ -1564,7 +1342,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
15641342checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
15651343dependencies = [
15661344 "equivalent",
1567− "hashbrown 0.14.1",
1345+ "hashbrown 0.14.3",
15681346]
15691347
15701348[[package]]
@@ -1574,24 +1352,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
15741352checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
15751353
15761354[[package]]
1577−name = "io-close"
1578−version = "0.3.7"
1355+name = "is-docker"
1356+version = "0.2.0"
15791357source = "registry+https://github.com/rust-lang/crates.io-index"
1580−checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
1358+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
15811359dependencies = [
1582− "libc",
1583− "winapi",
1360+ "once_cell",
15841361]
15851362
15861363[[package]]
1587−name = "io-lifetimes"
1588−version = "1.0.10"
1364+name = "is-wsl"
1365+version = "0.4.0"
15891366source = "registry+https://github.com/rust-lang/crates.io-index"
1590−checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
1367+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
15911368dependencies = [
1592− "hermit-abi 0.3.2",
1593− "libc",
1594− "windows-sys 0.48.0",
1369+ "is-docker",
1370+ "once_cell",
15951371]
15961372
15971373[[package]]
@@ -1609,26 +1385,11 @@ dependencies = [
16091385 "wasm-bindgen",
16101386]
16111387
1612−[[package]]
1613−name = "kstring"
1614−version = "2.0.0"
1615−source = "registry+https://github.com/rust-lang/crates.io-index"
1616−checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
1617−dependencies = [
1618− "static_assertions",
1619−]
1620−
1621−[[package]]
1622−name = "lazy_static"
1623−version = "1.4.0"
1624−source = "registry+https://github.com/rust-lang/crates.io-index"
1625−checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
1626−
16271388[[package]]
16281389name = "libc"
1629−version = "0.2.149"
1390+version = "0.2.151"
16301391source = "registry+https://github.com/rust-lang/crates.io-index"
1631−checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
1392+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
16321393
16331394[[package]]
16341395name = "libloading"
@@ -1651,15 +1412,9 @@ dependencies = [
16511412
16521413[[package]]
16531414name = "linux-raw-sys"
1654−version = "0.3.4"
1415+version = "0.4.11"
16551416source = "registry+https://github.com/rust-lang/crates.io-index"
1656−checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
1657−
1658−[[package]]
1659−name = "linux-raw-sys"
1660−version = "0.4.10"
1661−source = "registry+https://github.com/rust-lang/crates.io-index"
1662−checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
1417+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
16631418
16641419[[package]]
16651420name = "lock_api"
@@ -1679,9 +1434,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
16791434
16801435[[package]]
16811436name = "lsp-types"
1682−version = "0.94.1"
1437+version = "0.95.0"
16831438source = "registry+https://github.com/rust-lang/crates.io-index"
1684−checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
1439+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
16851440dependencies = [
16861441 "bitflags 1.3.2",
16871442 "serde",
@@ -1698,18 +1453,9 @@ checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
16981453
16991454[[package]]
17001455name = "memmap2"
1701−version = "0.5.10"
1702−source = "registry+https://github.com/rust-lang/crates.io-index"
1703−checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
1704−dependencies = [
1705− "libc",
1706−]
1707−
1708−[[package]]
1709−name = "memmap2"
1710−version = "0.7.1"
1456+version = "0.9.0"
17111457source = "registry+https://github.com/rust-lang/crates.io-index"
1712−checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
1458+checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
17131459dependencies = [
17141460 "libc",
17151461]
@@ -1723,12 +1469,6 @@ dependencies = [
17231469 "autocfg",
17241470]
17251471
1726−[[package]]
1727−name = "minimal-lexical"
1728−version = "0.2.1"
1729−source = "registry+https://github.com/rust-lang/crates.io-index"
1730−checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
1731−
17321472[[package]]
17331473name = "miniz_oxide"
17341474version = "0.7.1"
@@ -1740,24 +1480,14 @@ dependencies = [
17401480
17411481[[package]]
17421482name = "mio"
1743−version = "0.8.6"
1483+version = "0.8.9"
17441484source = "registry+https://github.com/rust-lang/crates.io-index"
1745−checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
1485+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
17461486dependencies = [
17471487 "libc",
17481488 "log",
17491489 "wasi",
1750− "windows-sys 0.45.0",
1751−]
1752−
1753−[[package]]
1754−name = "nom"
1755−version = "7.1.3"
1756−source = "registry+https://github.com/rust-lang/crates.io-index"
1757−checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
1758−dependencies = [
1759− "memchr",
1760− "minimal-lexical",
1490+ "windows-sys 0.48.0",
17611491]
17621492
17631493[[package]]
@@ -1797,7 +1527,7 @@ version = "1.15.0"
17971527source = "registry+https://github.com/rust-lang/crates.io-index"
17981528checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
17991529dependencies = [
1800− "hermit-abi 0.2.6",
1530+ "hermit-abi",
18011531 "libc",
18021532]
18031533
@@ -1821,15 +1551,20 @@ dependencies = [
18211551
18221552[[package]]
18231553name = "once_cell"
1824−version = "1.18.0"
1554+version = "1.19.0"
18251555source = "registry+https://github.com/rust-lang/crates.io-index"
1826−checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
1556+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
18271557
18281558[[package]]
1829−name = "option-ext"
1830−version = "0.2.0"
1559+name = "open"
1560+version = "5.0.1"
18311561source = "registry+https://github.com/rust-lang/crates.io-index"
1832−checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
1562+checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
1563+dependencies = [
1564+ "is-wsl",
1565+ "libc",
1566+ "pathdiff",
1567+]
18331568
18341569[[package]]
18351570name = "parking_lot"
@@ -1854,11 +1589,17 @@ dependencies = [
18541589 "windows-sys 0.45.0",
18551590]
18561591
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+
18571598[[package]]
18581599name = "percent-encoding"
1859−version = "2.3.0"
1600+version = "2.3.1"
18601601source = "registry+https://github.com/rust-lang/crates.io-index"
1861−checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
1602+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
18621603
18631604[[package]]
18641605name = "pin-project-lite"
@@ -1874,18 +1615,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
18741615
18751616[[package]]
18761617name = "proc-macro2"
1877−version = "1.0.63"
1618+version = "1.0.69"
18781619source = "registry+https://github.com/rust-lang/crates.io-index"
1879−checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
1620+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
18801621dependencies = [
18811622 "unicode-ident",
18821623]
18831624
18841625[[package]]
18851626name = "prodash"
1886−version = "25.0.0"
1627+version = "28.0.0"
18871628source = "registry+https://github.com/rust-lang/crates.io-index"
1888−checksum = "3236ce1618b6da4c7b618e0143c4d5b5dc190f75f81c49f248221382f7e9e9ae"
1629+checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
18891630
18901631[[package]]
18911632name = "pulldown-cmark"
@@ -1967,64 +1708,47 @@ dependencies = [
19671708
19681709[[package]]
19691710name = "redox_syscall"
1970−version = "0.3.5"
1711+version = "0.4.1"
19711712source = "registry+https://github.com/rust-lang/crates.io-index"
1972−checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
1713+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
19731714dependencies = [
19741715 "bitflags 1.3.2",
19751716]
19761717
1977−[[package]]
1978−name = "redox_users"
1979−version = "0.4.3"
1980−source = "registry+https://github.com/rust-lang/crates.io-index"
1981−checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
1982−dependencies = [
1983− "getrandom",
1984− "redox_syscall 0.2.16",
1985− "thiserror",
1986−]
1987−
19881718[[package]]
19891719name = "regex"
1990−version = "1.9.6"
1720+version = "1.10.2"
19911721source = "registry+https://github.com/rust-lang/crates.io-index"
1992−checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
1722+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
19931723dependencies = [
1994− "aho-corasick 1.0.2",
1724+ "aho-corasick",
19951725 "memchr",
19961726 "regex-automata",
1997− "regex-syntax 0.7.5",
1727+ "regex-syntax",
19981728]
19991729
20001730[[package]]
20011731name = "regex-automata"
2002−version = "0.3.9"
1732+version = "0.4.3"
20031733source = "registry+https://github.com/rust-lang/crates.io-index"
2004−checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
1734+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
20051735dependencies = [
2006− "aho-corasick 1.0.2",
1736+ "aho-corasick",
20071737 "memchr",
2008− "regex-syntax 0.7.5",
1738+ "regex-syntax",
20091739]
20101740
20111741[[package]]
20121742name = "regex-syntax"
2013−version = "0.6.29"
2014−source = "registry+https://github.com/rust-lang/crates.io-index"
2015−checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
2016−
2017−[[package]]
2018−name = "regex-syntax"
2019−version = "0.7.5"
1743+version = "0.8.2"
20201744source = "registry+https://github.com/rust-lang/crates.io-index"
2021−checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
1745+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
20221746
20231747[[package]]
20241748name = "ropey"
2025−version = "1.6.0"
1749+version = "1.6.1"
20261750source = "registry+https://github.com/rust-lang/crates.io-index"
2027−checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
1751+checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
20281752dependencies = [
20291753 "smallvec",
20301754 "str_indices",
@@ -2038,29 +1762,15 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
20381762
20391763[[package]]
20401764name = "rustix"
2041−version = "0.37.15"
2042−source = "registry+https://github.com/rust-lang/crates.io-index"
2043−checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
2044−dependencies = [
2045− "bitflags 1.3.2",
2046− "errno",
2047− "io-lifetimes",
2048− "libc",
2049− "linux-raw-sys 0.3.4",
2050− "windows-sys 0.48.0",
2051−]
2052−
2053−[[package]]
2054−name = "rustix"
2055−version = "0.38.18"
1765+version = "0.38.28"
20561766source = "registry+https://github.com/rust-lang/crates.io-index"
2057−checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
1767+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
20581768dependencies = [
2059− "bitflags 2.4.0",
1769+ "bitflags 2.4.1",
20601770 "errno",
20611771 "libc",
2062− "linux-raw-sys 0.4.10",
2063− "windows-sys 0.48.0",
1772+ "linux-raw-sys",
1773+ "windows-sys 0.52.0",
20641774]
20651775
20661776[[package]]
@@ -2092,29 +1802,29 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
20921802
20931803[[package]]
20941804name = "serde"
2095−version = "1.0.188"
1805+version = "1.0.193"
20961806source = "registry+https://github.com/rust-lang/crates.io-index"
2097−checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
1807+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
20981808dependencies = [
20991809 "serde_derive",
21001810]
21011811
21021812[[package]]
21031813name = "serde_derive"
2104−version = "1.0.188"
1814+version = "1.0.193"
21051815source = "registry+https://github.com/rust-lang/crates.io-index"
2106−checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
1816+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
21071817dependencies = [
21081818 "proc-macro2",
21091819 "quote",
2110− "syn 2.0.28",
1820+ "syn 2.0.38",
21111821]
21121822
21131823[[package]]
21141824name = "serde_json"
2115−version = "1.0.107"
1825+version = "1.0.108"
21161826source = "registry+https://github.com/rust-lang/crates.io-index"
2117−checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
1827+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
21181828dependencies = [
21191829 "itoa",
21201830 "ryu",
@@ -2129,7 +1839,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
21291839dependencies = [
21301840 "proc-macro2",
21311841 "quote",
2132− "syn 2.0.28",
1842+ "syn 2.0.38",
21331843]
21341844
21351845[[package]]
@@ -2200,18 +1910,18 @@ dependencies = [
22001910
22011911[[package]]
22021912name = "slotmap"
2203−version = "1.0.6"
1913+version = "1.0.7"
22041914source = "registry+https://github.com/rust-lang/crates.io-index"
2205−checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
1915+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
22061916dependencies = [
22071917 "version_check",
22081918]
22091919
22101920[[package]]
22111921name = "smallvec"
2212−version = "1.11.1"
1922+version = "1.11.2"
22131923source = "registry+https://github.com/rust-lang/crates.io-index"
2214−checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
1924+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
22151925
22161926[[package]]
22171927name = "smartstring"
@@ -2232,9 +1942,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
22321942
22331943[[package]]
22341944name = "socket2"
2235−version = "0.5.3"
1945+version = "0.5.5"
22361946source = "registry+https://github.com/rust-lang/crates.io-index"
2237−checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
1947+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
22381948dependencies = [
22391949 "libc",
22401950 "windows-sys 0.48.0",
@@ -2246,12 +1956,6 @@ version = "1.1.0"
22461956source = "registry+https://github.com/rust-lang/crates.io-index"
22471957checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
22481958
2249−[[package]]
2250−name = "str-buf"
2251−version = "1.0.6"
2252−source = "registry+https://github.com/rust-lang/crates.io-index"
2253−checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
2254−
22551959[[package]]
22561960name = "str_indices"
22571961version = "0.4.1"
@@ -2271,9 +1975,9 @@ dependencies = [
22711975
22721976[[package]]
22731977name = "syn"
2274−version = "2.0.28"
1978+version = "2.0.38"
22751979source = "registry+https://github.com/rust-lang/crates.io-index"
2276−checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
1980+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
22771981dependencies = [
22781982 "proc-macro2",
22791983 "quote",
@@ -2282,14 +1986,14 @@ dependencies = [
22821986
22831987[[package]]
22841988name = "tempfile"
2285−version = "3.8.0"
1989+version = "3.8.1"
22861990source = "registry+https://github.com/rust-lang/crates.io-index"
2287−checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
1991+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
22881992dependencies = [
22891993 "cfg-if",
22901994 "fastrand",
2291− "redox_syscall 0.3.5",
2292− "rustix 0.38.18",
1995+ "redox_syscall 0.4.1",
1996+ "rustix",
22931997 "windows-sys 0.48.0",
22941998]
22951999
@@ -2324,32 +2028,22 @@ dependencies = [
23242028
23252029[[package]]
23262030name = "thiserror"
2327−version = "1.0.49"
2031+version = "1.0.52"
23282032source = "registry+https://github.com/rust-lang/crates.io-index"
2329−checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
2033+checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
23302034dependencies = [
23312035 "thiserror-impl",
23322036]
23332037
23342038[[package]]
23352039name = "thiserror-impl"
2336−version = "1.0.49"
2040+version = "1.0.52"
23372041source = "registry+https://github.com/rust-lang/crates.io-index"
2338−checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
2042+checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
23392043dependencies = [
23402044 "proc-macro2",
23412045 "quote",
2342− "syn 2.0.28",
2343−]
2344−
2345−[[package]]
2346−name = "thread_local"
2347−version = "1.1.7"
2348−source = "registry+https://github.com/rust-lang/crates.io-index"
2349−checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
2350−dependencies = [
2351− "cfg-if",
2352− "once_cell",
2046+ "syn 2.0.38",
23532047]
23542048
23552049[[package]]
@@ -2363,9 +2057,9 @@ dependencies = [
23632057
23642058[[package]]
23652059name = "time"
2366−version = "0.3.20"
2060+version = "0.3.23"
23672061source = "registry+https://github.com/rust-lang/crates.io-index"
2368−checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
2062+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
23692063dependencies = [
23702064 "itoa",
23712065 "libc",
@@ -2377,15 +2071,15 @@ dependencies = [
23772071
23782072[[package]]
23792073name = "time-core"
2380−version = "0.1.0"
2074+version = "0.1.1"
23812075source = "registry+https://github.com/rust-lang/crates.io-index"
2382−checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
2076+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
23832077
23842078[[package]]
23852079name = "time-macros"
2386−version = "0.2.8"
2080+version = "0.2.10"
23872081source = "registry+https://github.com/rust-lang/crates.io-index"
2388−checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
2082+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
23892083dependencies = [
23902084 "time-core",
23912085]
@@ -2407,9 +2101,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
24072101
24082102[[package]]
24092103name = "tokio"
2410−version = "1.33.0"
2104+version = "1.35.1"
24112105source = "registry+https://github.com/rust-lang/crates.io-index"
2412−checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
2106+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
24132107dependencies = [
24142108 "backtrace",
24152109 "bytes",
@@ -2426,13 +2120,13 @@ dependencies = [
24262120
24272121[[package]]
24282122name = "tokio-macros"
2429−version = "2.1.0"
2123+version = "2.2.0"
24302124source = "registry+https://github.com/rust-lang/crates.io-index"
2431−checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
2125+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
24322126dependencies = [
24332127 "proc-macro2",
24342128 "quote",
2435− "syn 2.0.28",
2129+ "syn 2.0.38",
24362130]
24372131
24382132[[package]]
@@ -2477,7 +2171,7 @@ dependencies = [
24772171 "serde",
24782172 "serde_spanned",
24792173 "toml_datetime",
2480− "winnow",
2174+ "winnow 0.4.6",
24812175]
24822176
24832177[[package]]
@@ -2551,9 +2245,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
25512245
25522246[[package]]
25532247name = "url"
2554−version = "2.4.1"
2248+version = "2.5.0"
25552249source = "registry+https://github.com/rust-lang/crates.io-index"
2556−checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
2250+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
25572251dependencies = [
25582252 "form_urlencoded",
25592253 "idna",
@@ -2569,9 +2263,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
25692263
25702264[[package]]
25712265name = "walkdir"
2572−version = "2.3.3"
2266+version = "2.4.0"
25732267source = "registry+https://github.com/rust-lang/crates.io-index"
2574−checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
2268+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
25752269dependencies = [
25762270 "same-file",
25772271 "winapi-util",
@@ -2639,14 +2333,15 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
26392333
26402334[[package]]
26412335name = "which"
2642−version = "4.4.1"
2336+version = "5.0.0"
26432337source = "registry+https://github.com/rust-lang/crates.io-index"
2644−checksum = "8ad25fe5717e59ada8ea33511bbbf7420b11031730a24c65e82428766c307006"
2338+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
26452339dependencies = [
2646− "dirs",
26472340 "either",
2341+ "home",
26482342 "once_cell",
2649− "rustix 0.38.18",
2343+ "rustix",
2344+ "windows-sys 0.48.0",
26502345]
26512346
26522347[[package]]
@@ -2689,6 +2384,25 @@ dependencies = [
26892384 "windows-targets 0.48.0",
26902385]
26912386
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+
26922406[[package]]
26932407name = "windows-sys"
26942408version = "0.45.0"
@@ -2707,6 +2421,15 @@ dependencies = [
27072421 "windows-targets 0.48.0",
27082422]
27092423
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+
27102433[[package]]
27112434name = "windows-targets"
27122435version = "0.42.2"
@@ -2737,6 +2460,21 @@ dependencies = [
27372460 "windows_x86_64_msvc 0.48.0",
27382461]
27392462
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+
27402478[[package]]
27412479name = "windows_aarch64_gnullvm"
27422480version = "0.42.2"
@@ -2749,6 +2487,12 @@ version = "0.48.0"
27492487source = "registry+https://github.com/rust-lang/crates.io-index"
27502488checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
27512489
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+
27522496[[package]]
27532497name = "windows_aarch64_msvc"
27542498version = "0.42.2"
@@ -2761,6 +2505,12 @@ version = "0.48.0"
27612505source = "registry+https://github.com/rust-lang/crates.io-index"
27622506checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
27632507
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+
27642514[[package]]
27652515name = "windows_i686_gnu"
27662516version = "0.42.2"
@@ -2773,6 +2523,12 @@ version = "0.48.0"
27732523source = "registry+https://github.com/rust-lang/crates.io-index"
27742524checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
27752525
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+
27762532[[package]]
27772533name = "windows_i686_msvc"
27782534version = "0.42.2"
@@ -2785,6 +2541,12 @@ version = "0.48.0"
27852541source = "registry+https://github.com/rust-lang/crates.io-index"
27862542checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
27872543
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+
27882550[[package]]
27892551name = "windows_x86_64_gnu"
27902552version = "0.42.2"
@@ -2797,6 +2559,12 @@ version = "0.48.0"
27972559source = "registry+https://github.com/rust-lang/crates.io-index"
27982560checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
27992561
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+
28002568[[package]]
28012569name = "windows_x86_64_gnullvm"
28022570version = "0.42.2"
@@ -2809,6 +2577,12 @@ version = "0.48.0"
28092577source = "registry+https://github.com/rust-lang/crates.io-index"
28102578checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
28112579
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+
28122586[[package]]
28132587name = "windows_x86_64_msvc"
28142588version = "0.42.2"
@@ -2821,6 +2595,12 @@ version = "0.48.0"
28212595source = "registry+https://github.com/rust-lang/crates.io-index"
28222596checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
28232597
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+
28242604[[package]]
28252605name = "winnow"
28262606version = "0.4.6"
@@ -2830,9 +2610,18 @@ dependencies = [
28302610 "memchr",
28312611]
28322612
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+
28332622[[package]]
28342623name = "xtask"
2835−version = "0.6.0"
2624+version = "23.10.0"
28362625dependencies = [
28372626 "helix-core",
28382627 "helix-loader",
@@ -2840,3 +2629,23 @@ dependencies = [
28402629 "helix-view",
28412630 "toml",
28422631]
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+11
@@ -1,4 +1,5 @@
11[workspace]
2+resolver = "2"
23members = [
34 "helix-core",
45 "helix-view",
@@ -37,3 +38,13 @@ package.helix-term.opt-level = 2
3738[workspace.dependencies]
3839tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
3940nucleo = "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+1−1
@@ -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.
VERSIONdeleted−1
@@ -1 +0,0 @@
1−23.05
book/src/configuration.md+26−9
@@ -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` |
@@ -65,6 +65,8 @@ Its settings will be merged with the configuration directory `config.toml` and t
6565| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
6666| `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` |
6767| `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`
6870
6971### `[editor.statusline]` Section
7072
@@ -166,16 +168,31 @@ All git related options are only enabled in a git repository.
166168
167169| Key | Description | Default |
168170|--|--|---------|
169−|`hidden` | Enables ignoring hidden files | true
170−|`follow-symlinks` | Follow symlinks instead of ignoring them | true
171−|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
172−|`parents` | Enables reading ignore files from parent directories | true
173−|`ignore` | Enables reading `.ignore` files | true
174−|`git-ignore` | Enables reading `.gitignore` files | true
175−|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` option | true
176−|`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`
177179|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
178180
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+
179196### `[editor.auto-pairs]` Section
180197
181198Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a
book/src/generated/lang-support.md+16−7
@@ -1,5 +1,6 @@
11| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
22| --- | --- | --- | --- | --- |
3+| agda | ✓ | | | |
34| astro | ✓ | | | |
45| awk | ✓ | ✓ | | `awk-language-server` |
56| bash | ✓ | ✓ | ✓ | `bash-language-server` |
@@ -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 | ✓ | | | |
@@ -54,7 +56,8 @@
5456| git-rebase | ✓ | | | |
5557| gleam | ✓ | ✓ | | `gleam` |
5658| glsl | ✓ | ✓ | ✓ | |
57−| go | ✓ | ✓ | ✓ | `gopls` |
59+| gn | ✓ | | | |
60+| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
5861| godot-resource | ✓ | | | |
5962| gomod | ✓ | | | `gopls` |
6063| gotmpl | ✓ | | | `gopls` |
@@ -71,6 +74,7 @@
7174| idris | | | | `idris2-lsp` |
7275| iex | ✓ | | | |
7376| ini | ✓ | | | |
77+| janet | ✓ | | | |
7478| java | ✓ | ✓ | ✓ | `jdtls` |
7579| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
7680| jinja | ✓ | | | |
@@ -81,7 +85,7 @@
8185| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
8286| julia | ✓ | ✓ | ✓ | `julia` |
8387| just | ✓ | ✓ | ✓ | |
84−| kdl | ✓ | | | |
88+| kdl | ✓ | ✓ | ✓ | |
8589| kotlin | ✓ | | | `kotlin-language-server` |
8690| latex | ✓ | ✓ | | `texlab` |
8791| lean | ✓ | | | `lean` |
@@ -89,6 +93,8 @@
8993| llvm | ✓ | ✓ | ✓ | |
9094| llvm-mir | ✓ | ✓ | ✓ | |
9195| llvm-mir-yaml | ✓ | | ✓ | |
96+| log | ✓ | | | |
97+| lpf | ✓ | | | |
9298| lua | ✓ | ✓ | ✓ | `lua-language-server` |
9399| make | ✓ | | | |
94100| markdoc | ✓ | | | `markdoc-ls` |
@@ -103,7 +109,7 @@
103109| nickel | ✓ | | ✓ | `nls` |
104110| nim | ✓ | ✓ | ✓ | `nimlangserver` |
105111| nix | ✓ | | | `nil` |
106−| nu | ✓ | | | |
112+| nu | ✓ | | | `nu` |
107113| nunjucks | ✓ | | | |
108114| ocaml | ✓ | | ✓ | `ocamllsp` |
109115| ocaml-interface | ✓ | | | `ocamllsp` |
@@ -127,7 +133,7 @@
127133| python | ✓ | ✓ | ✓ | `pylsp` |
128134| qml | ✓ | | ✓ | `qmlls` |
129135| r | ✓ | | | `R` |
130−| racket | ✓ | | | `racket` |
136+| racket | ✓ | | ✓ | `racket` |
131137| regex | ✓ | | | |
132138| rego | ✓ | | | `regols` |
133139| rescript | ✓ | ✓ | | `rescript-language-server` |
@@ -139,9 +145,10 @@
139145| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
140146| sage | ✓ | ✓ | | |
141147| scala | ✓ | | ✓ | `metals` |
142−| scheme | ✓ | | | |
148+| scheme | ✓ | | ✓ | |
143149| scss | ✓ | | | `vscode-css-language-server` |
144150| slint | ✓ | | ✓ | `slint-lsp` |
151+| smali | ✓ | | ✓ | |
145152| smithy | ✓ | | | `cs` |
146153| sml | ✓ | | | |
147154| solidity | ✓ | | | `solc` |
@@ -155,6 +162,7 @@
155162| t32 | ✓ | | | |
156163| tablegen | ✓ | ✓ | ✓ | |
157164| task | ✓ | | | |
165+| templ | ✓ | | | `templ` |
158166| tfvars | ✓ | | ✓ | `terraform-ls` |
159167| todotxt | ✓ | | | |
160168| toml | ✓ | | | `taplo` |
@@ -162,6 +170,7 @@
162170| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
163171| twig | ✓ | | | |
164172| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
173+| typst | ✓ | | | `typst-lsp` |
165174| ungrammar | ✓ | | | |
166175| unison | ✓ | | | |
167176| uxntal | ✓ | | | |
book/src/generated/typable-cmd.md+2−1
@@ -17,7 +17,7 @@
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. |
@@ -85,3 +85,4 @@
8585| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
8686| `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
8787| `: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+9
@@ -12,6 +12,15 @@ Note that it matters where these added indents begin. For example,
1212multiple indent level increases that start on the same line only increase
1313the total indent level by 1. See [Capture types](#capture-types).
1414
15+By default, Helix uses the `hybrid` indentation heuristic. This means that
16+indent queries are not used to compute the expected absolute indentation of a
17+line but rather the expected difference in indentation between the new and an
18+already existing line. This difference is then added to the actual indentation
19+of the already existing line. Since this makes errors in the indent queries
20+harder to find, it is recommended to disable it when testing via
21+`:set indent-heuristic tree-sitter`. The rest of this guide assumes that
22+the `tree-sitter` heuristic is used.
23+
1524## Indent queries
1625
1726When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine
book/src/install.md+30−6
@@ -13,6 +13,7 @@
1313 - [AppImage](#appimage)
1414- [macOS](#macos)
1515 - [Homebrew Core](#homebrew-core)
16+ - [MacPorts](#macports)
1617- [Windows](#windows)
1718 - [Winget](#winget)
1819 - [Scoop](#scoop)
@@ -64,10 +65,7 @@ sudo apt install helix
6465
6566### Fedora/RHEL
6667
67−Enable the `COPR` repository for Helix:
68−
6968```sh
70−sudo dnf copr enable varlad/helix
7169sudo dnf install helix
7270```
7371
@@ -133,6 +131,12 @@ chmod +x helix-*.AppImage # change permission for executable mode
133131brew install helix
134132```
135133
134+### MacPorts
135+
136+```sh
137+port install helix
138+```
139+
136140## Windows
137141
138142Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
@@ -224,7 +228,7 @@ Or, create a symbolic link:
224228ln -Ts $PWD/runtime ~/.config/helix/runtime
225229```
226230
227−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.
228232
229233#### Windows
230234
@@ -257,12 +261,32 @@ following order:
2572611. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
258262 developing and testing helix only).
2592632. `runtime/` subdirectory of OS-dependent helix user config directory.
260−3. `$HELIX_RUNTIME`.
261−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.
262268
263269This order also sets the priority for selecting which file will be used if multiple runtime
264270directories have files with the same name.
265271
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+
266290### Validating the installation
267291
268292To make sure everything is set up as expected you should run the Helix health
book/src/keymap.md+1−1
@@ -25,7 +25,7 @@
2525
2626## Normal mode
2727
28−Normal mode is the default mode when you launch helix. Return to it from other modes by typing `Escape`.
28+Normal mode is the default mode when you launch helix. You can return to it from other modes by pressing the `Escape` key.
2929
3030### Movement
3131
book/src/languages.md+2
@@ -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
book/src/themes.md+5−1
@@ -155,6 +155,7 @@ We use a similar set of scopes as
155155
156156- `type` - Types
157157 - `builtin` - Primitive types provided by the language (`int`, `usize`)
158+ - `parameter` - Generic type parameters (`T`)
158159 - `enum`
159160 - `variant`
160161- `constructor`
@@ -295,11 +296,14 @@ These scopes are used for theming the editor interface:
295296| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
296297| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
297298| `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 |
298302| `ui.popup` | Documentation popups (e.g. Space + k) |
299303| `ui.popup.info` | Prompt for multiple key options |
300304| `ui.window` | Borderlines separating splits |
301305| `ui.help` | Description box for commands |
302−| `ui.text` | Command prompts, popup text, etc. |
306+| `ui.text` | Default text style, command prompts, popup text, etc. |
303307| `ui.text.focus` | The currently selected line in the picker |
304308| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
305309| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
book/src/usage.md+2−2
@@ -59,8 +59,8 @@ Some registers have special behavior when read from and written to.
5959| `#` | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
6060| `.` | Contents of the current selections | This register is not writable |
6161| `%` | 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 |
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 |
6464
6565When yanking multiple selections to the clipboard registers, the selections
6666are joined with newlines. Pasting from these registers will paste multiple
contrib/Helix.appdata.xml+3
@@ -48,6 +48,9 @@
4848 <content_rating type="oars-1.1" />
4949
5050 <releases>
51+ <release version="23.10" date="2023-10-24">
52+ <url>https://helix-editor.com/news/release-23-10-highlights/</url>
53+ </release>
5154 <release version="23.05" date="2023-05-18">
5255 <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
5356 </release>
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.
flake.lock+12−35
@@ -2,23 +2,16 @@
22 "nodes": {
33 "crane": {
44 "inputs": {
5− "flake-compat": "flake-compat",
6− "flake-utils": [
7− "flake-utils"
8− ],
95 "nixpkgs": [
106 "nixpkgs"
11− ],
12− "rust-overlay": [
13− "rust-overlay"
147 ]
158 },
169 "locked": {
17− "lastModified": 1688772518,
18− "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
10+ "lastModified": 1701025348,
11+ "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
1912 "owner": "ipetkov",
2013 "repo": "crane",
21− "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
14+ "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
2215 "type": "github"
2316 },
2417 "original": {
@@ -27,32 +20,16 @@
2720 "type": "github"
2821 }
2922 },
30− "flake-compat": {
31− "flake": false,
32− "locked": {
33− "lastModified": 1673956053,
34− "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
35− "owner": "edolstra",
36− "repo": "flake-compat",
37− "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
38− "type": "github"
39− },
40− "original": {
41− "owner": "edolstra",
42− "repo": "flake-compat",
43− "type": "github"
44− }
45− },
4623 "flake-utils": {
4724 "inputs": {
4825 "systems": "systems"
4926 },
5027 "locked": {
51− "lastModified": 1689068808,
52− "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
28+ "lastModified": 1694529238,
29+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
5330 "owner": "numtide",
5431 "repo": "flake-utils",
55− "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
32+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
5633 "type": "github"
5734 },
5835 "original": {
@@ -63,11 +40,11 @@
6340 },
6441 "nixpkgs": {
6542 "locked": {
66− "lastModified": 1690272529,
67− "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
43+ "lastModified": 1700794826,
44+ "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
6845 "owner": "nixos",
6946 "repo": "nixpkgs",
70− "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
47+ "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
7148 "type": "github"
7249 },
7350 "original": {
@@ -95,11 +72,11 @@
9572 ]
9673 },
9774 "locked": {
98− "lastModified": 1690424156,
99− "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=",
75+ "lastModified": 1701137803,
76+ "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
10077 "owner": "oxalica",
10178 "repo": "rust-overlay",
102− "rev": "f335a0213504c7e6481c359dc1009be9cf34432c",
79+ "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
10380 "type": "github"
10481 },
10582 "original": {
flake.nix+12−14
@@ -13,8 +13,6 @@
1313 };
1414 crane = {
1515 url = "github:ipetkov/crane";
16− inputs.rust-overlay.follows = "rust-overlay";
17− inputs.flake-utils.follows = "flake-utils";
1816 inputs.nixpkgs.follows = "nixpkgs";
1917 };
2018 };
@@ -123,18 +121,18 @@
123121 rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
124122 craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
125123 craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
126− commonArgs =
127− {
128− inherit stdenv;
129− src = filteredSource;
130− # disable fetching and building of tree-sitter grammars in the helix-term build.rs
131− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
132− buildInputs = [stdenv.cc.cc.lib];
133− # disable tests
134− doCheck = false;
135− meta.mainProgram = "hx";
136− }
137− // craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
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+ };
138136 cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
139137 in {
140138 packages = {
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+13−12
@@ -1,23 +1,24 @@
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+ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
2122smallvec = "1.11"
2223smartstring = "1.0.1"
2324unicode-segmentation = "1.10"
@@ -26,12 +27,12 @@ unicode-general-category = "0.6"
2627# slab = "0.4.2"
2728slotmap = "1.0"
2829tree-sitter.workspace = true
29−once_cell = "1.18"
30+once_cell = "1.19"
3031arc-swap = "1"
3132regex = "1"
3233bitflags = "2.4"
33−ahash = "0.8.3"
34−hashbrown = { version = "0.14.1", features = ["raw"] }
34+ahash = "0.8.6"
35+hashbrown = { version = "0.14.3", features = ["raw"] }
3536dunce = "1.0"
3637
3738log = "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/indent.rs+316−103
@@ -4,10 +4,11 @@ use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
44
55use crate::{
66 chars::{char_is_line_ending, char_is_whitespace},
7+ find_first_non_whitespace_char,
78 graphemes::{grapheme_width, tab_width_at},
8− syntax::{LanguageConfiguration, RopeProvider, Syntax},
9+ syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
910 tree_sitter::Node,
10− Rope, RopeGraphemes, RopeSlice,
11+ Position, Rope, RopeGraphemes, RopeSlice,
1112};
1213
1314/// Enum representing indentation style.
@@ -21,7 +22,7 @@ pub enum IndentStyle {
2122
2223// 16 spaces
2324const INDENTS: &str = " ";
24−const MAX_INDENT: u8 = 16;
25+pub const MAX_INDENT: u8 = 16;
2526
2627impl IndentStyle {
2728 /// Creates an `IndentStyle` from an indentation string.
@@ -196,6 +197,56 @@ pub fn indent_level_for_line(line: RopeSlice, tab_width: usize, indent_width: us
196197 len / indent_width
197198}
198199
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+
199250/// Computes for node and all ancestors whether they are the first node on their line.
200251/// The first entry in the return value represents the root node, the last one the node itself
201252fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
@@ -241,21 +292,21 @@ fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bo
241292/// - max(0, indent - outdent) tabs, if tabs are used for indentation
242293/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
243294#[derive(Default, Debug, PartialEq, Eq, Clone)]
244−pub struct Indentation {
295+pub struct Indentation<'a> {
245296 indent: usize,
246297 indent_always: usize,
247298 outdent: usize,
248299 outdent_always: usize,
249300 /// The alignment, as a string containing only tabs & spaces. Storing this as a string instead of e.g.
250301 /// the (visual) width ensures that the alignment is preserved even if the tab width changes.
251− align: Option<String>,
302+ align: Option<RopeSlice<'a>>,
252303}
253304
254−impl Indentation {
305+impl<'a> Indentation<'a> {
255306 /// Add some other [Indentation] to this.
256307 /// The added indent should be the total added indent from one line.
257308 /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).
258− fn add_line(&mut self, added: Indentation) {
309+ fn add_line(&mut self, added: Indentation<'a>) {
259310 // Align overrides the indent from outer scopes.
260311 if self.align.is_some() {
261312 return;
@@ -271,8 +322,10 @@ impl Indentation {
271322 }
272323
273324 /// Add an indent capture to this indent.
274− /// All the captures that are added in this way should be on the same line.
275− 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>) {
276329 match added {
277330 IndentCaptureType::Indent => {
278331 if self.indent_always == 0 {
@@ -295,47 +348,68 @@ impl Indentation {
295348 self.outdent = 0;
296349 }
297350 IndentCaptureType::Align(align) => {
298− self.align = Some(align);
351+ if self.align.is_none() {
352+ self.align = Some(align);
353+ }
299354 }
300355 }
301356 }
302− fn into_string(self, indent_style: &IndentStyle) -> String {
303− let indent = self.indent_always + self.indent;
304− let outdent = self.outdent_always + self.outdent;
305−
306− let indent_level = if indent >= outdent {
307− indent - outdent
308− } else {
309− log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
310− 0
311− };
312− let mut indent_string = if let Some(align) = self.align {
313− align
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+ ))
314380 } else {
315− String::new()
316− };
317− indent_string.push_str(&indent_style.as_str().repeat(indent_level));
318− indent_string
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+ )
319393 }
320394}
321395
322396/// An indent definition which corresponds to a capture from the indent query
323397#[derive(Debug)]
324−struct IndentCapture {
325− capture_type: IndentCaptureType,
398+struct IndentCapture<'a> {
399+ capture_type: IndentCaptureType<'a>,
326400 scope: IndentScope,
327401}
328402#[derive(Debug, Clone, PartialEq)]
329−enum IndentCaptureType {
403+enum IndentCaptureType<'a> {
330404 Indent,
331405 IndentAlways,
332406 Outdent,
333407 OutdentAlways,
334408 /// Alignment given as a string of whitespace
335− Align(String),
409+ Align(RopeSlice<'a>),
336410}
337411
338−impl IndentCaptureType {
412+impl<'a> IndentCaptureType<'a> {
339413 fn default_scope(&self) -> IndentScope {
340414 match self {
341415 IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
@@ -367,8 +441,8 @@ enum ExtendCapture {
367441/// each node (identified by its ID) the relevant captures (already filtered
368442/// by predicates).
369443#[derive(Debug)]
370−struct IndentQueryResult {
371− indent_captures: HashMap<usize, Vec<IndentCapture>>,
444+struct IndentQueryResult<'a> {
445+ indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,
372446 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
373447}
374448
@@ -389,14 +463,14 @@ fn get_node_end_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
389463 node_line
390464}
391465
392−fn query_indents(
466+fn query_indents<'a>(
393467 query: &Query,
394468 syntax: &Syntax,
395469 cursor: &mut QueryCursor,
396− text: RopeSlice,
470+ text: RopeSlice<'a>,
397471 range: std::ops::Range<usize>,
398472 new_line_byte_pos: Option<usize>,
399−) -> IndentQueryResult {
473+) -> IndentQueryResult<'a> {
400474 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
401475 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
402476 cursor.set_byte_range(range);
@@ -484,7 +558,7 @@ fn query_indents(
484558 "outdent" => IndentCaptureType::Outdent,
485559 "outdent.always" => IndentCaptureType::OutdentAlways,
486560 // The alignment will be updated to the correct value at the end, when the anchor is known.
487− "align" => IndentCaptureType::Align(String::from("")),
561+ "align" => IndentCaptureType::Align(RopeSlice::from("")),
488562 "anchor" => {
489563 if anchor.is_some() {
490564 log::error!("Invalid indent query: Encountered more than one @anchor in the same match.")
@@ -556,22 +630,10 @@ fn query_indents(
556630 }
557631 Some(anchor) => anchor,
558632 };
559− // Create a string of tabs & spaces that should have the same width
560− // as the string that precedes the anchor (independent of the tab width).
561− let mut align = String::new();
562− for grapheme in RopeGraphemes::new(
633+ capture.capture_type = IndentCaptureType::Align(
563634 text.line(anchor.start_position().row)
564635 .byte_slice(0..anchor.start_position().column),
565− ) {
566− if grapheme == "\t" {
567− align.push('\t');
568− } else {
569− align.extend(
570− std::iter::repeat(' ').take(grapheme_width(&Cow::from(grapheme))),
571− );
572− }
573− }
574− capture.capture_type = IndentCaptureType::Align(align);
636+ );
575637 }
576638 indent_captures
577639 .entry(node_id)
@@ -657,56 +719,20 @@ fn extend_nodes<'a>(
657719 }
658720}
659721
660−/// Use the syntax tree to determine the indentation for a given position.
661−/// This can be used in 2 ways:
662−///
663−/// - To get the correct indentation for an existing line (new_line=false), not necessarily equal to the current indentation.
664−/// - In this case, pos should be inside the first tree-sitter node on that line.
665−/// In most cases, this can just be the first non-whitespace on that line.
666−/// - To get the indentation for a new line (new_line=true). This behaves like the first usecase if the part of the current line
667−/// after pos were moved to a new line.
668−///
669−/// The indentation is determined by traversing all the tree-sitter nodes containing the position.
670−/// Each of these nodes produces some [Indentation] for:
671−///
672−/// - The line of the (beginning of the) node. This is defined by the scope `all` if this is the first node on its line.
673−/// - The line after the node. This is defined by:
674−/// - The scope `tail`.
675−/// - The scope `all` if this node is not the first node on its line.
676−/// Intuitively, `all` applies to everything contained in this node while `tail` applies to everything except for the first line of the node.
677−/// The indents from different nodes for the same line are then combined.
678−/// The result [Indentation] is simply the sum of the [Indentation] for all lines.
679−///
680−/// Specifying which line exactly an [Indentation] applies to is important because indents on the same line combine differently than indents on different lines:
681−/// ```ignore
682−/// some_function(|| {
683−/// // Both the function parameters as well as the contained block should be indented.
684−/// // Because they are on the same line, this only yields one indent level
685−/// });
686−/// ```
687−///
688−/// ```ignore
689−/// some_function(
690−/// param1,
691−/// || {
692−/// // Here we get 2 indent levels because the 'parameters' and the 'block' node begin on different lines
693−/// },
694−/// );
695−/// ```
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.
696725#[allow(clippy::too_many_arguments)]
697−pub fn treesitter_indent_for_pos(
726+fn init_indent_query<'a, 'b>(
698727 query: &Query,
699− syntax: &Syntax,
700− indent_style: &IndentStyle,
728+ syntax: &'a Syntax,
729+ text: RopeSlice<'b>,
701730 tab_width: usize,
702731 indent_width: usize,
703− text: RopeSlice,
704732 line: usize,
705− pos: usize,
706− new_line: bool,
707−) -> Option<String> {
708− let byte_pos = text.char_to_byte(pos);
709− let new_line_byte_pos = new_line.then_some(byte_pos);
733+ byte_pos: usize,
734+ new_line_byte_pos: Option<usize>,
735+) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {
710736 // The innermost tree-sitter node which is considered for the indent
711737 // computation. It may change if some predeceding node is extended
712738 let mut node = syntax
@@ -750,7 +776,6 @@ pub fn treesitter_indent_for_pos(
750776 (query_result, deepest_preceding)
751777 })
752778 };
753− let mut indent_captures = query_result.indent_captures;
754779 let extend_captures = query_result.extend_captures;
755780
756781 // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -765,6 +790,68 @@ pub fn treesitter_indent_for_pos(
765790 indent_width,
766791 );
767792 }
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+ )?;
768855 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
769856
770857 let mut result = Indentation::default();
@@ -832,7 +919,7 @@ pub fn treesitter_indent_for_pos(
832919 break;
833920 }
834921 }
835− Some(result.into_string(indent_style))
922+ Some(result)
836923}
837924
838925/// Returns the indentation for a new line.
@@ -841,6 +928,7 @@ pub fn treesitter_indent_for_pos(
841928pub fn indent_for_newline(
842929 language_config: Option<&LanguageConfiguration>,
843930 syntax: Option<&Syntax>,
931+ indent_heuristic: &IndentationHeuristic,
844932 indent_style: &IndentStyle,
845933 tab_width: usize,
846934 text: RopeSlice,
@@ -849,14 +937,18 @@ pub fn indent_for_newline(
849937 current_line: usize,
850938) -> String {
851939 let indent_width = indent_style.indent_width(tab_width);
852− if let (Some(query), Some(syntax)) = (
940+ if let (
941+ IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,
942+ Some(query),
943+ Some(syntax),
944+ ) = (
945+ indent_heuristic,
853946 language_config.and_then(|config| config.indent_query()),
854947 syntax,
855948 ) {
856949 if let Some(indent) = treesitter_indent_for_pos(
857950 query,
858951 syntax,
859− indent_style,
860952 tab_width,
861953 indent_width,
862954 text,
@@ -864,9 +956,57 @@ pub fn indent_for_newline(
864956 line_before_end_pos,
865957 true,
866958 ) {
867− 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);
8681007 };
8691008 }
1009+ // Fallback in case we either don't have indent queries or they failed for some reason
8701010 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
8711011 indent_style.as_str().repeat(indent_level)
8721012}
@@ -958,10 +1098,13 @@ mod test {
9581098 ..Default::default()
9591099 };
9601100
961− let add_capture = |mut indent: Indentation, capture| {
1101+ fn add_capture<'a>(
1102+ mut indent: Indentation<'a>,
1103+ capture: IndentCaptureType<'a>,
1104+ ) -> Indentation<'a> {
9621105 indent.add_capture(capture);
9631106 indent
964− };
1107+ }
9651108
9661109 // adding an indent to no indent makes an indent
9671110 assert_eq!(
@@ -1056,4 +1199,74 @@ mod test {
10561199 )
10571200 );
10581201 }
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+ }
10591272}
helix-core/src/syntax.rs+21−5
@@ -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)]
helix-core/src/transaction.rs+73−14
@@ -1,7 +1,7 @@
11use ropey::RopeSlice;
22use smallvec::SmallVec;
33
4−use crate::{Range, Rope, Selection, Tendril};
4+use crate::{chars::char_is_word, Range, Rope, Selection, Tendril};
55use std::{borrow::Cow, iter::once};
66
77/// (from, to, replacement)
@@ -23,6 +23,30 @@ pub enum Operation {
2323pub enum Assoc {
2424 Before,
2525 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+ }
2650}
2751
2852#[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -415,8 +439,6 @@ impl ChangeSet {
415439 map!(|pos, _| (old_end > pos).then_some(new_pos), i);
416440 }
417441 Insert(s) => {
418− let ins = s.chars().count();
419−
420442 // a subsequent delete means a replace, consume it
421443 if let Some((_, Delete(len))) = iter.peek() {
422444 iter.next();
@@ -424,13 +446,13 @@ impl ChangeSet {
424446 old_end = old_pos + len;
425447 // in range of replaced text
426448 map!(
427− |pos, assoc| (old_end > pos).then(|| {
449+ |pos, assoc: Assoc| (old_end > pos).then(|| {
428450 // at point or tracking before
429− if pos == old_pos || assoc == Assoc::Before {
451+ if pos == old_pos && assoc.stay_at_gaps() {
430452 new_pos
431453 } else {
432454 // place to end of insert
433− new_pos + ins
455+ new_pos + assoc.insert_offset(s)
434456 }
435457 }),
436458 i
@@ -438,20 +460,15 @@ impl ChangeSet {
438460 } else {
439461 // at insert point
440462 map!(
441− |pos, assoc| (old_pos == pos).then(|| {
463+ |pos, assoc: Assoc| (old_pos == pos).then(|| {
442464 // return position before inserted text
443− if assoc == Assoc::Before {
444− new_pos
445− } else {
446− // after text
447− new_pos + ins
448− }
465+ new_pos + assoc.insert_offset(s)
449466 }),
450467 i
451468 );
452469 }
453470
454− new_pos += ins;
471+ new_pos += s.chars().count();
455472 }
456473 }
457474 old_pos = old_end;
@@ -884,6 +901,48 @@ mod test {
884901 let mut positions = [4, 2];
885902 cs.update_positions(positions.iter_mut().map(|pos| (pos, Assoc::After)));
886903 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);
887946 }
888947
889948 #[test]
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/indent.rs+2−2
@@ -210,7 +210,6 @@ fn test_treesitter_indent(
210210 let suggested_indent = treesitter_indent_for_pos(
211211 indent_query,
212212 &syntax,
213− &indent_style,
214213 tab_width,
215214 indent_style.indent_width(tab_width),
216215 text,
@@ -218,7 +217,8 @@ fn test_treesitter_indent(
218217 text.line_to_char(i) + pos,
219218 false,
220219 )
221− .unwrap();
220+ .unwrap()
221+ .to_string(&indent_style, tab_width);
222222 assert!(
223223 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
224224 "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
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.toml+8−7
@@ -1,12 +1,13 @@
11[package]
22name = "helix-event"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
7−categories = ["editor"]
8−repository = "https://github.com/helix-editor/helix"
9−homepage = "https://helix-editor.com"
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
1011
1112# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1213
helix-loader/Cargo.toml+12−11
@@ -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"
@@ -19,16 +20,16 @@ serde = { version = "1.0", features = ["derive"] }
1920toml = "0.7"
2021etcetera = "0.8"
2122tree-sitter.workspace = true
22−once_cell = "1.18"
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.8.0"
32+tempfile = "3.8.1"
3233dunce = "1.0.4"
3334
3435[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
helix-loader/build.rs+14−4
@@ -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() {
helix-loader/src/lib.rs+10−1
@@ -60,7 +60,8 @@ pub fn initialize_log_file(specified_file: Option<PathBuf>) {
6060/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
6161/// 2. subdirectory of user config directory (always included)
6262/// 3. `HELIX_RUNTIME` (if environment variable is set)
63−/// 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)
6465///
6566/// Postcondition: returns at least two paths (they might not exist).
6667fn prioritize_runtime_dirs() -> Vec<PathBuf> {
@@ -81,6 +82,14 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
8182 rt_dirs.push(dir.into());
8283 }
8384
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+
8493 // fallback to location of the executable being run
8594 // canonicalize the path in case the executable is symlinked
8695 let exe_rt_dir = std::env::current_exe()
helix-lsp/Cargo.toml+15−14
@@ -1,31 +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 }
22−globset = "0.4.13"
23+globset = "0.4.14"
2324log = "0.4"
24−lsp-types = { version = "0.94" }
25+lsp-types = { version = "0.95" }
2526serde = { version = "1.0", features = ["derive"] }
2627serde_json = "1.0"
2728thiserror = "1.0"
28−tokio = { version = "1.33", 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"] }
2930tokio-stream = "0.1.14"
30−which = "4.4"
31+which = "5.0.0"
3132parking_lot = "0.12.1"
helix-lsp/src/client.rs+83−9
@@ -401,12 +401,22 @@ impl Client {
401401 &self,
402402 params: R::Params,
403403 ) -> 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>>
404415 where
405416 R::Params: serde::Serialize,
406417 {
407418 let server_tx = self.server_tx.clone();
408419 let id = self.next_request_id();
409− let timeout_secs = self.req_timeout;
410420
411421 async move {
412422 use std::time::Duration;
@@ -548,6 +558,11 @@ impl Client {
548558 dynamic_registration: Some(true),
549559 relative_pattern_support: Some(false),
550560 }),
561+ file_operations: Some(lsp::WorkspaceFileOperationsClientCapabilities {
562+ will_rename: Some(true),
563+ did_rename: Some(true),
564+ ..Default::default()
565+ }),
551566 ..Default::default()
552567 }),
553568 text_document: Some(lsp::TextDocumentClientCapabilities {
@@ -652,6 +667,7 @@ impl Client {
652667 version: Some(String::from(VERSION_AND_GIT_HASH)),
653668 }),
654669 locale: None, // TODO
670+ work_done_progress_params: lsp::WorkDoneProgressParams::default(),
655671 };
656672
657673 self.request::<lsp::request::Initialize>(params).await
@@ -700,6 +716,65 @@ impl Client {
700716 })
701717 }
702718
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+
703778 // -------------------------------------------------------------------------------------------
704779 // Text document
705780 // -------------------------------------------------------------------------------------------
@@ -895,20 +970,19 @@ impl Client {
895970 ) -> Option<impl Future<Output = Result<()>>> {
896971 let capabilities = self.capabilities.get().unwrap();
897972
898− let include_text = match &capabilities.text_document_sync {
899− Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
900− save: Some(options),
973+ let include_text = match &capabilities.text_document_sync.as_ref()? {
974+ lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
975+ save: options,
901976 ..
902− })) => match options {
977+ }) => match options.as_ref()? {
903978 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
904979 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
905980 include_text,
906981 }) => include_text.unwrap_or(false),
907− // Supported(false)
908− _ => return None,
982+ lsp::TextDocumentSyncSaveOptions::Supported(false) => return None,
909983 },
910− // unsupported
911− _ => return None,
984+ // see: https://github.com/microsoft/language-server-protocol/issues/288
985+ lsp::TextDocumentSyncCapability::Kind(..) => false,
912986 };
913987
914988 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
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+26−22
@@ -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,18 +23,18 @@ name = "hx"
2323path = "src/main.rs"
2424
2525[dependencies]
26−helix-core = { version = "0.6", path = "../helix-core" }
27−helix-event = { version = "0.6", path = "../helix-event" }
28−helix-view = { version = "0.6", path = "../helix-view" }
29−helix-lsp = { version = "0.6", path = "../helix-lsp" }
30−helix-dap = { version = "0.6", path = "../helix-dap" }
31−helix-vcs = { version = "0.6", path = "../helix-vcs" }
32−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" }
3333
3434anyhow = "1"
35−once_cell = "1.18"
35+once_cell = "1.19"
3636
37−which = "4.4"
37+which = "5.0.0"
3838
3939tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
4040tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
@@ -57,6 +57,10 @@ pulldown-cmark = { version = "0.9", default-features = false }
5757# file type detection
5858content_inspector = "0.2.4"
5959
60+# opening URLs
61+open = "5.0.1"
62+url = "2.5.0"
63+
6064# config
6165toml = "0.7"
6266
@@ -64,20 +68,20 @@ serde_json = "1.0"
6468serde = { version = "1.0", features = ["derive"] }
6569
6670# ripgrep for global search
67−grep-regex = "0.1.11"
68−grep-searcher = "0.1.11"
71+grep-regex = "0.1.12"
72+grep-searcher = "0.1.13"
6973
7074[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
7175signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
72−libc = "0.2.149"
76+libc = "0.2.151"
7377
7478[target.'cfg(target_os = "macos")'.dependencies]
7579crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
7680
7781[build-dependencies]
78−helix-loader = { version = "0.6", path = "../helix-loader" }
82+helix-loader = { path = "../helix-loader" }
7983
8084[dev-dependencies]
8185smallvec = "1.11"
8286indoc = "2.0.4"
83−tempfile = "3.8.0"
87+tempfile = "3.8.1"
helix-term/src/application.rs+95−47
@@ -1,6 +1,7 @@
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,
@@ -162,15 +163,19 @@ impl Application {
162163 // Unset path to prevent accidentally saving to the original tutor file.
163164 doc_mut!(editor).set_path(None);
164165 } else if !args.files.is_empty() {
165− let first = &args.files[0].0; // we know it's not empty
166− if first.is_dir() {
167− // NOTE: The working directory is already set to args.files[0] in main()
168− editor.new_file(Action::VerticalSplit);
169− 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);
170171 compositor.push(Box::new(overlaid(picker)));
171− } else {
172− let nr_of_files = args.files.len();
173− 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;
174179 if file.is_dir() {
175180 return Err(anyhow::anyhow!(
176181 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
@@ -182,7 +187,7 @@ impl Application {
182187 // option. If neither of those two arguments are passed
183188 // in, just load the files normally.
184189 let action = match args.split {
185− _ if i == 0 => Action::VerticalSplit,
190+ _ if nr_of_files == 1 => Action::VerticalSplit,
186191 Some(Layout::Vertical) => Action::VerticalSplit,
187192 Some(Layout::Horizontal) => Action::HorizontalSplit,
188193 None => Action::Load,
@@ -209,6 +214,8 @@ impl Application {
209214 // does not affect views without pos since it is at the top
210215 let (view, doc) = current!(editor);
211216 align_view(doc, view, Align::Center);
217+ } else {
218+ editor.new_file(Action::VerticalSplit);
212219 }
213220 } else if stdin().is_tty() || cfg!(feature = "integration") {
214221 editor.new_file(Action::VerticalSplit);
@@ -711,7 +718,7 @@ impl Application {
711718 ));
712719 }
713720 }
714− Notification::PublishDiagnostics(params) => {
721+ Notification::PublishDiagnostics(mut params) => {
715722 let path = match params.uri.to_file_path() {
716723 Ok(path) => path,
717724 Err(_) => {
@@ -725,31 +732,69 @@ impl Application {
725732 return;
726733 }
727734 let offset_encoding = language_server.offset_encoding();
728− let doc = self.editor.document_by_path_mut(&path).filter(|doc| {
729− if let Some(version) = params.version {
730− if version != doc.version() {
731− log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
732− return false;
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+ }
733744 }
734− }
735−
736− true
737− });
745+ true
746+ });
738747
739748 if let Some(doc) = doc {
740− let lang_conf = doc.language_config();
741− 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+ }
742782
743− let diagnostics = params
744− .diagnostics
745− .iter()
746− .filter_map(|diagnostic| {
783+ let unchaged_diag_sources = &unchaged_diag_sources_;
784+ let diagnostics =
785+ params.diagnostics.iter().filter_map(move |diagnostic| {
747786 use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
748787 use lsp::DiagnosticSeverity;
749788
789+ if diagnostic.source.as_ref().map_or(false, |source| {
790+ unchaged_diag_sources.contains(source)
791+ }) {
792+ return None;
793+ }
794+
750795 // TODO: convert inside server
751796 let start = if let Some(start) = lsp_pos_to_pos(
752− text,
797+ &text,
753798 diagnostic.range.start,
754799 offset_encoding,
755800 ) {
@@ -760,14 +805,13 @@ impl Application {
760805 };
761806
762807 let end = if let Some(end) =
763− lsp_pos_to_pos(text, diagnostic.range.end, offset_encoding)
808+ lsp_pos_to_pos(&text, diagnostic.range.end, offset_encoding)
764809 {
765810 end
766811 } else {
767812 log::warn!("lsp position out of bounds - {:?}", diagnostic);
768813 return None;
769814 };
770−
771815 let severity =
772816 diagnostic.severity.map(|severity| match severity {
773817 DiagnosticSeverity::ERROR => Error,
@@ -780,7 +824,7 @@ impl Application {
780824 ),
781825 });
782826
783− if let Some(lang_conf) = lang_conf {
827+ if let Some(lang_conf) = &lang_conf {
784828 if let Some(severity) = severity {
785829 if severity < lang_conf.diagnostic_severity {
786830 return None;
@@ -819,8 +863,17 @@ impl Application {
819863 Vec::new()
820864 };
821865
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+
822872 Some(Diagnostic {
823873 range: Range { start, end },
874+ ends_at_word,
875+ starts_at_word,
876+ zero_width: start == end,
824877 line: diagnostic.range.start.line as usize,
825878 message: diagnostic.message.clone(),
826879 severity,
@@ -830,38 +883,33 @@ impl Application {
830883 data: diagnostic.data.clone(),
831884 language_server_id: server_id,
832885 })
833− })
834− .collect();
886+ });
835887
836− doc.replace_diagnostics(diagnostics, server_id);
888+ doc.replace_diagnostics(diagnostics, unchaged_diag_sources, server_id);
837889 }
838890
839− let mut diagnostics = params
840− .diagnostics
841− .into_iter()
842− .map(|d| (d, server_id))
843− .collect();
891+ let diagnostics = params.diagnostics.into_iter().map(|d| (d, server_id));
844892
845893 // Insert the original lsp::Diagnostics here because we may have no open document
846894 // for diagnosic message and so we can't calculate the exact position.
847895 // When using them later in the diagnostics picker, we calculate them on-demand.
848− match self.editor.diagnostics.entry(params.uri) {
896+ let diagnostics = match self.editor.diagnostics.entry(params.uri) {
849897 Entry::Occupied(o) => {
850898 let current_diagnostics = o.into_mut();
851899 // there may entries of other language servers, which is why we can't overwrite the whole entry
852900 current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
853− current_diagnostics.append(&mut diagnostics);
854− // Sort diagnostics first by severity and then by line numbers.
855− // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
901+ current_diagnostics.extend(diagnostics);
856902 current_diagnostics
857− .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
858− }
859− Entry::Vacant(v) => {
860− diagnostics
861− .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
862− v.insert(diagnostics);
903+ // Sort diagnostics first by severity and then by line numbers.
863904 }
905+ Entry::Vacant(v) => v.insert(diagnostics.collect()),
864906 };
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+ });
865913 }
866914 Notification::ShowMessage(params) => {
867915 log::warn!("unhandled window/showMessage: {:?}", params);
helix-term/src/commands.rs+193−97
@@ -60,8 +60,13 @@ use crate::{
6060
6161use crate::job::{self, Jobs};
6262use futures_util::{stream::FuturesUnordered, TryStreamExt};
63−use std::{collections::HashMap, fmt, future::Future};
64−use std::{collections::HashSet, num::NonZeroUsize};
63+use std::{
64+ collections::{HashMap, HashSet},
65+ fmt,
66+ future::Future,
67+ io::Read,
68+ num::NonZeroUsize,
69+};
6570
6671use std::{
6772 borrow::Cow,
@@ -70,6 +75,7 @@ use std::{
7075
7176use once_cell::sync::Lazy;
7277use serde::de::{self, Deserialize, Deserializer};
78+use url::Url;
7379
7480use grep_regex::RegexMatcherBuilder;
7581use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
@@ -331,7 +337,7 @@ impl MappableCommand {
331337 goto_implementation, "Goto implementation",
332338 goto_file_start, "Goto line number <n> else file start",
333339 goto_file_end, "Goto file end",
334− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
335341 goto_file_hsplit, "Goto files in selection (hsplit)",
336342 goto_file_vsplit, "Goto files in selection (vsplit)",
337343 goto_reference, "Goto references",
@@ -984,6 +990,7 @@ fn align_selections(cx: &mut Context) {
984990
985991 let transaction = Transaction::change(doc.text(), changes.into_iter());
986992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
987994}
988995
989996fn goto_window(cx: &mut Context, align: Align) {
@@ -1189,10 +1196,53 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11891196 .to_string(),
11901197 );
11911198 }
1199+
11921200 for sel in paths {
11931201 let p = sel.trim();
1194− if !p.is_empty() {
1195− let path = &rel_path.join(p);
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());
11961246 if path.is_dir() {
11971247 let picker = ui::file_picker(path.into(), &cx.editor.config());
11981248 cx.push_layer(Box::new(overlaid(picker)));
@@ -1203,6 +1253,23 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
12031253 }
12041254}
12051255
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+
12061273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
12071274where
12081275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1251,7 +1318,7 @@ fn extend_next_long_word_end(cx: &mut Context) {
12511318 extend_word_impl(cx, movement::move_next_long_word_end)
12521319}
12531320
1254−/// Separate branch to find_char designed only for <ret> char.
1321+/// Separate branch to find_char designed only for `<ret>` char.
12551322//
12561323// This is necessary because the one document can have different line endings inside. And we
12571324// cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
@@ -1527,6 +1594,7 @@ where
15271594 });
15281595
15291596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
15301598}
15311599
15321600fn switch_case(cx: &mut Context) {
@@ -2184,7 +2252,10 @@ fn global_search(cx: &mut Context) {
21842252 let searcher = SearcherBuilder::new()
21852253 .binary_detection(BinaryDetection::quit(b'\x00'))
21862254 .build();
2187− WalkBuilder::new(search_root)
2255+
2256+ let mut walk_builder = WalkBuilder::new(search_root);
2257+
2258+ walk_builder
21882259 .hidden(file_picker_config.hidden)
21892260 .parents(file_picker_config.parents)
21902261 .ignore(file_picker_config.ignore)
@@ -2195,73 +2266,77 @@ fn global_search(cx: &mut Context) {
21952266 .max_depth(file_picker_config.max_depth)
21962267 .filter_entry(move |entry| {
21972268 filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2198− })
2199− .build_parallel()
2200− .run(|| {
2201− let mut searcher = searcher.clone();
2202− let matcher = matcher.clone();
2203− let injector = injector_.clone();
2204− let documents = &documents;
2205− Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
2206− let entry = match entry {
2207− Ok(entry) => entry,
2208− Err(_) => return WalkState::Continue,
2209− };
2210−
2211− match entry.file_type() {
2212− Some(entry) if entry.is_file() => {}
2213− // skip everything else
2214− _ => return WalkState::Continue,
2215− };
2216−
2217− let mut stop = false;
2218− let sink = sinks::UTF8(|line_num, _| {
2219− stop = injector
2220− .push(FileResult::new(entry.path(), line_num as usize - 1))
2221− .is_err();
2222−
2223− Ok(!stop)
2224− });
2225− let doc = documents.iter().find(|&(doc_path, _)| {
2226− doc_path
2227− .as_ref()
2228− .map_or(false, |doc_path| doc_path == entry.path())
2229− });
2230−
2231− let result = if let Some((_, doc)) = doc {
2232− // there is already a buffer for this file
2233− // search the buffer instead of the file because it's faster
2234− // and captures new edits without requiring a save
2235− if searcher.multi_line_with_matcher(&matcher) {
2236− // in this case a continous buffer is required
2237− // convert the rope to a string
2238− let text = doc.to_string();
2239− searcher.search_slice(&matcher, text.as_bytes(), sink)
2240− } else {
2241− searcher.search_reader(
2242− &matcher,
2243− RopeReader::new(doc.slice(..)),
2244− sink,
2245− )
2246− }
2247− } else {
2248− searcher.search_path(&matcher, entry.path(), sink)
2249− };
2269+ });
22502270
2251− if let Err(err) = result {
2252− log::error!(
2253− "Global search error: {}, {}",
2254− entry.path().display(),
2255− err
2256− );
2257− }
2258− if stop {
2259− WalkState::Quit
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(|| {
2276+ let mut searcher = searcher.clone();
2277+ let matcher = matcher.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
2280+ Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
2281+ let entry = match entry {
2282+ Ok(entry) => entry,
2283+ Err(_) => return WalkState::Continue,
2284+ };
2285+
2286+ match entry.file_type() {
2287+ Some(entry) if entry.is_file() => {}
2288+ // skip everything else
2289+ _ => return WalkState::Continue,
2290+ };
2291+
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)
22602315 } else {
2261− WalkState::Continue
2316+ searcher.search_reader(
2317+ &matcher,
2318+ RopeReader::new(doc.slice(..)),
2319+ sink,
2320+ )
22622321 }
2263− })
2264− });
2322+ } else {
2323+ searcher.search_path(&matcher, entry.path(), sink)
2324+ };
2325+
2326+ if let Err(err) = result {
2327+ log::error!(
2328+ "Global search error: {}, {}",
2329+ entry.path().display(),
2330+ err
2331+ );
2332+ }
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
2338+ })
2339+ });
22652340 });
22662341
22672342 cx.jobs.callback(async move {
@@ -2978,6 +3053,7 @@ fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
29783053 let indent = indent::indent_for_newline(
29793054 language_config,
29803055 syntax,
3056+ &doc.config.load().indent_heuristic,
29813057 &doc.indent_style,
29823058 tab_width,
29833059 text,
@@ -3106,6 +3182,7 @@ fn open(cx: &mut Context, open: Open) {
31063182 let indent = indent::indent_for_newline(
31073183 doc.language_config(),
31083184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
31093186 &doc.indent_style,
31103187 doc.tab_width(),
31113188 text,
@@ -3645,6 +3722,7 @@ pub mod insert {
36453722 let indent = indent::indent_for_newline(
36463723 doc.language_config(),
36473724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
36483726 &doc.indent_style,
36493727 doc.tab_width(),
36503728 text,
@@ -3890,12 +3968,12 @@ fn yank(cx: &mut Context) {
38903968}
38913969
38923970fn yank_to_clipboard(cx: &mut Context) {
3893− yank_impl(cx.editor, '*');
3971+ yank_impl(cx.editor, '+');
38943972 exit_select_mode(cx);
38953973}
38963974
38973975fn yank_to_primary_clipboard(cx: &mut Context) {
3898− yank_impl(cx.editor, '+');
3976+ yank_impl(cx.editor, '*');
38993977 exit_select_mode(cx);
39003978}
39013979
@@ -3952,13 +4030,13 @@ fn yank_joined(cx: &mut Context) {
39524030
39534031fn yank_joined_to_clipboard(cx: &mut Context) {
39544032 let line_ending = doc!(cx.editor).line_ending;
3955− yank_joined_impl(cx.editor, line_ending.as_str(), '*');
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
39564034 exit_select_mode(cx);
39574035}
39584036
39594037fn yank_joined_to_primary_clipboard(cx: &mut Context) {
39604038 let line_ending = doc!(cx.editor).line_ending;
3961− yank_joined_impl(cx.editor, line_ending.as_str(), '+');
4039+ yank_joined_impl(cx.editor, line_ending.as_str(), '*');
39624040 exit_select_mode(cx);
39634041}
39644042
@@ -3975,12 +4053,12 @@ fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
39754053}
39764054
39774055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3978− yank_primary_selection_impl(cx.editor, '*');
4056+ yank_primary_selection_impl(cx.editor, '+');
39794057 exit_select_mode(cx);
39804058}
39814059
39824060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3983− yank_primary_selection_impl(cx.editor, '+');
4061+ yank_primary_selection_impl(cx.editor, '*');
39844062 exit_select_mode(cx);
39854063}
39864064
@@ -4078,22 +4156,27 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
40784156 };
40794157 let (view, doc) = current!(cx.editor);
40804158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
4159+ exit_select_mode(cx);
40814160}
40824161
40834162fn paste_clipboard_after(cx: &mut Context) {
4084− paste(cx.editor, '*', Paste::After, cx.count());
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
40854165}
40864166
40874167fn paste_clipboard_before(cx: &mut Context) {
4088− paste(cx.editor, '*', Paste::Before, cx.count());
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
40894170}
40904171
40914172fn paste_primary_clipboard_after(cx: &mut Context) {
4092− paste(cx.editor, '+', Paste::After, cx.count());
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
40934175}
40944176
40954177fn paste_primary_clipboard_before(cx: &mut Context) {
4096− paste(cx.editor, '+', Paste::Before, cx.count());
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
40974180}
40984181
40994182fn replace_with_yanked(cx: &mut Context) {
@@ -4131,11 +4214,13 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
41314214}
41324215
41334216fn replace_selections_with_clipboard(cx: &mut Context) {
4134− replace_with_yanked_impl(cx.editor, '*', cx.count());
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
41354219}
41364220
41374221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
4138− replace_with_yanked_impl(cx.editor, '+', cx.count());
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
41394224}
41404225
41414226fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
@@ -4153,6 +4238,7 @@ fn paste_after(cx: &mut Context) {
41534238 Paste::After,
41544239 cx.count(),
41554240 );
4241+ exit_select_mode(cx);
41564242}
41574243
41584244fn paste_before(cx: &mut Context) {
@@ -4162,6 +4248,7 @@ fn paste_before(cx: &mut Context) {
41624248 Paste::Before,
41634249 cx.count(),
41644250 );
4251+ exit_select_mode(cx);
41654252}
41664253
41674254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4200,6 +4287,7 @@ fn indent(cx: &mut Context) {
42004287 }),
42014288 );
42024289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
42034291}
42044292
42054293fn unindent(cx: &mut Context) {
@@ -4239,6 +4327,7 @@ fn unindent(cx: &mut Context) {
42394327 let transaction = Transaction::change(doc.text(), changes.into_iter());
42404328
42414329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
42424331}
42434332
42444333fn format_selections(cx: &mut Context) {
@@ -4305,10 +4394,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
43054394 use movement::skip_while;
43064395 let (view, doc) = current!(cx.editor);
43074396 let text = doc.text();
4308− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
43094398
43104399 let mut changes = Vec::new();
4311− let fragment = Tendril::from(" ");
43124400
43134401 for selection in doc.selection(view.id) {
43144402 let (start, mut end) = selection.line_range(slice);
@@ -4324,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
43244412 let mut end = text.line_to_char(line + 1);
43254413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
43264414
4327− // need to skip from start, not end
4328− let change = (start, end, Some(fragment.clone()));
4329− 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));
43304422 }
43314423 }
43324424
@@ -4338,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
43384430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
43394431 changes.dedup();
43404432
4341− // TODO: joining multiple empty lines should be replaced by a single space.
4342− // need to merge change ranges that touch
4343−
43444433 // select inserted spaces
43454434 let transaction = if select_space {
43464435 let ranges: SmallVec<_> = changes
@@ -4352,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
43524441 })
43534442 .collect();
43544443 let selection = Selection::new(ranges, 0);
4355− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
43564445 } else {
4357− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
43584447 };
43594448
43604449 doc.apply(&transaction, view.id);
@@ -5520,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
55205609 };
55215610
55225611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5523− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5524− // arithmetic to assert this.
5525− 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");
55265617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
55275618 ranges.push(new_range);
5528− 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");
55295624
55305625 changes.push((from, to, Some(output)));
55315626 }
@@ -5664,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
56645759 let transaction = Transaction::change(doc.text(), changes.into_iter());
56655760 let transaction = transaction.with_selection(new_selection);
56665761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
56675763 }
56685764}
56695765
helix-term/src/commands/dap.rs+7−2
@@ -8,7 +8,7 @@ use 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;
@@ -581,7 +581,12 @@ pub fn dap_variables(cx: &mut Context) {
581581 }
582582
583583 let contents = Text::from(tui::text::Text::from(variables));
584− 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);
585590 cx.replace_or_push_layer("dap-variables", popup);
586591}
587592
helix-term/src/commands/lsp.rs+12−2
@@ -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};
@@ -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) => {{
@@ -744,7 +745,16 @@ pub fn code_action(cx: &mut Context) {
744745 });
745746 picker.move_down(); // pre-select the first item
746747
747− 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+
748758 compositor.replace_or_push("code-action", popup);
749759 };
750760
helix-term/src/commands/typed.rs+97−16
@@ -6,7 +6,9 @@ use crate::job::Job;
66use super::*;
77
88use helix_core::fuzzy::fuzzy_match;
9−use helix_core::{encoding, line_ending, shellwords::Shellwords};
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};
1012use helix_view::document::DEFAULT_LANGUAGE_NAME;
1113use helix_view::editor::{Action, CloseError, ConfigEvent};
1214use serde_json::Value;
@@ -475,8 +477,7 @@ fn set_indent_style(
475477 cx.editor.set_status(match style {
476478 Tabs => "tabs".to_owned(),
477479 Spaces(1) => "1 space".to_owned(),
478− Spaces(n) if (2..=8).contains(&n) => format!("{} spaces", n),
479− _ => unreachable!(), // Shouldn't happen.
480+ Spaces(n) => format!("{} spaces", n),
480481 });
481482 return Ok(());
482483 }
@@ -488,7 +489,7 @@ fn set_indent_style(
488489 Some(arg) => arg
489490 .parse::<u8>()
490491 .ok()
491− .filter(|n| (1..=8).contains(n))
492+ .filter(|n| (1..=MAX_INDENT).contains(n))
492493 .map(Spaces),
493494 _ => None,
494495 };
@@ -573,7 +574,6 @@ fn set_line_ending(
573574
574575 Ok(())
575576}
576−
577577fn earlier(
578578 cx: &mut compositor::Context,
579579 args: &[Cow<str>],
@@ -921,7 +921,7 @@ fn yank_main_selection_to_clipboard(
921921 return Ok(());
922922 }
923923
924− yank_primary_selection_impl(cx.editor, '*');
924+ yank_primary_selection_impl(cx.editor, '+');
925925 Ok(())
926926}
927927
@@ -956,7 +956,7 @@ fn yank_joined_to_clipboard(
956956 let doc = doc!(cx.editor);
957957 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
958958 let separator = args.first().unwrap_or(&default_sep);
959− yank_joined_impl(cx.editor, separator, '*');
959+ yank_joined_impl(cx.editor, separator, '+');
960960 Ok(())
961961}
962962
@@ -969,7 +969,7 @@ fn yank_main_selection_to_primary_clipboard(
969969 return Ok(());
970970 }
971971
972− yank_primary_selection_impl(cx.editor, '+');
972+ yank_primary_selection_impl(cx.editor, '*');
973973 Ok(())
974974}
975975
@@ -985,7 +985,7 @@ fn yank_joined_to_primary_clipboard(
985985 let doc = doc!(cx.editor);
986986 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
987987 let separator = args.first().unwrap_or(&default_sep);
988− yank_joined_impl(cx.editor, separator, '+');
988+ yank_joined_impl(cx.editor, separator, '*');
989989 Ok(())
990990}
991991
@@ -998,7 +998,7 @@ fn paste_clipboard_after(
998998 return Ok(());
999999 }
10001000
1001− paste(cx.editor, '*', Paste::After, 1);
1001+ paste(cx.editor, '+', Paste::After, 1);
10021002 Ok(())
10031003}
10041004
@@ -1011,7 +1011,7 @@ fn paste_clipboard_before(
10111011 return Ok(());
10121012 }
10131013
1014− paste(cx.editor, '*', Paste::Before, 1);
1014+ paste(cx.editor, '+', Paste::Before, 1);
10151015 Ok(())
10161016}
10171017
@@ -1024,7 +1024,7 @@ fn paste_primary_clipboard_after(
10241024 return Ok(());
10251025 }
10261026
1027− paste(cx.editor, '+', Paste::After, 1);
1027+ paste(cx.editor, '*', Paste::After, 1);
10281028 Ok(())
10291029}
10301030
@@ -1037,7 +1037,7 @@ fn paste_primary_clipboard_before(
10371037 return Ok(());
10381038 }
10391039
1040− paste(cx.editor, '+', Paste::Before, 1);
1040+ paste(cx.editor, '*', Paste::Before, 1);
10411041 Ok(())
10421042}
10431043
@@ -1050,7 +1050,7 @@ fn replace_selections_with_clipboard(
10501050 return Ok(());
10511051 }
10521052
1053− replace_with_yanked_impl(cx.editor, '*', 1);
1053+ replace_with_yanked_impl(cx.editor, '+', 1);
10541054 Ok(())
10551055}
10561056
@@ -1063,7 +1063,7 @@ fn replace_selections_with_primary_clipboard(
10631063 return Ok(());
10641064 }
10651065
1066− replace_with_yanked_impl(cx.editor, '+', 1);
1066+ replace_with_yanked_impl(cx.editor, '*', 1);
10671067 Ok(())
10681068}
10691069
@@ -2408,6 +2408,80 @@ fn redraw(
24082408 Ok(())
24092409}
24102410
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+
24112485pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
24122486 TypableCommand {
24132487 name: "quit",
@@ -2531,7 +2605,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
25312605 TypableCommand {
25322606 name: "indent-style",
25332607 aliases: &[],
2534− doc: "Set the indentation style for editing. ('t' for tabs or 1-8 for number of spaces.)",
2608+ doc: "Set the indentation style for editing. ('t' for tabs or 1-16 for number of spaces.)",
25352609 fun: set_indent_style,
25362610 signature: CommandSignature::none(),
25372611 },
@@ -3008,6 +3082,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
30083082 fun: redraw,
30093083 signature: CommandSignature::none(),
30103084 },
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+ },
30113092];
30123093
30133094pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
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/main.rs+9−3
@@ -76,7 +76,7 @@ FLAGS:
7676 helix_loader::default_log_file().display(),
7777 );
7878
79− let args = Args::parse_args().context("could not parse arguments")?;
79+ let mut args = Args::parse_args().context("could not parse arguments")?;
8080
8181 helix_loader::initialize_config_file(args.config_file.clone());
8282 helix_loader::initialize_log_file(args.log_file.clone());
@@ -116,11 +116,17 @@ FLAGS:
116116
117117 setup_logging(args.verbosity).context("failed to initialize logging")?;
118118
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);
122+ }
123+
119124 // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
120125 // Application::new() depends on this logic so it must be updated if this changes.
121− if let Some((path, true)) = args.files.first().map(|(path, _)| (path, path.is_dir())) {
126+ if let Some(path) = &args.working_directory {
122127 helix_loader::set_current_working_dir(path)?;
123− } else if let Some(path) = &args.working_directory {
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
124130 helix_loader::set_current_working_dir(path)?;
125131 }
126132
helix-term/src/ui/completion.rs+17−1
@@ -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};
@@ -326,9 +327,18 @@ impl Completion {
326327 }
327328 };
328329 });
330+
331+ let margin = if editor.menu_border() {
332+ Margin::vertical(1)
333+ } else {
334+ Margin::none()
335+ };
336+
329337 let popup = Popup::new(Self::ID, menu)
330338 .with_scrollbar(false)
331− .ignore_escape_key(true);
339+ .ignore_escape_key(true)
340+ .margin(margin);
341+
332342 let mut completion = Self {
333343 popup,
334344 start_offset,
@@ -569,6 +579,12 @@ impl Component for Completion {
569579 // clear area
570580 let background = cx.editor.theme.get("ui.popup");
571581 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+
572588 markdown_doc.render(doc_area, surface, cx);
573589 }
574590}
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+77−44
@@ -124,16 +124,20 @@ impl EditorView {
124124 line_decorations.push(Box::new(line_decoration));
125125 }
126126
127− let mut highlights =
127+ let syntax_highlights =
128128 Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
129− 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(
130133 doc,
131134 view.offset.anchor,
132135 inner.height,
133136 &text_annotations,
134137 );
135− if !overlay_highlights.is_empty() {
136− 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));
137141 }
138142
139143 for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
@@ -142,29 +146,28 @@ impl EditorView {
142146 if diagnostic.is_empty() {
143147 continue;
144148 }
145− highlights = Box::new(syntax::merge(highlights, diagnostic));
149+ overlay_highlights = Box::new(syntax::merge(overlay_highlights, diagnostic));
146150 }
147151
148− let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
152+ if is_focused {
149153 let highlights = syntax::merge(
150− highlights,
154+ overlay_highlights,
151155 Self::doc_selection_highlights(
152156 editor.mode(),
153157 doc,
154158 view,
155159 theme,
156160 &config.cursor_shape,
161+ self.terminal_focused,
157162 ),
158163 );
159164 let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
160165 if focused_view_elements.is_empty() {
161− Box::new(highlights)
166+ overlay_highlights = Box::new(highlights)
162167 } else {
163− Box::new(syntax::merge(highlights, focused_view_elements))
168+ overlay_highlights = Box::new(syntax::merge(highlights, focused_view_elements))
164169 }
165− } else {
166− Box::new(highlights)
167− };
170+ }
168171
169172 let gutter_overflow = view.gutter_offset(doc) == 0;
170173 if !gutter_overflow {
@@ -197,7 +200,8 @@ impl EditorView {
197200 doc,
198201 view.offset,
199202 &text_annotations,
200− highlights,
203+ syntax_highlights,
204+ overlay_highlights,
201205 theme,
202206 &mut line_decorations,
203207 &mut translated_positions,
@@ -257,27 +261,39 @@ impl EditorView {
257261 .for_each(|area| surface.set_style(area, ruler_theme))
258262 }
259263
260− 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(
261280 doc: &Document,
262281 anchor: usize,
263282 height: u16,
264− text_annotations: &TextAnnotations,
265− ) -> Vec<(usize, std::ops::Range<usize>)> {
283+ ) -> Box<dyn Iterator<Item = HighlightEvent>> {
266284 let text = doc.text().slice(..);
267285 let row = text.char_to_line(anchor.min(text.len_chars()));
268286
269− let range = {
270− // Calculate viewport byte ranges:
271− // Saturating subs to make it inclusive zero indexing.
272− let last_line = text.len_lines().saturating_sub(1);
273− let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
274− let start = text.line_to_byte(row.min(last_line));
275− let end = text.line_to_byte(last_visible_line + 1);
276−
277− start..end
278− };
279−
280− 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+ )
281297 }
282298
283299 /// Get syntax highlights for a document in a view represented by the first line
@@ -292,16 +308,7 @@ impl EditorView {
292308 let text = doc.text().slice(..);
293309 let row = text.char_to_line(anchor.min(text.len_chars()));
294310
295− let range = {
296− // Calculate viewport byte ranges:
297− // Saturating subs to make it inclusive zero indexing.
298− let last_line = text.len_lines().saturating_sub(1);
299− let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
300− let start = text.line_to_byte(row.min(last_line));
301− let end = text.line_to_byte(last_visible_line + 1);
302−
303− start..end
304− };
311+ let range = Self::viewport_byte_range(text, row, height);
305312
306313 match doc.syntax() {
307314 Some(syntax) => {
@@ -334,6 +341,20 @@ impl EditorView {
334341 }
335342 }
336343
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+
337358 /// Get highlight spans for document diagnostics
338359 pub fn doc_diagnostics_highlights(
339360 doc: &Document,
@@ -365,7 +386,7 @@ impl EditorView {
365386 let mut warning_vec = Vec::new();
366387 let mut error_vec = Vec::new();
367388
368− for diagnostic in doc.diagnostics() {
389+ for diagnostic in doc.shown_diagnostics() {
369390 // Separate diagnostics into different Vecs by severity.
370391 let (vec, scope) = match diagnostic.severity {
371392 Some(Severity::Info) => (&mut info_vec, info),
@@ -400,6 +421,7 @@ impl EditorView {
400421 view: &View,
401422 theme: &Theme,
402423 cursor_shape_config: &CursorShapeConfig,
424+ is_terminal_focused: bool,
403425 ) -> Vec<(usize, std::ops::Range<usize>)> {
404426 let text = doc.text().slice(..);
405427 let selection = doc.selection(view.id);
@@ -447,7 +469,7 @@ impl EditorView {
447469
448470 // Special-case: cursor at end of the rope.
449471 if range.head == range.anchor && range.head == text.len_chars() {
450− if !selection_is_primary || cursor_is_block {
472+ if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
451473 // Bar and underline cursors are drawn by the terminal
452474 // BUG: If the editor area loses focus while having a bar or
453475 // underline cursor (eg. when a regex prompt has focus) then
@@ -470,13 +492,17 @@ impl EditorView {
470492 cursor_start
471493 };
472494 spans.push((selection_scope, range.anchor..selection_end));
473− 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) {
474498 spans.push((cursor_scope, cursor_start..range.head));
475499 }
476500 } else {
477501 // Reverse case.
478502 let cursor_end = next_grapheme_boundary(text, range.head);
479− 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) {
480506 spans.push((cursor_scope, range.head..cursor_end));
481507 }
482508 // non block cursors look like they exclude the cursor
@@ -1500,8 +1526,15 @@ impl Component for EditorView {
15001526
15011527 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
15021528 match editor.cursor() {
1503− // All block cursors are drawn manually
1504− (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+ }
15051538 cursor => cursor,
15061539 }
15071540 }
helix-term/src/ui/lsp.rs+3−1
@@ -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));
helix-term/src/ui/menu.rs+34−13
@@ -7,11 +7,18 @@ use crate::{
77use helix_core::fuzzy::MATCHER;
88use nucleo::pattern::{Atom, AtomKind, CaseMatching};
99use nucleo::{Config, Utf32Str};
10−use tui::{buffer::Buffer as Surface, widgets::Table};
10+use tui::{
11+ buffer::Buffer as Surface,
12+ widgets::{Block, Borders, Table, Widget},
13+};
1114
1215pub use tui::widgets::{Cell, Row};
1316
14−use helix_view::{editor::SmartTabConfig, graphics::Rect, Editor};
17+use helix_view::{
18+ editor::SmartTabConfig,
19+ graphics::{Margin, Rect},
20+ Editor,
21+};
1522use tui::layout::Constraint;
1623
1724pub trait Item: Sync + Send + 'static {
@@ -322,6 +329,15 @@ impl<T: Item + 'static> Component for Menu<T> {
322329 let selected = theme.get("ui.menu.selected");
323330 surface.clear_with(area, style);
324331
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+
325341 let scroll = self.scroll;
326342
327343 let options: Vec<_> = self
@@ -362,15 +378,19 @@ impl<T: Item + 'static> Component for Menu<T> {
362378 false,
363379 );
364380
365− if let Some(cursor) = self.cursor {
366− let offset_from_top = cursor - scroll;
367− let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
368− left.set_style(selected);
369− let right = &mut surface[(
370− area.right().saturating_sub(1),
371− area.y + offset_from_top as u16,
372− )];
373− 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+ }
374394 }
375395
376396 let fits = len <= win_height;
@@ -385,12 +405,13 @@ impl<T: Item + 'static> Component for Menu<T> {
385405 for i in 0..win_height {
386406 cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
387407
388− cell.set_symbol("▐"); // right half block
408+ let half_block = if render_borders { "▌" } else { "▐" };
389409
390410 if scroll_line <= i && i < scroll_line + scroll_height {
391411 // Draw scroll thumb
412+ cell.set_symbol(half_block);
392413 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
393− } else {
414+ } else if !render_borders {
394415 // Draw scroll track
395416 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
396417 }
helix-term/src/ui/mod.rs+3
@@ -177,6 +177,9 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
177177 .max_depth(config.file_picker.max_depth)
178178 .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
179179
180+ walk_builder.add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
181+ walk_builder.add_custom_ignore_filename(".helix/ignore");
182+
180183 // We want to exclude files that the editor can't handle yet
181184 let mut type_builder = TypesBuilder::new();
182185 type_builder
helix-term/src/ui/picker.rs+9−4
@@ -736,17 +736,20 @@ impl<T: Item + 'static> Picker<T> {
736736 }
737737 }
738738
739− let mut highlights = EditorView::doc_syntax_highlights(
739+ let syntax_highlights = EditorView::doc_syntax_highlights(
740740 doc,
741741 offset.anchor,
742742 area.height,
743743 &cx.editor.theme,
744744 );
745+
746+ let mut overlay_highlights =
747+ EditorView::empty_highlight_iter(doc, offset.anchor, area.height);
745748 for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
746749 if spans.is_empty() {
747750 continue;
748751 }
749− highlights = Box::new(helix_core::syntax::merge(highlights, spans));
752+ overlay_highlights = Box::new(helix_core::syntax::merge(overlay_highlights, spans));
750753 }
751754 let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
752755
@@ -777,7 +780,8 @@ impl<T: Item + 'static> Picker<T> {
777780 offset,
778781 // TODO: compute text annotations asynchronously here (like inlay hints)
779782 &TextAnnotations::default(),
780− highlights,
783+ syntax_highlights,
784+ overlay_highlights,
781785 &cx.editor.theme,
782786 &mut decorations,
783787 &mut [],
@@ -795,7 +799,8 @@ impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
795799 // | | | |
796800 // +---------+ +---------+
797801
798− let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
802+ let render_preview =
803+ self.show_preview && self.file_fn.is_some() && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
799804
800805 let picker_width = if render_preview {
801806 area.width / 2
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/tests/test/commands.rs+46
@@ -480,3 +480,49 @@ fn bar() {#(\n|)#\
480480
481481 Ok(())
482482}
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/helpers.rs+8
@@ -320,6 +320,14 @@ impl AppBuilder {
320320 }
321321
322322 pub fn build(self) -> anyhow::Result<Application> {
323+ if let Some(path) = &self.args.working_directory {
324+ bail!("Changing the working directory to {path:?} is not yet supported for integration tests");
325+ }
326+
327+ if let Some((path, _)) = self.args.files.first().filter(|p| p.0.is_dir()) {
328+ bail!("Having the directory {path:?} in args.files[0] is not yet supported for integration tests");
329+ }
330+
323331 let mut app = Application::new(self.args, self.config, self.syn_conf)?;
324332
325333 if let Some((text, selection)) = self.input {
helix-tui/Cargo.toml+13−13
@@ -1,28 +1,28 @@
11[package]
22name = "helix-tui"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−description = """
6−A library to build rich terminal user interfaces or dashboards
7−"""
8−edition = "2021"
9−license = "MPL-2.0"
10−categories = ["editor"]
11−repository = "https://github.com/helix-editor/helix"
12−homepage = "https://helix-editor.com"
3+description = """A library to build rich terminal user interfaces or dashboards"""
134include = ["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
1413
1514[features]
1615default = ["crossterm"]
1716
1817[dependencies]
18+helix-view = { path = "../helix-view", features = ["term"] }
19+helix-core = { path = "../helix-core" }
20+
1921bitflags = "2.4"
2022cassowary = "0.3"
2123unicode-segmentation = "1.10"
2224crossterm = { version = "0.27", optional = true }
2325termini = "1.0"
2426serde = { version = "1", "optional" = true, features = ["derive"]}
25−once_cell = "1.18"
27+once_cell = "1.19"
2628log = "~0.4"
27−helix-view = { version = "0.6", path = "../helix-view", features = ["term"] }
28−helix-core = { version = "0.6", path = "../helix-core" }
helix-tui/src/backend/crossterm.rs+18−2
@@ -32,10 +32,21 @@ fn vte_version() -> Option<usize> {
3232}
3333
3434/// Describes terminal capabilities like extended underline, truecolor, etc.
35−#[derive(Copy, Clone, Debug, Default)]
35+#[derive(Clone, Debug)]
3636struct Capabilities {
3737 /// Support for undercurled, underdashed, etc.
3838 has_extended_underlines: bool,
39+ /// Support for resetting the cursor style back to normal.
40+ reset_cursor_command: String,
41+}
42+
43+impl Default for Capabilities {
44+ fn default() -> Self {
45+ Self {
46+ has_extended_underlines: false,
47+ reset_cursor_command: "\x1B[0 q".to_string(),
48+ }
49+ }
3950}
4051
4152impl Capabilities {
@@ -54,6 +65,10 @@ impl Capabilities {
5465 || t.extended_cap("Su").is_some()
5566 || vte_version() >= Some(5102)
5667 || matches!(term_program().as_deref(), Some("WezTerm")),
68+ reset_cursor_command: t
69+ .utf8_string_cap(termini::StringCapability::CursorNormal)
70+ .unwrap_or("\x1B[0 q")
71+ .to_string(),
5772 },
5873 }
5974 }
@@ -154,7 +169,8 @@ where
154169
155170 fn restore(&mut self, config: Config) -> io::Result<()> {
156171 // reset cursor shape
157− write!(self.buffer, "\x1B[0 q")?;
172+ self.buffer
173+ .write_all(self.capabilities.reset_cursor_command.as_bytes())?;
158174 if config.enable_mouse_capture {
159175 execute!(self.buffer, DisableMouseCapture)?;
160176 }
helix-tui/src/buffer.rs+2−2
@@ -213,7 +213,7 @@ impl Buffer {
213213 && y < self.area.bottom()
214214 }
215215
216− /// Returns the index in the Vec<Cell> for the given global (x, y) coordinates.
216+ /// Returns the index in the `Vec<Cell>` for the given global (x, y) coordinates.
217217 ///
218218 /// Global coordinates are offset by the Buffer's area offset (`x`/`y`).
219219 ///
@@ -242,7 +242,7 @@ impl Buffer {
242242 ((y - self.area.y) as usize) * (self.area.width as usize) + ((x - self.area.x) as usize)
243243 }
244244
245− /// Returns the index in the Vec<Cell> for the given global (x, y) coordinates,
245+ /// Returns the index in the `Vec<Cell>` for the given global (x, y) coordinates,
246246 /// or `None` if the coordinates are outside the buffer's area.
247247 fn index_of_opt(&self, x: u16, y: u16) -> Option<usize> {
248248 if self.in_bounds(x, y) {
helix-vcs/Cargo.toml+12−11
@@ -1,24 +1,25 @@
11[package]
22name = "helix-vcs"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
7−categories = ["editor"]
8−repository = "https://github.com/helix-editor/helix"
9−homepage = "https://helix-editor.com"
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
1011
1112# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1213
1314[dependencies]
14−helix-core = { version = "0.6", path = "../helix-core" }
15−helix-event = { version = "0.6", path = "../helix-event" }
15+helix-core = { path = "../helix-core" }
16+helix-event = { path = "../helix-event" }
1617
1718tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
1819parking_lot = "0.12"
1920arc-swap = { version = "1.6.0" }
2021
21−gix = { version = "0.48.0", default-features = false , optional = true }
22+gix = { version = "0.57.0", default-features = false , optional = true }
2223imara-diff = "0.1.5"
2324anyhow = "1"
2425
@@ -28,4 +29,4 @@ log = "0.4"
2829git = ["gix"]
2930
3031[dev-dependencies]
31−tempfile = "3.8"
32+tempfile = "3.8"
helix-vcs/src/git.rs+5−5
@@ -3,7 +3,7 @@ use arc_swap::ArcSwap;
33use std::path::Path;
44use std::sync::Arc;
55
6−use gix::objs::tree::EntryMode;
6+use gix::objs::tree::EntryKind;
77use gix::sec::trust::DefaultForLevel;
88use gix::{Commit, ObjectId, Repository, ThreadSafeRepository};
99
@@ -126,14 +126,14 @@ fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Resul
126126 let rel_path = file.strip_prefix(repo_dir)?;
127127 let tree = commit.tree()?;
128128 let tree_entry = tree
129− .lookup_entry_by_path(rel_path)?
129+ .lookup_entry_by_path(rel_path, &mut Vec::new())?
130130 .context("file is untracked")?;
131− match tree_entry.mode() {
131+ match tree_entry.mode().kind() {
132132 // not a file, everything is new, do not show diff
133− mode @ (EntryMode::Tree | EntryMode::Commit | EntryMode::Link) => {
133+ mode @ (EntryKind::Tree | EntryKind::Commit | EntryKind::Link) => {
134134 bail!("entry at {} is not a file but a {mode:?}", file.display())
135135 }
136136 // found a file
137− EntryMode::Blob | EntryMode::BlobExecutable => Ok(tree_entry.object_id()),
137+ EntryKind::Blob | EntryKind::BlobExecutable => Ok(tree_entry.object_id()),
138138 }
139139}
helix-view/Cargo.toml+19−17
@@ -1,32 +1,34 @@
11[package]
22name = "helix-view"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
73description = "UI abstractions for use in backends"
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[features]
1314default = []
1415term = ["crossterm"]
1516
1617[dependencies]
18+helix-core = { path = "../helix-core" }
19+helix-event = { path = "../helix-event" }
20+helix-loader = { path = "../helix-loader" }
21+helix-lsp = { path = "../helix-lsp" }
22+helix-dap = { path = "../helix-dap" }
23+helix-vcs = { path = "../helix-vcs" }
24+
1725bitflags = "2.4"
1826anyhow = "1"
19−helix-core = { version = "0.6", path = "../helix-core" }
20−helix-event = { version = "0.6", path = "../helix-event" }
21−helix-loader = { version = "0.6", path = "../helix-loader" }
22−helix-lsp = { version = "0.6", path = "../helix-lsp" }
23−helix-dap = { version = "0.6", path = "../helix-dap" }
2427crossterm = { version = "0.27", optional = true }
25−helix-vcs = { version = "0.6", path = "../helix-vcs" }
2628
2729# Conversion traits
28−once_cell = "1.18"
29−url = "2"
30+once_cell = "1.19"
31+url = "2.5.0"
3032
3133arc-swap = { version = "1.6.0" }
3234
@@ -43,12 +45,12 @@ serde_json = "1.0"
4345toml = "0.7"
4446log = "~0.4"
4547
46−which = "4.4"
48+which = "5.0.0"
4749parking_lot = "0.12.1"
4850
4951
5052[target.'cfg(windows)'.dependencies]
51−clipboard-win = { version = "4.5", features = ["std"] }
53+clipboard-win = { version = "5.0", features = ["std"] }
5254
5355[target.'cfg(unix)'.dependencies]
5456libc = "0.2"
helix-view/src/document.rs+57−20
@@ -1213,23 +1213,40 @@ impl Document {
12131213
12141214 let changes = transaction.changes();
12151215
1216− changes.update_positions(
1217− self.diagnostics
1218− .iter_mut()
1219− .map(|diagnostic| (&mut diagnostic.range.start, Assoc::After)),
1220− );
1221− changes.update_positions(
1222− self.diagnostics
1223− .iter_mut()
1224− .map(|diagnostic| (&mut diagnostic.range.end, Assoc::After)),
1225− );
1226− // map state.diagnostics over changes::map_pos too
1227− for diagnostic in &mut self.diagnostics {
1216+ // map diagnostics over changes too
1217+ changes.update_positions(self.diagnostics.iter_mut().map(|diagnostic| {
1218+ let assoc = if diagnostic.starts_at_word {
1219+ Assoc::BeforeWord
1220+ } else {
1221+ Assoc::After
1222+ };
1223+ (&mut diagnostic.range.start, assoc)
1224+ }));
1225+ changes.update_positions(self.diagnostics.iter_mut().map(|diagnostic| {
1226+ let assoc = if diagnostic.ends_at_word {
1227+ Assoc::AfterWord
1228+ } else {
1229+ Assoc::Before
1230+ };
1231+ (&mut diagnostic.range.end, assoc)
1232+ }));
1233+ self.diagnostics.retain_mut(|diagnostic| {
1234+ if diagnostic.range.start > diagnostic.range.end
1235+ || (!diagnostic.zero_width && diagnostic.range.start == diagnostic.range.end)
1236+ {
1237+ return false;
1238+ }
12281239 diagnostic.line = self.text.char_to_line(diagnostic.range.start);
1229− }
1240+ true
1241+ });
12301242
1231− self.diagnostics
1232− .sort_unstable_by_key(|diagnostic| diagnostic.range);
1243+ self.diagnostics.sort_unstable_by_key(|diagnostic| {
1244+ (
1245+ diagnostic.range,
1246+ diagnostic.severity,
1247+ diagnostic.language_server_id,
1248+ )
1249+ });
12331250
12341251 // Update the inlay hint annotations' positions, helping ensure they are displayed in the proper place
12351252 let apply_inlay_hint_changes = |annotations: &mut Rc<[InlineAnnotation]>| {
@@ -1706,13 +1723,33 @@ impl Document {
17061723
17071724 pub fn replace_diagnostics(
17081725 &mut self,
1709− mut diagnostics: Vec<Diagnostic>,
1726+ diagnostics: impl IntoIterator<Item = Diagnostic>,
1727+ unchanged_sources: &[String],
17101728 language_server_id: usize,
17111729 ) {
1712− self.clear_diagnostics(language_server_id);
1713− self.diagnostics.append(&mut diagnostics);
1714− self.diagnostics
1715− .sort_unstable_by_key(|diagnostic| diagnostic.range);
1730+ if unchanged_sources.is_empty() {
1731+ self.clear_diagnostics(language_server_id);
1732+ } else {
1733+ self.diagnostics.retain(|d| {
1734+ if d.language_server_id != language_server_id {
1735+ return true;
1736+ }
1737+
1738+ if let Some(source) = &d.source {
1739+ unchanged_sources.contains(source)
1740+ } else {
1741+ false
1742+ }
1743+ });
1744+ }
1745+ self.diagnostics.extend(diagnostics);
1746+ self.diagnostics.sort_unstable_by_key(|diagnostic| {
1747+ (
1748+ diagnostic.range,
1749+ diagnostic.severity,
1750+ diagnostic.language_server_id,
1751+ )
1752+ });
17161753 }
17171754
17181755 pub fn clear_diagnostics(&mut self, language_server_id: usize) {
helix-view/src/editor.rs+31−11
@@ -42,10 +42,9 @@ use anyhow::{anyhow, bail, Error};
4242pub use helix_core::diagnostic::Severity;
4343use helix_core::{
4444 auto_pairs::AutoPairs,
45− syntax::{self, AutoPairConfig, SoftWrap},
46− Change, LineEnding, NATIVE_LINE_ENDING,
45+ syntax::{self, AutoPairConfig, IndentationHeuristic, SoftWrap},
46+ Change, LineEnding, Position, Selection, NATIVE_LINE_ENDING,
4747};
48−use helix_core::{Position, Selection};
4948use helix_dap as dap;
5049use helix_lsp::lsp;
5150
@@ -291,6 +290,11 @@ pub struct Config {
291290 pub insert_final_newline: bool,
292291 /// Enables smart tab
293292 pub smart_tab: Option<SmartTabConfig>,
293+ /// Draw border around popups.
294+ pub popup_border: PopupBorderConfig,
295+ /// Which indent heuristic to use when a new line is inserted
296+ #[serde(default)]
297+ pub indent_heuristic: IndentationHeuristic,
294298}
295299
296300#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
@@ -727,7 +731,7 @@ pub struct WhitespaceCharacters {
727731impl Default for WhitespaceCharacters {
728732 fn default() -> Self {
729733 Self {
730− space: '·', // U+00B7
734+ space: '·', // U+00B7
731735 nbsp: '⍽', // U+237D
732736 tab: '→', // U+2192
733737 newline: '⏎', // U+23CE
@@ -755,12 +759,13 @@ impl Default for IndentGuidesConfig {
755759}
756760
757761/// Line ending configuration.
758−#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
762+#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
759763#[serde(rename_all = "lowercase")]
760764pub enum LineEndingConfig {
761765 /// The platform's native line ending.
762766 ///
763767 /// `crlf` on Windows, otherwise `lf`.
768+ #[default]
764769 Native,
765770 /// Line feed.
766771 LF,
@@ -777,12 +782,6 @@ pub enum LineEndingConfig {
777782 Nel,
778783}
779784
780−impl Default for LineEndingConfig {
781− fn default() -> Self {
782− LineEndingConfig::Native
783− }
784−}
785−
786785impl From<LineEndingConfig> for LineEnding {
787786 fn from(line_ending: LineEndingConfig) -> Self {
788787 match line_ending {
@@ -799,6 +798,15 @@ impl From<LineEndingConfig> for LineEnding {
799798 }
800799}
801800
801+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
802+#[serde(rename_all = "kebab-case")]
803+pub enum PopupBorderConfig {
804+ None,
805+ All,
806+ Popup,
807+ Menu,
808+}
809+
802810impl Default for Config {
803811 fn default() -> Self {
804812 Self {
@@ -846,6 +854,8 @@ impl Default for Config {
846854 default_line_ending: LineEndingConfig::default(),
847855 insert_final_newline: true,
848856 smart_tab: Some(SmartTabConfig::default()),
857+ popup_border: PopupBorderConfig::None,
858+ indent_heuristic: IndentationHeuristic::default(),
849859 }
850860 }
851861}
@@ -1065,6 +1075,16 @@ impl Editor {
10651075 }
10661076 }
10671077
1078+ pub fn popup_border(&self) -> bool {
1079+ self.config().popup_border == PopupBorderConfig::All
1080+ || self.config().popup_border == PopupBorderConfig::Popup
1081+ }
1082+
1083+ pub fn menu_border(&self) -> bool {
1084+ self.config().popup_border == PopupBorderConfig::All
1085+ || self.config().popup_border == PopupBorderConfig::Menu
1086+ }
1087+
10681088 pub fn apply_motion<F: Fn(&mut Self) + 'static>(&mut self, motion: F) {
10691089 motion(self);
10701090 self.last_motion = Some(Box::new(motion));
helix-view/src/gutter.rs+1−2
@@ -9,8 +9,7 @@ use crate::{
99};
1010
1111fn count_digits(n: usize) -> usize {
12− // TODO: use checked_log10 when MSRV reaches 1.67
13− std::iter::successors(Some(n), |&n| (n >= 10).then_some(n / 10)).count()
12+ (usize::checked_ilog10(n).unwrap_or(0) + 1) as usize
1413}
1514
1615pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, bool, &mut String) -> Option<Style> + 'doc>;
helix-view/src/handlers/dap.rs+1−3
@@ -369,9 +369,7 @@ impl Editor {
369369 {
370370 Ok(process) => process,
371371 Err(err) => {
372− // TODO replace the pretty print {:?} with a regular format {}
373− // when the MSRV is raised to 1.60.0
374− self.set_error(format!("Error starting external terminal: {:?}", err));
372+ self.set_error(format!("Error starting external terminal: {}", err));
375373 return true;
376374 }
377375 };
helix-view/src/register.rs+10−10
@@ -75,8 +75,8 @@ impl Registers {
7575 self.clipboard_provider.as_ref(),
7676 self.inner.get(&name),
7777 match name {
78− '*' => ClipboardType::Clipboard,
79− '+' => ClipboardType::Selection,
78+ '+' => ClipboardType::Clipboard,
79+ '*' => ClipboardType::Selection,
8080 _ => unreachable!(),
8181 },
8282 )),
@@ -95,8 +95,8 @@ impl Registers {
9595 self.clipboard_provider.set_contents(
9696 values.join(NATIVE_LINE_ENDING.as_str()),
9797 match name {
98− '*' => ClipboardType::Clipboard,
99− '+' => ClipboardType::Selection,
98+ '+' => ClipboardType::Clipboard,
99+ '*' => ClipboardType::Selection,
100100 _ => unreachable!(),
101101 },
102102 )?;
@@ -118,8 +118,8 @@ impl Registers {
118118 '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
119119 '*' | '+' => {
120120 let clipboard_type = match name {
121− '*' => ClipboardType::Clipboard,
122− '+' => ClipboardType::Selection,
121+ '+' => ClipboardType::Clipboard,
122+ '*' => ClipboardType::Selection,
123123 _ => unreachable!(),
124124 };
125125 let contents = self.clipboard_provider.get_contents(clipboard_type)?;
@@ -172,8 +172,8 @@ impl Registers {
172172 ('#', "<selection indices>"),
173173 ('.', "<selection contents>"),
174174 ('%', "<document path>"),
175− ('*', "<system clipboard>"),
176− ('+', "<primary clipboard>"),
175+ ('+', "<system clipboard>"),
176+ ('*', "<primary clipboard>"),
177177 ]
178178 .iter()
179179 .copied(),
@@ -190,8 +190,8 @@ impl Registers {
190190 match name {
191191 '*' | '+' => {
192192 self.clear_clipboard(match name {
193− '*' => ClipboardType::Clipboard,
194− '+' => ClipboardType::Selection,
193+ '+' => ClipboardType::Clipboard,
194+ '*' => ClipboardType::Selection,
195195 _ => unreachable!(),
196196 });
197197 self.inner.remove(&name);
languages.toml+175−167
@@ -3,6 +3,7 @@
33
44[language-server]
55
6+als = { command = "als" }
67awk-language-server = { command = "awk-language-server" }
78bash-language-server = { command = "bash-language-server", args = ["start"] }
89bass = { command = "bass", args = ["--lsp"] }
@@ -47,6 +48,7 @@ mint = { command = "mint", args = ["ls"] }
4748nil = { command = "nil" }
4849nimlangserver = { command = "nimlangserver" }
4950nls = { command = "nls" }
51+nu-lsp = { command = "nu", args = [ "--lsp" ] }
5052ocamllsp = { command = "ocamllsp" }
5153ols = { command = "ols", args = [] }
5254omnisharp = { command = "OmniSharp", args = [ "--languageserver" ] }
@@ -74,6 +76,7 @@ svlangserver = { command = "svlangserver", args = [] }
7476swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
7577tailwindcss-ls = { command = "tailwindcss-language-server", args = ["--stdio"] }
7678taplo = { command = "taplo", args = ["lsp", "stdio"] }
79+templ = { command = "templ", args = ["lsp"] }
7780terraform-ls = { command = "terraform-ls", args = ["serve"] }
7881texlab = { command = "texlab" }
7982vala-language-server = { command = "vala-language-server" }
@@ -87,13 +90,14 @@ wgsl_analyzer = { command = "wgsl_analyzer" }
8790yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
8891zls = { command = "zls" }
8992blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
93+typst-lsp = { command = "typst-lsp" }
9094
9195[language-server.ansible-language-server]
9296command = "ansible-language-server"
9397args = ["--stdio"]
9498
9599[language-server.lua-language-server]
96−command = "lua-language-server"
100+command = "lua-language-server"
97101
98102[language-server.lua-language-server.config.Lua.hint]
99103enable = true
@@ -115,6 +119,12 @@ functionTypeParameters = true
115119parameterNames = true
116120rangeVariableTypes = true
117121
122+[language-server.golangci-lint-lsp]
123+command = "golangci-lint-langserver"
124+
125+[language-server.golangci-lint-lsp.config]
126+command = ["golangci-lint", "run", "--out-format", "json", "--issues-exit-code=1"]
127+
118128
119129[language-server.rust-analyzer]
120130command = "rust-analyzer"
@@ -181,6 +191,7 @@ auto-format = true
181191comment-token = "//"
182192language-servers = [ "rust-analyzer" ]
183193indent = { tab-width = 4, unit = " " }
194+persistent-diagnostic-sources = ["rustc", "clippy"]
184195
185196[language.auto-pairs]
186197'(' = ')'
@@ -241,7 +252,6 @@ name = "toml"
241252scope = "source.toml"
242253injection-regex = "toml"
243254file-types = ["toml", "poetry.lock", "Cargo.lock"]
244−roots = []
245255comment-token = "#"
246256language-servers = [ "taplo" ]
247257indent = { tab-width = 2, unit = " " }
@@ -255,7 +265,6 @@ name = "awk"
255265scope = "source.awk"
256266injection-regex = "awk"
257267file-types = ["awk", "gawk", "nawk", "mawk"]
258−roots = []
259268comment-token = "#"
260269language-servers = [ "awk-language-server" ]
261270indent = { tab-width = 2, unit = " " }
@@ -270,7 +279,6 @@ scope = "source.proto"
270279injection-regex = "protobuf"
271280file-types = ["proto"]
272281language-servers = [ "bufls", "pbkit" ]
273−roots = []
274282comment-token = "//"
275283indent = { tab-width = 2, unit = " " }
276284
@@ -299,7 +307,6 @@ scope = "source.fish"
299307injection-regex = "fish"
300308file-types = ["fish"]
301309shebangs = ["fish"]
302−roots = []
303310comment-token = "#"
304311indent = { tab-width = 4, unit = " " }
305312
@@ -313,7 +320,6 @@ scope = "source.mint"
313320injection-regex = "mint"
314321file-types = ["mint"]
315322shebangs = []
316−roots = []
317323comment-token = "//"
318324language-servers = [ "mint" ]
319325indent = { tab-width = 2, unit = " " }
@@ -341,9 +347,9 @@ file-types = [
341347 "jsonld",
342348 ".vuerc",
343349 "composer.lock",
344− ".watchmanconfig"
350+ ".watchmanconfig",
351+ "avsc"
345352]
346−roots = []
347353language-servers = [ "vscode-json-language-server" ]
348354auto-format = true
349355indent = { tab-width = 2, unit = " " }
@@ -358,7 +364,6 @@ name = "json5"
358364scope = "source.json5"
359365injection-regex = "json5"
360366file-types = ["json5"]
361−roots = []
362367language-servers = []
363368comment-token = "//"
364369indent = { tab-width = 4, unit = " " }
@@ -373,7 +378,6 @@ name = "c"
373378scope = "source.c"
374379injection-regex = "c"
375380file-types = ["c"] # TODO: ["h"]
376−roots = []
377381comment-token = "//"
378382language-servers = [ "clangd" ]
379383indent = { tab-width = 2, unit = " " }
@@ -410,7 +414,6 @@ name = "cpp"
410414scope = "source.cpp"
411415injection-regex = "cpp"
412416file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm", "h++", "ii", "inl", { suffix = ".hpp.in" }, { suffix = ".h.in" }]
413−roots = []
414417comment-token = "//"
415418language-servers = [ "clangd" ]
416419indent = { tab-width = 2, unit = " " }
@@ -493,7 +496,7 @@ file-types = ["go"]
493496roots = ["go.work", "go.mod"]
494497auto-format = true
495498comment-token = "//"
496−language-servers = [ "gopls" ]
499+language-servers = [ "gopls", "golangci-lint-lsp" ]
497500# TODO: gopls needs utf-8 offsets?
498501indent = { tab-width = 4, unit = "\t" }
499502
@@ -543,7 +546,6 @@ name = "gomod"
543546scope = "source.gomod"
544547injection-regex = "gomod"
545548file-types = ["go.mod"]
546−roots = []
547549auto-format = true
548550comment-token = "//"
549551language-servers = [ "gopls" ]
@@ -558,7 +560,6 @@ name = "gotmpl"
558560scope = "source.gotmpl"
559561injection-regex = "gotmpl"
560562file-types = ["gotmpl"]
561−roots = []
562563comment-token = "//"
563564language-servers = [ "gopls" ]
564565indent = { tab-width = 2, unit = " " }
@@ -572,7 +573,6 @@ name = "gowork"
572573scope = "source.gowork"
573574injection-regex = "gowork"
574575file-types = ["go.work"]
575−roots = []
576576auto-format = true
577577comment-token = "//"
578578language-servers = [ "gopls" ]
@@ -589,7 +589,6 @@ injection-regex = "(js|javascript)"
589589language-id = "javascript"
590590file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", "jakefile"]
591591shebangs = ["node"]
592−roots = []
593592comment-token = "//"
594593language-servers = [ "typescript-language-server" ]
595594indent = { tab-width = 2, unit = " " }
@@ -616,7 +615,6 @@ scope = "source.jsx"
616615injection-regex = "jsx"
617616language-id = "javascriptreact"
618617file-types = ["jsx"]
619−roots = []
620618comment-token = "//"
621619language-servers = [ "typescript-language-server" ]
622620indent = { tab-width = 2, unit = " " }
@@ -629,7 +627,6 @@ injection-regex = "(ts|typescript)"
629627file-types = ["ts", "mts", "cts"]
630628language-id = "typescript"
631629shebangs = ["deno", "ts-node"]
632−roots = []
633630language-servers = [ "typescript-language-server" ]
634631indent = { tab-width = 2, unit = " " }
635632
@@ -643,7 +640,6 @@ scope = "source.tsx"
643640injection-regex = "(tsx)" # |typescript
644641language-id = "typescriptreact"
645642file-types = ["tsx"]
646−roots = []
647643language-servers = [ "typescript-language-server" ]
648644indent = { tab-width = 2, unit = " " }
649645
@@ -656,7 +652,6 @@ name = "css"
656652scope = "source.css"
657653injection-regex = "css"
658654file-types = ["css", "scss"]
659−roots = []
660655language-servers = [ "vscode-css-language-server" ]
661656auto-format = true
662657indent = { tab-width = 2, unit = " " }
@@ -670,7 +665,6 @@ name = "scss"
670665scope = "source.scss"
671666injection-regex = "scss"
672667file-types = ["scss"]
673−roots = []
674668language-servers = [ "vscode-css-language-server" ]
675669auto-format = true
676670indent = { tab-width = 2, unit = " " }
@@ -684,7 +678,6 @@ name = "html"
684678scope = "text.html.basic"
685679injection-regex = "html"
686680file-types = ["html", "htm", "shtml", "xhtml", "xht", "jsp", "asp", "aspx", "jshtm", "volt", "rhtml"]
687−roots = []
688681language-servers = [ "vscode-html-language-server" ]
689682auto-format = true
690683indent = { tab-width = 2, unit = " " }
@@ -707,7 +700,7 @@ indent = { tab-width = 4, unit = " " }
707700
708701[[grammar]]
709702name = "python"
710−source = { git = "https://github.com/tree-sitter/tree-sitter-python", rev = "de221eccf9a221f5b85474a553474a69b4b5784d" }
703+source = { git = "https://github.com/tree-sitter/tree-sitter-python", rev = "4bfdd9033a2225cc95032ce77066b7aeca9e2efc" }
711704
712705[[language]]
713706name = "nickel"
@@ -715,7 +708,6 @@ scope = "source.nickel"
715708injection-regex = "nickel"
716709file-types = ["ncl"]
717710shebangs = []
718−roots = []
719711comment-token = "#"
720712language-servers = [ "nls" ]
721713indent = { tab-width = 2, unit = " " }
@@ -736,7 +728,6 @@ scope = "source.nix"
736728injection-regex = "nix"
737729file-types = ["nix"]
738730shebangs = []
739−roots = []
740731comment-token = "#"
741732language-servers = [ "nil" ]
742733indent = { tab-width = 2, unit = " " }
@@ -786,7 +777,6 @@ file-types = [
786777 "Gymfile"
787778]
788779shebangs = ["ruby"]
789−roots = []
790780comment-token = "#"
791781language-servers = [ "solargraph" ]
792782indent = { tab-width = 2, unit = " " }
@@ -841,7 +831,6 @@ file-types = [
841831 "zshrc_Apple_Terminal"
842832]
843833shebangs = ["sh", "bash", "dash", "zsh"]
844−roots = []
845834comment-token = "#"
846835language-servers = [ "bash-language-server" ]
847836indent = { tab-width = 2, unit = " " }
@@ -869,7 +858,6 @@ name = "twig"
869858scope = "source.twig"
870859injection-regex = "twig"
871860file-types = ["twig"]
872−roots = []
873861indent = { tab-width = 2, unit = " " }
874862
875863[[grammar]]
@@ -881,7 +869,6 @@ name = "latex"
881869scope = "source.tex"
882870injection-regex = "tex"
883871file-types = ["tex", "sty", "cls", "Rd", "bbx", "cbx"]
884−roots = []
885872comment-token = "%"
886873language-servers = [ "texlab" ]
887874indent = { tab-width = 4, unit = "\t" }
@@ -895,7 +882,6 @@ name = "bibtex"
895882scope = "source.bib"
896883injection-regex = "bib"
897884file-types = ["bib"]
898−roots = []
899885comment-token = "%"
900886language-servers = [ "texlab" ]
901887indent = { tab-width = 4, unit = "\t" }
@@ -932,6 +918,17 @@ indent = { tab-width = 2, unit = " " }
932918name = "lean"
933919source = { git = "https://github.com/Julian/tree-sitter-lean", rev = "d98426109258b266e1e92358c5f11716d2e8f638" }
934920
921+
922+[[language]]
923+name = "lpf"
924+comment-token = "#"
925+scope = "source.lpf"
926+file-types = ["lpf"]
927+
928+[[grammar]]
929+name = "lpf"
930+source = { git = "https://gitlab.com/TheZoq2/tree-sitter-lpf", rev = "db7372e60c722ca7f12ab359e57e6bf7611ab126" }
931+
935932[[language]]
936933name = "julia"
937934scope = "source.julia"
@@ -960,12 +957,24 @@ indent = { tab-width = 2, unit = " " }
960957name = "java"
961958source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e" }
962959
960+[[language]]
961+name = "smali"
962+scope = "source.smali"
963+injection-regex = "smali"
964+file-types = ["smali"]
965+comment-token = "#"
966+roots = []
967+indent = { tab-width = 4, unit = " " }
968+
969+[[grammar]]
970+name = "smali"
971+source = { git = "https://github.com/amaanq/tree-sitter-smali", rev = "5ae51e15c4d1ac93cba6127caf3d1f0a072c140c" }
972+
963973[[language]]
964974name = "ledger"
965975scope = "source.ledger"
966976injection-regex = "ledger"
967977file-types = ["ldg", "ledger", "journal"]
968−roots = []
969978comment-token = ";"
970979indent = { tab-width = 4, unit = " " }
971980
@@ -978,13 +987,12 @@ name = "beancount"
978987scope = "source.beancount"
979988injection-regex = "beancount"
980989file-types = ["beancount", "bean"]
981−roots = []
982990comment-token = ";"
983991indent = { tab-width = 2, unit = " " }
984992
985993[[grammar]]
986994name = "beancount"
987−source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c" }
995+source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3" }
988996
989997[[language]]
990998name = "ocaml"
@@ -992,7 +1000,6 @@ scope = "source.ocaml"
9921000injection-regex = "ocaml"
9931001file-types = ["ml"]
9941002shebangs = ["ocaml", "ocamlrun", "ocamlscript"]
995−roots = []
9961003comment-token = "(**)"
9971004language-servers = [ "ocamllsp" ]
9981005indent = { tab-width = 2, unit = " " }
@@ -1012,7 +1019,6 @@ name = "ocaml-interface"
10121019scope = "source.ocaml.interface"
10131020file-types = ["mli"]
10141021shebangs = []
1015−roots = []
10161022comment-token = "(**)"
10171023language-servers = [ "ocamllsp" ]
10181024indent = { tab-width = 2, unit = " " }
@@ -1047,7 +1053,6 @@ name = "svelte"
10471053scope = "source.svelte"
10481054injection-regex = "svelte"
10491055file-types = ["svelte"]
1050−roots = []
10511056indent = { tab-width = 2, unit = " " }
10521057language-servers = [ "svelteserver" ]
10531058
@@ -1072,7 +1077,6 @@ source = { git = "https://github.com/ikatyang/tree-sitter-vue", rev = "91fe27547
10721077name = "yaml"
10731078scope = "source.yaml"
10741079file-types = ["yml", "yaml"]
1075−roots = []
10761080comment-token = "#"
10771081indent = { tab-width = 2, unit = " " }
10781082language-servers = [ "yaml-language-server", "ansible-language-server" ]
@@ -1094,13 +1098,12 @@ indent = { tab-width = 2, unit = " " }
10941098
10951099[[grammar]]
10961100name = "haskell"
1097−source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "98fc7f59049aeb713ab9b72a8ff25dcaaef81087" }
1101+source = { git = "https://github.com/tree-sitter/tree-sitter-haskell", rev = "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3" }
10981102
10991103[[language]]
11001104name = "haskell-persistent"
11011105scope = "source.persistentmodels"
11021106file-types = ["persistentmodels"]
1103−roots = []
11041107comment-token = "--"
11051108indent = { tab-width = 2, unit = " " }
11061109
@@ -1122,7 +1125,7 @@ formatter = { command = "purs-tidy", args = ["format"] }
11221125
11231126[[grammar]]
11241127name = "purescript"
1125−source = { git = "https://github.com/maskhjarna/tree-sitter-purescript", rev = "5f5a030826849b7be17596d372967f60051b42bd" }
1128+source = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "5ef5592674ea42de75fc2792972e4ea0b6e3da6c" }
11261129
11271130[[language]]
11281131name = "zig"
@@ -1166,7 +1169,6 @@ source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4
11661169[[language]]
11671170name = "prolog"
11681171scope = "source.prolog"
1169−roots = []
11701172file-types = ["pl", "prolog"]
11711173shebangs = ["swipl"]
11721174comment-token = "%"
@@ -1176,7 +1178,6 @@ language-servers = [ "swipl" ]
11761178name = "tsq"
11771179scope = "source.tsq"
11781180file-types = ["tsq"]
1179−roots = []
11801181comment-token = ";"
11811182injection-regex = "tsq"
11821183indent = { tab-width = 2, unit = " " }
@@ -1189,7 +1190,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-tsq", rev = "48b5
11891190name = "cmake"
11901191scope = "source.cmake"
11911192file-types = ["cmake", "CMakeLists.txt"]
1192−roots = []
11931193comment-token = "#"
11941194indent = { tab-width = 2, unit = " " }
11951195language-servers = [ "cmake-language-server" ]
@@ -1205,7 +1205,6 @@ scope = "source.make"
12051205file-types = ["Makefile", "makefile", "make", "mk", "mak", "GNUmakefile", "OCamlMakefile"]
12061206shebangs = ["make", "gmake"]
12071207injection-regex = "(make|makefile|Makefile|mk)"
1208−roots = []
12091208comment-token = "#"
12101209indent = { tab-width = 4, unit = "\t" }
12111210
@@ -1217,7 +1216,6 @@ source = { git = "https://github.com/alemuller/tree-sitter-make", rev = "a4b9187
12171216name = "glsl"
12181217scope = "source.glsl"
12191218file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
1220−roots = []
12211219comment-token = "//"
12221220indent = { tab-width = 4, unit = " " }
12231221injection-regex = "glsl"
@@ -1231,20 +1229,18 @@ name = "perl"
12311229scope = "source.perl"
12321230file-types = ["pl", "pm", "t", "psgi", "raku", "rakumod", "rakutest", "rakudoc", "nqp", "p6", "pl6", "pm6"]
12331231shebangs = ["perl"]
1234−roots = []
12351232comment-token = "#"
12361233language-servers = [ "perlnavigator" ]
12371234indent = { tab-width = 2, unit = " " }
12381235
12391236[[grammar]]
12401237name = "perl"
1241−source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "9f3166800d40267fa68ed8273e96baf74f390517" }
1238+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "e99bb5283805db4cb86c964722d709df21b0ac16" }
12421239
12431240[[language]]
12441241name = "pod"
12451242scope = "source.pod"
12461243injection-regex = "pod"
1247−roots = []
12481244file-types = ["pod"]
12491245
12501246[[grammar]]
@@ -1254,17 +1250,16 @@ source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "d
12541250[[language]]
12551251name = "racket"
12561252scope = "source.racket"
1257−roots = []
12581253file-types = ["rkt", "rktd", "rktl", "scrbl"]
12591254shebangs = ["racket"]
12601255comment-token = ";"
1256+indent = { tab-width = 2, unit = " " }
12611257language-servers = [ "racket" ]
12621258grammar = "scheme"
12631259
12641260[[language]]
12651261name = "common-lisp"
12661262scope = "source.lisp"
1267−roots = []
12681263file-types = ["lisp", "asd", "cl", "l", "lsp", "ny", "podsl", "sexp"]
12691264shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
12701265comment-token = ";"
@@ -1281,19 +1276,17 @@ grammar = "scheme"
12811276[[language]]
12821277name = "comment"
12831278scope = "scope.comment"
1284−roots = []
12851279file-types = []
12861280injection-regex = "comment"
12871281
12881282[[grammar]]
12891283name = "comment"
1290−source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "5dd3c62f1bbe378b220fe16b317b85247898639e" }
1284+source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e" }
12911285
12921286[[language]]
12931287name = "wgsl"
12941288scope = "source.wgsl"
12951289file-types = ["wgsl"]
1296−roots = []
12971290comment-token = "//"
12981291language-servers = [ "wgsl_analyzer" ]
12991292indent = { tab-width = 4, unit = " " }
@@ -1305,7 +1298,6 @@ source = { git = "https://github.com/szebniok/tree-sitter-wgsl", rev = "272e89ef
13051298[[language]]
13061299name = "llvm"
13071300scope = "source.llvm"
1308−roots = []
13091301file-types = ["ll"]
13101302comment-token = ";"
13111303indent = { tab-width = 2, unit = " " }
@@ -1313,12 +1305,11 @@ injection-regex = "llvm"
13131305
13141306[[grammar]]
13151307name = "llvm"
1316−source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d" }
1308+source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6" }
13171309
13181310[[language]]
13191311name = "llvm-mir"
13201312scope = "source.llvm_mir"
1321−roots = []
13221313file-types = []
13231314comment-token = ";"
13241315indent = { tab-width = 2, unit = " " }
@@ -1334,7 +1325,6 @@ name = "llvm-mir-yaml"
13341325#
13351326# grammar = "yaml"
13361327scope = "source.yaml"
1337−roots = []
13381328file-types = ["mir"]
13391329comment-token = "#"
13401330indent = { tab-width = 2, unit = " " }
@@ -1342,7 +1332,6 @@ indent = { tab-width = 2, unit = " " }
13421332[[language]]
13431333name = "tablegen"
13441334scope = "source.tablegen"
1345−roots = []
13461335file-types = ["td"]
13471336comment-token = "//"
13481337indent = { tab-width = 2, unit = " " }
@@ -1363,19 +1352,18 @@ indent = { tab-width = 2, unit = " " }
13631352
13641353[[grammar]]
13651354name = "markdown"
1366−source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", subpath = "tree-sitter-markdown" }
1355+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee", subpath = "tree-sitter-markdown" }
13671356
13681357[[language]]
13691358name = "markdown.inline"
13701359scope = "source.markdown.inline"
13711360injection-regex = "markdown\\.inline"
13721361file-types = []
1373−roots = []
13741362grammar = "markdown_inline"
13751363
13761364[[grammar]]
13771365name = "markdown_inline"
1378−source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "fa6bfd51727e4bef99f7eec5f43947f73d64ea7d", subpath = "tree-sitter-markdown-inline" }
1366+source = { git = "https://github.com/MDeiml/tree-sitter-markdown", rev = "aaf76797aa8ecd9a5e78e0ec3681941de6c945ee", subpath = "tree-sitter-markdown-inline" }
13791367
13801368[[language]]
13811369name = "dart"
@@ -1421,7 +1409,6 @@ source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev =
14211409[[language]]
14221410name = "git-commit"
14231411scope = "git.commitmsg"
1424−roots = []
14251412file-types = ["COMMIT_EDITMSG"]
14261413comment-token = "#"
14271414indent = { tab-width = 2, unit = " " }
@@ -1435,7 +1422,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev
14351422[[language]]
14361423name = "diff"
14371424scope = "source.diff"
1438−roots = []
14391425file-types = ["diff", "patch", "rej"]
14401426injection-regex = "diff"
14411427comment-token = "#"
@@ -1448,7 +1434,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-diff", rev = "fd7
14481434[[language]]
14491435name = "git-rebase"
14501436scope = "source.gitrebase"
1451−roots = []
14521437file-types = ["git-rebase-todo"]
14531438injection-regex = "git-rebase"
14541439comment-token = "#"
@@ -1463,7 +1448,6 @@ name = "regex"
14631448scope = "source.regex"
14641449injection-regex = "regex"
14651450file-types = ["regex", ".Rbuildignore"]
1466−roots = []
14671451
14681452[[grammar]]
14691453name = "regex"
@@ -1472,7 +1456,6 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-regex", rev = "e1cf
14721456[[language]]
14731457name = "git-config"
14741458scope = "source.gitconfig"
1475−roots = []
14761459file-types = [".gitmodules", ".gitconfig", { suffix = ".git/config" }, { suffix = ".config/git/config" }]
14771460injection-regex = "git-config"
14781461comment-token = "#"
@@ -1485,7 +1468,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-config", rev
14851468[[language]]
14861469name = "git-attributes"
14871470scope = "source.gitattributes"
1488−roots = []
14891471file-types = [".gitattributes"]
14901472injection-regex = "git-attributes"
14911473comment-token = "#"
@@ -1498,7 +1480,6 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-gitattributes", rev =
14981480[[language]]
14991481name = "git-ignore"
15001482scope = "source.gitignore"
1501−roots = []
15021483file-types = [".gitignore", ".gitignore_global", ".ignore", ".prettierignore", ".eslintignore", ".npmignore", "CODEOWNERS"]
15031484injection-regex = "git-ignore"
15041485comment-token = "#"
@@ -1513,7 +1494,6 @@ name = "graphql"
15131494scope = "source.graphql"
15141495injection-regex = "graphql"
15151496file-types = ["gql", "graphql", "graphqls"]
1516−roots = []
15171497language-servers = [ "graphql-language-service" ]
15181498indent = { tab-width = 2, unit = " " }
15191499
@@ -1541,7 +1521,6 @@ name = "iex"
15411521scope = "source.iex"
15421522injection-regex = "iex"
15431523file-types = ["iex"]
1544−roots = []
15451524
15461525[[grammar]]
15471526name = "iex"
@@ -1560,7 +1539,7 @@ indent = { tab-width = 2, unit = " " }
15601539
15611540[[grammar]]
15621541name = "rescript"
1563−source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "65609807c628477f3b94052e7ef895885ac51c3c" }
1542+source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "467dcf99f68c47823d7b378779a6b282d7ef9782" }
15641543
15651544[[language]]
15661545name = "erlang"
@@ -1604,7 +1583,6 @@ scope = "source.hcl"
16041583injection-regex = "(hcl|tf|nomad)"
16051584language-id = "terraform"
16061585file-types = ["hcl", "tf", "nomad"]
1607−roots = []
16081586comment-token = "#"
16091587indent = { tab-width = 2, unit = " " }
16101588language-servers = [ "terraform-ls" ]
@@ -1619,7 +1597,6 @@ name = "tfvars"
16191597scope = "source.tfvars"
16201598language-id = "terraform-vars"
16211599file-types = ["tfvars"]
1622−roots = []
16231600comment-token = "#"
16241601indent = { tab-width = 2, unit = " " }
16251602language-servers = [ "terraform-ls" ]
@@ -1631,7 +1608,6 @@ name = "org"
16311608scope = "source.org"
16321609injection-regex = "org"
16331610file-types = ["org"]
1634−roots = []
16351611indent = { tab-width = 2, unit = " " }
16361612
16371613[[grammar]]
@@ -1643,7 +1619,6 @@ name = "solidity"
16431619scope = "source.sol"
16441620injection-regex = "(sol|solidity)"
16451621file-types = ["sol"]
1646−roots = []
16471622comment-token = "//"
16481623indent = { tab-width = 4, unit = " " }
16491624language-servers = [ "solc" ]
@@ -1665,17 +1640,19 @@ auto-format = true
16651640
16661641[[grammar]]
16671642name = "gleam"
1668−source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "a59aadf3d7c11702cad244e7cd6b67b34ca9c16a" }
1643+source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "b2afa4fd6bb41a7bf912b034c653c90af7ae5122" }
16691644
16701645[[language]]
16711646name = "ron"
16721647scope = "source.ron"
16731648injection-regex = "ron"
16741649file-types = ["ron"]
1675−roots = []
16761650comment-token = "//"
16771651indent = { tab-width = 4, unit = " " }
1678−grammar = "rust"
1652+
1653+[[grammar]]
1654+name = "ron"
1655+source = { git = "https://github.com/zee-editor/tree-sitter-ron", rev = "7762d709a0f7c1f9e269d0125a2e8a7a69006146" }
16791656
16801657[[language]]
16811658name = "robot"
@@ -1683,7 +1660,6 @@ scope = "source.robot"
16831660injection-regex = "robot"
16841661file-types = ["robot", "resource"]
16851662comment-token = "#"
1686−roots = []
16871663indent = { tab-width = 4, unit = " " }
16881664language-servers = [ "robotframework_ls" ]
16891665
@@ -1697,7 +1673,6 @@ scope = "source.r"
16971673injection-regex = "(r|R)"
16981674file-types = ["r", "R", ".Rprofile", "Rprofile.site", ".RHistory"]
16991675shebangs = ["r", "R"]
1700−roots = []
17011676comment-token = "#"
17021677indent = { tab-width = 2, unit = " " }
17031678language-servers = [ "r" ]
@@ -1709,9 +1684,9 @@ source = { git = "https://github.com/r-lib/tree-sitter-r", rev = "cc04302e1bff76
17091684[[language]]
17101685name = "rmarkdown"
17111686scope = "source.rmd"
1687+language-id = "rmd"
17121688injection-regex = "(r|R)md"
17131689file-types = ["rmd", "Rmd"]
1714−roots = []
17151690indent = { tab-width = 2, unit = " " }
17161691grammar = "markdown"
17171692language-servers = [ "r" ]
@@ -1735,7 +1710,6 @@ name = "erb"
17351710scope = "text.html.erb"
17361711injection-regex = "erb"
17371712file-types = ["erb"]
1738−roots = []
17391713indent = { tab-width = 2, unit = " " }
17401714grammar = "embedded-template"
17411715
@@ -1744,7 +1718,6 @@ name = "ejs"
17441718scope = "text.html.ejs"
17451719injection-regex = "ejs"
17461720file-types = ["ejs"]
1747−roots = []
17481721indent = { tab-width = 2, unit = " " }
17491722grammar = "embedded-template"
17501723
@@ -1781,14 +1754,13 @@ source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "
17811754name = "sql"
17821755scope = "source.sql"
17831756file-types = ["sql", "dsql"]
1784−roots = []
17851757comment-token = "--"
17861758indent = { tab-width = 4, unit = " " }
17871759injection-regex = "sql"
17881760
17891761[[grammar]]
17901762name = "sql"
1791−source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "eeab7240a11098724e6f95bc57cc3ceaf5487d5f" }
1763+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286" }
17921764
17931765[[language]]
17941766name = "gdscript"
@@ -1827,9 +1799,9 @@ scope = "source.nu"
18271799injection-regex = "nu"
18281800file-types = ["nu"]
18291801shebangs = ["nu"]
1830−roots = []
18311802comment-token = "#"
18321803indent = { tab-width = 2, unit = " " }
1804+language-servers = [ "nu-lsp" ]
18331805
18341806[[grammar]]
18351807name = "nu"
@@ -1840,7 +1812,6 @@ name = "vala"
18401812scope = "source.vala"
18411813injection-regex = "vala"
18421814file-types = ["vala", "vapi"]
1843−roots = []
18441815comment-token = "//"
18451816indent = { tab-width = 2, unit = " " }
18461817language-servers = [ "vala-language-server" ]
@@ -1854,7 +1825,6 @@ name = "hare"
18541825scope = "source.hare"
18551826injection-regex = "hare"
18561827file-types = ["ha"]
1857−roots = []
18581828comment-token = "//"
18591829indent = { tab-width = 8, unit = "\t" }
18601830
@@ -1867,7 +1837,6 @@ name = "devicetree"
18671837scope = "source.devicetree"
18681838injection-regex = "(dtsi?|devicetree|fdt)"
18691839file-types = ["dts", "dtsi"]
1870−roots = []
18711840comment-token = "//"
18721841indent = { tab-width = 4, unit = "\t" }
18731842
@@ -1880,7 +1849,6 @@ name = "cairo"
18801849scope = "source.cairo"
18811850injection-regex = "cairo"
18821851file-types = ["cairo"]
1883−roots = []
18841852comment-token = "//"
18851853indent = { tab-width = 4, unit = " " }
18861854# auto-format = true
@@ -1892,7 +1860,6 @@ name = "cpon"
18921860scope = "scope.cpon"
18931861injection-regex = "cpon"
18941862file-types = ["cpon", "cp"]
1895−roots = []
18961863auto-format = true
18971864comment-token = "//"
18981865indent = { tab-width = 2, unit = " " }
@@ -1919,8 +1886,7 @@ source = { git = "https://github.com/ap29600/tree-sitter-odin", rev = "b219207e4
19191886name = "meson"
19201887scope = "source.meson"
19211888injection-regex = "meson"
1922−file-types = ["meson.build"]
1923−roots = []
1889+file-types = ["meson.build", "meson_options.txt"]
19241890comment-token = "#"
19251891indent = { tab-width = 2, unit = " " }
19261892
@@ -1932,7 +1898,6 @@ source = { git = "https://github.com/staysail/tree-sitter-meson", rev = "32a83e8
19321898name = "sshclientconfig"
19331899scope = "source.sshclientconfig"
19341900file-types = [{ suffix = ".ssh/config" }, { suffix = "/etc/ssh/ssh_config" }]
1935−roots = []
19361901comment-token = "#"
19371902
19381903[[grammar]]
@@ -1945,7 +1910,6 @@ scope = "source.scheme"
19451910injection-regex = "scheme"
19461911file-types = ["ss", "scm"]
19471912shebangs = ["scheme", "guile", "chicken"]
1948−roots = []
19491913comment-token = ";"
19501914indent = { tab-width = 2, unit = " " }
19511915
@@ -1972,7 +1936,6 @@ source = {git = "https://github.com/v-analyzer/v-analyzer", subpath = "tree_sitt
19721936name = "verilog"
19731937scope = "source.verilog"
19741938file-types = ["v", "vh", "sv", "svh"]
1975−roots = []
19761939comment-token = "//"
19771940language-servers = [ "svlangserver" ]
19781941indent = { tab-width = 2, unit = " " }
@@ -1987,7 +1950,6 @@ name = "edoc"
19871950scope = "source.edoc"
19881951file-types = ["edoc", "edoc.in"]
19891952injection-regex = "edoc"
1990−roots = []
19911953indent = { tab-width = 4, unit = " " }
19921954
19931955[[grammar]]
@@ -1999,7 +1961,6 @@ name = "jsdoc"
19991961scope = "source.jsdoc"
20001962injection-regex = "jsdoc"
20011963file-types = ["jsdoc"]
2002−roots = []
20031964indent = { tab-width = 2, unit = " " }
20041965
20051966[[grammar]]
@@ -2011,7 +1972,6 @@ name = "openscad"
20111972scope = "source.openscad"
20121973injection-regex = "openscad"
20131974file-types = ["scad"]
2014−roots = []
20151975comment-token = "//"
20161976language-servers = [ "openscad-lsp" ]
20171977indent = { tab-width = 2, unit = "\t" }
@@ -2053,7 +2013,6 @@ name = "starlark"
20532013scope = "source.starlark"
20542014injection-regex = "(starlark|bzl|bazel)"
20552015file-types = ["bzl", "bazel", "BUILD", "star"]
2056−roots = []
20572016comment-token = "#"
20582017indent = { tab-width = 4, unit = " " }
20592018grammar = "python"
@@ -2062,7 +2021,6 @@ grammar = "python"
20622021name = "elvish"
20632022scope = "source.elvish"
20642023file-types = ["elv"]
2065−roots = []
20662024comment-token = "#"
20672025indent = { tab-width = 2, unit = " " }
20682026language-servers = [ "elvish" ]
@@ -2078,7 +2036,6 @@ scope = "source.idr"
20782036injection-regex = "idr"
20792037file-types = ["idr"]
20802038shebangs = []
2081−roots = []
20822039comment-token = "--"
20832040indent = { tab-width = 2, unit = " " }
20842041language-servers = [ "idris2-lsp" ]
@@ -2102,20 +2059,18 @@ name = "ungrammar"
21022059scope = "source.ungrammar"
21032060injection-regex = "ungrammar"
21042061file-types = ["ungram", "ungrammar"]
2105−roots = []
21062062comment-token = "//"
21072063indent = { tab-width = 2, unit = " " }
21082064
21092065[[grammar]]
21102066name = "ungrammar"
2111−source = { git = "https://github.com/Philipp-M/tree-sitter-ungrammar", rev = "0113de880a58ea14f2a75802e9b99fcc25003d9c" }
2067+source = { git = "https://github.com/Philipp-M/tree-sitter-ungrammar", rev = "a7e104629cff5a8b7367187610631e8f5eb7c6ea" }
21122068
21132069[[language]]
21142070name = "dot"
21152071scope = "source.dot"
21162072injection-regex = "dot"
21172073file-types = ["dot"]
2118−roots = []
21192074comment-token = "//"
21202075indent = { tab-width = 4, unit = " " }
21212076language-servers = [ "dot-language-server" ]
@@ -2145,7 +2100,6 @@ name = "slint"
21452100scope = "source.slint"
21462101injection-regex = "slint"
21472102file-types = ["slint"]
2148−roots = []
21492103comment-token = "//"
21502104indent = { tab-width = 4, unit = " " }
21512105language-servers = [ "slint-lsp" ]
@@ -2159,7 +2113,6 @@ name = "task"
21592113scope = "source.task"
21602114injection-regex = "task"
21612115file-types = ["task"]
2162−roots = []
21632116comment-token = "#"
21642117indent = { tab-width = 2, unit = " " }
21652118
@@ -2172,7 +2125,6 @@ name = "xit"
21722125scope = "source.xit"
21732126injection-regex = "xit"
21742127file-types = ["xit"]
2175−roots = []
21762128indent = { tab-width = 4, unit = " " }
21772129
21782130[[grammar]]
@@ -2197,7 +2149,6 @@ name = "pascal"
21972149scope = "source.pascal"
21982150injection-regex = "pascal"
21992151file-types = ["pas", "pp", "inc", "lpr", "lfm"]
2200−roots = []
22012152comment-token = "//"
22022153indent = { tab-width = 2, unit = " " }
22032154language-servers = [ "pasls" ]
@@ -2212,7 +2163,6 @@ scope = "source.sml"
22122163injection-regex = "sml"
22132164file-types = ["sml"]
22142165comment-token = "(*"
2215−roots = []
22162166
22172167[[grammar]]
22182168name = "sml"
@@ -2236,19 +2186,17 @@ name = "astro"
22362186scope = "source.astro"
22372187injection-regex = "astro"
22382188file-types = ["astro"]
2239−roots = []
22402189indent = { tab-width = 2, unit = " " }
22412190
22422191[[grammar]]
22432192name = "astro"
2244−source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "5f5c3e73c45967df9aa42f861fad2d77cd4e0900" }
2193+source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "947e93089e60c66e681eba22283f4037841451e7" }
22452194
22462195[[language]]
22472196name = "bass"
22482197scope = "source.bass"
22492198injection-regex = "bass"
22502199file-types = ["bass"]
2251−roots = []
22522200comment-token = ";"
22532201indent = { tab-width = 2, unit = " " }
22542202language-servers = [ "bass" ]
@@ -2262,7 +2210,6 @@ name = "wat"
22622210scope = "source.wat"
22632211comment-token = ";;"
22642212file-types = ["wat"]
2265−roots = []
22662213
22672214[[grammar]]
22682215name = "wat"
@@ -2273,7 +2220,6 @@ name = "wast"
22732220scope = "source.wast"
22742221comment-token = ";;"
22752222file-types = ["wast"]
2276−roots = []
22772223
22782224[[grammar]]
22792225name = "wast"
@@ -2283,7 +2229,6 @@ source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f
22832229name = "d"
22842230scope = "source.d"
22852231file-types = [ "d", "dd" ]
2286−roots = []
22872232comment-token = "//"
22882233injection-regex = "d"
22892234indent = { tab-width = 4, unit = " "}
@@ -2292,13 +2237,12 @@ formatter = { command = "dfmt" }
22922237
22932238[[grammar]]
22942239name = "d"
2295−source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb2f3c43fa8a923d0d27497f3c04" }
2240+source = { git = "https://github.com/gdamore/tree-sitter-d", rev = "5566f8ce8fc24186fad06170bbb3c8d97c935d74" }
22962241
22972242[[language]]
22982243name = "vhs"
22992244scope = "source.vhs"
23002245file-types = ["tape"]
2301−roots = []
23022246comment-token = "#"
23032247indent = { tab-width = 2, unit = " " }
23042248grammar = "vhs"
@@ -2311,13 +2255,12 @@ source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "c6d8
23112255name = "kdl"
23122256scope = "source.kdl"
23132257file-types = ["kdl"]
2314−roots = []
23152258comment-token = "//"
23162259injection-regex = "kdl"
23172260
23182261[[grammar]]
23192262name = "kdl"
2320−source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d15df6610484e1d4b5c987ecad52373" }
2263+source = { git = "https://github.com/amaanq/tree-sitter-kdl", rev = "3ca569b9f9af43593c24f9e7a21f02f43a13bb88" }
23212264
23222265[[language]]
23232266name = "xml"
@@ -2377,10 +2320,11 @@ file-types = [
23772320 "xliff",
23782321 "xpdl",
23792322 "xul",
2380− "xoml"
2323+ "xoml",
2324+ "musicxml",
2325+ "glif"
23812326]
23822327indent = { tab-width = 2, unit = " " }
2383−roots = []
23842328
23852329[language.auto-pairs]
23862330'(' = ')'
@@ -2401,7 +2345,6 @@ scope = "source.dtd"
24012345injection-regex = "dtd"
24022346file-types = ["dtd", "ent"]
24032347indent = {tab-width = 2, unit = " "}
2404−roots = []
24052348
24062349[language.auto-pairs]
24072350'(' = ')'
@@ -2419,7 +2362,6 @@ name = "wit"
24192362scope = "source.wit"
24202363injection-regex = "wit"
24212364file-types = ["wit"]
2422−roots = []
24232365comment-token = "//"
24242366indent = { tab-width = 2, unit = " " }
24252367
@@ -2438,11 +2380,10 @@ source = { git = "https://github.com/hh9527/tree-sitter-wit", rev = "c917790ab9a
24382380[[language]]
24392381name = "env"
24402382scope = "source.env"
2441−file-types = [".env", ".env.local", ".env.development", ".env.production", ".env.dist", ".envrc"]
2383+file-types = [".env", ".env.local", ".env.development", ".env.production", ".env.dist", ".envrc", ".envrc.local", ".envrc.private"]
24422384injection-regex = "env"
24432385comment-token = "#"
24442386indent = { tab-width = 4, unit = "\t" }
2445−roots = []
24462387grammar = "bash"
24472388
24482389[[language]]
@@ -2475,7 +2416,6 @@ file-types = [
24752416injection-regex = "ini"
24762417comment-token = "#"
24772418indent = { tab-width = 4, unit = "\t" }
2478−roots = []
24792419
24802420[[grammar]]
24812421name = "ini"
@@ -2485,7 +2425,6 @@ source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "4d247fb87
24852425name = "bicep"
24862426scope = "source.bicep"
24872427file-types = ["bicep"]
2488−roots = []
24892428auto-format = true
24902429comment-token = "//"
24912430indent = { tab-width = 2, unit = " "}
@@ -2499,7 +2438,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-bicep", rev = "d8
24992438name = "qml"
25002439scope = "source.qml"
25012440file-types = ["qml"]
2502−roots = []
25032441language-servers = [ "qmlls" ]
25042442indent = { tab-width = 4, unit = " " }
25052443grammar = "qmljs"
@@ -2513,7 +2451,6 @@ name = "mermaid"
25132451scope = "source.mermaid"
25142452injection-regex = "mermaid"
25152453file-types = ["mermaid"]
2516−roots = []
25172454comment-token = "%%"
25182455indent = { tab-width = 4, unit = " " }
25192456
@@ -2527,7 +2464,6 @@ scope = "source.m"
25272464file-types = ["m"]
25282465comment-token = "%"
25292466shebangs = ["octave-cli", "matlab"]
2530−roots = []
25312467indent = { tab-width = 2, unit = " " }
25322468
25332469[[grammar]]
@@ -2552,7 +2488,6 @@ name = "dhall"
25522488scope = "source.dhall"
25532489injection-regex = "dhall"
25542490file-types = ["dhall"]
2555−roots = []
25562491comment-token = "--"
25572492indent = { tab-width = 2, unit = " " }
25582493language-servers = [ "dhall-lsp-server" ]
@@ -2567,7 +2502,6 @@ name = "sage"
25672502scope = "source.sage"
25682503file-types = ["sage"]
25692504injection-regex = "sage"
2570−roots = []
25712505comment-token = "#"
25722506indent = { tab-width = 4, unit = " " }
25732507grammar = "python"
@@ -2578,7 +2512,6 @@ scope = "source.msbuild"
25782512injection-regex = "msbuild"
25792513file-types = ["proj", "vbproj", "csproj", "fsproj", "targets", "props"]
25802514indent = { tab-width = 2, unit = " " }
2581−roots = []
25822515grammar = "xml"
25832516
25842517[language.auto-pairs]
@@ -2594,7 +2527,6 @@ name = "pem"
25942527scope = "source.pem"
25952528file-types = ["pem", "cert", "crt"]
25962529injection-regex = "pem"
2597−roots = []
25982530grammar = "pem"
25992531
26002532[[grammar]]
@@ -2605,7 +2537,6 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-pem", rev = "be67a433
26052537name = "passwd"
26062538scope = "source.passwd"
26072539file-types = ["passwd"]
2608−roots = []
26092540
26102541[[grammar]]
26112542name = "passwd"
@@ -2615,7 +2546,6 @@ source = { git = "https://github.com/ath3/tree-sitter-passwd", rev = "20239395ea
26152546name = "hosts"
26162547scope = "source.hosts"
26172548file-types = ["hosts"]
2618−roots = []
26192549comment-token = "#"
26202550
26212551[[grammar]]
@@ -2627,20 +2557,18 @@ name = "uxntal"
26272557scope = "source.tal"
26282558injection-regex = "tal"
26292559file-types = ["tal"]
2630−roots = []
26312560auto-format = false
26322561comment-token = "("
26332562
26342563[[grammar]]
26352564name = "uxntal"
2636−source = { git = "https://github.com/Jummit/tree-sitter-uxntal", rev = "9297e95ef74380b0ad84c4fd98f91e9f6e4319e6" }
2565+source = { git = "https://github.com/Jummit/tree-sitter-uxntal", rev = "d68406066648cd6db4c6a2f11ec305af02079884" }
26372566
26382567[[language]]
26392568name = "yuck"
26402569scope = "source.yuck"
26412570injection-regex = "yuck"
26422571file-types = ["yuck"]
2643−roots = []
26442572comment-token = ";"
26452573indent = { tab-width = 2, unit = " " }
26462574
@@ -2653,7 +2581,6 @@ name = "prql"
26532581scope = "source.prql"
26542582injection-regex = "prql"
26552583file-types = ["prql"]
2656−roots = []
26572584comment-token = "#"
26582585indent = { tab-width = 4, unit = " " }
26592586
@@ -2665,7 +2592,6 @@ source = { git = "https://github.com/PRQL/tree-sitter-prql", rev = "09e158cd3650
26652592name = "po"
26662593scope = "source.po"
26672594file-types = ["po", "pot"]
2668−roots = []
26692595comment-token = "#"
26702596
26712597[[grammar]]
@@ -2677,7 +2603,6 @@ name = "nasm"
26772603scope = "source.nasm"
26782604file-types = ["asm", "S", "nasm"]
26792605injection-regex = "n?asm"
2680−roots = []
26812606comment-token = ";"
26822607indent = { tab-width = 8, unit = " " }
26832608
@@ -2690,7 +2615,6 @@ name = "gas"
26902615scope = "source.gas"
26912616file-types = ["s"]
26922617injection-regex = "gas"
2693−roots = []
26942618comment-token = "#"
26952619indent = { tab-width = 8, unit = " " }
26962620
@@ -2703,7 +2627,6 @@ name = "rst"
27032627scope = "source.rst"
27042628comment-token = ".."
27052629file-types = ["rst"]
2706−roots = []
27072630
27082631[[grammar]]
27092632name = "rst"
@@ -2714,7 +2637,6 @@ name = "capnp"
27142637scope = "source.capnp"
27152638injection-regex = "capnp"
27162639file-types = ["capnp"]
2717−roots = []
27182640comment-token = "#"
27192641indent = { tab-width = 2, unit = " " }
27202642
@@ -2740,7 +2662,6 @@ source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "c
27402662name = "vhdl"
27412663scope = "source.vhdl"
27422664file-types = ["vhd", "vhdl"]
2743−roots = []
27442665comment-token = "--"
27452666language-servers = [ "vhdl_ls" ]
27462667indent = { tab-width = 2, unit = " " }
@@ -2752,7 +2673,6 @@ source = { git = "https://github.com/teburd/tree-sitter-vhdl", rev = "c57313adee
27522673
27532674[[language]]
27542675name = "rego"
2755−roots = []
27562676scope = "source.rego"
27572677injection-regex = "rego"
27582678file-types = ["rego"]
@@ -2763,7 +2683,7 @@ grammar = "rego"
27632683
27642684[[grammar]]
27652685name = "rego"
2766−source = { git = "https://github.com/FallenAngel97/tree-sitter-rego", rev = "b2667c975f07b33be3ceb83bea5cfbad88095866" }
2686+source = { git = "https://github.com/FallenAngel97/tree-sitter-rego", rev = "9ac75e71b2d791e0aadeef68098319d86a2a14cf" }
27672687
27682688[[language]]
27692689name = "nim"
@@ -2771,7 +2691,6 @@ scope = "source.nim"
27712691injection-regex = "nim"
27722692file-types = ["nim", "nims", "nimble"]
27732693shebangs = []
2774−roots = []
27752694comment-token = "#"
27762695indent = { tab-width = 2, unit = " " }
27772696language-servers = [ "nimlangserver" ]
@@ -2795,13 +2714,13 @@ file-types = [ "cabal" ]
27952714roots = ["cabal.project", "Setup.hs"]
27962715indent = { tab-width = 2, unit = " " }
27972716comment-token = "--"
2717+language-servers = [ "haskell-language-server" ]
27982718
27992719[[language]]
28002720name = "hurl"
28012721scope = "source.hurl"
28022722injection-regex = "hurl"
28032723file-types = ["hurl"]
2804−roots = []
28052724comment-token = "#"
28062725indent = { tab-width = 2, unit = " " }
28072726
@@ -2812,7 +2731,6 @@ source = { git = "https://github.com/pfeiferj/tree-sitter-hurl", rev = "264c4206
28122731[[language]]
28132732name = "markdoc"
28142733scope = "text.markdoc"
2815−roots = []
28162734file-types = ["mdoc"]
28172735language-servers = [ "markdoc-ls" ]
28182736
@@ -2825,7 +2743,6 @@ name = "opencl"
28252743scope = "source.cl"
28262744injection-regex = "(cl|opencl)"
28272745file-types = ["cl"]
2828−roots = []
28292746comment-token = "//"
28302747language-servers = [ "clangd" ]
28312748
@@ -2838,7 +2755,6 @@ name = "just"
28382755scope = "source.just"
28392756file-types = ["justfile", "Justfile", ".justfile", ".Justfile"]
28402757injection-regex = "just"
2841−roots = []
28422758comment-token = "#"
28432759indent = { tab-width = 4, unit = "\t" }
28442760
@@ -2846,12 +2762,25 @@ indent = { tab-width = 4, unit = "\t" }
28462762name = "just"
28472763source = { git = "https://github.com/IndianBoy42/tree-sitter-just", rev = "8af0aab79854aaf25b620a52c39485849922f766" }
28482764
2765+[[language]]
2766+name = "gn"
2767+scope = "source.gn"
2768+injection-regex = "gn"
2769+file-types = ["gn", "gni"]
2770+roots = []
2771+comment-token = "#"
2772+indent = { tab-width = 2, unit = " " }
2773+formatter = { command = "gn", args = ["format", "--stdin"] }
2774+
2775+[[grammar]]
2776+name = "gn"
2777+source = { git = "https://github.com/willcassella/tree-sitter-gn", rev = "e18d6e36a79b20dafb58f19d407bd38b0e60260e" }
2778+
28492779[[language]]
28502780name = "blueprint"
28512781scope = "source.blueprint"
28522782injection-regex = "blueprint"
28532783file-types = ["blp"]
2854−roots = []
28552784comment-token = "//"
28562785language-servers = [ "blueprint-compiler" ]
28572786indent = { tab-width = 4, unit = " " }
@@ -2865,14 +2794,13 @@ name = "forth"
28652794scope = "source.forth"
28662795injection-regex = "forth"
28672796file-types = ["fs", "forth", "fth", "4th"]
2868−roots = []
28692797comment-token = "\\"
28702798language-servers = [ "forth-lsp" ]
28712799indent = { tab-width = 3, unit = " " }
28722800
28732801[[grammar]]
28742802name = "forth"
2875−source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "304ed77beb113e37af38b20ff14e3c37bf350d10" }
2803+source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "90189238385cf636b9ee99ce548b9e5b5e569d48" }
28762804
28772805[[language]]
28782806name = "fsharp"
@@ -2894,7 +2822,6 @@ name = "t32"
28942822scope = "source.t32"
28952823injection-regex = "t32"
28962824file-types = ["cmm", "t32"]
2897−roots = []
28982825comment-token = ";"
28992826indent = { tab-width = 2, unit = " " }
29002827
@@ -2907,16 +2834,34 @@ name = "webc"
29072834scope = "text.html.webc"
29082835injection-regex = "webc"
29092836file-types = ["webc"]
2910−roots = []
29112837indent = { tab-width = 2, unit = " " }
29122838grammar = "html"
29132839
2840+[[language]]
2841+name = "typst"
2842+scope = "source.typst"
2843+injection-regex = "typst"
2844+file-types = ["typst", "typ"]
2845+comment-token = "//"
2846+language-servers = ["typst-lsp"]
2847+indent = { tab-width = 2, unit = " " }
2848+
2849+[language.auto-pairs]
2850+'(' = ')'
2851+'{' = '}'
2852+'[' = ']'
2853+'$' = '$'
2854+'"' = '"'
2855+
2856+[[grammar]]
2857+name = "typst"
2858+source = { git = "https://github.com/uben0/tree-sitter-typst", rev = "e35aa22395fdde82bbc4b5700c324ce346dfc9e5" }
2859+
29142860[[language]]
29152861name = "nunjucks"
29162862scope = "text.html.nunjucks"
29172863injection-regex = "nunjucks"
29182864file-types = ["njk"]
2919−roots = []
29202865indent = { tab-width = 2, unit = " " }
29212866grammar = "jinja2"
29222867
@@ -2925,7 +2870,6 @@ name = "jinja"
29252870scope = "text.html.jinja"
29262871injection-regex = "jinja"
29272872file-types = ["jinja", "jinja2", "j2"]
2928−roots = []
29292873indent = { tab-width = 2, unit = " " }
29302874grammar = "jinja2"
29312875
@@ -2942,7 +2886,6 @@ name = "wren"
29422886scope = "source.wren"
29432887injection-regex = "wren"
29442888file-types = ["wren"]
2945−roots = []
29462889indent = { tab-width = 2, unit = " "}
29472890
29482891[[language]]
@@ -2951,7 +2894,6 @@ scope = "source.unison"
29512894injection-regex = "unison"
29522895file-types = ["u"]
29532896shebangs = []
2954−roots = []
29552897auto-format = false
29562898comment-token = "--"
29572899indent = { tab-width = 4, unit = " " }
@@ -2971,7 +2913,6 @@ source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "98c4e
29712913name = "todotxt"
29722914scope = "text.todotxt"
29732915file-types = [{ suffix = ".todo.txt" }, "todotxt"]
2974−roots = []
29752916formatter = { command = "sort" }
29762917auto-format = true
29772918
@@ -2983,7 +2924,6 @@ source = { git = "https://github.com/arnarg/tree-sitter-todotxt", rev = "0207f6a
29832924name = "strace"
29842925scope = "source.strace"
29852926file-types = ["strace"]
2986−roots = []
29872927
29882928[[grammar]]
29892929name = "strace"
@@ -2993,8 +2933,76 @@ source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "2b18fdf
29932933name = "gemini"
29942934scope = "source.gmi"
29952935file-types = ["gmi"]
2996−roots = []
29972936
29982937[[grammar]]
29992938name = "gemini"
3000−source = { git = "https://git.sr.ht/~sfr/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
2939+source = { git = "https://git.sr.ht/~nbsp/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" }
2940+
2941+[[language]]
2942+name = "agda"
2943+scope = "source.agda"
2944+injection-regex = "agda"
2945+file-types = ["agda"]
2946+roots = []
2947+comment-token = "--"
2948+# language-servers = [ "als" ]
2949+# the agda language server is of questionable functionality.
2950+auto-format = false
2951+indent = { tab-width = 2, unit = " " }
2952+
2953+[language.auto-pairs]
2954+'"' = '"'
2955+"'" = "'"
2956+'{' = '}'
2957+'(' = ')'
2958+'[' = ']'
2959+
2960+# [language.debugger]
2961+# ?? can this be used for proof assistant support? explore
2962+
2963+[[grammar]]
2964+name = "agda"
2965+source = { git = "https://github.com/tree-sitter/tree-sitter-agda", rev = "c21c3a0f996363ed17b8ac99d827fe5a4821f217" }
2966+
2967+[[language]]
2968+name = "templ"
2969+scope = "source.templ"
2970+file-types = ["templ"]
2971+roots = ["go.work", "go.mod"]
2972+comment-token = "//"
2973+indent = { tab-width = 2, unit = " " }
2974+language-servers = [ "templ" ]
2975+
2976+[[grammar]]
2977+name = "templ"
2978+source = { git = "https://github.com/vrischmann/tree-sitter-templ", rev = "ea56ac0655243490a4929a988f4eaa91dfccc995" }
2979+
2980+[[language]]
2981+name = "dbml"
2982+scope = "source.dbml"
2983+injection-regex = "dbml"
2984+file-types = ["dbml"]
2985+comment-token = ";"
2986+indent = { tab-width = 2, unit = " " }
2987+
2988+[[grammar]]
2989+name = "dbml"
2990+source = { git = "https://github.com/dynamotn/tree-sitter-dbml", rev = "2e2fa5640268c33c3d3f27f7e676f631a9c68fd9" }
2991+
2992+[[language]]
2993+name = "log"
2994+scope = "source.log"
2995+file-types = ["log"]
2996+
2997+[[grammar]]
2998+name = "log"
2999+source = { git = "https://github.com/Tudyx/tree-sitter-log", rev = "62cfe307e942af3417171243b599cc7deac5eab9" }
3000+
3001+[[language]]
3002+name = "janet"
3003+scope = "source.janet"
3004+injection-regex = "janet"
3005+file-types = ["janet"]
3006+comment-token = "#"
3007+indent = { tab-width = 2, unit = " " }
3008+grammar = "clojure"
logo.svg+1−1
@@ -1 +1 @@
1−<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75"> <g transform="matrix(1,0,0,1,-31352.7,-1817.25)"> <g transform="matrix(1,0,0,1,31062.7,-20.8972)"> <g transform="matrix(1,0,0,1,-130.173,0.00185558)"> <path d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z" style="fill:#706bc8;"></path> </g> <g transform="matrix(1,0,0,1,-130.173,0.00185558)"> <path d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z" style="fill:#55c5e4;"></path> </g> <g transform="matrix(1,0,0,1,216.062,984.098)"> <path d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z" style="fill:#84ddea;"></path> </g> <g transform="matrix(1,0,0,1,216.062,984.098)"> <path d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z" style="fill:#997bc8;"></path></g></g></g> </svg>
1+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" viewBox="663.38 37.57 575.35 903.75"><g transform="matrix(1,0,0,1,-31352.7,-1817.25)"><g transform="matrix(1,0,0,1,31062.7,-20.8972)"><g transform="matrix(1,0,0,1,-130.173,0.00185558)"><path style="fill:#706bc8;" d="M1083.58,1875.72L1635.06,2194.12C1649.8,2202.63 1658.88,2218.37 1658.88,2235.39C1658.88,2264.98 1658.88,2311.74 1658.88,2341.33C1658.88,2349.84 1656.61,2358.03 1652.5,2365.16C1652.5,2365.16 1214.7,2112.4 1107.2,2050.33C1092.58,2041.89 1083.58,2026.29 1083.58,2009.41C1083.58,1963.5 1083.58,1875.72 1083.58,1875.72Z"></path></g><g transform="matrix(1,0,0,1,-130.173,0.00185558)"><path style="fill:#55c5e4;" d="M1635.26,2604.84C1649.88,2613.28 1658.88,2628.87 1658.88,2645.75C1658.88,2691.67 1658.88,2779.44 1658.88,2779.44L1107.41,2461.05C1092.66,2452.53 1083.58,2436.8 1083.58,2419.78C1083.58,2390.19 1083.58,2343.42 1083.58,2313.84C1083.58,2305.32 1085.85,2297.13 1089.96,2290.01C1089.96,2290.01 1527.76,2542.77 1635.26,2604.84Z"></path></g><g transform="matrix(1,0,0,1,216.062,984.098)"><path style="fill:#84ddea;" d="M790.407,1432.56C785.214,1435.55 780.717,1439.9 777.509,1445.46C767.862,1462.16 773.473,1483.76 790.004,1493.59L789.998,1493.59L761.173,1476.95C746.427,1468.44 737.344,1452.71 737.344,1435.68C737.344,1406.09 737.344,1359.33 737.344,1329.74C737.344,1312.71 746.427,1296.98 761.173,1288.47L1259.59,1000.74L1259.83,1000.6C1264.92,997.617 1269.33,993.314 1272.48,987.844C1282.13,971.136 1276.52,949.544 1259.99,939.707L1260,939.707L1288.82,956.349C1303.57,964.862 1312.65,980.595 1312.65,997.622C1312.65,1027.21 1312.65,1073.97 1312.65,1103.56C1312.65,1120.59 1303.57,1136.32 1288.82,1144.83L1259.19,1161.94L1259.59,1161.68L790.407,1432.56Z"></path></g><g transform="matrix(1,0,0,1,216.062,984.098)"><path style="fill:#997bc8;" d="M790.407,1686.24C785.214,1689.23 780.717,1693.58 777.509,1699.13C767.862,1715.84 773.473,1737.43 790.004,1747.27L789.998,1747.27L761.173,1730.63C746.427,1722.12 737.344,1706.38 737.344,1689.36C737.344,1659.77 737.344,1613.01 737.344,1583.42C737.344,1566.39 746.427,1550.66 761.173,1542.15L1259.59,1254.42L1259.83,1254.28C1264.92,1251.29 1269.33,1246.99 1272.48,1241.52C1282.13,1224.81 1276.52,1203.22 1259.99,1193.38L1260,1193.38L1288.82,1210.03C1303.57,1218.54 1312.65,1234.27 1312.65,1251.3C1312.65,1280.89 1312.65,1327.65 1312.65,1357.24C1312.65,1374.26 1303.57,1390 1288.82,1398.51L1259.19,1415.61L1259.59,1415.36L790.407,1686.24Z"></path></g></g></g></svg>
runtime/queries/_typescript/highlights.scm+5−3
@@ -39,11 +39,11 @@
3939 (identifier) @variable.parameter))
4040
4141; (p?: t)
42−; (p?: t = 1) // Invalid but still posible to hihglight.
42+; (p?: t = 1) // Invalid but still possible to highlight.
4343(optional_parameter
4444 (identifier) @variable.parameter)
4545
46−; (...p?: t) // Invalid but still posible to hihglight.
46+; (...p?: t) // Invalid but still possible to highlight.
4747(optional_parameter
4848 (rest_pattern
4949 (identifier) @variable.parameter))
@@ -59,7 +59,7 @@
5959 (pair_pattern
6060 value: (identifier) @variable.parameter)))
6161
62−; ([ p ]?: t[]) // Invalid but still posible to hihglight.
62+; ([ p ]?: t[]) // Invalid but still possible to highlight.
6363(optional_parameter
6464 (array_pattern
6565 (identifier) @variable.parameter))
@@ -107,6 +107,8 @@
107107; Types
108108; -----
109109
110+(type_parameter
111+ name: (type_identifier) @type.parameter)
110112(type_identifier) @type
111113(predefined_type) @type.builtin
112114
runtime/queries/_typescript/locals.scm+17
@@ -1,6 +1,18 @@
1+; Scopes
2+;-------
3+
4+[
5+ (type_alias_declaration)
6+ (class_declaration)
7+ (interface_declaration)
8+] @local.scope
9+
110; Definitions
211;------------
312
13+(type_parameter
14+ name: (type_identifier) @local.definition)
15+
416; Javascript and Typescript Treesitter grammars deviate when defining the
517; tree structure for parameters, so we need to address them in each specific
618; language instead of ecma.
@@ -14,3 +26,8 @@
1426; (i?: t = 1) // Invalid but still posible to hihglight.
1527(optional_parameter
1628 (identifier) @local.definition)
29+
30+; References
31+;-----------
32+
33+(type_identifier) @local.reference
runtime/queries/agda/highlights.scmnew file+124
@@ -0,0 +1,124 @@
1+;; Punctuation
2+[ "." ";" ":"] @punctuation.delimiter
3+[ "(" ")" "{" "}" ] @punctuation.bracket
4+
5+;; Constants
6+(integer) @constant.numeric.integer
7+; (float) @constant.numeric.float
8+(literal) @string
9+
10+;; Pragmas and comments
11+(comment) @comment
12+(pragma) @attribute
13+(macro) @function.macro
14+
15+;; Imports
16+(module_name) @namespace
17+(import_directive (id) @namespace)
18+[(module) (import) (open)] @keyword.control.import
19+
20+;; Types
21+(typed_binding (expr) @type)
22+(record (expr) @type)
23+(data (expr) @type)
24+(signature (expr) @type)
25+(function (rhs (expr) @type))
26+; todo: these are too general. ideally, any nested (atom)
27+; https://github.com/tree-sitter/tree-sitter/issues/880
28+
29+;; Variables
30+(untyped_binding (atom) @variable)
31+(typed_binding (atom) @variable)
32+(field_name) @variable.other.member
33+
34+;; Functions
35+(function_name) @function
36+;(function (lhs
37+; . (atom) @function
38+; (atom) @variable.parameter))
39+; todo: currently fails to parse, upstream tree-sitter bug
40+
41+;; Data
42+[(data_name) (record_name)] @constructor
43+((atom) @constant.builtin.boolean
44+ (#any-of? @constant.builtin.boolean "true" "false" "True" "False"))
45+
46+"Set" @type.builtin
47+
48+; postulate
49+; type_signature
50+; pattern
51+; id
52+; bid
53+; typed_binding
54+; primitive
55+; private
56+; record_signature
57+; record_assignments
58+; field_assignment
59+; module_assignment
60+; renaming
61+; import_directive
62+; lambda
63+; let
64+; instance
65+; generalize
66+; record
67+; fields
68+; syntax
69+; hole_name
70+; data_signature
71+
72+;; Keywords
73+[
74+ "where"
75+ "data"
76+ "rewrite"
77+ "postulate"
78+ "public"
79+ "private"
80+ "tactic"
81+ "Prop"
82+ "quote"
83+ "renaming"
84+ "in"
85+ "hiding"
86+ "constructor"
87+ "abstract"
88+ "let"
89+ "field"
90+ "mutual"
91+ "infix"
92+ "infixl"
93+ "infixr"
94+ "record"
95+ "overlap"
96+ "instance"
97+ "do"
98+] @keyword
99+
100+[
101+ "="
102+] @operator
103+
104+; = | -> : ? \ .. ... λ ∀ →
105+; (_LAMBDA) (_FORALL) (_ARROW)
106+; "coinductive"
107+; "eta-equality"
108+; "field"
109+; "inductive"
110+; "interleaved"
111+; "macro"
112+; "no-eta-equality"
113+; "pattern"
114+; "primitive"
115+; "quoteTerm"
116+; "rewrite"
117+; "syntax"
118+; "unquote"
119+; "unquoteDecl"
120+; "unquoteDef"
121+; "using"
122+; "variable"
123+; "with"
124+
runtime/queries/bash/indents.scm+1
@@ -2,6 +2,7 @@
22 (function_definition)
33 (if_statement)
44 (for_statement)
5+ (while_statement)
56 (case_statement)
67 (pipeline)
78] @indent
runtime/queries/c/indents.scm+13
@@ -36,3 +36,16 @@
3636(parameter_list
3737 . (parameter_declaration) @anchor
3838 (#set! "scope" "tail")) @align
39+(argument_list
40+ . (_) @anchor
41+ (#set! "scope" "tail")) @align
42+; These are a bit opinionated since some people just indent binary/ternary expressions spanning multiple lines.
43+; Since they are only triggered when a newline is inserted into an already complete binary/ternary expression,
44+; this should happen rarely, so it is not a big deal either way.
45+; Additionally, adding these queries has the advantage of preventing such continuation lines from being used
46+; as the baseline when the `hybrid` indent heuristic is used (which is desirable since their indentation is so inconsistent).
47+(binary_expression
48+ (#set! "scope" "tail")) @anchor @align
49+(conditional_expression
50+ "?" @anchor
51+ (#set! "scope" "tail")) @align
runtime/queries/comment/highlights.scm+8−8
@@ -7,31 +7,31 @@
77
88; Hint level tags
99((tag (name) @hint)
10− (#match? @hint "^(HINT|MARK)$"))
10+ (#match? @hint "^(HINT|MARK|PASSED|STUB|MOCK)$"))
1111
1212("text" @hint
13− (#match? @hint "^(HINT|MARK)$"))
13+ (#match? @hint "^(HINT|MARK|PASSED|STUB|MOCK)$"))
1414
1515; Info level tags
1616((tag (name) @info)
17− (#match? @info "^(INFO|NOTE|TODO)$"))
17+ (#match? @info "^(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK)$"))
1818
1919("text" @info
20− (#match? @info "^(INFO|NOTE|TODO)$"))
20+ (#match? @info "^(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK)$"))
2121
2222; Warning level tags
2323((tag (name) @warning)
24− (#match? @warning "^(HACK|WARN|WARNING)$"))
24+ (#match? @warning "^(HACK|WARN|WARNING|TEST|TEMP)$"))
2525
2626("text" @warning
27− (#match? @warning "^(HACK|WARN|WARNING)$"))
27+ (#match? @warning "^(HACK|WARN|WARNING|TEST|TEMP)$"))
2828
2929; Error level tags
3030((tag (name) @error)
31− (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
31+ (#match? @error "^(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG)$"))
3232
3333("text" @error
34− (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
34+ (#match? @error "^(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG)$"))
3535
3636(tag
3737 (name) @ui.text
runtime/queries/common-lisp/indents.scmnew file+1
@@ -0,0 +1 @@
1+; inherits: scheme
runtime/queries/dbml/highlights.scmnew file+44
@@ -0,0 +1,44 @@
1+
2+; comments highlighting
3+(comment) @comment
4+
5+; keyword highlighting
6+(keyword_def) @keyword
7+(keyword_enum) @keyword
8+(keyword_ref) @keyword
9+
10+; identify blocks and definitions
11+(definition) @function
12+
13+; for identifiers
14+(identifier) @variable
15+(type) @keyword
16+
17+; Highlight special types for database/data types
18+("Project" ) @type
19+("Table" ) @type
20+("TableGroup" ) @type
21+("database_type" ) @variable
22+
23+; string and number constants
24+("'''") @constant.character.escape
25+(string) @string
26+(number) @constant.numeric
27+
28+; brackets
29+[
30+ "("
31+ ")"
32+ "{"
33+ "}"
34+ "["
35+ "]"
36+] @punctuation.bracket
37+
38+; brackets
39+[
40+ ":"
41+ "."
42+ ","
43+] @punctuation.delimiter
44+
runtime/queries/gleam/highlights.scm+16−5
@@ -21,6 +21,8 @@
2121
2222; Functions
2323(unqualified_import (identifier) @function)
24+(unqualified_import "type" (type_identifier) @type)
25+(unqualified_import (type_identifier) @constructor)
2426(function
2527 name: (identifier) @function)
2628(external_function
@@ -43,6 +45,13 @@
4345(tuple_access
4446 index: (integer) @variable.other.member)
4547
48+; Attributes
49+(attribute
50+ "@" @attribute
51+ name: (identifier) @attribute)
52+
53+(attribute_value (identifier) @constant)
54+
4655; Type names
4756(remote_type_identifier) @type
4857(type_identifier) @type
@@ -60,10 +69,6 @@
6069(identifier) @variable
6170(discard) @comment.unused
6271
63−; Operators
64−(binary_expression
65− operator: _ @operator)
66−
6772; Keywords
6873[
6974 (visibility_modifier) ; "pub"
@@ -72,6 +77,7 @@
7277 "assert"
7378 "case"
7479 "const"
80+ ; DEPRECATED: 'external' was removed in v0.30.
7581 "external"
7682 "fn"
7783 "if"
@@ -79,11 +85,16 @@
7985 "let"
8086 "panic"
8187 "todo"
82− "try"
8388 "type"
8489 "use"
8590] @keyword
8691
92+; Operators
93+(binary_expression
94+ operator: _ @operator)
95+(boolean_negation "!" @operator)
96+(integer_negation "-" @operator)
97+
8798; Punctuation
8899[
89100 "("
runtime/queries/gn/highlights.scmnew file+42
@@ -0,0 +1,42 @@
1+; Copyright (C) 2021 Will Cassella (github@willcassella.com)
2+;
3+; Licensed under the Apache License, Version 2.0 (the "License");
4+; you may not use this file except in compliance with the License.
5+; You may obtain a copy of the License at
6+;
7+; http://www.apache.org/licenses/LICENSE-2.0
8+;
9+; Unless required by applicable law or agreed to in writing, software
10+; distributed under the License is distributed on an "AS IS" BASIS,
11+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+; See the License for the specific language governing permissions and
13+; limitations under the License.
14+
15+(identifier) @variable.builtin
16+
17+(scope_access field: (_) @variable.other.member)
18+
19+(call target: (_) @function)
20+
21+[ "if" "else" ] @keyword.control.conditional
22+
23+[
24+ (assign_op)
25+ (arithmetic_binary_op)
26+ (comparison_binary_op)
27+ (equivalence_binary_op)
28+ (logical_and_binary_op)
29+ (logical_or_binary_op)
30+ (negation_unary_op)
31+] @operator
32+
33+[ "(" ")" "[" "]" "{" "}" ] @punctuation.bracket
34+[ "." "," ] @punctuation.delimiter
35+
36+(string) @string
37+(string_escape) @constant.character.escape
38+(string_expansion [ "$" "${" "}" ] @constant.character.escape)
39+[ (integer) (hex) ] @constant.numeric
40+(boolean) @constant.builtin.boolean
41+
42+(comment) @comment
runtime/queries/gn/injections.scmnew file+15
@@ -0,0 +1,15 @@
1+; Copyright (C) 2021 Will Cassella (github@willcassella.com)
2+;
3+; Licensed under the Apache License, Version 2.0 (the "License");
4+; you may not use this file except in compliance with the License.
5+; You may obtain a copy of the License at
6+;
7+; http://www.apache.org/licenses/LICENSE-2.0
8+;
9+; Unless required by applicable law or agreed to in writing, software
10+; distributed under the License is distributed on an "AS IS" BASIS,
11+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+; See the License for the specific language governing permissions and
13+; limitations under the License.
14+
15+((comment) @injection.content (#set! injection.language "comment"))
runtime/queries/gn/locals.scmnew file+16
@@ -0,0 +1,16 @@
1+; Copyright (C) 2021 Will Cassella (github@willcassella.com)
2+;
3+; Licensed under the Apache License, Version 2.0 (the "License");
4+; you may not use this file except in compliance with the License.
5+; You may obtain a copy of the License at
6+;
7+; http://www.apache.org/licenses/LICENSE-2.0
8+;
9+; Unless required by applicable law or agreed to in writing, software
10+; distributed under the License is distributed on an "AS IS" BASIS,
11+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+; See the License for the specific language governing permissions and
13+; limitations under the License.
14+
15+(source_file) @local.scope
16+(assignment target: (identifier) @local.definition)
runtime/queries/go/highlights.scm+12−4
@@ -11,6 +11,18 @@
1111 function: (selector_expression
1212 field: (field_identifier) @function.method))
1313
14+
15+; Types
16+
17+(type_parameter_list
18+ (parameter_declaration
19+ name: (identifier) @type.parameter))
20+
21+((type_identifier) @type.builtin
22+ (match? @type.builtin "^(any|bool|byte|comparable|complex128|complex64|error|float32|float64|int|int16|int32|int64|int8|rune|string|uint|uint16|uint32|uint64|uint8|uintptr)$"))
23+
24+(type_identifier) @type
25+
1426; Function definitions
1527
1628(function_declaration
@@ -30,10 +42,6 @@
3042(parameter_declaration (identifier) @variable.parameter)
3143(variadic_parameter_declaration (identifier) @variable.parameter)
3244
33−((type_identifier) @type.builtin
34− (match? @type.builtin "^(any|bool|byte|comparable|complex128|complex64|error|float32|float64|int|int16|int32|int64|int8|rune|string|uint|uint16|uint32|uint64|uint8|uintptr)$"))
35−
36−(type_identifier) @type
3745(type_spec
3846 name: (type_identifier) @constructor)
3947(field_identifier) @variable.other.member
runtime/queries/go/locals.scm+10−2
@@ -1,9 +1,17 @@
11; Scopes
22
3−(block) @local.scope
3+[
4+ (function_declaration)
5+ (type_declaration)
6+ (block)
7+] @local.scope
48
59; Definitions
610
11+(type_parameter_list
12+ (parameter_declaration
13+ name: (identifier) @local.definition))
14+
715(parameter_declaration (identifier) @local.definition)
816(variadic_parameter_declaration (identifier) @local.definition)
917
@@ -27,4 +35,4 @@
2735
2836(identifier) @local.reference
2937(field_identifier) @local.reference
30−
38+(type_identifier) @local.reference
runtime/queries/haskell/highlights.scm+24−11
@@ -33,6 +33,11 @@
3333;; ----------------------------------------------------------------------------
3434;; Keywords, operators, includes
3535
36+[
37+ "forall"
38+ "∀"
39+] @keyword.control.repeat
40+
3641(pragma) @constant.macro
3742
3843[
@@ -68,10 +73,7 @@
6873 "@"
6974] @operator
7075
71−(qualified_module (module) @constructor)
72−(qualified_type (module) @namespace)
73−(qualified_variable (module) @namespace)
74−(import (module) @namespace)
76+(module) @namespace
7577
7678[
7779 (where)
@@ -92,8 +94,6 @@
9294 "do"
9395 "mdo"
9496 "rec"
95− "forall"
96− "∀"
9797 "infix"
9898 "infixl"
9999 "infixr"
@@ -104,22 +104,35 @@
104104;; Functions and variables
105105
106106(signature name: (variable) @type)
107−(function name: (variable) @function)
108−
109−(variable) @variable
110−"_" @variable.builtin
107+(function
108+ name: (variable) @function
109+ patterns: (patterns))
110+((signature (fun)) . (function (variable) @function))
111+((signature (context (fun))) . (function (variable) @function))
112+((signature (forall (context (fun)))) . (function (variable) @function))
111113
112114(exp_infix (variable) @operator) ; consider infix functions as operators
113115
114−("@" @namespace) ; "as" pattern operator, e.g. x@Constructor
116+(exp_infix (exp_name) @function)
117+(exp_apply . (exp_name (variable) @function))
118+(exp_apply . (exp_name (qualified_variable (variable) @function)))
115119
120+(variable) @variable
121+(pat_wildcard) @variable
116122
117123;; ----------------------------------------------------------------------------
118124;; Types
119125
120126(type) @type
127+(type_variable) @type.parameter
121128
122129(constructor) @constructor
123130
124131; True or False
125132((constructor) @_bool (#match? @_bool "(True|False)")) @constant.builtin.boolean
133+
134+;; ----------------------------------------------------------------------------
135+;; Quasi-quotes
136+
137+(quoter) @function
138+; Highlighting of quasiquote_body is handled by injections.scm
runtime/queries/janet/highlights.scmnew file+1
@@ -0,0 +1 @@
1+; inherits: clojure
runtime/queries/kdl/highlights.scm+4−4
@@ -1,12 +1,12 @@
1−(comment) @comment
21(single_line_comment) @comment
2+(multi_line_comment) @comment
33
44(node
5− name: (identifier) @function)
5+ (identifier) @variable)
6+
67(prop (identifier) @attribute)
7−(type) @type
88
9−(bare_identifier) @variable.other.member
9+(type (_) @type) @punctuation.bracket
1010
1111(keyword) @keyword
1212
runtime/queries/kdl/indents.scmnew file+3
@@ -0,0 +1,3 @@
1+(node_children) @indent
2+
3+ "}" @outdent
runtime/queries/kdl/textobjects.scmnew file+27
@@ -0,0 +1,27 @@
1+(type (_) @test.inside) @test.around
2+
3+(node
4+ children: (node_children)? @class.inside) @class.around
5+
6+(node
7+ children: (node_children)? @function.inside) @function.around
8+
9+(node (identifier) @function.movement)
10+
11+[
12+ (single_line_comment)
13+ (multi_line_comment)
14+] @comment.inside
15+
16+[
17+ (single_line_comment)+
18+ (multi_line_comment)+
19+] @comment.around
20+
21+[
22+ (prop)
23+ (value)
24+] @parameter.inside
25+
26+(value (type) ? (_) @parameter.inside @parameter.movement . ) @parameter.around
27+
runtime/queries/kotlin/highlights.scm+4−1
@@ -244,7 +244,10 @@
244244 . (identifier)) @namespace
245245
246246((type_identifier) @type.builtin
247− (#match? @function.builtin "^(Byte|Short|Int|Long|UByte|UShort|UInt|ULong|Float|Double|Boolean|Char|String|Array|ByteArray|ShortArray|IntArray|LongArray|UByteArray|UShortArray|UIntArray|ULongArray|FloatArray|DoubleArray|BooleanArray|CharArray|Map|Set|List|EmptyMap|EmptySet|EmptyList|MutableMap|MutableSet|MutableList)$"))
247+ (#match? @type.builtin "^(Byte|Short|Int|Long|UByte|UShort|UInt|ULong|Float|Double|Boolean|Char|String|Array|ByteArray|ShortArray|IntArray|LongArray|UByteArray|UShortArray|UIntArray|ULongArray|FloatArray|DoubleArray|BooleanArray|CharArray|Map|Set|List|EmptyMap|EmptySet|EmptyList|MutableMap|MutableSet|MutableList)$"))
248+
249+(type_parameter
250+ (type_identifier) @type.parameter)
248251
249252(type_identifier) @type
250253
runtime/queries/kotlin/locals.scmnew file+15
@@ -0,0 +1,15 @@
1+; Scopes
2+
3+[
4+ (class_declaration)
5+ (function_declaration)
6+] @local.scope
7+
8+; Definitions
9+
10+(type_parameter
11+ (type_identifier) @local.definition)
12+
13+; References
14+
15+(type_identifier) @local.reference
runtime/queries/log/highlights.scmnew file+10
@@ -0,0 +1,10 @@
1+(trace) @comment
2+(debug) @hint
3+(info) @info
4+(warn) @warning
5+(error) @error
6+(year_month_day) @keyword
7+(time) @constant
8+(string_literal) @string
9+(number) @constant.numeric
10+(constant) @constant.builtin
runtime/queries/lpf/highlights.scmnew file+19
@@ -0,0 +1,19 @@
1+[
2+ "SYSCONFIG"
3+ "BLOCK"
4+ "LOCATE"
5+ "COMP"
6+ "FREQUENCY"
7+ "PORT"
8+ "IOBUF"
9+] @keyword
10+
11+["SITE"] @keyword.storage
12+
13+["="] @operator
14+
15+((number) @constant.numeric)
16+
17+((string) @string)
18+((line_comment) @comment)
19+
runtime/queries/ocaml/highlights.scm+2
@@ -8,6 +8,8 @@
88
99[(class_name) (class_type_name) (type_constructor)] @type
1010
11+(type_variable) @type.parameter
12+
1113[(constructor_name) (tag)] @constructor
1214
1315; Functions
runtime/queries/purescript/highlights.scm+52−10
@@ -1,13 +1,30 @@
1+; ----------------------------------------------------------------------------
2+; Record fields would need to come before literal strings in order to be captured correctly
3+
4+ (record_accessor
5+ field: [ (variable)
6+ (string)
7+ (triple_quote_string)
8+ ] @variable.other.member)
9+
10+ (exp_record_access
11+ field: [ (variable)
12+ (string)
13+ (triple_quote_string)
14+ ] @variable.other.member)
15+
16+
117; ----------------------------------------------------------------------------
218; Literals and comments
319
420 (integer) @constant.numeric.integer
521 (exp_negation) @constant.numeric.integer
6− (exp_literal (float)) @constant.numeric.float
22+ (exp_literal (number)) @constant.numeric.float
723 (char) @constant.character
8− (string) @string
9−
10− (con_unit) @constant.builtin ; unit, as in ()
24+ [
25+ (string)
26+ (triple_quote_string)
27+ ] @string
1128
1229 (comment) @comment
1330
@@ -33,6 +50,10 @@
3350; ----------------------------------------------------------------------------
3451; Keywords, operators, includes
3552
53+ ; This needs to come before the other "else" in
54+ ; order to be highlighted correctly
55+ (class_instance "else" @keyword)
56+
3657 [
3758 "if"
3859 "then"
@@ -50,15 +71,20 @@
5071 (operator)
5172 (constructor_operator)
5273 (type_operator)
53− (tycon_arrow)
5474 (qualified_module) ; grabs the `.` (dot), ex: import System.IO
5575 (all_names)
76+
77+ ; `_` wildcards in if-then-else and case-of expressions,
78+ ; as well as record updates and operator sections
79+ (wildcard)
5680 "="
5781 "|"
5882 "::"
5983 "∷"
6084 "=>"
6185 "⇒"
86+ "<="
87+ "⇐"
6288 "->"
6389 "→"
6490 "<-"
@@ -86,6 +112,7 @@
86112 "newtype"
87113 "type"
88114 "as"
115+ "hiding"
89116 "do"
90117 "ado"
91118 "forall"
@@ -95,24 +122,39 @@
95122 "infixr"
96123 ] @keyword
97124
125+ (type_role_declaration
126+ "role" @keyword
127+ role: (type_role) @keyword)
128+
129+ (hole) @label
98130
99131; ----------------------------------------------------------------------------
100132; Functions and variables
101133
134+ (row_field (field_name) @variable.other.member)
135+ (record_field (field_name) @variable.other.member)
136+ (record_field (field_pun) @variable.other.member)
137+
102138 (signature name: (variable) @type)
103139 (function name: (variable) @function)
140+ (class_instance (instance_name) @function)
141+ (derive_declaration (instance_name) @function)
104142
105143 ; true or false
106−((variable) @constant.builtin.boolean
107− (#match? @constant.builtin.boolean "^(true|false)$"))
144+ ((variable) @constant.builtin.boolean
145+ (#match? @constant.builtin.boolean "^(true|false)$"))
108146
109− (variable) @variable
147+ ; The former one works for `tree-sitter highlight` but not in Helix/Kakoune.
148+ ; The latter two work in Helix (but not Kakoune) and are a good compromise between not highlighting anything at all
149+ ; as an operator and leaving it to the child nodes, and highlighting everything as an operator.
150+ (exp_ticked (_) @operator)
151+ (exp_ticked (exp_name (variable) @operator))
152+ (exp_ticked (exp_name (qualified_variable (variable) @operator)))
110153
111− (exp_infix (variable) @operator) ; consider infix functions as operators
154+ (variable) @variable
112155
113156 ("@" @namespace) ; "as" pattern operator, e.g. x@Constructor
114157
115−
116158; ----------------------------------------------------------------------------
117159; Types
118160
runtime/queries/python/highlights.scm+6
@@ -134,14 +134,17 @@
134134 "//="
135135 "/="
136136 "&"
137+ "&="
137138 "%"
138139 "%="
139140 "^"
141+ "^="
140142 "+"
141143 "->"
142144 "+="
143145 "<"
144146 "<<"
147+ "<<="
145148 "<="
146149 "<>"
147150 "="
@@ -150,8 +153,11 @@
150153 ">"
151154 ">="
152155 ">>"
156+ ">>="
153157 "|"
158+ "|="
154159 "~"
160+ "@="
155161] @operator
156162
157163[
runtime/queries/racket/indents.scmnew file+1
@@ -0,0 +1 @@
1+; inherits: scheme
runtime/queries/ron/highlights.scm+43−1
@@ -1 +1,43 @@
1−; inherits: rust
1+; Literals
2+;------------
3+
4+(string) @string
5+(boolean) @constant.builtin.boolean
6+(integer) @constant.numeric.integer
7+(float) @constant.numeric.float
8+(char) @constant.character
9+
10+; Structs
11+;------------
12+
13+(enum_variant) @type.enum.variant
14+(struct_entry (_) @variable.other.member ":")
15+(struct_name (identifier)) @type
16+
17+
18+
19+
20+; Comments
21+;------------
22+
23+(line_comment) @comment.line
24+(block_comment) @comment.block
25+
26+
27+; Punctuation
28+;------------
29+
30+"," @punctuation.delimiter
31+":" @punctuation.delimiter
32+
33+"(" @punctuation.bracket
34+")" @punctuation.bracket
35+"[" @punctuation.bracket
36+"]" @punctuation.bracket
37+"{" @punctuation.bracket
38+"}" @punctuation.bracket
39+
40+
41+; Special
42+;------------
43+(escape_sequence) @constant.character.escape
runtime/queries/ron/indents.scm+12−1
@@ -1 +1,12 @@
1−; inherits: rust
1+[
2+ (array)
3+ (map)
4+ (tuple)
5+ (struct)
6+] @indent
7+
8+[
9+ "}"
10+ "]"
11+ ")"
12+] @outdent
runtime/queries/ron/injections.scm+2−1
@@ -1 +1,2 @@
1−; inherits: rust
1+([(line_comment) (block_comment)] @injection.content
2+ (#set! injection.language "comment"))
runtime/queries/rust/highlights.scm+7
@@ -9,6 +9,13 @@
99; Types
1010; -------
1111
12+(type_parameters
13+ (type_identifier) @type.parameter)
14+(constrained_type_parameter
15+ left: (type_identifier) @type.parameter)
16+(optional_type_parameter
17+ name: (type_identifier) @type.parameter)
18+
1219; ---
1320; Primitives
1421; ---
runtime/queries/rust/injections.scm+6
@@ -1,6 +1,12 @@
11([(line_comment) (block_comment)] @injection.content
22 (#set! injection.language "comment"))
33
4+((macro_invocation
5+ macro: (identifier) @_html (#eq? @_html "html")
6+ (token_tree) @injection.content)
7+ (#set! injection.language "html")
8+ (#set! injection.include-children))
9+
410((macro_invocation
511 (token_tree) @injection.content)
612 (#set! injection.language "rust")
runtime/queries/rust/locals.scm+14−1
@@ -2,6 +2,12 @@
22
33[
44 (function_item)
5+ (struct_item)
6+ (enum_item)
7+ (union_item)
8+ (type_item)
9+ (trait_item)
10+ (impl_item)
511 (closure_expression)
612 (block)
713] @local.scope
@@ -11,8 +17,15 @@
1117(parameter
1218 (identifier) @local.definition)
1319
20+(type_parameters
21+ (type_identifier) @local.definition)
22+(constrained_type_parameter
23+ left: (type_identifier) @local.definition)
24+(optional_type_parameter
25+ name: (type_identifier) @local.definition)
26+
1427(closure_parameters (identifier) @local.definition)
1528
1629; References
1730(identifier) @local.reference
18−
31+(type_identifier) @local.reference
runtime/queries/scheme/indents.scmnew file+43
@@ -0,0 +1,43 @@
1+; This roughly follows the description at: https://github.com/ds26gte/scmindent#how-subforms-are-indented
2+
3+; Exclude literals in the first patterns, since different rules apply for them.
4+; Similarly, exclude certain keywords (detected by a regular expression).
5+; If a list has 2 elements on the first line, it is aligned to the second element.
6+(list . (_) @first . (_) @anchor
7+ (#same-line? @first @anchor)
8+ (#set! "scope" "tail")
9+ (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
10+ (#not-match? @first "def.*|let.*|set!")) @align
11+; If the first element in a list is also a list and on a line by itself, the outer list is aligned to it
12+(list . (list) @anchor .
13+ (#set! "scope" "tail")
14+ (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")) @align
15+(list . (list) @anchor . (_) @second
16+ (#not-same-line? @anchor @second)
17+ (#set! "scope" "tail")
18+ (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
19+ (#not-match? @first "def.*|let.*|set!")) @align
20+; If the first element in a list is not a list and on a line by itself, the outer list is aligned to
21+; it plus 1 additional space. This cannot currently be modelled exactly by our indent queries,
22+; but the following is equivalent, assuming that:
23+; - the indent width is 2 (the default for scheme)
24+; - There is no space between the opening parenthesis of the list and the first element
25+(list . (_) @first .
26+ (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
27+ (#not-match? @first "def.*|let.*|set!")) @indent
28+(list . (_) @first . (_) @second
29+ (#not-same-line? @first @second)
30+ (#not-kind-eq? @first "boolean") (#not-kind-eq? @first "character") (#not-kind-eq? @first "string") (#not-kind-eq? @first "number")
31+ (#not-match? @first "def.*|let.*|set!")) @indent
32+
33+; If the first element in a list is a literal, align the list to it
34+(list . [(boolean) (character) (string) (number)] @anchor
35+ (#set! "scope" "tail")) @align
36+
37+; If the first element is among a set of predefined keywords, align the list to this element
38+; plus 1 space (using the same workaround as above for now). This is a simplification since actually
39+; the second line of the list should be indented by 2 spaces more in some cases. Supporting this would
40+; be possible but require significantly more patterns.
41+(list . (symbol) @first
42+ (#match? @first "def.*|let.*|set!")) @indent
43+
runtime/queries/smali/folds.scmnew file+12
@@ -0,0 +1,12 @@
1+[
2+ (annotation_directive)
3+ (array_data_directive)
4+ (field_definition)
5+ (method_definition)
6+ (packed_switch_directive)
7+ (param_directive)
8+ (parameter_directive)
9+ (sparse_switch_directive)
10+ (subannotation_directive)
11+ (list)
12+] @fold
runtime/queries/smali/highlights.scmnew file+216
@@ -0,0 +1,216 @@
1+; Types
2+
3+(class_identifier
4+ (identifier) @type)
5+
6+(primitive_type) @type.builtin
7+
8+((class_identifier
9+ . (identifier) @_first @type.builtin
10+ (identifier) @type.builtin)
11+ (#match? @_first "^(android|dalvik|java|kotlinx)$"))
12+
13+((class_identifier
14+ . (identifier) @_first @type.builtin
15+ . (identifier) @_second @type.builtin
16+ (identifier) @type.builtin)
17+ (#eq? @_first "com")
18+ (#match? @_second "^(android|google)$"))
19+
20+; Methods
21+
22+(method_definition
23+ (method_signature (method_identifier) @function.method))
24+
25+(expression
26+ (opcode) @_invoke
27+ (body
28+ (full_method_signature
29+ (method_signature (method_identifier) @function.method)))
30+ (#match? @_invoke "^invoke"))
31+
32+(expression
33+ (opcode) @_field_access
34+ (body
35+ (field_identifier) @variable.other.member)
36+ (#match? @_field_access "^[is](get|put)-"))
37+
38+(method_handle
39+ (full_method_signature
40+ (method_signature (method_identifier) @function.method)))
41+
42+(custom_invoke
43+ . (identifier) @function.method
44+ (method_signature (method_identifier) @function.method))
45+
46+(annotation_value
47+ (body
48+ (method_signature (method_identifier) @function.method)))
49+
50+(annotation_value
51+ (body
52+ (full_method_signature
53+ (method_signature (method_identifier) @function.method))))
54+
55+(field_definition
56+ (body
57+ (method_signature (method_identifier) @function.method)))
58+
59+(field_definition
60+ (body
61+ (full_method_signature
62+ (method_signature (method_identifier) @function.method))))
63+
64+((method_identifier) @constructor
65+ (#match? @constructor "^(<init>|<clinit>)$"))
66+
67+"constructor" @constructor
68+
69+; Fields
70+
71+[
72+ (field_identifier)
73+ (annotation_key)
74+] @variable.other.member
75+
76+((field_identifier) @constant
77+ (#match? @constant "^[%u_]*$"))
78+
79+; Variables
80+
81+(variable) @variable.builtin
82+
83+(local_directive
84+ (identifier) @variable)
85+
86+; Parameters
87+
88+(parameter) @variable.parameter
89+(param_identifier) @variable.parameter
90+
91+; Labels
92+
93+[
94+ (label)
95+ (jmp_label)
96+] @label
97+
98+; Operators
99+
100+; (opcode) @keyword.operator
101+
102+((opcode) @keyword.control.return
103+ (#match? @keyword.control.return "^return"))
104+
105+((opcode) @keyword.control.conditional
106+ (#match? @keyword.control.conditional "^if"))
107+
108+((opcode) @keyword.control.conditional
109+ (#match? @keyword.control.conditional "^cmp"))
110+
111+((opcode) @keyword.control.exception
112+ (#match? @keyword.control.exception "^throw"))
113+
114+[
115+ "="
116+ ".."
117+] @operator
118+
119+; Keywords
120+
121+[
122+ ".class"
123+ ".super"
124+ ".implements"
125+ ".field"
126+ ".end field"
127+ ".annotation"
128+ ".end annotation"
129+ ".subannotation"
130+ ".end subannotation"
131+ ".param"
132+ ".end param"
133+ ".parameter"
134+ ".end parameter"
135+ ".local"
136+ ".end local"
137+ ".restart local"
138+ ".registers"
139+ ".packed-switch"
140+ ".end packed-switch"
141+ ".sparse-switch"
142+ ".end sparse-switch"
143+ ".array-data"
144+ ".end array-data"
145+ ".enum"
146+ (prologue_directive)
147+ (epilogue_directive)
148+] @keyword
149+
150+[
151+ ".source"
152+] @keyword.directive
153+
154+[
155+ ".method"
156+ ".end method"
157+] @keyword.function
158+
159+[
160+ ".catch"
161+ ".catchall"
162+] @keyword.control.exception
163+
164+; Literals
165+
166+(string) @string
167+(source_directive (string "\"" _ @string.special.url "\""))
168+(escape_sequence) @constant.character.escape
169+
170+(character) @constant.character
171+
172+"L" @punctuation
173+
174+(line_directive (number) @comment) @comment
175+(".locals" (number) @comment) @comment
176+
177+(number) @constant.numeric.integer
178+
179+[
180+ (float)
181+ (NaN)
182+ (Infinity)
183+] @constant.numeric.float
184+
185+(boolean) @constant.builtin.boolean
186+
187+(null) @constant.builtin
188+
189+; Misc
190+
191+(annotation_visibility) @keyword.storage.modifier
192+
193+(access_modifier) @keyword.storage.type
194+
195+(array_type
196+ "[" @punctuation.special)
197+
198+["{" "}"] @punctuation.bracket
199+
200+["(" ")"] @punctuation.bracket
201+
202+[
203+ "->"
204+ ","
205+ ":"
206+ ";"
207+ "@"
208+ "/"
209+] @punctuation.delimiter
210+
211+; Comments
212+
213+(comment) @comment
214+
215+(class_definition
216+ (comment) @comment.block.documentation)
runtime/queries/smali/indents.scmnew file+31
@@ -0,0 +1,31 @@
1+[
2+ (annotation_directive)
3+ (array_data_directive)
4+ (field_definition)
5+ (method_definition)
6+ (packed_switch_directive)
7+ (param_directive)
8+ (parameter_directive)
9+ (sparse_switch_directive)
10+ (subannotation_directive)
11+ (list)
12+ "\{"
13+] @indent
14+
15+[
16+ ".end annotation"
17+ ".end array-data"
18+ ".end field"
19+ ".end method"
20+ ".end packed-switch"
21+ ".end param"
22+ ".end parameter"
23+ ".end sparse-switch"
24+ ".end subannotation"
25+ "\}"
26+] @outdent
27+
28+[
29+ (ERROR)
30+ (comment)
31+] @indent.always
runtime/queries/smali/injections.scmnew file+2
@@ -0,0 +1,2 @@
1+((comment) @injection.content
2+ (#set! injection.language "comment"))
runtime/queries/smali/locals.scmnew file+42
@@ -0,0 +1,42 @@
1+[
2+ (class_directive)
3+ (expression)
4+ (annotation_directive)
5+ (array_data_directive)
6+ (method_definition)
7+ (packed_switch_directive)
8+ (sparse_switch_directive)
9+ (subannotation_directive)
10+] @local.scope
11+
12+[
13+ (identifier)
14+ (class_identifier)
15+ (label)
16+ (jmp_label)
17+] @local.reference
18+
19+(enum_reference
20+ (field_identifier) @local.definition)
21+
22+((field_definition
23+ (access_modifiers) @_mod
24+ (field_identifier) @local.definition)
25+ (#eq? @_mod "enum"))
26+
27+(field_definition
28+ (field_identifier) @local.definition
29+ (field_type) @local.definition)
30+
31+(annotation_key) @local.definition
32+
33+(method_definition
34+ (method_signature (method_identifier) @local.definition))
35+
36+(param_identifier) @local.definition
37+
38+(annotation_directive
39+ (class_identifier) @local.definition)
40+
41+(class_directive
42+ (class_identifier) @local.definition)
runtime/queries/sql/highlights.scm+42−4
@@ -131,6 +131,7 @@
131131 (keyword_partition)
132132 (keyword_group)
133133 (keyword_with)
134+ (keyword_without)
134135 (keyword_as)
135136 (keyword_having)
136137 (keyword_limit)
@@ -227,6 +228,7 @@
227228 (keyword_input)
228229 (keyword_name)
229230 (keyword_oid)
231+ (keyword_oids)
230232 (keyword_options)
231233 (keyword_plpgsql)
232234 (keyword_precision)
@@ -264,6 +266,44 @@
264266 (keyword_user)
265267 (keyword_valid)
266268 (keyword_action)
269+ (keyword_definer)
270+ (keyword_invoker)
271+ (keyword_security)
272+ (keyword_extension)
273+ (keyword_version)
274+ (keyword_out)
275+ (keyword_inout)
276+ (keyword_variadic)
277+ (keyword_session)
278+ (keyword_isolation)
279+ (keyword_level)
280+ (keyword_serializable)
281+ (keyword_repeatable)
282+ (keyword_read)
283+ (keyword_write)
284+ (keyword_committed)
285+ (keyword_uncommitted)
286+ (keyword_deferrable)
287+ (keyword_names)
288+ (keyword_zone)
289+ (keyword_immediate)
290+ (keyword_deferred)
291+ (keyword_constraints)
292+ (keyword_snapshot)
293+ (keyword_characteristics)
294+ (keyword_off)
295+ (keyword_follows)
296+ (keyword_precedes)
297+ (keyword_each)
298+ (keyword_instead)
299+ (keyword_of)
300+ (keyword_initially)
301+ (keyword_old)
302+ (keyword_new)
303+ (keyword_referencing)
304+ (keyword_statement)
305+ (keyword_execute)
306+ (keyword_procedure)
267307] @keyword
268308
269309[
@@ -373,10 +413,8 @@
373413 ">="
374414 ">"
375415 "<>"
376− "->"
377− "->>"
378− "#>"
379− "#>>"
416+ (op_other)
417+ (op_unary_other)
380418] @operator
381419
382420[
runtime/queries/templ/highlights.scmnew file+99
@@ -0,0 +1,99 @@
1+(package_identifier) @namespace
2+
3+(parameter_declaration (identifier) @variable.parameter)
4+(variadic_parameter_declaration (identifier) @variable.parameter)
5+
6+(function_declaration
7+ name: (identifier) @function)
8+
9+(type_spec name: (type_identifier) @type)
10+(type_identifier) @type
11+(field_identifier) @variable.other.member
12+(identifier) @variable
13+
14+; Function calls
15+
16+(call_expression
17+ function: (identifier) @function)
18+
19+(call_expression
20+ function: (selector_expression
21+ field: (field_identifier) @function))
22+
23+;
24+; These are Templ specific
25+;
26+
27+(component_declaration
28+ name: (component_identifier) @function)
29+
30+(tag_start) @tag
31+(tag_end) @tag
32+(self_closing_tag) @tag
33+(style_element) @tag
34+
35+(attribute
36+ name: (attribute_name) @attribute)
37+(attribute
38+ value: (quoted_attribute_value) @string)
39+
40+(element_text) @string.special
41+(style_element_text) @string.special
42+
43+(css_property
44+ name: (css_property_name) @attribute)
45+
46+(expression) @function.method
47+(dynamic_class_attribute_value) @function.method
48+
49+(component_import
50+ name: (component_identifier) @function)
51+
52+(component_render) @function
53+
54+[
55+ "@"
56+] @operator
57+
58+[
59+ "func"
60+ "var"
61+ "const"
62+ "templ"
63+ "css"
64+ "type"
65+ "struct"
66+ "range"
67+ "script"
68+] @keyword.storage.type
69+
70+[
71+ "return"
72+] @keyword.control.return
73+
74+[
75+ "import"
76+ "package"
77+] @keyword.control.import
78+
79+[
80+ "else"
81+ "case"
82+ "switch"
83+ "if"
84+ "default"
85+] @keyword.control.conditional
86+
87+"for" @keyword.control.repeat
88+
89+[
90+ (interpreted_string_literal)
91+ (raw_string_literal)
92+ (rune_literal)
93+] @string
94+
95+; Comments
96+
97+(comment) @comment
98+
99+(element_comment) @comment
runtime/queries/templ/injections.scmnew file+4
@@ -0,0 +1,4 @@
1+((script_block_text) @injection.content (#set! injection.language "javascript"))
2+((script_element_text) @injection.content (#set! injection.language "javascript"))
3+
4+((style_element_text) @injection.content (#set! injection.language "css"))
runtime/queries/typst/highlights.scmnew file+77
@@ -0,0 +1,77 @@
1+(call
2+ item: (ident) @function)
3+(call
4+ item: (field field: (ident) @function.method))
5+(tagged field: (ident) @tag)
6+(field field: (ident) @tag)
7+(comment) @comment
8+
9+; CONTROL
10+(let "let" @keyword.storage.type)
11+(branch ["if" "else"] @keyword.control.conditional)
12+(while "while" @keyword.control.repeat)
13+(for ["for" "in"] @keyword.control.repeat)
14+(import "import" @keyword.control.import)
15+(as "as" @keyword.operator)
16+(include "include" @keyword.control.import)
17+(show "show" @keyword.control)
18+(set "set" @keyword.control)
19+(return "return" @keyword.control)
20+(flow ["break" "continue"] @keyword.control)
21+
22+; OPERATOR
23+(in ["in" "not"] @keyword.operator)
24+(and "and" @keyword.operator)
25+(or "or" @keyword.operator)
26+(not "not" @keyword.operator)
27+(sign ["+" "-"] @operator)
28+(add "+" @operator)
29+(sub "-" @operator)
30+(mul "*" @operator)
31+(div "/" @operator)
32+(cmp ["==" "<=" ">=" "!=" "<" ">"] @operator)
33+(fraction "/" @operator)
34+(fac "!" @operator)
35+(attach ["^" "_"] @operator)
36+(wildcard) @operator
37+
38+; VALUE
39+(raw_blck "```" @operator) @markup.raw.block
40+(raw_span "`" @operator) @markup.raw.block
41+(raw_blck lang: (ident) @tag)
42+(label) @tag
43+(ref) @tag
44+(number) @constant.numeric
45+(string) @string
46+(content ["[" "]"] @operator)
47+(bool) @constant.builtin.boolean
48+(builtin) @constant.builtin
49+(none) @constant.builtin
50+(auto) @constant.builtin
51+(ident) @variable
52+(call
53+ item: (builtin) @function.builtin)
54+
55+; MARKUP
56+(item "-" @markup.list)
57+(term ["/" ":"] @markup.list)
58+(heading ["=" "==" "===" "====" "====="] @markup.heading.marker) @markup.heading
59+(url) @tag
60+(emph) @markup.italic
61+(strong) @markup.bold
62+(symbol) @constant.character
63+(shorthand) @constant.builtin
64+(quote) @markup.quote
65+(align) @operator
66+(letter) @constant.character
67+(linebreak) @constant.builtin
68+
69+(math "$" @operator)
70+"#" @operator
71+"end" @operator
72+
73+(escape) @constant.character.escape
74+["(" ")" "{" "}"] @punctuation.bracket
75+["," ";" ".." ":" "sep"] @punctuation.delimiter
76+"assign" @punctuation
77+(field "." @punctuation)
runtime/queries/typst/injections.scmnew file+6
@@ -0,0 +1,6 @@
1+(raw_blck
2+ (blob) @injection.shebang @injection.content)
3+
4+(raw_blck
5+ lang: (ident) @injection.language
6+ (blob) @injection.content)
runtime/queries/yuck/highlights.scm+1−1
@@ -101,7 +101,7 @@
101101(list
102102 (symbol) @tag)
103103
104−; Other stuff that has not been catched by the previous queries yet
104+; Other stuff that has not been caught by the previous queries yet
105105
106106(ident) @variable
107107(index) @variable
runtime/themes/README.md+8
@@ -6,4 +6,12 @@ If you submit a theme, please include a comment at the top with your name and em
66# Author : Name <email@my.domain>
77```
88
9+If you are submitting a theme that is already published somewhere, then please
10+add the corresponding license file for it under `licenses/` with the following
11+name `theme_name.license` and add a comment at the top of the theme file:
12+
13+```toml
14+# License: <License specification>
15+```
16+
917We have a preview page for themes on our [wiki](https://github.com/helix-editor/helix/wiki/Themes)!
runtime/themes/cyan_light.toml+9−6
@@ -57,9 +57,12 @@
5757"markup.raw.inline" = "green"
5858"markup.raw.block" = "green"
5959
60−"diff.plus" = "diff_green"
61−"diff.minus" = "diff_red"
62−"diff.delta" = "diff_blue"
60+"diff.plus" = "green"
61+"diff.plus.gutter" = "gutter_green"
62+"diff.minus" = "red"
63+"diff.minus.gutter" = "gutter_red"
64+"diff.delta" = "blue"
65+"diff.delta.gutter" = "gutter_blue"
6366
6467# ui specific
6568"ui.background" = { bg = "shade00" }
@@ -121,7 +124,7 @@ foreground = "#25293c"
121124
122125comment_gray = "#808080"
123126
124−diff_blue = "#C3D6E8"
127+gutter_blue = "#C3D6E8"
125128faint_blue = "#E8Eef1"
126129lighter_blue = "#d0eaff"
127130light_blue = "#99ccff"
@@ -134,7 +137,7 @@ darker_blue = "#000080"
134137purple = "#660E7A"
135138light_purple = "#ED9CFF"
136139
137−diff_green = "#C9DEC1"
140+gutter_green = "#C9DEC1"
138141green = "#00733B"
139142light_green = "#5DCE87"
140143green_blue = "#458383"
@@ -146,6 +149,6 @@ dark_yellow = "#7A7A43"
146149light_orange = "#f9c881"
147150orange = "#F49810"
148151
149−diff_red = "#EBBCBC"
152+gutter_red = "#EBBCBC"
150153red = "#d90016"
151154dark_red = "#7F0000"
runtime/themes/darcula.toml+6−2
@@ -15,7 +15,7 @@
1515"ui.statusline.select" = { bg = "orange", fg = "grey01" }
1616"ui.help" = { fg = "grey04", bg = "grey01" }
1717"ui.cursor" = { fg = "grey04", modifiers = ["reversed"] }
18−"ui.cursor.primary" = { fg = "grey05", modifiers = ["reversed"] }
18+"ui.cursor.primary" = { fg = "grey02", bg = "grey05" }
1919"ui.cursor.match" = { fg = "white", modifiers = ["underlined"] }
2020"ui.cursorline.primary" = { bg = "grey02" }
2121"ui.cursorline.secondary" = { bg = "grey02" }
@@ -35,7 +35,11 @@
3535"constant.numeric" = "lightblue"
3636"constant.character.escape" = "white"
3737"attribute" = "yellow"
38−"type" = "orange"
38+"type" = "white"
39+"type.builtin" = "orange"
40+"type.parameter" = { fg = "white", modifiers = ["bold"] }
41+"type.enum" = "white"
42+"type.enum.variant" = "orange"
3943"string" = "darkgreen"
4044"function" = "yellow"
4145"function.macro" = "green"
runtime/themes/everblush.toml+1
@@ -68,6 +68,7 @@
6868"ui.virtual.whitespace" = { fg = "comment" }
6969"ui.virtual.wrap" = { fg = "comment" }
7070"ui.virtual.indent-guide" = { fg = "comment" }
71+"ui.virtual.inlay-hint" = { fg = "comment" }
7172"ui.window" = { fg = "black" }
7273
7374"error" = { fg = "red" }
runtime/themes/gruber-darker.tomlnew file+114
@@ -0,0 +1,114 @@
1+# Author : Mehedi Hasan <mehedi.r137@gmail.com>
2+# Based on : https://github.com/rexim/gruber-darker-theme
3+
4+"attribute" = "fg0"
5+"keyword" = { fg = "yellow0", modifiers = ["bold"] }
6+"keyword.directive" = "quartz"
7+"namespace" = "quartz"
8+"punctuation" = "fg0"
9+"punctuation.delimiter" = "fg0"
10+"operator" = "fg0"
11+"special" = { fg = "yellow0", modifiers = ["bold"] }
12+"variable" = "fg0"
13+"variable.builtin" = { fg = "yellow0", modifiers = ["bold"] }
14+"variable.parameter" = "fg0"
15+"type" = "quartz"
16+"type.builtin" = "yellow0"
17+"constructor" = { fg = "quartz" }
18+"function" = "niagara0"
19+"function.builtin" = "yellow0"
20+"tag" = "niagara0"
21+"comment" = { fg = "brown0" }
22+"constant.character" = { fg = "green0" }
23+"constant.character.escape" = { fg = "yellow0" }
24+"constant.builtin" = { fg = "yellow0", modifiers = ["bold"] }
25+"string" = "green0"
26+"constant.numeric" = "wisteria"
27+"label" = "fg0"
28+"module" = "aqua1"
29+
30+"diff.plus" = "green1"
31+"diff.delta" = "orange1"
32+"diff.minus" = "red0"
33+
34+"warning" = { fg = "orange1", modifiers = ["bold"] }
35+"error" = { fg = "red0", modifiers = ["bold"] }
36+"info" = { fg = "aqua1", modifiers = ["bold"] }
37+"hint" = { fg = "blue0", modifiers = ["bold"] }
38+
39+"ui.background" = { bg = "bg0" }
40+"ui.linenr" = { fg = "bg4" }
41+"ui.linenr.selected" = { fg = "yellow0" }
42+"ui.cursorline" = { bg = "bg1" }
43+
44+"ui.statusline" = { fg = "fg0", bg = "bg1" }
45+"ui.statusline.normal" = { fg = "bg1", bg = "yellow0", modifiers = ["bold"] }
46+"ui.statusline.insert" = { fg = "bg1", bg = "blue0", modifiers = ["bold"] }
47+"ui.statusline.select" = { fg = "bg1", bg = "wisteria", modifiers = ["bold"] }
48+"ui.statusline.inactive" = { fg = "fg3", bg = "bg1" }
49+
50+"ui.bufferline" = { fg = "fg3", bg = "bg6" }
51+"ui.bufferline.active" = { fg = "fg0", bg = "bg7" }
52+
53+"ui.popup" = { bg = "bg6" }
54+"ui.window" = { fg = "bg1" }
55+"ui.help" = { bg = "bg1", fg = "fg0" }
56+"ui.text" = { fg = "fg0" }
57+"ui.text.focus" = { bg = "bg5", modifiers = ["bold"] }
58+"ui.selection" = { bg = "bg2" }
59+"ui.selection.primary" = { bg = "bg5" }
60+"ui.cursor.primary" = { bg = "fg0", fg = "niagara1" }
61+"ui.cursor.match" = { bg = "yellow1" }
62+"ui.menu" = { fg = "fg0", bg = "bg6" }
63+"ui.menu.selected" = { fg = "fg0", bg = "bg5", modifiers = ["bold"] }
64+
65+"ui.virtual.whitespace" = "bg8"
66+"ui.virtual.indent-guide" = "bg8"
67+"ui.virtual.ruler" = { bg = "bg1" }
68+"ui.virtual.inlay-hint" = { fg = "bg7" }
69+"ui.virtual.wrap" = { fg = "bg2" }
70+
71+"diagnostic.warning" = { underline = { color = "orange1", style = "dashed" } }
72+"diagnostic.error" = { underline = { color = "red3", style = "dashed" } }
73+"diagnostic.info" = { underline = { color = "aqua1", style = "dashed" } }
74+"diagnostic.hint" = { underline = { color = "blue0", style = "dashed" } }
75+
76+"markup.heading" = { fg = "aqua1", modifiers = ["bold"] }
77+"markup.bold" = { modifiers = ["bold"] }
78+"markup.italic" = { modifiers = ["italic"] }
79+"markup.strikethrough" = { modifiers = ["crossed_out"] }
80+"markup.link.url" = { fg = "green1", modifiers = ["underlined"] }
81+"markup.link.text" = "red3"
82+"markup.raw" = { fg = "fg0", bg = "bg8", modifiers = ["bold"] }
83+
84+[palette]
85+fg0 = "#e4e4ef"
86+fg1 = "#f4f4ff"
87+fg2 = "#f5f5f5"
88+fg3 = "#a89984"
89+bg0 = "#181818"
90+bg1 = "#282828"
91+bg2 = "#453d41"
92+bg4 = "#52494e"
93+bg5 = "#404040"
94+bg6 = "#232323"
95+bg7 = "#3f3f3f"
96+bg8 = "#2c2c2c"
97+red0 = "#f43841"
98+red1 = "#ff4f58"
99+red2 = "#2B0A0B"
100+red3 = "#fb4934"
101+green0 = "#73c936"
102+green1 = "#b8bb26"
103+yellow0 = "#ffdd33"
104+yellow1 = "#655814"
105+blue0 = "#5292c8"
106+orange0 = "#d65d0e"
107+orange1 = "#fe8019"
108+brown0 = "#cc8c3c"
109+quartz = "#95a99f"
110+niagara0 = "#96a6c8"
111+niagara1 = "#303540"
112+wisteria = "#9e95c7"
113+aqua1 = "#8ec07c"
114+
runtime/themes/horizon-dark.tomlnew file+80
@@ -0,0 +1,80 @@
1+# Syntax
2+string = "orange"
3+constant = "purple"
4+"constant.numeric" = "orange"
5+"constant.builtin" = "orange"
6+variable = "red"
7+comment = "light-gray"
8+special = "purple"
9+"punctuation.bracket" = "purple"
10+keyword = "purple"
11+function = "blue"
12+label = "orange"
13+type = "orange"
14+namespace = "orange"
15+
16+# User Interface
17+"ui.background" = { bg = "bg", fg = "gray" }
18+"ui.background.separator" = "light-gray"
19+"ui.text" = "white"
20+"ui.text.focus" = "green"
21+"ui.text.inactive" = "selection"
22+"ui.text.info" = "orange"
23+"ui.cursor" = { modifiers = ["reversed"] }
24+"ui.cursor.primary" = { modifiers = ["reversed"] }
25+"ui.cursor.match" = { bg = "selection" }
26+"ui.gutter" = "gray"
27+"ui.gutter.selected" = "light-gray"
28+"ui.selection" = { bg = "selection" }
29+"ui.virtual.indent-guide" = { fg = "gray"}
30+"ui.virtual.whitespace" = { fg = "light-gray"}
31+"ui.statusline" = { bg = "dark-bg", fg = "light-gray" }
32+"ui.popup" = { bg = "dark-bg", fg = "orange" }
33+"ui.help" = { bg = "dark-bg", fg = "orange" }
34+"ui.menu" = { bg = "dark-bg", fg = "light-gray" }
35+"ui.menu.selected" = { bg = "selection", fg = "orange" }
36+"ui.window" = "selection"
37+"ui.bufferline" = { bg = "dark-bg", fg = "light-gray" }
38+"ui.bufferline.active" = { bg = "dark-bg", fg = "orange" }
39+
40+# Diagnostics
41+"diagnostic" = { underline = { style = "curl" } }
42+"diagnostic.hint" = { underline = { color = "green", style = "curl" } }
43+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
44+"diagnostics.error" = { underline = { color = "red", style = "curl"} }
45+"diagnostics.warning" = { underline = { color = "orange", style = "curl"} }
46+
47+warning = { fg = "orange", modifiers = ["bold"] }
48+error = { fg = "red", modifiers = ["bold"] }
49+info = { fg = "blue", modifiers = ["bold"] }
50+hint = { fg = "green", modifiers = ["bold"] }
51+
52+# Markup
53+"markup.heading" = "pink"
54+"markup.list" = "light-gray"
55+"markup.list.checked" = "green"
56+"markup.list.unchecked" = "light-gray"
57+"markup.bold" = { modifiers = ["bold"] }
58+"markup.italic" = { modifiers = ["italic"] }
59+"markup.strikethrough" = { modifiers = ["crossed_out"] }
60+"markup.link" = "blue"
61+"markup.quote" = "orange"
62+"markup.raw" = "orange"
63+
64+"diff.plus" = "green"
65+"diff.minus" = "red"
66+"diff.delta" = "orange"
67+
68+[palette]
69+white = "#D5D8DA"
70+gray = "#2E303E"
71+light-gray = "#6C6F93"
72+bg = "#1C1E26"
73+dark-bg = "#16161C"
74+pink = "#EE64AE"
75+selection = "#353747"
76+green = "#27D796"
77+orange = "#FAB795"
78+purple = "#B877DB"
79+red = "#E95678"
80+blue = "#25B2BC"
runtime/themes/licenses/everforest.LICENSEnew file+21
@@ -0,0 +1,21 @@
1+MIT License
2+
3+Copyright (c) 2019 sainnhe
4+
5+Permission is hereby granted, free of charge, to any person obtaining a copy
6+of this software and associated documentation files (the "Software"), to deal
7+in the Software without restriction, including without limitation the rights
8+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+copies of the Software, and to permit persons to whom the Software is
10+furnished to do so, subject to the following conditions:
11+
12+The above copyright notice and this permission notice shall be included in all
13+copies or substantial portions of the Software.
14+
15+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+SOFTWARE.
runtime/themes/licenses/modus_vivendi.LICENSEnew file+5
@@ -0,0 +1,5 @@
1+Copyright (C) 2020-2023 Free Software Foundation, Inc.
2+
3+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
4+
5+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
runtime/themes/licenses/modus_vivendi_deuteranopia.LICENSEnew file+5
@@ -0,0 +1,5 @@
1+Copyright (C) 2020-2023 Free Software Foundation, Inc.
2+
3+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
4+
5+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
runtime/themes/licenses/modus_vivendi_tinted.LICENSEnew file+5
@@ -0,0 +1,5 @@
1+Copyright (C) 2020-2023 Free Software Foundation, Inc.
2+
3+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
4+
5+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
runtime/themes/licenses/modus_vivendi_tritanopia.LICENSEnew file+5
@@ -0,0 +1,5 @@
1+Copyright (C) 2020-2023 Free Software Foundation, Inc.
2+
3+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” and with the Back-Cover Texts as in (a) below. A copy of the license is included in the section entitled “GNU Free Documentation License.”
4+
5+(a) The FSF’s Back-Cover Text is: “You have the freedom to copy and modify this GNU manual.”
runtime/themes/licenses/poimandres.LICENSEnew file+21
@@ -0,0 +1,21 @@
1+MIT License
2+
3+Copyright (c) 2023 drcmda
4+
5+Permission is hereby granted, free of charge, to any person obtaining a copy
6+of this software and associated documentation files (the "Software"), to deal
7+in the Software without restriction, including without limitation the rights
8+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+copies of the Software, and to permit persons to whom the Software is
10+furnished to do so, subject to the following conditions:
11+
12+The above copyright notice and this permission notice shall be included in all
13+copies or substantial portions of the Software.
14+
15+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+SOFTWARE.
runtime/themes/licenses/serika-syntax.LICENSEnew file+21
@@ -0,0 +1,21 @@
1+MIT License
2+
3+Copyright (c) 2018 arturoalviar
4+
5+Permission is hereby granted, free of charge, to any person obtaining a copy
6+of this software and associated documentation files (the "Software"), to deal
7+in the Software without restriction, including without limitation the rights
8+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+copies of the Software, and to permit persons to whom the Software is
10+furnished to do so, subject to the following conditions:
11+
12+The above copyright notice and this permission notice shall be included in all
13+copies or substantial portions of the Software.
14+
15+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+SOFTWARE.
runtime/themes/licenses/sonokai.LICENSEnew file+21
@@ -0,0 +1,21 @@
1+MIT License
2+
3+Copyright (c) 2020 sainnhe
4+
5+Permission is hereby granted, free of charge, to any person obtaining a copy
6+of this software and associated documentation files (the "Software"), to deal
7+in the Software without restriction, including without limitation the rights
8+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+copies of the Software, and to permit persons to whom the Software is
10+furnished to do so, subject to the following conditions:
11+
12+The above copyright notice and this permission notice shall be included in all
13+copies or substantial portions of the Software.
14+
15+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+SOFTWARE.
runtime/themes/licenses/starlight.LICENSEnew file+24
@@ -0,0 +1,24 @@
1+This is free and unencumbered software released into the public domain.
2+
3+Anyone is free to copy, modify, publish, use, compile, sell, or
4+distribute this software, either in source code form or as a compiled
5+binary, for any purpose, commercial or non-commercial, and by any
6+means.
7+
8+In jurisdictions that recognize copyright laws, the author or authors
9+of this software dedicate any and all copyright interest in the
10+software to the public domain. We make this dedication for the benefit
11+of the public at large and to the detriment of our heirs and
12+successors. We intend this dedication to be an overt act of
13+relinquishment in perpetuity of all present and future rights to this
14+software under copyright law.
15+
16+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
20+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
21+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
22+OTHER DEALINGS IN THE SOFTWARE.
23+
24+For more information, please refer to <https://unlicense.org>
runtime/themes/modus_operandi.tomlnew file+194
@@ -0,0 +1,194 @@
1+# Author: Alexis Mousset <contact@amousset.me>
2+# Adapted from https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
3+# Version 4.3.0
4+#
5+
6+# Syntax highlighting
7+# -------------------
8+"type" = "cyan-cooler"
9+"constructor" = "cyan-cooler"
10+
11+"constant" = "blue-cooler"
12+"constant.character.escape" = "magenta"
13+
14+"string" = "blue-warmer"
15+"string.regexp" = "magenta-faint"
16+"string.special" = "blue-faint" # used for colors in CSS
17+
18+"comment" = "fg-dim"
19+
20+"variable.parameter" = "cyan"
21+"variable.builtin" = "magenta-cooler"
22+"label" = "fg-dim" # used for language in markdown code blocks
23+"keyword" = "magenta-cooler"
24+"keyword.directive" = "red-cooler"
25+"function" = "magenta"
26+"function.macro" = "magenta-warmer"
27+
28+punctuation = "fg-dim"
29+"tag" = "magenta"
30+"attribute" = "cyan-cooler"
31+"namespace" = "blue-cooler"
32+"special" = "red-cooler"
33+
34+"markup.heading.marker" = "fg-dim"
35+"markup.heading.1" = { fg = "fg-main", modifiers = ["bold"] }
36+"markup.heading.2" = { fg = "yellow-faint", modifiers = ["bold"] }
37+"markup.heading.3" = { fg = "fg-alt", modifiers = ["bold"] }
38+"markup.heading.4" = { fg = "magenta", modifiers = ["bold"] }
39+"markup.heading.5" = { fg = "green-faint", modifiers = ["bold"] }
40+"markup.heading.6" = { fg = "red-faint", modifiers = ["bold"] }
41+"markup.list" = "fg-dim"
42+"markup.list.checked" = { fg = "yellow-warmer" }
43+"markup.list.unchecked" = { fg = "yellow-warmer" }
44+"markup.bold" = { modifiers = ["bold"] }
45+"markup.italic" = { modifiers = ["italic"] }
46+"markup.strikethrough" = { modifiers = ["crossed_out"] }
47+"markup.link.url" = { fg = "cyan" }
48+"markup.link.text" = { fg = "blue-warmer", modifiers = ["underlined"] }
49+"markup.raw.block" = { bg = "bg-dim" }
50+"markup.raw.inline" = { fg = "green-cooler" }
51+
52+"diff.plus" = { fg = "fg-added", bg = "bg-added" }
53+"diff.plus.gutter" = "green-intense"
54+"diff.minus" = { fg = "fg-removed", bg = "bg-removed" }
55+"diff.minus.gutter" = "red-intense"
56+"diff.delta" = { fg = "fg-changed", bg = "bg-changed" }
57+"diff.delta.gutter" = "yellow-intense"
58+
59+# User Interface
60+# --------------
61+
62+"ui.background" = { bg = "bg-main" }
63+
64+"ui.linenr" = { fg = "fg-dim", bg = "bg-dim" }
65+"ui.linenr.selected" = { fg = "fg-main", bg = "bg-active" }
66+
67+"ui.statusline" = { fg = "fg-mode-line-active", bg = "bg-mode-line-active" }
68+"ui.statusline.inactive" = { fg = "fg-mode-line-inactive", bg = "bg-mode-line-inactive" }
69+"ui.statusline.normal" = { fg = "blue-warmer" }
70+"ui.statusline.insert" = { fg = "green-warmer" }
71+"ui.statusline.select" = { fg = "magenta-warmer" }
72+
73+"ui.popup" = { fg = "fg-main", bg = "bg-dim" }
74+"ui.window" = { fg = "fg-dim" }
75+"ui.help" = { fg = "fg-main", bg = "bg-dim" }
76+"ui.gutter" = { bg = "bg-dim" }
77+"ui.text" = "fg-main"
78+"ui.text.focus" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
79+"ui.text.inactive" = { fg = "fg-dim" }
80+"ui.virtual" = "bg-active"
81+"ui.virtual.ruler" = { bg = "bg-dim" }
82+"ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
83+
84+"ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
85+"ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
86+
87+"ui.cursor" = { fg = "bg-main", bg = "fg-main" }
88+"ui.cursor.primary" = { fg = "bg-main", bg = "fg-dim" }
89+"ui.cursor.match" = { bg = "bg-paren-match" }
90+"ui.cursorline.primary" = { bg = "bg-hl-line" }
91+
92+"ui.highlight" = { bg = "bg-hl-line" }
93+
94+"ui.menu" = { fg = "fg-main", bg = "bg-dim" }
95+"ui.menu.selected" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
96+"ui.menu.scroll" = { fg = "fg-dim", bg = "bg-cyan-intense" }
97+
98+"diagnostic.error" = { underline = { color = "red-intense", style = "curl" } }
99+"diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
100+"diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
101+"diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
102+
103+error = "red"
104+warning = "yellow-warmer"
105+info = "cyan-cooler"
106+hint = "blue-cooler"
107+
108+[palette]
109+# Basic values
110+bg-main = "#ffffff"
111+bg-dim = "#f2f2f2"
112+fg-main = "#000000"
113+fg-dim = "#595959"
114+fg-alt = "#193668"
115+bg-active = "#c4c4c4"
116+bg-inactive = "#e0e0e0"
117+
118+# Common accent foregrounds
119+red = "#a60000"
120+red-warmer = "#972500"
121+red-cooler = "#a0132f"
122+red-faint = "#7f0000"
123+red-intense = "#d00000"
124+green = "#006800"
125+green-warmer = "#316500"
126+green-cooler = "#00663f"
127+green-faint = "#2a5045"
128+green-intense = "#008900"
129+yellow = "#6f5500"
130+yellow-warmer = "#884900"
131+yellow-cooler = "#7a4f2f"
132+yellow-faint = "#624416"
133+yellow-intense = "#808000"
134+blue = "#0031a9"
135+blue-warmer = "#354fcf"
136+blue-cooler = "#0000b0"
137+blue-faint = "#003497"
138+blue-intense = "#0000ff"
139+magenta = "#721045"
140+magenta-warmer = "#8f0075"
141+magenta-cooler = "#531ab6"
142+magenta-faint = "#7c318f"
143+magenta-intense = "#dd22dd"
144+cyan = "#005e8b"
145+cyan-warmer = "#3f578f"
146+cyan-cooler = "#005f5f"
147+cyan-faint = "#005077"
148+cyan-intense = "#008899"
149+
150+# Common accent backgrounds
151+bg-red-intense = "#ff8f88"
152+bg-green-intense = "#8adf80"
153+bg-yellow-intense = "#f3d000"
154+bg-blue-intense = "#bfc9ff"
155+bg-magenta-intense = "#dfa0f0"
156+bg-cyan-intense = "#a4d5f9"
157+
158+bg-red-subtle = "#ffcfbf"
159+bg-green-subtle = "#b3fabf"
160+bg-yellow-subtle = "#fff576"
161+bg-blue-subtle = "#ccdfff"
162+bg-magenta-subtle = "#ffddff"
163+bg-cyan-subtle = "#bfefff"
164+
165+bg-red-nuanced = "#fff1f0"
166+bg-green-nuanced = "#ecf7ed"
167+bg-yellow-nuanced = "#fff3da"
168+bg-blue-nuanced = "#f3f3ff"
169+bg-magenta-nuanced = "#fdf0ff"
170+bg-cyan-nuanced = "#ebf6fa"
171+
172+# Special purpose
173+bg-completion = "#c0deff"
174+bg-hl-line = "#dae5ec"
175+
176+bg-mode-line-active = "#c8c8c8"
177+fg-mode-line-active = "#000000"
178+bg-mode-line-inactive = "#e6e6e6"
179+fg-mode-line-inactive = "#585858"
180+
181+modeline-err = "#7f0000"
182+modeline-warning = "#5f0070"
183+modeline-info = "#002580"
184+
185+# Diffs
186+bg-added = "#c1f2d1"
187+fg-added = "#005000"
188+bg-changed = "#ffdfa9"
189+fg-changed = "#553d00"
190+bg-removed = "#ffd8d5"
191+fg-removed = "#8f1313"
192+
193+# Paren match
194+bg-paren-match = "#5fcfff"
runtime/themes/modus_operandi_deuteranopia.tomlnew file+46
@@ -0,0 +1,46 @@
1+# Author: Alexis Mousset <contact@amousset.me>
2+# modus_operandi.toml variant
3+#
4+# This variant is optimized for users with red-green color deficiency (deuteranopia)
5+
6+inherits = "modus_operandi"
7+
8+"constant.character.escape" = "magenta"
9+"comment" = "yellow-cooler"
10+"function" = "magenta"
11+"tag" = "magenta"
12+
13+"ui.cursor" = { fg = "bg-main", bg = "blue-intense" }
14+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "blue-intense" }
15+
16+"diagnostic.error" = { underline = { color = "yellow-intense", style = "curl" } }
17+"diagnostic.warning" = { underline = { color = "magenta-faint", style = "curl" } }
18+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
19+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
20+
21+error = "yellow-intense"
22+warning = "magenta-faint"
23+info = "cyan"
24+hint = "blue"
25+
26+[palette]
27+
28+yellow = "#695500"
29+yellow-warmer = "#973300"
30+yellow-cooler = "#77492f"
31+
32+bg-mode-line-active = "#d0d6ff"
33+fg-mode-line-active = "#0f0f0f"
34+border-mode-line-active = "#4f4f74"
35+
36+modeline-err = "#603a00"
37+modeline-warning = "#454500"
38+modeline-info = "#023d92"
39+
40+# Diffs
41+bg-added = "#d5d7ff"
42+fg-added = "#303099"
43+bg-changed = "#eecfdf"
44+fg-changed = "#6f1343"
45+bg-removed = "#f4f099"
46+fg-removed = "#553d00"
runtime/themes/modus_operandi_tinted.tomlnew file+45
@@ -0,0 +1,45 @@
1+# Author: Alexis Mousset <contact@amousset.me>
2+# modus_operandi.toml variant
3+
4+inherits = "modus_operandi"
5+
6+"comment" = "red-faint"
7+
8+"ui.cursor.primary" = { fg = "bg-main", bg = "red" }
9+
10+[palette]
11+# Basic values
12+bg-main = "#fbf7f0"
13+bg-dim = "#efe9dd"
14+bg-active = "#c9b9b0"
15+bg-inactive = "#dfd5cf"
16+border = "#9f9690"
17+
18+# Common accent backgrounds
19+bg-red-nuanced = "#ffe8f0"
20+bg-green-nuanced = "#e0f5e0"
21+bg-yellow-nuanced = "#f9ead0"
22+bg-blue-nuanced = "#ebebff"
23+bg-magenta-nuanced = "#f6e7ff"
24+bg-cyan-nuanced = "#e1f3fc"
25+
26+# Special purpose
27+bg-completion = "#f0c1cf"
28+bg-hl-line = "#f1d5d0"
29+bg-region = "#c2bcb5"
30+
31+bg-mode-line-active = "#cab9b2"
32+border-mode-line-active = "#545454"
33+bg-mode-line-inactive = "#dfd9cf"
34+border-mode-line-inactive = "#a59a94"
35+
36+bg-tab-bar = "#e0d4ce"
37+bg-tab-current = "#fbf7f0"
38+bg-tab-other = "#c8b8b2"
39+
40+# Diffs
41+bg-added = "#c3ebc1"
42+bg-removed = "#f4d0cf"
43+
44+# Paren match
45+bg-paren-match = "#7fdfcf"
runtime/themes/modus_operandi_tritanopia.tomlnew file+73
@@ -0,0 +1,73 @@
1+# Author: Alexis Mousset <contact@amousset.me>
2+# modus_operandi.toml variant
3+#
4+# This variant is optimized for users with blue-yellow color deficiency (tritanopia)
5+
6+inherits = "modus_operandi"
7+
8+"type" = "blue-warmer"
9+"constructor" = "blue-warmer"
10+"constant" = "green-cooler"
11+"constant.character.escape" = "red-cooler"
12+"string" = "cyan"
13+"comment" = "red-faint"
14+"variable.parameter" = "cyan-cooler"
15+"keyword" = "red-cooler"
16+"keyword.directive" = "red-warmer"
17+"function" = "cyan-warmer"
18+"function.macro" = "magenta"
19+"tag" = "red-cooler"
20+
21+"markup.heading.2" = { fg = "red-faint", modifiers = ["bold"] }
22+"markup.heading.3" = { fg = "cyan-faint", modifiers = ["bold"] }
23+"markup.heading.6" = { fg = "magenta-faint", modifiers = ["bold"] }
24+"markup.link.url" = { fg = "cyan-cooler" }
25+"markup.link.text" = { fg = "cyan", modifiers = ["underlined"] }
26+
27+"ui.cursor" = { fg = "bg-main", bg = "red-intense" }
28+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "red-intense" }
29+
30+"diagnostic.error" = { underline = { color = "red-warmer", style = "curl" } }
31+"diagnostic.warning" = { underline = { color = "magenta", style = "curl" } }
32+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
33+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
34+
35+error = "red-warmer"
36+warning = "magenta"
37+info = "cyan"
38+hint = "blue"
39+
40+[palette]
41+
42+# Common accent foregrounds
43+red-warmer = "#b21100"
44+red-faint = "#702000"
45+yellow = "#695500"
46+yellow-warmer = "#973300"
47+yellow-cooler = "#77492f"
48+magenta-intense = "#cd22bd"
49+cyan-faint = "#004f5f"
50+
51+# Special purpose
52+bg-completion = "#afdfef"
53+bg-hover = "#ffafbc"
54+bg-hover-secondary = "#9fdfff"
55+bg-hl-line = "#dfeaec"
56+
57+bg-char-0 = "#ff908f"
58+bg-char-1 = "#bfbfff"
59+bg-char-2 = "#5fcfdf"
60+
61+bg-mode-line-active = "#afe0f2"
62+fg-mode-line-active = "#0f0f0f"
63+border-mode-line-active = "#2f4f44"
64+
65+modeline-err = "#8f0000"
66+modeline-warning = "#6f306f"
67+modeline-info = "#00445f"
68+
69+# Diffs
70+bg-added = "#b5e7ff"
71+fg-added = "#005079"
72+bg-changed = "#eecfdf"
73+fg-changed = "#6f1343"
runtime/themes/modus_vivendi.tomlnew file+242
@@ -0,0 +1,242 @@
1+# Author: Matous Dzivjak <matousdzivjak@gmail.com>
2+# Adapted from https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
3+# Source: https://github.com/protesilaos/modus-themes/blob/main/modus-vivendi-theme.el
4+# Version 4.3.0
5+
6+# Syntax highlighting
7+# -------------------
8+"type" = "cyan-cooler"
9+"constructor" = "cyan-cooler"
10+
11+"constant" = "blue-cooler"
12+"constant.character.escape" = "magenta"
13+
14+"string" = "blue-warmer"
15+"string.regexp" = "magenta-faint"
16+"string.special" = "blue-faint" # used for colors in CSS
17+
18+"comment" = "fg-dim"
19+
20+"variable.parameter" = "cyan"
21+"variable.builtin" = "magenta-cooler"
22+"label" = "fg-dim" # used for language in markdown code blocks
23+"keyword" = "magenta-cooler"
24+"keyword.directive" = "red-cooler"
25+"function" = "magenta"
26+"function.macro" = "magenta-warmer"
27+
28+punctuation = "fg-dim"
29+"tag" = "magenta"
30+"attribute" = "cyan-cooler"
31+"namespace" = "blue-cooler"
32+"special" = "red-cooler"
33+
34+"markup.heading.marker" = "fg-dim"
35+"markup.heading.1" = { fg = "fg-main", modifiers = ["bold"] }
36+"markup.heading.2" = { fg = "yellow-faint", modifiers = ["bold"] }
37+"markup.heading.3" = { fg = "fg-alt", modifiers = ["bold"] }
38+"markup.heading.4" = { fg = "magenta", modifiers = ["bold"] }
39+"markup.heading.5" = { fg = "green-faint", modifiers = ["bold"] }
40+"markup.heading.6" = { fg = "red-faint", modifiers = ["bold"] }
41+"markup.list" = "fg-dim"
42+"markup.list.checked" = { fg = "yellow-warmer" }
43+"markup.list.unchecked" = { fg = "yellow-warmer" }
44+"markup.bold" = { modifiers = ["bold"] }
45+"markup.italic" = { modifiers = ["italic"] }
46+"markup.strikethrough" = { modifiers = ["crossed_out"] }
47+"markup.link.url" = { fg = "cyan" }
48+"markup.link.text" = { fg = "blue-warmer", modifiers = ["underlined"] }
49+"markup.raw.block" = { bg = "bg-dim" }
50+"markup.raw.inline" = { fg = "green-cooler" }
51+
52+"diff.plus" = { fg = "fg-added", bg = "bg-added" }
53+"diff.plus.gutter" = "green-intense"
54+"diff.minus" = { fg = "fg-removed", bg = "bg-removed" }
55+"diff.minus.gutter" = "red-intense"
56+"diff.delta" = { fg = "fg-changed", bg = "bg-changed" }
57+"diff.delta.gutter" = "yellow-intense"
58+
59+# User Interface
60+# --------------
61+
62+"ui.background" = { bg = "bg-main" }
63+
64+"ui.linenr" = { fg = "fg-dim", bg = "bg-dim" }
65+"ui.linenr.selected" = { fg = "fg-main", bg = "bg-active" }
66+
67+"ui.statusline" = { fg = "fg-mode-line-active", bg = "bg-mode-line-active" }
68+"ui.statusline.inactive" = { fg = "fg-mode-line-inactive", bg = "bg-mode-line-inactive" }
69+"ui.statusline.normal" = { fg = "blue-warmer" }
70+"ui.statusline.insert" = { fg = "green-warmer" }
71+"ui.statusline.select" = { fg = "magenta-warmer" }
72+
73+"ui.bufferline" = { bg = "bg-tab-bar" }
74+"ui.bufferline.active" = { bg = "bg-tab-current", fg = "fg-mode-line-active" }
75+
76+"ui.popup" = { fg = "fg-main", bg = "bg-dim" }
77+"ui.window" = { fg = "fg-dim" }
78+"ui.help" = { fg = "fg-main", bg = "bg-dim" }
79+"ui.gutter" = { bg = "bg-dim" }
80+"ui.text" = "fg-main"
81+"ui.text.focus" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
82+"ui.text.inactive" = { fg = "fg-dim" }
83+"ui.virtual" = "bg-active"
84+"ui.virtual.ruler" = { bg = "bg-dim" }
85+"ui.virtual.inlay-hint" = { fg = "fg-dim", modifiers = ["italic"] }
86+
87+"ui.selection" = { fg = "fg-main", bg = "bg-inactive" }
88+"ui.selection.primary" = { fg = "fg-main", bg = "bg-active" }
89+
90+"ui.cursor" = { fg = "bg-main", bg = "fg-main" }
91+"ui.cursor.primary" = { fg = "bg-main", bg = "fg-dim" }
92+"ui.cursor.match" = { bg = "bg-paren-match" }
93+"ui.cursorline.primary" = { bg = "bg-hl-line" }
94+
95+"ui.highlight" = { bg = "bg-hl-line" }
96+
97+"ui.menu" = { fg = "fg-main", bg = "bg-dim" }
98+"ui.menu.selected" = { fg = "fg-main", bg = "bg-completion", modifiers = ["bold"] }
99+"ui.menu.scroll" = { fg = "fg-dim", bg = "bg-cyan-intense" }
100+
101+"diagnostic.error" = { underline = { color = "red-intense", style = "curl" } }
102+"diagnostic.warning" = { underline = { color = "yellow-intense", style = "curl" } }
103+"diagnostic.info" = { underline = { color = "cyan-intense", style = "curl" } }
104+"diagnostic.hint" = { underline = { color = "blue-intense", style = "curl" } }
105+
106+error = "red"
107+warning = "yellow-warmer"
108+info = "cyan-cooler"
109+hint = "blue-cooler"
110+
111+[palette]
112+# Basic values
113+bg-main = "#000000"
114+bg-dim = "#1e1e1e"
115+fg-main = "#ffffff"
116+fg-dim = "#989898"
117+fg-alt = "#c6daff"
118+bg-active = "#535353"
119+bg-inactive = "#303030"
120+
121+# Common accent foregrounds
122+red = "#ff5f59"
123+red-warmer = "#ff6b55"
124+red-cooler = "#ff7f9f"
125+red-faint = "#ff9580"
126+red-intense = "#ff5f5f"
127+green = "#44bc44"
128+green-warmer = "#70b900"
129+green-cooler = "#00c06f"
130+green-faint = "#88ca9f"
131+green-intense = "#44df44"
132+yellow = "#d0bc00"
133+yellow-warmer = "#fec43f"
134+yellow-cooler = "#dfaf7a"
135+yellow-faint = "#d2b580"
136+yellow-intense = "#efef00"
137+blue = "#2fafff"
138+blue-warmer = "#79a8ff"
139+blue-cooler = "#00bcff"
140+blue-faint = "#82b0ec"
141+blue-intense = "#338fff"
142+magenta = "#feacd0"
143+magenta-warmer = "#f78fe7"
144+magenta-cooler = "#b6a0ff"
145+magenta-faint = "#caa6df"
146+magenta-intense = "#ff66ff"
147+cyan = "#00d3d0"
148+cyan-warmer = "#4ae2f0"
149+cyan-cooler = "#6ae4b9"
150+cyan-faint = "#9ac8e0"
151+cyan-intense = "#00eff0"
152+
153+# Uncommon accent foregrounds
154+rust = "#db7b5f"
155+gold = "#c0965b"
156+olive = "#9cbd6f"
157+slate = "#76afbf"
158+indigo = "#9099d9"
159+maroon = "#cf7fa7"
160+pink = "#d09dc0"
161+
162+# Common accent backgrounds
163+bg-red-intense = "#9d1f1f"
164+bg-green-intense = "#2f822f"
165+bg-yellow-intense = "#7a6100"
166+bg-blue-intense = "#1640b0"
167+bg-magenta-intense = "#7030af"
168+bg-cyan-intense = "#2266ae"
169+
170+bg-red-subtle = "#620f2a"
171+bg-green-subtle = "#00422a"
172+bg-yellow-subtle = "#4a4000"
173+bg-blue-subtle = "#242679"
174+bg-magenta-subtle = "#552f5f"
175+bg-cyan-subtle = "#004065"
176+
177+bg-red-nuanced = "#2c0614"
178+bg-green-nuanced = "#001904"
179+bg-yellow-nuanced = "#221000"
180+bg-blue-nuanced = "#0f0e39"
181+bg-magenta-nuanced = "#230631"
182+bg-cyan-nuanced = "#041529"
183+
184+# Uncommon accent backgrounds
185+bg-ochre = "#442c2f"
186+bg-lavender = "#38325c"
187+bg-sage = "#0f3d30"
188+
189+# Special purpose
190+bg-completion = "#2f447f"
191+bg-hover = "#45605e"
192+bg-hover-secondary = "#654a39"
193+bg-hl-line = "#2f3849"
194+bg-region = "#5a5a5a"
195+fg-region = "#ffffff"
196+
197+bg-char-0 = "#0050af"
198+bg-char-1 = "#7f1f7f"
199+bg-char-2 = "#625a00"
200+
201+bg-mode-line-active = "#505050"
202+fg-mode-line-active = "#ffffff"
203+border-mode-line-active = "#959595"
204+bg-mode-line-inactive = "#2d2d2d"
205+fg-mode-line-inactive = "#969696"
206+border-mode-line-inactive = "#606060"
207+
208+modeline-err = "#ffa9bf"
209+modeline-warning = "#dfcf43"
210+modeline-info = "#9fefff"
211+
212+bg-tab-bar = "#313131"
213+bg-tab-current = "#000000"
214+bg-tab-other = "#545454"
215+
216+# Diffs
217+bg-added = "#00381f"
218+bg-added-faint = "#002910"
219+bg-added-refine = "#034f2f"
220+bg-added-fringe = "#237f3f"
221+fg-added = "#a0e0a0"
222+fg-added-intense = "#80e080"
223+
224+bg-changed = "#363300"
225+bg-changed-faint = "#2a1f00"
226+bg-changed-refine = "#4a4a00"
227+bg-changed-fringe = "#8a7a00"
228+fg-changed = "#efef80"
229+fg-changed-intense = "#c0b05f"
230+
231+bg-removed = "#4f1119"
232+bg-removed-faint = "#380a0f"
233+bg-removed-refine = "#781a1f"
234+bg-removed-fringe = "#b81a1f"
235+fg-removed = "#ffbfbf"
236+fg-removed-intense = "#ff9095"
237+
238+bg-diff-context = "#1a1a1a"
239+
240+# Paren match
241+bg-paren-match = "#2f7f9f"
242+tg-paren-expression = "#453040"
runtime/themes/modus_vivendi_deuteranopia.tomlnew file+158
@@ -0,0 +1,158 @@
1+# Author: Matous Dzivjak <matousdzivjak@gmail.com>
2+# Adapted from https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
3+# Source: https://github.com/protesilaos/modus-themes/blob/main/modus-vivendi-deuteranopia-theme.el
4+# Version 4.3.0
5+
6+inherits = "modus_vivendi"
7+
8+"constant.character.escape" = "magenta"
9+"comment" = "yellow-cooler"
10+"function" = "magenta"
11+"tag" = "magenta"
12+
13+"ui.cursor" = { fg = "bg-main", bg = "blue-intense" }
14+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "blue-intense" }
15+
16+"diagnostic.error" = { underline = { color = "yellow-intense", style = "curl" } }
17+"diagnostic.warning" = { underline = { color = "magenta-faint", style = "curl" } }
18+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
19+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
20+
21+error = "yellow-intense"
22+warning = "magenta-faint"
23+info = "cyan"
24+hint = "blue"
25+
26+[palette]
27+# Basic values
28+bg-main = "#000000"
29+bg-dim = "#1e1e1e"
30+fg-main = "#ffffff"
31+fg-dim = "#989898"
32+fg-alt = "#c6daff"
33+bg-active = "#535353"
34+bg-inactive = "#303030"
35+border = "#646464"
36+
37+# Common accent foregrounds
38+red = "#ff5f59"
39+red-warmer = "#ff6b55"
40+red-cooler = "#ff7f9f"
41+red-faint = "#ff9580"
42+red-intense = "#ff5f5f"
43+green = "#44bc44"
44+green-warmer = "#70b900"
45+green-cooler = "#00c06f"
46+green-faint = "#88ca9f"
47+green-intense = "#44df44"
48+yellow = "#cabf00"
49+yellow-warmer = "#ffa00f"
50+yellow-cooler = "#d8af7a"
51+yellow-faint = "#d2b580"
52+yellow-intense = "#efef00"
53+blue = "#2fafff"
54+blue-warmer = "#79a8ff"
55+blue-cooler = "#00bcff"
56+blue-faint = "#82b0ec"
57+blue-intense = "#338fff"
58+magenta = "#feacd0"
59+magenta-warmer = "#f78fe7"
60+magenta-cooler = "#b6a0ff"
61+magenta-faint = "#caa6df"
62+magenta-intense = "#ff66ff"
63+cyan = "#00d3d0"
64+cyan-warmer = "#4ae2f0"
65+cyan-cooler = "#6ae4b9"
66+cyan-faint = "#9ac8e0"
67+cyan-intense = "#00eff0"
68+
69+# Uncommon accent foregrounds
70+rust = "#db7b5f"
71+gold = "#c0965b"
72+olive = "#9cbd6f"
73+slate = "#76afbf"
74+indigo = "#9099d9"
75+maroon = "#cf7fa7"
76+pink = "#d09dc0"
77+
78+# Common accent backgrounds
79+bg-red-intense = "#9d1f1f"
80+bg-green-intense = "#2f822f"
81+bg-yellow-intense = "#7a6100"
82+bg-blue-intense = "#1640b0"
83+bg-magenta-intense = "#7030af"
84+bg-cyan-intense = "#2266ae"
85+
86+bg-red-subtle = "#620f2a"
87+bg-green-subtle = "#00422a"
88+bg-yellow-subtle = "#4a4000"
89+bg-blue-subtle = "#242679"
90+bg-magenta-subtle = "#552f5f"
91+bg-cyan-subtle = "#004065"
92+
93+bg-red-nuanced = "#2c0614"
94+bg-green-nuanced = "#001904"
95+bg-yellow-nuanced = "#221000"
96+bg-blue-nuanced = "#0f0e39"
97+bg-magenta-nuanced = "#230631"
98+bg-cyan-nuanced = "#041529"
99+
100+# Uncommon accent backgrounds
101+bg-ochre = "#442c2f"
102+bg-lavender = "#38325c"
103+bg-sage = "#0f3d30"
104+
105+# Special purpose
106+bg-completion = "#2f447f"
107+bg-hover = "#45605e"
108+bg-hover-secondary = "#654a39"
109+bg-hl-line = "#2f3849"
110+bg-region = "#5a5a5a"
111+fg-region = "#ffffff"
112+
113+bg-char-0 = "#0050af"
114+bg-char-1 = "#7f1f7f"
115+bg-char-2 = "#625a00"
116+
117+bg-mode-line-active = "#2a2a6a"
118+fg-mode-line-active = "#f0f0f0"
119+border-mode-line-active = "#8080a7"
120+bg-mode-line-inactive = "#2d2d2d"
121+fg-mode-line-inactive = "#969696"
122+border-mode-line-inactive = "#606060"
123+
124+modeline-err = "#e5bf00"
125+modeline-warning = "#c0cf35"
126+modeline-info = "#abeadf"
127+
128+bg-tab-bar = "#313131"
129+bg-tab-current = "#000000"
130+bg-tab-other = "#545454"
131+
132+# Diffs
133+bg-added = "#003066"
134+bg-added-faint = "#001a4f"
135+bg-added-refine = "#0f4a77"
136+bg-added-fringe = "#006fff"
137+fg-added = "#c4d5ff"
138+fg-added-intense = "#8080ff"
139+
140+bg-changed = "#2f123f"
141+bg-changed-faint = "#1f022f"
142+bg-changed-refine = "#3f325f"
143+bg-changed-fringe = "#7f55a0"
144+fg-changed = "#e3cfff"
145+fg-changed-intense = "#cf9fe2"
146+
147+bg-removed = "#3d3d00"
148+bg-removed-faint = "#281f00"
149+bg-removed-refine = "#555500"
150+bg-removed-fringe = "#d0c03f"
151+fg-removed = "#d4d48f"
152+fg-removed-intense = "#d0b05f"
153+
154+bg-diff-context = "#1a1a1a"
155+
156+# Paren match
157+bg-paren-match = "#2f7f9f"
158+bg-paren-expression = "#453040"
runtime/themes/modus_vivendi_tinted.tomlnew file+144
@@ -0,0 +1,144 @@
1+# Author: Matous Dzivjak <matousdzivjak@gmail.com>
2+# Adapted from: https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
3+# Source: https://github.com/protesilaos/modus-themes/blob/main/modus-vivendi-tinted-theme.el
4+# Version 4.3.0
5+
6+inherits = "modus_vivendi"
7+
8+"comment" = "red-faint"
9+
10+"ui.cursor.primary" = { fg = "bg-main", bg = "red" }
11+
12+[palette]
13+# Basic values
14+bg-main = "#0d0e1c"
15+bg-dim = "#1d2235"
16+fg-main = "#ffffff"
17+fg-dim = "#989898"
18+fg-alt = "#c6daff"
19+bg-active = "#4a4f69"
20+bg-inactive = "#2b3045"
21+border = "#61647a"
22+
23+# Common accent foregrounds
24+red = "#ff5f59"
25+red-warmer = "#ff6b55"
26+red-cooler = "#ff7f9f"
27+red-faint = "#ff9f80"
28+red-intense = "#ff5f5f"
29+green = "#44bc44"
30+green-warmer = "#70b900"
31+green-cooler = "#00c06f"
32+green-faint = "#88ca9f"
33+green-intense = "#44df44"
34+yellow = "#d0bc00"
35+yellow-warmer = "#fec43f"
36+yellow-cooler = "#dfaf7a"
37+yellow-faint = "#d2b580"
38+yellow-intense = "#efef00"
39+blue = "#2fafff"
40+blue-warmer = "#79a8ff"
41+blue-cooler = "#00bcff"
42+blue-faint = "#82b0ec"
43+blue-intense = "#338fff"
44+magenta = "#feacd0"
45+magenta-warmer = "#f78fe7"
46+magenta-cooler = "#b6a0ff"
47+magenta-faint = "#caa6df"
48+magenta-intense = "#ff66ff"
49+cyan = "#00d3d0"
50+cyan-warmer = "#4ae2f0"
51+cyan-cooler = "#6ae4b9"
52+cyan-faint = "#9ac8e0"
53+cyan-intense = "#00eff0"
54+
55+# Uncommon accent foregrounds
56+rust = "#db7b5f"
57+gold = "#c0965b"
58+olive = "#9cbd6f"
59+slate = "#76afbf"
60+indigo = "#9099d9"
61+maroon = "#cf7fa7"
62+pink = "#d09dc0"
63+
64+# Common accent backgrounds
65+bg-red-intense = "#9d1f1f"
66+bg-green-intense = "#2f822f"
67+bg-yellow-intense = "#7a6100"
68+bg-blue-intense = "#1640b0"
69+bg-magenta-intense = "#7030af"
70+bg-cyan-intense = "#2266ae"
71+
72+bg-red-subtle = "#620f2a"
73+bg-green-subtle = "#00422a"
74+bg-yellow-subtle = "#4a4000"
75+bg-blue-subtle = "#242679"
76+bg-magenta-subtle = "#552f5f"
77+bg-cyan-subtle = "#004065"
78+
79+bg-red-nuanced = "#350f14"
80+bg-green-nuanced = "#002718"
81+bg-yellow-nuanced = "#2c1f00"
82+bg-blue-nuanced = "#131c4d"
83+bg-magenta-nuanced = "#2f133f"
84+bg-cyan-nuanced = "#04253f"
85+
86+# Special purpose
87+bg-completion = "#483d8a"
88+bg-hover = "#45605e"
89+bg-hover-secondary = "#654a39"
90+bg-hl-line = "#303a6f"
91+bg-region = "#555a66"
92+fg-region = "#ffffff"
93+
94+bg-char-0 = "#0050af"
95+bg-char-1 = "#7f1f7f"
96+bg-char-2 = "#625a00"
97+
98+bg-mode-line-active = "#484d67"
99+fg-mode-line-active = "#ffffff"
100+border-mode-line-active = "#979797"
101+bg-mode-line-inactive = "#292d48"
102+fg-mode-line-inactive = "#969696"
103+border-mode-line-inactive = "#606270"
104+
105+modeline-err = "#ffa9bf"
106+modeline-warning = "#dfcf43"
107+modeline-info = "#9fefff"
108+
109+bg-tab-bar = "#2c3045"
110+bg-tab-current = "#0d0e1c"
111+bg-tab-other = "#4a4f6a"
112+
113+# Diffs
114+bg-added = "#003a2f"
115+bg-added-faint = "#002922"
116+bg-added-refine = "#035542"
117+bg-added-fringe = "#23884f"
118+fg-added = "#a0e0a0"
119+fg-added-intense = "#80e080"
120+
121+bg-changed = "#363300"
122+bg-changed-faint = "#2a1f00"
123+bg-changed-refine = "#4a4a00"
124+bg-changed-fringe = "#8f7a30"
125+fg-changed = "#efef80"
126+fg-changed-intense = "#c0b05f"
127+
128+bg-removed = "#4f1127"
129+bg-removed-faint = "#380a19"
130+bg-removed-refine = "#781a3a"
131+bg-removed-fringe = "#b81a26"
132+fg-removed = "#ffbfbf"
133+fg-removed-intense = "#ff9095"
134+
135+bg-diff-context = "#1a1f30"
136+
137+# Uncommon accent backgrounds
138+bg-ochre = "#442c2f"
139+bg-lavender = "#38325c"
140+bg-sage = "#0f3d30"
141+
142+# Paren match
143+bg-paren-match = "#2f7f9f"
144+bg-paren-expression = "#453040"
runtime/themes/modus_vivendi_tritanopia.tomlnew file+186
@@ -0,0 +1,186 @@
1+# Author: Matous Dzivjak <matousdzivjak@gmail.com>
2+# Adapted from https://protesilaos.com/emacs/modus-themes, by Protesilaos Stavrou
3+# Source: https://github.com/protesilaos/modus-themes/blob/main/modus-vivendi-tritanopia-theme.el
4+# Version 4.3.0
5+
6+inherits = "modus_vivendi"
7+
8+"type" = "blue-warmer"
9+"constructor" = "blue-warmer"
10+"constant" = "green-cooler"
11+"constant.character.escape" = "red-cooler"
12+"string" = "cyan"
13+"comment" = "red-faint"
14+"variable.parameter" = "cyan-cooler"
15+"keyword" = "red-cooler"
16+"keyword.directive" = "red-warmer"
17+"function" = "cyan-warmer"
18+"function.macro" = "magenta"
19+"tag" = "red-cooler"
20+
21+"markup.heading.2" = { fg = "red-faint", modifiers = ["bold"] }
22+"markup.heading.3" = { fg = "cyan-faint", modifiers = ["bold"] }
23+"markup.heading.6" = { fg = "magenta-faint", modifiers = ["bold"] }
24+"markup.link.url" = { fg = "cyan-cooler" }
25+"markup.link.text" = { fg = "cyan", modifiers = ["underlined"] }
26+
27+"ui.cursor" = { fg = "bg-main", bg = "red-intense" }
28+"ui.cursor.primary.normal" = { fg = "bg-main", bg = "red-intense" }
29+
30+"diagnostic.error" = { underline = { color = "red-warmer", style = "curl" } }
31+"diagnostic.warning" = { underline = { color = "magenta", style = "curl" } }
32+"diagnostic.info" = { underline = { color = "cyan", style = "curl" } }
33+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
34+
35+error = "red-warmer"
36+warning = "magenta"
37+info = "cyan"
38+hint = "blue"
39+
40+[palette]
41+# Basic values
42+bg-main = "#000000"
43+bg-dim = "#1e1e1e"
44+fg-main = "#ffffff"
45+fg-dim = "#989898"
46+fg-alt = "#c6daff"
47+bg-active = "#535353"
48+bg-inactive = "#303030"
49+border = "#646464"
50+
51+# Common accent foregrounds
52+red = "#ff5f59"
53+red-warmer = "#ff6740"
54+red-cooler = "#ff6f9f"
55+red-faint = "#ff9070"
56+red-intense = "#ff5f5f"
57+green = "#44bc44"
58+green-warmer = "#70b900"
59+green-cooler = "#00c06f"
60+green-faint = "#88ca9f"
61+green-intense = "#44df44"
62+yellow = "#cabf00"
63+yellow-warmer = "#ffa00f"
64+yellow-cooler = "#d8af7a"
65+yellow-faint = "#d2b580"
66+yellow-intense = "#efef00"
67+blue = "#2fafff"
68+blue-warmer = "#79a8ff"
69+blue-cooler = "#00bcff"
70+blue-faint = "#82b0ec"
71+blue-intense = "#338fff"
72+magenta = "#feacd0"
73+magenta-warmer = "#f78fe7"
74+magenta-cooler = "#b6a0ff"
75+magenta-faint = "#caa6df"
76+magenta-intense = "#ef7fff"
77+cyan = "#00d3d0"
78+cyan-warmer = "#4ae2ff"
79+cyan-cooler = "#6ae4b9"
80+cyan-faint = "#7fdbdf"
81+cyan-intense = "#00eff0"
82+
83+# Uncommon accent foregrounds
84+rust = "#db7b5f"
85+gold = "#c0965b"
86+olive = "#9cbd6f"
87+slate = "#76afbf"
88+indigo = "#9099d9"
89+maroon = "#cf7fa7"
90+pink = "#d09dc0"
91+
92+# Common accent backgrounds
93+bg-red-intense = "#9d1f1f"
94+bg-green-intense = "#2f822f"
95+bg-yellow-intense = "#7a6100"
96+bg-blue-intense = "#1640b0"
97+bg-magenta-intense = "#7030af"
98+bg-cyan-intense = "#2266ae"
99+
100+bg-red-subtle = "#620f2a"
101+bg-green-subtle = "#00422a"
102+bg-yellow-subtle = "#4a4000"
103+bg-blue-subtle = "#242679"
104+bg-magenta-subtle = "#552f5f"
105+bg-cyan-subtle = "#004065"
106+
107+bg-red-nuanced = "#2c0614"
108+bg-green-nuanced = "#001904"
109+bg-yellow-nuanced = "#221000"
110+bg-blue-nuanced = "#0f0e39"
111+bg-magenta-nuanced = "#230631"
112+bg-cyan-nuanced = "#041529"
113+
114+# Uncommon accent backgrounds
115+bg-ochre = "#442c2f"
116+bg-lavender = "#38325c"
117+bg-sage = "#0f3d30"
118+
119+# Graphs
120+bg-graph-red-0 = "#b52c2c"
121+bg-graph-red-1 = "#702020"
122+bg-graph-green-0 = "#afd1c0"
123+bg-graph-green-1 = "#607a8f"
124+bg-graph-yellow-0 = "#facfd6"
125+bg-graph-yellow-1 = "#b57b85"
126+bg-graph-blue-0 = "#4f9fdf"
127+bg-graph-blue-1 = "#004559"
128+bg-graph-magenta-0 = "#b6427f"
129+bg-graph-magenta-1 = "#7f506f"
130+bg-graph-cyan-0 = "#57dfea"
131+bg-graph-cyan-1 = "#00808f"
132+
133+# Special purpose
134+bg-completion = "#004253"
135+bg-hover = "#8e3e3b"
136+bg-hover-secondary = "#00405f"
137+bg-hl-line = "#2f3849"
138+bg-region = "#5a5a5a"
139+fg-region = "#ffffff"
140+
141+bg-char-0 = "#922a00"
142+bg-char-1 = "#00709f"
143+bg-char-2 = "#5f3faf"
144+
145+bg-mode-line-active = "#003c52"
146+fg-mode-line-active = "#f0f0f0"
147+border-mode-line-active = "#5f8fb4"
148+bg-mode-line-inactive = "#2d2d2d"
149+fg-mode-line-inactive = "#969696"
150+border-mode-line-inactive = "#606060"
151+
152+modeline-err = "#ff7fbf"
153+modeline-warning = "#df9f93"
154+modeline-info = "#4fcfef"
155+
156+bg-tab-bar = "#313131"
157+bg-tab-current = "#000000"
158+bg-tab-other = "#545454"
159+
160+# Diffs
161+bg-added = "#004254"
162+bg-added-faint = "#003042"
163+bg-added-refine = "#004f7f"
164+bg-added-fringe = "#008fcf"
165+fg-added = "#9fdfdf"
166+fg-added-intense = "#50c0ef"
167+
168+bg-changed = "#2f123f"
169+bg-changed-faint = "#1f022f"
170+bg-changed-refine = "#3f325f"
171+bg-changed-fringe = "#7f55a0"
172+fg-changed = "#e3cfff"
173+fg-changed-intense = "#cf9fe2"
174+
175+bg-removed = "#4f1119"
176+bg-removed-faint = "#380a0f"
177+bg-removed-refine = "#781a1f"
178+bg-removed-fringe = "#b81a1f"
179+fg-removed = "#ffbfbf"
180+fg-removed-intense = "#ff9095"
181+
182+bg-diff-context = "#1a1a1a"
183+
184+# Paren match
185+bg-paren-match = "#2f7f9f"
186+bg-paren-expression = "#453040"
runtime/themes/naysayer.toml+2−2
@@ -20,13 +20,13 @@
2020"ui.help" = { fg = "text", bg = "bg" }
2121"ui.popup" = { fg = "text", bg = "bg" }
2222"ui.menu" = { fg = "text", bg = "bg" }
23−"ui.menu.selected" = { fg = "text", bg = "bg" }
23+"ui.menu.selected" = { fg = "text", bg = "bg", modifiers = ['underlined'] }
2424"ui.window" = { bg = "bg" }
2525"diagnostic.error" = { bg = "error", fg = "text", modifiers = ["bold"] }
2626"diagnostic.warning" = { bg = "warning", fg = "text", modifiers = ["bold"] }
2727"diagnostic.hint" = { bg = "cyan", modifiers = ["bold"] }
2828"ui.bufferline" = { fg = "text", bg = "bg" }
29−"ui.bufferline.active" = { fg = "text", bg = "bg" }
29+"ui.bufferline.active" = { fg = "text", bg = "bg", modifiers = ['underlined'] }
3030"ui.gutter.selected" = { bg = "highlight-line", modifiers = ["bold"] }
3131"ui.highlight" = { bg = "highlight-line" }
3232
runtime/themes/noctis.toml+25−25
@@ -7,8 +7,8 @@
77
88'property' = { fg = "red" } # Regex group names.
99"warning" = { fg ="yellow", modifiers = ["bold"] } # Editor warnings.
10−"error" = { bg = "mid-green", fg = "red", modifiers = ["bold"] } # Editor errors, like mis-typing a command.
11−"info" = { fg = "mid-blue", bg = "mid-green" } # Code diagnostic info in gutter (LSP).
10+"error" = { fg = "red", modifiers = ["bold"] } # Editor errors, like mis-typing a command.
11+"info" = { fg = "mid-blue" } # Code diagnostic info in gutter (LSP).
1212# ? Difference between info and hint ?
1313"hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP).
1414
@@ -21,14 +21,14 @@
2121# UI ==============================
2222# For styling helix itself.
2323
24−'ui.background' = { bg = "dark-green"} # Default background color.
24+'ui.background' = { fg = "autocomp-green", bg = "dark-green" } # Default background color.
2525'ui.window' = { fg = "mid-green" } # Window border between splits.
2626
2727'ui.gutter' = { } # Left gutter for diagnostics and breakpoints.
2828
2929'ui.text' = { fg = "white" } # Default text color.
3030'ui.text.focus' = { fg = "white", bg = "mid-green", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker.
31−'ui.text.info' = { } # Info popup contents (space mode menu).
31+'ui.text.info' = { fg = "white" } # Info popup contents (space mode menu).
3232
3333'ui.cursor' = { fg = "dark-green", bg = "white" } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c).
3434'ui.cursor.primary' = { fg = "dark-green", bg = "light-blue" } # The primary cursor when there are multiple (shift-c).
@@ -40,8 +40,8 @@
4040'ui.selection.primary' = { bg = "autocomp-green" } # The primary selection when there are multiple.
4141'ui.cursorline.primary' = { bg = 'mid-green' }
4242
43−'ui.linenr' = { bg = "dark-green", fg = "gray" } # Line numbers.
44−'ui.linenr.selected' = { bg = "mid-green", fg = "light-green", modifiers = [ "bold" ] } # Current line number.
43+'ui.linenr' = { fg = "gray" } # Line numbers.
44+'ui.linenr.selected' = { fg = "light-green", modifiers = [ "bold" ] } # Current line number.
4545
4646'ui.virtual' = { fg = "mid-green" } # Namespace for additions to the editing area.
4747'ui.virtual.ruler' = { bg = "mid-green" } # Vertical rulers (colored columns in editing area).
@@ -75,9 +75,9 @@
7575#'type.builtin' = { } # Primitive types of the language (string, int, float).
7676#'type.enum.variant' = { } # A variant of an enum.
7777
78−'constructor' = { fg = "mid-blue", modifiers = ["bold"]} # Constructor method for a class or struct. And in some cases applies to module names
78+'constructor' = { fg = "light-blue", modifiers = ["bold"]} # Constructor method for a class or struct. And in some cases applies to module names
7979
80−'constant' = { fg = "light-blue" } # Constant value
80+'constant' = { fg = "light-blue", modifiers = ["bold"] } # Constant value
8181'constant.builtin' = { fg = "mid-blue", modifiers = ["bold"] } # Special constants like `true`, `false`, `none`, etc.
8282'constant.builtin.boolean' = { } # True or False.
8383'constant.character' = { fg = "light-green"} # Constant of character type.
@@ -88,21 +88,20 @@
8888
8989'string' = { fg = "light-green" } # String literal.
9090'string.regexp' = { } # Regular expression literal.
91−'string.special' = { fg = "light-blue" } # Strings containing a path, URL, etc.
92−'string.special.path' = { } # String containing a file path.
93−'string.special.url' = { } # String containing a web URL.
94−'string.special.symbol' = { } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords.
91+'string.special' = { fg = "red" } # Strings containing a path, URL, etc.
92+# 'string.special.path' = { } # String containing a file path.
93+# 'string.special.url' = { } # String containing a web URL.
94+# 'string.special.symbol' = { } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords.
9595
9696'comment' = { fg = "gray", modifiers = ["italic"] } # This is a comment.
9797'comment.line' = { } # Line comments, like this.
9898'comment.block' = { } # Block comments, like /* this */ in some languages.
9999'comment.block.documentation' = { } # Doc comments, e.g '///' in rust.
100100
101−'variable' = { fg = "white" } # Variable names.
102−'variable.builtin' = { } # Language reserved variables: `this`, `self`, `super`, etc.
103−'variable.parameter' = { } # Function parameters.
104−'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions).
105−'variable.function' = { } # ?
101+'variable' = { fg = "light-orange" } # Variable names.
102+# 'variable.builtin' = { } # Language reserved variables: `this`, `self`, `super`, etc.
103+# 'variable.parameter' = { } # Function parameters.
104+'variable.other.member' = { fg = "orange" } # Fields of composite data types (e.g. structs, unions).
106105
107106'label' = { fg = "purple" } # Loop labels in rust.
108107
@@ -113,17 +112,17 @@
113112'keyword' = { fg = "pink", modifiers = ["bold"] } # Language reserved keywords.
114113'keyword.control' = { fg = "pink", modifiers = ["bold"] } # Control keywords.
115114'keyword.control.conditional' = { fg = "pink", modifiers = ["bold"] } # 'if', 'else', 'elif'.
116−'keyword.control.repeat' = { } # 'for', 'while', 'loop'.
115+# 'keyword.control.repeat' = { } # 'for', 'while', 'loop'.
117116'keyword.control.import' = { fg = "pink", modifiers = ["italic"] } # 'import', 'export' ('use'?).
118−'keyword.control.return' = { } # 'return' in most languages.
117+# 'keyword.control.return' = { } # 'return' in most languages.
119118'keyword.control.exception' = {fg = "pink", modifiers = ["bold"] } # 'raise' in python.
120−'keyword.operator' = { } # 'or', 'and', 'in'.
119+'keyword.operator' = { fg = "pink" } # 'or', 'and', 'in'.
121120'keyword.directive' = { fg = "purple" } # Preprocessor directives (#if in C).
122−'keyword.function' = { } # The keyword to define a function: 'def', 'fun', 'fn'.
121+'keyword.function' = { fg= "red" } # The keyword to define a function: 'def', 'fun', 'fn'.
123122
124123'operator' = { fg = "pink", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators
125124
126−'function' = { fg = "dark-blue"}
125+'function' = { fg = "mid-blue"}
127126'function.builtin' = { fg = "dark-blue" }
128127'function.method' = { fg = "dark-blue" } # Class / Struct methods.
129128'function.macro' = { fg = "purple" } # Like macros in rust.
@@ -181,8 +180,8 @@
181180# Version control changes.
182181
183182'diff.plus' = "light-green" # { } # Additions.
184−'diff.minus' = "yellow" # { } # Deletions.
185−'diff.delta' = "red" # { } # Modifications.
183+'diff.minus' = "red" # { } # Deletions.
184+'diff.delta' = "yellow" # { } # Modifications.
186185# 'diff.delta.moved' = { } # Renamed or moved files / changes.
187186
188187
@@ -197,8 +196,9 @@ yellow = "#ffd800"
197196purple = "#918cff"
198197white = "#b1cace"
199198orange = "#ffa864"
199+light-orange = "#fff2c5"
200200gray = "#5b858b" # mainly for comments/background text
201−light-gray = "#354e51" # used when whitespace rendering is enabled and for indent-guides
201+light-gray = "#2a3c41" # used when whitespace rendering is enabled and for indent-guides
202202red = "#e34e1b"
203203
204204dark-blue = "#19a2b7"
runtime/themes/nord-night.tomlnew file+23
@@ -0,0 +1,23 @@
1+# Nord Night
2+#
3+# Based on the Nord theme, with minor modifications.
4+# The Background and the Primary Text color have been slightly darkened.
5+# The Aurora color palette has been used more generously.
6+
7+inherits = 'nord'
8+
9+'constant' = 'nord13'
10+'constant.builtin.boolean' = 'nord13'
11+'constant.numeric' = 'nord13'
12+
13+'keyword.control' = 'nord11'
14+'keyword.control.conditional' = 'nord11'
15+'keyword.control.exception' = 'nord11'
16+'keyword.control.repeat' = 'nord11'
17+'keyword.control.return' = 'nord11'
18+
19+'variable.parameter' = 'nord15'
20+
21+[palette]
22+nord0 = '#252933'
23+nord4 = '#C0C5CF'
runtime/themes/nord.toml+9
@@ -134,6 +134,15 @@
134134"ui.bufferline" = { fg = "nord5", bg = "nord1" }
135135"ui.bufferline.active" = { fg = "nord6", bg = "nord2", underline = { color = "nord8", style = "line" }, modifiers = [ "italic" ] }
136136
137+# Markup
138+"markup.heading" = "nord8"
139+"markup.list" = "nord9"
140+"markup.bold" = { modifiers = ["bold"] }
141+"markup.italic" = { modifiers = ["italic"] }
142+"markup.strikethrough" = { modifiers = ["crossed_out"] }
143+"markup.link.text" = "nord8"
144+"markup.raw" = "nord7"
145+
137146[palette]
138147# Polar Night is made up of four darker colors that are commonly used for base elements like backgrounds or text color in bright ambiance designs.
139148#
runtime/themes/papercolor-light.toml+4
@@ -26,6 +26,9 @@
2626"ui.virtual.whitespace" = { fg = "regular5" }
2727"ui.virtual.indent-guide" = { fg = "bright0" }
2828"ui.virtual.ruler" = { bg = "cursorline_secondary_bg", fg = "regular4" }
29+"ui.virtual.inlay-hint" = { fg = "regular5", modifiers = ["italic"] }
30+"ui.virtual.inlay-hint.parameter" = { fg = "regular5", modifiers = ["italic"] }
31+"ui.virtual.inlay-hint.type" = { fg = "regular5", modifiers = ["bold", "italic"] }
2932"ui.cursor.match" = { bg = "matchparen_bg", fg = "matchparen_fg" }
3033"ui.cursor" = { bg = "regular5", fg = "background" }
3134"ui.cursor.primary" = { bg = "foreground", fg = "background" }
@@ -52,6 +55,7 @@
5255
5356"type" = { fg = "bright2", modifiers = ["bold"] }
5457"type.builtin" = { fg = "bright2", modifiers = ["bold"] }
58+"type.parameter" = { fg = "foreground" }
5559"type.enum" = { fg = "foreground" }
5660"type.enum.variant" = { fg = "foreground" }
5761
runtime/themes/poimandres.tomlnew file+113
@@ -0,0 +1,113 @@
1+# Author: Ambuj Kumar <ambujs89@gmail.com>
2+# Ported from: https://github.com/drcmda/poimandres-theme
3+
4+attribute = { fg = "desaturatedBlue", modifiers = ["italic"] }
5+keyword = "brightMint"
6+"keyword.directive" = "gray"
7+"keyword.storage.type" = "desaturatedBlue"
8+"keyword.storage.modifier" = "lowerMint"
9+"keyword.other" = "brightMint"
10+"keyword.operator" = "desaturatedBlue"
11+namespace = "lightBlue"
12+punctuation = "gray"
13+"punctuation.bracket" = "desaturatedBlue"
14+operator = "desaturatedBlue"
15+special = "desaturatedBlue"
16+variable = "offWhite"
17+"variable.parameter" = { fg = "offWhite" }
18+"variable.builtin" = { fg = "lightBlue", modifiers = ["italic"] }
19+"variable.other" = "offWhite"
20+type = { fg = "gray.c0" }
21+"type.builtin" = { fg = "desaturatedBlue" }
22+constructor = "lightBlue"
23+function = "lightBlue"
24+"function.method" = { fg = "lightBlue" }
25+tag = "brightMint"
26+comment = { fg = "darkerGray.b0", modifiers = ["italic"] }
27+constant = "brightMint"
28+"constant.character.escape" = { fg = "offWhite" }
29+"constant.numeric" = { fg = "brightMint" }
30+"constant.builtin" = { fg = "hotRed" }
31+label = { fg = "gray.c0" }
32+string = { fg = "brightMint" }
33+
34+# Markup
35+"markup.heading" = { fg = "brightMint" }
36+"markup.bold" = { fg = "bluishGrayBrighter", modifiers = ["bold"] }
37+"markup.italic" = { fg = "bluishGrayBrighter", modifiers = ["italic"] }
38+"markup.strikethrough" = { modifiers = ["italic", "crossed_out"] }
39+
40+# UI
41+"markup.link.url" = { fg = "lightBlue", modifiers = ["underlined"] }
42+"markup.link.text" = { fg = "lightBlue", modifiers = ["underlined"] }
43+"markup.raw" = { fg = "lightBlue" }
44+
45+"ui.background" = { bg = "bg" }
46+"ui.background.separator" = { fg = "darkerGray" }
47+"ui.linenr" = "darkerGray.50"
48+"ui.linenr.selected" = "offWhite"
49+"ui.cursor" = { bg = "gray", fg = "bg" }
50+"ui.cursor.match" = { bg = "focus" }
51+"ui.cursorline" = { bg = "#242837" }
52+
53+"ui.popup" = { bg = "#20232d" }
54+"ui.window" = "gray"
55+
56+"ui.text" = "gray"
57+"ui.text.focus" = { fg = "offWhite", bg = "focus", modifiers = ["bold"] }
58+"ui.text.inactive" = "darkerGray"
59+"ui.virtual" = { fg = "darkerGray.b0" }
60+"ui.virtual.indent-guide" = "#303442"
61+
62+"ui.selection" = { bg = "focus" }
63+"ui.selection.primary" = { bg = "selection" }
64+
65+"ui.menu" = { fg = "offWhite", bg = "bg" }
66+"ui.menu.selected" = { fg = "bg", bg = "gray" }
67+"ui.menu.scroll" = { fg = "gray", bg = "bg" }
68+
69+"ui.statusline" = { fg = "offWhite", bg = "selection" }
70+"ui.statusline.inactive" = { fg = "lightBlue", bg = "bg" }
71+"ui.statusline.normal" = { bg = "lightBlue", fg = "bg", modifiers = ["bold"] }
72+"ui.statusline.insert" = { bg = "brightMint", fg = "bg", modifiers = ["bold"] }
73+"ui.statusline.select" = { bg = "hotRed", fg = "bg", modifiers = ["bold"] }
74+
75+"diagnostic.hint" = { underline = { color = "lowerMint", style = "curl" } }
76+"diagnostic.info" = { underline = { color = "lightBlue", style = "curl" } }
77+"diagnostic.warning" = { underline = { color = "brightYellow", style = "curl" } }
78+"diagnostic.error" = { underline = { color = "hotRed", style = "curl" } }
79+
80+hint = "lowerMint"
81+info = "lightBlue"
82+warning = "brightYellow"
83+error = "hotRed"
84+
85+# Version Control
86+"diff.plus" = "lowerMint"
87+"diff.minus" = "hotRed"
88+"diff.delta" = "lightBlue"
89+
90+[palette]
91+brightYellow = "#fffac2"
92+brightMint = "#5DE4c7"
93+lowerMint = "#5fb3a1"
94+blueishGreen = "#42675A"
95+lowerBlue = "#89ddff"
96+lightBlue = "#ADD7FF"
97+desaturatedBlue = "#91B4D5"
98+bluishGrayBrighter = "#7390AA"
99+hotRed = "#d0679d"
100+pink = "#f087bd"
101+gray = "#a6accd"
102+"gray.c0" = "#98a0c2"
103+darkerGray = "#767c9d"
104+"darkerGray.50" = "#404559"
105+"darkerGray.b0" = "#6c7494"
106+bluishGray = "#506477"
107+focus = "#303340"
108+bg = "#1b1e28"
109+offWhite = "#e4f0fb"
110+selection = "#30354a"
111+white = "#ffffff"
112+black = "#000000"
113+transparent = "#00000000"
runtime/themes/poimandres_storm.tomlnew file+19
@@ -0,0 +1,19 @@
1+# Author: Ambuj Kumar <ambujs89@gmail.com>
2+# Ported from: https://github.com/drcmda/poimandres-theme
3+
4+inherits = "poimandres"
5+
6+"ui.cursorline" = { bg = "#303747" }
7+"ui.popup" = { bg = "#2a303c" }
8+"ui.virtual.indent-guide" = "#3a4151"
9+
10+[palette]
11+"gray.c0" = "#98a2c4"
12+darkerGray = "#868cad"
13+"darkerGray.50" = "#4f576d"
14+"darkerGray.b0" = "#818cae"
15+bluishGray = "#607487"
16+focus = "#404350"
17+bg = "#252b37"
18+selection = "#3d455c"
19+black = "#101010"
runtime/themes/rose_pine.toml+30−28
@@ -10,7 +10,7 @@
1010"ui.cursor" = { fg = "text", bg = "highlight_high" }
1111# "ui.cursor.select" = {}
1212"ui.cursor.match" = { fg = "text", bg = "highlight_med" }
13−"ui.cursor.primary" = { fg = "text", bg = "muted"}
13+"ui.cursor.primary" = { fg = "text", bg = "muted" }
1414
1515# "ui.gutter" = {}
1616# "ui.gutter.selected" = {}
@@ -18,6 +18,8 @@
1818"ui.linenr" = { fg = "muted" }
1919"ui.linenr.selected" = { fg = "text" }
2020
21+"ui.bufferline" = { fg = "muted", bg = "base" }
22+"ui.bufferline.active" = { fg = "text", bg = "overlay" }
2123"ui.statusline" = { fg = "subtle", bg = "surface" }
2224"ui.statusline.inactive" = { fg = "muted", bg = "surface" }
2325"ui.statusline.normal" = { fg = "rose", bg = "rose_10" }
@@ -71,8 +73,8 @@
7173"constructor" = "foam"
7274
7375"constant" = "foam"
74−"constant.builtin" = "rose"
75−# "constant.builtin.boolean" = ""
76+"constant.builtin" = "love"
77+"constant.builtin.boolean" = "rose"
7678"constant.character" = "gold"
7779"constant.character.escape" = "pine"
7880"constant.numeric" = "gold"
@@ -86,7 +88,7 @@
8688# "string.special.url" = ""
8789# "string.special.symbol" = ""
8890
89−"comment" = { fg = "muted", modifiers = ["italic"]}
91+"comment" = { fg = "muted", modifiers = ["italic"] }
9092# "comment.line" = ""
9193# "comment.block" = ""
9294# "comment.block.documentation" = ""
@@ -95,7 +97,7 @@
9597"variable.builtin" = "love"
9698"variable.parameter" = "iris"
9799# "variable.other" = ""
98−# "variable.other.member" = ""
100+"variable.other.member" = "foam"
99101
100102"label" = "foam"
101103
@@ -120,7 +122,7 @@
120122
121123"operator" = "subtle"
122124
123−"function" = "rose" # maybe pine
125+"function" = "rose" # maybe pine
124126"function.builtin" = "love"
125127# "function.method" = ""
126128# "function.macro" = ""
@@ -128,7 +130,7 @@
128130
129131"tag" = "foam"
130132
131−"namespace" = "iris"
133+"namespace" = "text"
132134
133135"markup.heading.marker" = "muted"
134136"markup.heading" = { fg = "iris", modifiers = ["bold"] }
@@ -147,7 +149,7 @@
147149"markup.italic" = { modifiers = ["italic"] }
148150"markup.strikethrough" = { modifiers = ["crossed_out"] }
149151"markup.link" = "iris"
150−"markup.link.url" = { fg = "iris", underline = { color = "iris", style = "line" } }
152+"markup.link.url" = { fg = "iris", underline = { color = "iris", style = "line" } }
151153"markup.link.label" = "subtle"
152154"markup.link.text" = "text"
153155"markup.quote" = "subtle"
@@ -167,24 +169,24 @@
167169# "diff.delta.moved" = ""
168170
169171[palette]
170−base = "#191724"
171−surface = "#1f1d2e"
172−overlay = "#26233a"
173−muted = "#6e6a86"
174−subtle = "#908caa"
175−text = "#e0def4"
176−love = "#eb6f92"
177−love_10 = "#311f30"
178−gold = "#f6c177"
179−gold_10 = "#30282c"
180−rose = "#ebbcba"
181−rose_10 = "#2f2834"
182−pine = "#31748f"
183−pine_10 = "#1a2030"
184−foam = "#9ccfd8"
185−foam_10 = "#252937"
186−iris = "#c4a7e7"
187−iris_10 = "#2b2539"
188−highlight_low = "#21202e"
189−highlight_med = "#403d52"
172+base = "#191724"
173+surface = "#1f1d2e"
174+overlay = "#26233a"
175+muted = "#6e6a86"
176+subtle = "#908caa"
177+text = "#e0def4"
178+love = "#eb6f92"
179+love_10 = "#311f30"
180+gold = "#f6c177"
181+gold_10 = "#30282c"
182+rose = "#ebbcba"
183+rose_10 = "#2f2834"
184+pine = "#31748f"
185+pine_10 = "#1a2030"
186+foam = "#9ccfd8"
187+foam_10 = "#252937"
188+iris = "#c4a7e7"
189+iris_10 = "#2b2539"
190+highlight_low = "#21202e"
191+highlight_med = "#403d52"
190192highlight_high = "#524f67"
runtime/themes/starlight.tomlnew file+113
@@ -0,0 +1,113 @@
1+# Author : eemilhaa <eemil.haapanen@gmail.com>
2+# Palette from : https://github.com/CosmicToast/starlight
3+
4+# Syntax
5+"function" = "green"
6+"constructor" = "green"
7+
8+"type" = "cyan"
9+"string.special" = "cyan"
10+"string.regexp" = "cyan"
11+"constant" = "cyan"
12+"punctuation.special" = "cyan"
13+
14+"namespace" = "white"
15+"module" = "white"
16+"variable" = "white"
17+
18+"attribute" = "magenta"
19+"variable.parameter" = "magenta"
20+"variable.other.member" = "magenta"
21+"type.parameter" = "magenta"
22+
23+"keyword" = "blue"
24+"variable.builtin" = "blue"
25+"label" = "blue"
26+"tag" = "blue"
27+"operator" = "blue"
28+"special" = "blue"
29+
30+"string" = "yellow"
31+
32+"punctuation" = "punct"
33+
34+"comment" = "dark-fg"
35+
36+# Markup
37+"markup.heading.marker" = { fg = "blue", modifiers = ["bold"] }
38+"markup.heading" = { fg = "white", modifiers = ["bold"] }
39+"markup.list" = "blue"
40+"markup.bold" = { fg = "magenta", modifiers = ["bold"] }
41+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
42+"markup.strikethrough" = "red"
43+"markup.link" = "cyan"
44+"markup.link.text" = "yellow"
45+"markup.quote" = "magenta"
46+"markup.raw" = "green"
47+
48+# UI
49+"diff.plus" = "green"
50+"diff.minus" = "red"
51+"diff.delta" = "blue"
52+
53+"ui.background" = { fg = "dark-fg", bg = "dark-bg" }
54+"ui.cursor" = { fg = "black", bg = "light-fg" }
55+"ui.cursor.primary" = { fg = "black", bg = "yellow" }
56+"ui.cursor.match" = { fg = "black", bg = "dark-blue", modifiers = ["bold"] }
57+"ui.linenr" = "dark-fg"
58+"ui.linenr.selected" = "yellow"
59+"ui.statusline" = { fg = "light-fg", bg = "light-bg" }
60+"ui.statusline.inactive" = { fg = "dark-fg", bg = "light-bg" }
61+"ui.statusline.insert" = { fg = "black", bg = "green" }
62+"ui.statusline.select" = { fg = "black", bg = "magenta" }
63+"ui.statusline.normal" = { fg = "black", bg = "blue" }
64+"ui.popup" = { fg = "dark-fg", bg = "light-bg" }
65+"ui.window" = { fg = "light-bg", bg = "dark-bg" }
66+"ui.help" = { fg = "light-fg", bg = "light-bg" }
67+"ui.text" = "light-fg"
68+"ui.text.focus" = { fg = "white", bg = "light-bg", modifiers = ["bold"] }
69+"ui.virtual" = "dark-fg"
70+"ui.virtual.ruler" = { bg = "medium-bg" }
71+"ui.virtual.indent-guide" = "indent"
72+"ui.virtual.whitespace" = "indent"
73+"ui.menu" = { fg = "light-fg", bg = "light-bg" }
74+"ui.menu.selected" = { fg = "white", bg = "dark-fg", modifiers = ["bold"] }
75+"ui.selection" = { fg = "light-fg", bg = "dark-fg" }
76+"ui.selection.primary" = { fg = "white", bg = "dark-blue" }
77+"ui.highlight" = { bg = "light-bg" }
78+"ui.cursorline.primary" = { bg = "black" }
79+"ui.cursorcolumn.primary" = { bg = "black" }
80+"ui.bufferline.background" = { bg = "dark-bg" }
81+"ui.bufferline" = { fg = "light-fg", bg = "light-bg" }
82+"ui.bufferline.active" = { fg = "white", bg = "dark-fg" }
83+
84+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
85+"diagnostic.warning" = { underline = { color = "yellow", style = "curl" } }
86+"diagnostic.info" = { underline = { color = "blue", style = "curl" } }
87+"diagnostic.hint" = { underline = { color = "blue", style = "curl" } }
88+
89+"info" = "blue"
90+"hint" = "blue"
91+"warning" = "yellow"
92+"error" = "red"
93+
94+[palette]
95+# Colors
96+red = "#FF4D51"
97+green = "#35D450"
98+yellow = "#E9E836"
99+blue = "#5DC5F8"
100+dark-blue = "#24ACD4"
101+magenta = "#FEABF2"
102+cyan = "#24DFC4"
103+white = "#ffffff"
104+punct = "#C9C9C9"
105+
106+# Grays
107+black = "#1e1e1e"
108+dark-bg = "#242424"
109+medium-bg = "#2D2D2D"
110+light-bg = "#353535"
111+indent = "#616161"
112+dark-fg = "#929292"
113+light-fg = "#E6E6E6"
runtime/tutor+157−3
@@ -794,11 +794,11 @@ lines.
794794= 7.3 INDENTING LINES =
795795=================================================================
796796
797− Type > to indent a line and < to outdent it.
797+ Type > to indent a line and < to unindent it.
798798
799799 1. Move the cursor to the line marked '-->' below.
800800 2. Move down to the second line and type > to indent it.
801− 3. Move to the third line and type < to outdent it.
801+ 3. Move to the third line and type < to unindent it.
802802
803803 --> These lines
804804 are indented
@@ -842,7 +842,7 @@ lines.
842842
843843 * Type J to join lines in selection.
844844
845− * Type < and > to indent / outdent lines.
845+ * Type > and < to indent / unindent lines.
846846
847847 * Press Ctrl-a to increment the selected number.
848848 * Press Ctrl-x to decrement the selected number.
@@ -1186,6 +1186,160 @@ multiple cursors, they won't be uncommented but commented again.
11861186
11871187
11881188
1189+=================================================================
1190+= 12.1 USING MATCH MODE JUMP =
1191+=================================================================
1192+
1193+To switch to match mode from normal mode, type m. This feature
1194+is particularly useful for handling bracket pairs and their
1195+contents.
1196+
1197+There are several actions that can be performed in match mode,
1198+as indicated by the help pop-up. To jump to a matching bracket pair,
1199+simply press mm. For example on the lines below (starting with
1200+-->), move the cursor in normal mode to (, and then press mm to jump
1201+to the matching ). You can do the same on the line below: for example
1202+move to ], and press mm to jump to [ .
1203+
1204+--> you can (jump between matching parenthesis)
1205+--> or between matching [ square brackets ]
1206+--> now { you know the drill: this works with brackets too }
1207+
1208+
1209+
1210+
1211+=================================================================
1212+= 12.2 USING MATCH MODE SELECT INSIDE =
1213+=================================================================
1214+
1215+Match mode also lets you select the "inside" content between a
1216+pair of brackets or other delimiters. In the lines below:
1217+
1218+- move to the --> line, put your cursor in normal mode at any
1219+location between the parenthesis, for example at 'x', and press
1220+mi( or mi) to select the whole content inside the parenthesis
1221+(parenthesis excluded). As usual, you can then do anything you want
1222+with the selection (for example, press c to change it)
1223+
1224+--> outside and (inside x parenthesis) - and outside again
1225+
1226+Test below that you can do the same with [], or {}, or with
1227+nested combinations of these (this will act on the immediately
1228+surrounding matching pair). This also works with "" and similar
1229+
1230+--> test [ with square brackets ] !
1231+--> try ( with nested [ pairs of ( parenthesis) and "brackets" ])
1232+
1233+=================================================================
1234+= 12.3 USING MATCH MODE SELECT AROUND =
1235+=================================================================
1236+
1237+You can also select the "around" content, i.e. both the inside
1238+content and the delimiters themselves, by using the ma select.
1239+For example, move to the line under, move your cursor in normal
1240+mode to any position between the (), and select the content of
1241+the (), including the surrounding (), by typing ma( or ma). As
1242+usual, you can do anything you want with the selection, for
1243+example delete it all with ma(d .
1244+
1245+--> you ( select x around ) to include delimiters in the select
1246+
1247+This naturally works with other delimiters too:
1248+
1249+--> try [ with 'square' brackets ] too!
1250+
1251+
1252+
1253+
1254+
1255+=================================================================
1256+= 12.4 USING MATCH MODE SURROUND =
1257+=================================================================
1258+
1259+The match mode can also be used to add surrounding around the
1260+current selection. For example, move to the line below, then:
1261+ * i) select the "select all of this" line segment (for example,
1262+move in normal mode the cursor to the start of select, then enter
1263+selection mode with v , then select the 4 next words with 4e ),
1264+ * ii) press ms( or ms) to surround the selection with a pair of
1265+parenthesis.
1266+
1267+--> so, select all of this, and surround it with ()
1268+
1269+You can do the same with other delimiters: for example, ms' on
1270+WORD below to surround it with a pair of ''. You can try also
1271+with adding a surrounding pair of "", or {}, or [].
1272+
1273+--> surround this WORD !
1274+
1275+
1276+
1277+=================================================================
1278+= 12.5 USING MATCH MODE DELETE SURROUND =
1279+=================================================================
1280+
1281+You can delete surrounding pair of delimiters with the md
1282+command. On the line below, move the cursor anywhere
1283+within the pair of (), for example to the 'x', then from there,
1284+in normal mode, press md( or md) to delete the surrounding
1285+pair of parenthesis.
1286+
1287+--> delete (the x pair of parenthesis) from within!
1288+
1289+You can naturally delete other kinds of surroundings:
1290+
1291+--> delete (nested [delimiters]): "this" will delete the nearest
1292+matching surrounding pair.
1293+--> delete "layers "of" quote marks" too: this will delete the
1294+nearest previous and following quote marks
1295+
1296+Trying to delete unexisting surrounding delimiters print an error
1297+at the bottom bar and does nothing.
1298+
1299+=================================================================
1300+= 12.6 USING MATCH MODE REPLACE SURROUND =
1301+=================================================================
1302+
1303+You can replace surrounding pairs of delimiters with the mr
1304+command. On the line below, move the cursor to
1305+anywhere within the pair of (), for example on the 'x', then in
1306+normal mode, press mr([ to replace the pair of () with a pair
1307+of [].
1308+
1309+--> replace the (pair from x within), with something else
1310+
1311+This command will act on the closest enclosing pair, so you
1312+can try replacing different surrounding in the following:
1313+
1314+--> some (nested surroundings [can be replaced])
1315+--> this "works with 'other surroundings' too"
1316+
1317+You can try to replace a non existing pair: this will show
1318+an error warning at the bottom bar and do nothing.
1319+
1320+
1321+=================================================================
1322+= CHAPTER 12 RECAP =
1323+=================================================================
1324+
1325+You can enter the match mode with the m key; this will show the
1326+actions available in a popup. This will allow you to:
1327+ * jump to matching pair of delimiters with mm (you must have a
1328+ delimiter belonging to a pair under your cursor)
1329+ * select inside a pair of delimiters surrounding your cursor
1330+ (i.e. select the content but not the delimiters) with mi(
1331+ and similar
1332+ * select around a pair of delimiters surrounding your cursor
1333+ (i.e. select the content and the delimiters) with ma( and
1334+ similar
1335+ * delete surrounding delimiters with md( and similar
1336+ * add surrounding delimiters around the selection with ms(
1337+ * replace a pair of delimiters surrounding your selection with
1338+ mr([ to replace for example surrounding () with []
1339+
1340+
1341+
1342+
11891343=================================================================
11901344 This tutorial is still a work-in-progress.
11911345 More sections are planned.
rust-toolchain.toml+2−2
@@ -1,3 +1,3 @@
11[toolchain]
2−channel = "1.65.0"
3−components = ["rustfmt", "rust-src"]
2+channel = "1.70.0"
3+components = ["rustfmt", "rust-src", "clippy"]
xtask/Cargo.toml+12−6
@@ -1,13 +1,19 @@
11[package]
22name = "xtask"
3−version = "0.6.0"
4−edition = "2021"
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
511
612# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
713
814[dependencies]
9−helix-term = { version = "0.6", path = "../helix-term" }
10−helix-core = { version = "0.6", path = "../helix-core" }
11−helix-view = { version = "0.6", path = "../helix-view" }
12−helix-loader = { version = "0.6", path = "../helix-loader" }
15+helix-term = { path = "../helix-term" }
16+helix-core = { path = "../helix-core" }
17+helix-view = { path = "../helix-view" }
18+helix-loader = { path = "../helix-loader" }
1319toml = "0.7"