on master help sign in
.envrc+1
since splitsnapshots
unifiedsplit
@@ -1,5 +1,6 @@
1watch_file shell.nix
1watch_file shell.nix
2watch_file flake.lock
2watch_file flake.lock
3+watch_file rust-toolchain.toml
3
4
4# try to use flakes, if it fails use normal nix (ie. shell.nix)
5# try to use flakes, if it fails use normal nix (ie. shell.nix)
5use flake || use nix
6use flake || use nix
.github/ISSUE_TEMPLATE/bug_report.yaml+10
@@ -55,6 +55,16 @@ body:
55 placeholder: wezterm 20220101-133340-7edc5b5a
55 placeholder: wezterm 20220101-133340-7edc5b5a
56 validations:
56 validations:
57 required: true
57 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
58 - type: input
68 - type: input
59 id: helix-version
69 id: helix-version
60 attributes:
70 attributes:
.github/workflows/build.yml+15−7
@@ -14,7 +14,7 @@ jobs:
14 runs-on: ubuntu-latest
14 runs-on: ubuntu-latest
15 steps:
15 steps:
16 - name: Checkout sources
16 - name: Checkout sources
17− uses: actions/checkout@v3
17+ uses: actions/checkout@v4
18 - name: Install stable toolchain
18 - name: Install stable toolchain
19 uses: helix-editor/rust-toolchain@v1
19 uses: helix-editor/rust-toolchain@v1
20 with:
20 with:
@@ -22,6 +22,8 @@ jobs:
22 override: true
22 override: true
23
23
24 - uses: Swatinem/rust-cache@v2
24 - uses: Swatinem/rust-cache@v2
25+ with:
26+ shared-key: "build"
25
27
26 - name: Run cargo check
28 - name: Run cargo check
27 run: cargo check
29 run: cargo check
@@ -34,12 +36,14 @@ jobs:
34 HELIX_LOG_LEVEL: info
36 HELIX_LOG_LEVEL: info
35 steps:
37 steps:
36 - name: Checkout sources
38 - name: Checkout sources
37− uses: actions/checkout@v3
39+ uses: actions/checkout@v4
38
40
39 - name: Install stable toolchain
41 - name: Install stable toolchain
40− uses: dtolnay/rust-toolchain@1.65
42+ uses: dtolnay/rust-toolchain@1.70
41
43
42 - uses: Swatinem/rust-cache@v2
44 - uses: Swatinem/rust-cache@v2
45+ with:
46+ shared-key: "build"
43
47
44 - name: Cache test tree-sitter grammar
48 - name: Cache test tree-sitter grammar
45 uses: actions/cache@v3
49 uses: actions/cache@v3
@@ -63,14 +67,16 @@ jobs:
63 runs-on: ubuntu-latest
67 runs-on: ubuntu-latest
64 steps:
68 steps:
65 - name: Checkout sources
69 - name: Checkout sources
66− uses: actions/checkout@v3
70+ uses: actions/checkout@v4
67
71
68 - name: Install stable toolchain
72 - name: Install stable toolchain
69− uses: dtolnay/rust-toolchain@1.65
73+ uses: dtolnay/rust-toolchain@1.70
70 with:
74 with:
71 components: rustfmt, clippy
75 components: rustfmt, clippy
72
76
73 - uses: Swatinem/rust-cache@v2
77 - uses: Swatinem/rust-cache@v2
78+ with:
79+ shared-key: "build"
74
80
75 - name: Run cargo fmt
81 - name: Run cargo fmt
76 run: cargo fmt --all --check
82 run: cargo fmt --all --check
@@ -88,12 +94,14 @@ jobs:
88 runs-on: ubuntu-latest
94 runs-on: ubuntu-latest
89 steps:
95 steps:
90 - name: Checkout sources
96 - name: Checkout sources
91− uses: actions/checkout@v3
97+ uses: actions/checkout@v4
92
98
93 - name: Install stable toolchain
99 - name: Install stable toolchain
94− uses: dtolnay/rust-toolchain@1.65
100+ uses: dtolnay/rust-toolchain@1.70
95
101
96 - uses: Swatinem/rust-cache@v2
102 - uses: Swatinem/rust-cache@v2
103+ with:
104+ shared-key: "build"
97
105
98 - name: Validate queries
106 - name: Validate queries
99 run: cargo xtask query-check
107 run: cargo xtask query-check
.github/workflows/cachix.yml+3−3
@@ -11,13 +11,13 @@ jobs:
11 runs-on: ubuntu-latest
11 runs-on: ubuntu-latest
12 steps:
12 steps:
13 - name: Checkout sources
13 - name: Checkout sources
14− uses: actions/checkout@v3
14+ uses: actions/checkout@v4
15
15
16 - name: Install nix
16 - name: Install nix
17− uses: cachix/install-nix-action@v22
17+ uses: cachix/install-nix-action@v24
18
18
19 - name: Authenticate with Cachix
19 - name: Authenticate with Cachix
20− uses: cachix/cachix-action@v12
20+ uses: cachix/cachix-action@v13
21 with:
21 with:
22 name: helix
22 name: helix
23 authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
23 authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
.github/workflows/gh-pages.yml+5−5
@@ -11,7 +11,7 @@ jobs:
11 deploy:
11 deploy:
12 runs-on: ubuntu-latest
12 runs-on: ubuntu-latest
13 steps:
13 steps:
14− - uses: actions/checkout@v3
14+ - uses: actions/checkout@v4
15
15
16 - name: Setup mdBook
16 - name: Setup mdBook
17 uses: peaceiris/actions-mdbook@v1
17 uses: peaceiris/actions-mdbook@v1
@@ -26,16 +26,16 @@ jobs:
26 OUTDIR=$(basename ${{ github.ref }})
26 OUTDIR=$(basename ${{ github.ref }})
27 echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
27 echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
28
28
29− - name: Deploy
29+ - name: Deploy stable
30 uses: peaceiris/actions-gh-pages@v3
30 uses: peaceiris/actions-gh-pages@v3
31+ if: startswith(github.ref, 'refs/tags/')
31 with:
32 with:
32 github_token: ${{ secrets.GITHUB_TOKEN }}
33 github_token: ${{ secrets.GITHUB_TOKEN }}
33 publish_dir: ./book/book
34 publish_dir: ./book/book
34− destination_dir: ./${{ env.OUTDIR }}
35
35
36− - name: Deploy stable
36+ - name: Deploy
37 uses: peaceiris/actions-gh-pages@v3
37 uses: peaceiris/actions-gh-pages@v3
38− if: startswith(github.ref, 'refs/tags/')
39 with:
38 with:
40 github_token: ${{ secrets.GITHUB_TOKEN }}
39 github_token: ${{ secrets.GITHUB_TOKEN }}
41 publish_dir: ./book/book
40 publish_dir: ./book/book
41+ destination_dir: ./${{ env.OUTDIR }}
.github/workflows/release.yml+13−13
@@ -23,7 +23,7 @@ jobs:
23 runs-on: ubuntu-latest
23 runs-on: ubuntu-latest
24 steps:
24 steps:
25 - name: Checkout sources
25 - name: Checkout sources
26− uses: actions/checkout@v3
26+ uses: actions/checkout@v4
27
27
28 - name: Install stable toolchain
28 - name: Install stable toolchain
29 uses: dtolnay/rust-toolchain@stable
29 uses: dtolnay/rust-toolchain@stable
@@ -36,7 +36,7 @@ jobs:
36 - name: Bundle grammars
36 - name: Bundle grammars
37 run: tar cJf grammars.tar.xz -C runtime/grammars/sources .
37 run: tar cJf grammars.tar.xz -C runtime/grammars/sources .
38
38
39− - uses: actions/upload-artifact@v3
39+ - uses: actions/upload-artifact@v4
40 with:
40 with:
41 name: grammars
41 name: grammars
42 path: grammars.tar.xz
42 path: grammars.tar.xz
@@ -70,11 +70,11 @@ jobs:
70 rust: stable
70 rust: stable
71 target: aarch64-unknown-linux-gnu
71 target: aarch64-unknown-linux-gnu
72 cross: true
72 cross: true
73− - build: riscv64-linux
73+ # - build: riscv64-linux
74− os: ubuntu-latest
74+ # os: ubuntu-latest
75− rust: stable
75+ # rust: stable
76− target: riscv64gc-unknown-linux-gnu
76+ # target: riscv64gc-unknown-linux-gnu
77− cross: true
77+ # cross: true
78 - build: x86_64-macos
78 - build: x86_64-macos
79 os: macos-latest
79 os: macos-latest
80 rust: stable
80 rust: stable
@@ -103,10 +103,10 @@ jobs:
103
103
104 steps:
104 steps:
105 - name: Checkout sources
105 - name: Checkout sources
106− uses: actions/checkout@v3
106+ uses: actions/checkout@v4
107
107
108 - name: Download grammars
108 - name: Download grammars
109− uses: actions/download-artifact@v3
109+ uses: actions/download-artifact@v4
110
110
111 - name: Move grammars under runtime
111 - name: Move grammars under runtime
112 if: "!startsWith(matrix.os, 'windows')"
112 if: "!startsWith(matrix.os, 'windows')"
@@ -220,7 +220,7 @@ jobs:
220 fi
220 fi
221 cp -r runtime dist
221 cp -r runtime dist
222
222
223− - uses: actions/upload-artifact@v3
223+ - uses: actions/upload-artifact@v4
224 with:
224 with:
225 name: bins-${{ matrix.build }}
225 name: bins-${{ matrix.build }}
226 path: dist
226 path: dist
@@ -231,9 +231,9 @@ jobs:
231 runs-on: ubuntu-latest
231 runs-on: ubuntu-latest
232 steps:
232 steps:
233 - name: Checkout sources
233 - name: Checkout sources
234− uses: actions/checkout@v3
234+ uses: actions/checkout@v4
235
235
236− - uses: actions/download-artifact@v3
236+ - uses: actions/download-artifact@v4
237
237
238 - name: Build archive
238 - name: Build archive
239 shell: bash
239 shell: bash
@@ -288,7 +288,7 @@ jobs:
288 overwrite: true
288 overwrite: true
289
289
290 - name: Upload binaries as artifact
290 - name: Upload binaries as artifact
291− uses: actions/upload-artifact@v3
291+ uses: actions/upload-artifact@v4
292 if: env.preview == 'true'
292 if: env.preview == 'true'
293 with:
293 with:
294 name: release
294 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+
1# 23.05 (2023-05-18)
261# 23.05 (2023-05-18)
2
262
323.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!
26323.05 is a smaller release focusing on fixes. There were 88 contributors in this release. Thank you all!
Cargo.lock+534−604
@@ -19,41 +19,22 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
19
19
20[[package]]
20[[package]]
21name = "ahash"
21name = "ahash"
22−version = "0.7.6"
22+version = "0.8.6"
23−source = "registry+https://github.com/rust-lang/crates.io-index"
24−checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
25−dependencies = [
26− "getrandom",
27− "once_cell",
28− "version_check",
29−]
30−
31−[[package]]
32−name = "ahash"
33−version = "0.8.3"
34source = "registry+https://github.com/rust-lang/crates.io-index"
23source = "registry+https://github.com/rust-lang/crates.io-index"
35−checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
24+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
36dependencies = [
25dependencies = [
37 "cfg-if",
26 "cfg-if",
38 "getrandom",
27 "getrandom",
39 "once_cell",
28 "once_cell",
40 "version_check",
29 "version_check",
30+ "zerocopy",
41]
31]
42
32
43[[package]]
33[[package]]
44name = "aho-corasick"
34name = "aho-corasick"
45−version = "0.7.20"
35+version = "1.1.2"
46source = "registry+https://github.com/rust-lang/crates.io-index"
36source = "registry+https://github.com/rust-lang/crates.io-index"
47−checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
37+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
48−dependencies = [
49− "memchr",
50−]
51−
52−[[package]]
53−name = "aho-corasick"
54−version = "1.0.2"
55−source = "registry+https://github.com/rust-lang/crates.io-index"
56−checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
57dependencies = [
38dependencies = [
58 "memchr",
39 "memchr",
59]
40]
@@ -81,9 +62,9 @@ dependencies = [
81
62
82[[package]]
63[[package]]
83name = "anyhow"
64name = "anyhow"
84−version = "1.0.75"
65+version = "1.0.76"
85source = "registry+https://github.com/rust-lang/crates.io-index"
66source = "registry+https://github.com/rust-lang/crates.io-index"
86−checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
67+checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
87
68
88[[package]]
69[[package]]
89name = "arc-swap"
70name = "arc-swap"
@@ -107,7 +88,7 @@ dependencies = [
107 "cc",
88 "cc",
108 "cfg-if",
89 "cfg-if",
109 "libc",
90 "libc",
110− "miniz_oxide 0.7.1",
91+ "miniz_oxide",
111 "object",
92 "object",
112 "rustc-demangle",
93 "rustc-demangle",
113]
94]
@@ -120,15 +101,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
120
101
121[[package]]
102[[package]]
122name = "bitflags"
103name = "bitflags"
123−version = "2.4.0"
104+version = "2.4.1"
124source = "registry+https://github.com/rust-lang/crates.io-index"
105source = "registry+https://github.com/rust-lang/crates.io-index"
125−checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
106+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
126
107
127[[package]]
108[[package]]
128name = "bstr"
109name = "bstr"
129−version = "1.6.0"
110+version = "1.8.0"
130source = "registry+https://github.com/rust-lang/crates.io-index"
111source = "registry+https://github.com/rust-lang/crates.io-index"
131−checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"
112+checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
132dependencies = [
113dependencies = [
133 "memchr",
114 "memchr",
134 "regex-automata",
115 "regex-automata",
@@ -150,12 +131,6 @@ version = "3.12.0"
150source = "registry+https://github.com/rust-lang/crates.io-index"
131source = "registry+https://github.com/rust-lang/crates.io-index"
151checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
132checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
152
133
153−[[package]]
154−name = "bytecount"
155−version = "0.6.3"
156−source = "registry+https://github.com/rust-lang/crates.io-index"
157−checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
158−
159[[package]]
134[[package]]
160name = "bytes"
135name = "bytes"
161version = "1.4.0"
136version = "1.4.0"
@@ -170,9 +145,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
170
145
171[[package]]
146[[package]]
172name = "cc"
147name = "cc"
173−version = "1.0.79"
148+version = "1.0.84"
174source = "registry+https://github.com/rust-lang/crates.io-index"
149source = "registry+https://github.com/rust-lang/crates.io-index"
175−checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
150+checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856"
151+dependencies = [
152+ "libc",
153+]
176
154
177[[package]]
155[[package]]
178name = "cfg-if"
156name = "cfg-if"
@@ -193,25 +171,23 @@ dependencies = [
193
171
194[[package]]
172[[package]]
195name = "chrono"
173name = "chrono"
196−version = "0.4.26"
174+version = "0.4.31"
197source = "registry+https://github.com/rust-lang/crates.io-index"
175source = "registry+https://github.com/rust-lang/crates.io-index"
198−checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
176+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
199dependencies = [
177dependencies = [
200 "android-tzdata",
178 "android-tzdata",
201 "iana-time-zone",
179 "iana-time-zone",
202 "num-traits",
180 "num-traits",
203− "winapi",
181+ "windows-targets 0.48.0",
204]
182]
205
183
206[[package]]
184[[package]]
207name = "clipboard-win"
185name = "clipboard-win"
208−version = "4.5.0"
186+version = "5.0.0"
209source = "registry+https://github.com/rust-lang/crates.io-index"
187source = "registry+https://github.com/rust-lang/crates.io-index"
210−checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
188+checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc"
211dependencies = [
189dependencies = [
212 "error-code",
190 "error-code",
213− "str-buf",
214− "winapi",
215]
191]
216
192
217[[package]]
193[[package]]
@@ -245,6 +221,12 @@ version = "0.8.4"
245source = "registry+https://github.com/rust-lang/crates.io-index"
221source = "registry+https://github.com/rust-lang/crates.io-index"
246checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
222checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
247
223
224+[[package]]
225+name = "cov-mark"
226+version = "1.1.0"
227+source = "registry+https://github.com/rust-lang/crates.io-index"
228+checksum = "9ffa3d3e0138386cd4361f63537765cac7ee40698028844635a54495a92f67f3"
229+
248[[package]]
230[[package]]
249name = "crc32fast"
231name = "crc32fast"
250version = "1.3.2"
232version = "1.3.2"
@@ -254,13 +236,56 @@ dependencies = [
254 "cfg-if",
236 "cfg-if",
255]
237]
256
238
239+[[package]]
240+name = "crossbeam-channel"
241+version = "0.5.8"
242+source = "registry+https://github.com/rust-lang/crates.io-index"
243+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
244+dependencies = [
245+ "cfg-if",
246+ "crossbeam-utils",
247+]
248+
249+[[package]]
250+name = "crossbeam-deque"
251+version = "0.8.3"
252+source = "registry+https://github.com/rust-lang/crates.io-index"
253+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
254+dependencies = [
255+ "cfg-if",
256+ "crossbeam-epoch",
257+ "crossbeam-utils",
258+]
259+
260+[[package]]
261+name = "crossbeam-epoch"
262+version = "0.9.15"
263+source = "registry+https://github.com/rust-lang/crates.io-index"
264+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
265+dependencies = [
266+ "autocfg",
267+ "cfg-if",
268+ "crossbeam-utils",
269+ "memoffset",
270+ "scopeguard",
271+]
272+
273+[[package]]
274+name = "crossbeam-utils"
275+version = "0.8.16"
276+source = "registry+https://github.com/rust-lang/crates.io-index"
277+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
278+dependencies = [
279+ "cfg-if",
280+]
281+
257[[package]]
282[[package]]
258name = "crossterm"
283name = "crossterm"
259−version = "0.26.1"
284+version = "0.27.0"
260source = "registry+https://github.com/rust-lang/crates.io-index"
285source = "registry+https://github.com/rust-lang/crates.io-index"
261−checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13"
286+checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
262dependencies = [
287dependencies = [
263− "bitflags 1.3.2",
288+ "bitflags 2.4.1",
264 "crossterm_winapi",
289 "crossterm_winapi",
265 "filedescriptor",
290 "filedescriptor",
266 "futures-core",
291 "futures-core",
@@ -274,9 +299,9 @@ dependencies = [
274
299
275[[package]]
300[[package]]
276name = "crossterm_winapi"
301name = "crossterm_winapi"
277−version = "0.9.0"
302+version = "0.9.1"
278source = "registry+https://github.com/rust-lang/crates.io-index"
303source = "registry+https://github.com/rust-lang/crates.io-index"
279−checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
304+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
280dependencies = [
305dependencies = [
281 "winapi",
306 "winapi",
282]
307]
@@ -305,7 +330,7 @@ dependencies = [
305 "proc-macro2",
330 "proc-macro2",
306 "quote",
331 "quote",
307 "scratch",
332 "scratch",
308− "syn 2.0.28",
333+ "syn 2.0.38",
309]
334]
310
335
311[[package]]
336[[package]]
@@ -322,7 +347,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5"
322dependencies = [
347dependencies = [
323 "proc-macro2",
348 "proc-macro2",
324 "quote",
349 "quote",
325− "syn 2.0.28",
350+ "syn 2.0.38",
326]
351]
327
352
328[[package]]
353[[package]]
@@ -339,9 +364,9 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
339
364
340[[package]]
365[[package]]
341name = "encoding_rs"
366name = "encoding_rs"
342−version = "0.8.32"
367+version = "0.8.33"
343source = "registry+https://github.com/rust-lang/crates.io-index"
368source = "registry+https://github.com/rust-lang/crates.io-index"
344−checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
369+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
345dependencies = [
370dependencies = [
346 "cfg-if",
371 "cfg-if",
347]
372]
@@ -363,34 +388,19 @@ checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
363
388
364[[package]]
389[[package]]
365name = "errno"
390name = "errno"
366−version = "0.3.1"
391+version = "0.3.8"
367−source = "registry+https://github.com/rust-lang/crates.io-index"
368−checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
369−dependencies = [
370− "errno-dragonfly",
371− "libc",
372− "windows-sys 0.48.0",
373−]
374−
375−[[package]]
376−name = "errno-dragonfly"
377−version = "0.1.2"
378source = "registry+https://github.com/rust-lang/crates.io-index"
392source = "registry+https://github.com/rust-lang/crates.io-index"
379−checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
393+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
380dependencies = [
394dependencies = [
381− "cc",
382 "libc",
395 "libc",
396+ "windows-sys 0.52.0",
383]
397]
384
398
385[[package]]
399[[package]]
386name = "error-code"
400name = "error-code"
387−version = "2.3.1"
401+version = "3.0.0"
388source = "registry+https://github.com/rust-lang/crates.io-index"
402source = "registry+https://github.com/rust-lang/crates.io-index"
389−checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
403+checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc"
390−dependencies = [
391− "libc",
392− "str-buf",
393−]
394
404
395[[package]]
405[[package]]
396name = "etcetera"
406name = "etcetera"
@@ -403,6 +413,15 @@ dependencies = [
403 "windows-sys 0.48.0",
413 "windows-sys 0.48.0",
404]
414]
405
415
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+
406[[package]]
425[[package]]
407name = "fastrand"
426name = "fastrand"
408version = "2.0.0"
427version = "2.0.0"
@@ -429,54 +448,36 @@ dependencies = [
429 "winapi",
448 "winapi",
430]
449]
431
450
432−[[package]]
433−name = "filetime"
434−version = "0.2.21"
435−source = "registry+https://github.com/rust-lang/crates.io-index"
436−checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153"
437−dependencies = [
438− "cfg-if",
439− "libc",
440− "redox_syscall 0.2.16",
441− "windows-sys 0.48.0",
442−]
443−
444[[package]]
451[[package]]
445name = "flate2"
452name = "flate2"
446−version = "1.0.25"
453+version = "1.0.27"
447source = "registry+https://github.com/rust-lang/crates.io-index"
454source = "registry+https://github.com/rust-lang/crates.io-index"
448−checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
455+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
449dependencies = [
456dependencies = [
450 "crc32fast",
457 "crc32fast",
451− "miniz_oxide 0.6.2",
458+ "miniz_oxide",
452]
459]
453
460
454−[[package]]
455−name = "fnv"
456−version = "1.0.7"
457−source = "registry+https://github.com/rust-lang/crates.io-index"
458−checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
459−
460[[package]]
461[[package]]
461name = "form_urlencoded"
462name = "form_urlencoded"
462−version = "1.2.0"
463+version = "1.2.1"
463source = "registry+https://github.com/rust-lang/crates.io-index"
464source = "registry+https://github.com/rust-lang/crates.io-index"
464−checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
465+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
465dependencies = [
466dependencies = [
466 "percent-encoding",
467 "percent-encoding",
467]
468]
468
469
469[[package]]
470[[package]]
470name = "futures-core"
471name = "futures-core"
471−version = "0.3.28"
472+version = "0.3.30"
472source = "registry+https://github.com/rust-lang/crates.io-index"
473source = "registry+https://github.com/rust-lang/crates.io-index"
473−checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
474+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
474
475
475[[package]]
476[[package]]
476name = "futures-executor"
477name = "futures-executor"
477−version = "0.3.28"
478+version = "0.3.29"
478source = "registry+https://github.com/rust-lang/crates.io-index"
479source = "registry+https://github.com/rust-lang/crates.io-index"
479−checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
480+checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
480dependencies = [
481dependencies = [
481 "futures-core",
482 "futures-core",
482 "futures-task",
483 "futures-task",
@@ -485,15 +486,15 @@ dependencies = [
485
486
486[[package]]
487[[package]]
487name = "futures-task"
488name = "futures-task"
488−version = "0.3.28"
489+version = "0.3.30"
489source = "registry+https://github.com/rust-lang/crates.io-index"
490source = "registry+https://github.com/rust-lang/crates.io-index"
490−checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
491+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
491
492
492[[package]]
493[[package]]
493name = "futures-util"
494name = "futures-util"
494−version = "0.3.28"
495+version = "0.3.30"
495source = "registry+https://github.com/rust-lang/crates.io-index"
496source = "registry+https://github.com/rust-lang/crates.io-index"
496−checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
497+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
497dependencies = [
498dependencies = [
498 "futures-core",
499 "futures-core",
499 "futures-task",
500 "futures-task",
@@ -502,15 +503,6 @@ dependencies = [
502 "slab",
503 "slab",
503]
504]
504
505
505−[[package]]
506−name = "fuzzy-matcher"
507−version = "0.3.7"
508−source = "registry+https://github.com/rust-lang/crates.io-index"
509−checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94"
510−dependencies = [
511− "thread_local",
512−]
513−
514[[package]]
506[[package]]
515name = "getrandom"
507name = "getrandom"
516version = "0.2.9"
508version = "0.2.9"
@@ -530,15 +522,13 @@ checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
530
522
531[[package]]
523[[package]]
532name = "gix"
524name = "gix"
533−version = "0.48.0"
525+version = "0.57.0"
534source = "registry+https://github.com/rust-lang/crates.io-index"
526source = "registry+https://github.com/rust-lang/crates.io-index"
535−checksum = "c1e74cea676de7f53a79f3c0365812b11f6814b81e671b8ee4abae6ca09c7881"
527+checksum = "721c7497ab24b665ed5a1eb2b3526936aa60068e61ba260651f7e77c52feec69"
536dependencies = [
528dependencies = [
537 "gix-actor",
529 "gix-actor",
538− "gix-attributes",
539 "gix-commitgraph",
530 "gix-commitgraph",
540 "gix-config",
531 "gix-config",
541− "gix-credentials",
542 "gix-date",
532 "gix-date",
543 "gix-diff",
533 "gix-diff",
544 "gix-discover",
534 "gix-discover",
@@ -547,19 +537,16 @@ dependencies = [
547 "gix-glob",
537 "gix-glob",
548 "gix-hash",
538 "gix-hash",
549 "gix-hashtable",
539 "gix-hashtable",
550− "gix-ignore",
551− "gix-index",
552 "gix-lock",
540 "gix-lock",
553− "gix-mailmap",
541+ "gix-macros",
554− "gix-negotiate",
555 "gix-object",
542 "gix-object",
556 "gix-odb",
543 "gix-odb",
557 "gix-pack",
544 "gix-pack",
558 "gix-path",
545 "gix-path",
559− "gix-prompt",
560 "gix-ref",
546 "gix-ref",
561 "gix-refspec",
547 "gix-refspec",
562 "gix-revision",
548 "gix-revision",
549+ "gix-revwalk",
563 "gix-sec",
550 "gix-sec",
564 "gix-tempfile",
551 "gix-tempfile",
565 "gix-trace",
552 "gix-trace",
@@ -567,10 +554,8 @@ dependencies = [
567 "gix-url",
554 "gix-url",
568 "gix-utils",
555 "gix-utils",
569 "gix-validate",
556 "gix-validate",
570− "gix-worktree",
571− "log",
572 "once_cell",
557 "once_cell",
573− "signal-hook",
558+ "parking_lot",
574 "smallvec",
559 "smallvec",
575 "thiserror",
560 "thiserror",
576 "unicode-normalization",
561 "unicode-normalization",
@@ -578,81 +563,46 @@ dependencies = [
578
563
579[[package]]
564[[package]]
580name = "gix-actor"
565name = "gix-actor"
581−version = "0.23.0"
566+version = "0.29.0"
582source = "registry+https://github.com/rust-lang/crates.io-index"
567source = "registry+https://github.com/rust-lang/crates.io-index"
583−checksum = "1969b77b9ee4cc1755c841987ec6f7622aaca95e952bcafb76973ae59d1b8716"
568+checksum = "886014c4865b93ce268f1d3eddd4fd3261242c3f3ee61eb36009f913016a9059"
584dependencies = [
569dependencies = [
585 "bstr",
570 "bstr",
586 "btoi",
571 "btoi",
587 "gix-date",
572 "gix-date",
588 "itoa",
573 "itoa",
589− "nom",
590− "thiserror",
591−]
592−
593−[[package]]
594−name = "gix-attributes"
595−version = "0.14.1"
596−source = "registry+https://github.com/rust-lang/crates.io-index"
597−checksum = "e3772b0129dcd1fc73e985bbd08a1482d082097d2915cb1ee31ce8092b8e4434"
598−dependencies = [
599− "bstr",
600− "gix-glob",
601− "gix-path",
602− "gix-quote",
603− "kstring",
604− "log",
605− "smallvec",
606− "thiserror",
607− "unicode-bom",
608−]
609−
610−[[package]]
611−name = "gix-bitmap"
612−version = "0.2.5"
613−source = "registry+https://github.com/rust-lang/crates.io-index"
614−checksum = "311e2fa997be6560c564b070c5da2d56d038b645a94e1e5796d5d85a350da33c"
615−dependencies = [
616 "thiserror",
574 "thiserror",
575+ "winnow 0.5.28",
617]
576]
618
577
619[[package]]
578[[package]]
620name = "gix-chunk"
579name = "gix-chunk"
621−version = "0.4.3"
580+version = "0.4.6"
622source = "registry+https://github.com/rust-lang/crates.io-index"
581source = "registry+https://github.com/rust-lang/crates.io-index"
623−checksum = "39db5ed0fc0a2e9b1b8265993f7efdbc30379dec268f3b91b7af0c2de4672fdd"
582+checksum = "2ade37ef69870de0ed966b97c57a3a947a22ff3482a52c3b99b205f77bcb08fb"
624dependencies = [
583dependencies = [
625 "thiserror",
584 "thiserror",
626]
585]
627
586
628−[[package]]
629−name = "gix-command"
630−version = "0.2.6"
631−source = "registry+https://github.com/rust-lang/crates.io-index"
632−checksum = "bb49ab557a37b0abb2415bca2b10e541277dff0565deb5bd5e99fd95f93f51eb"
633−dependencies = [
634− "bstr",
635−]
636−
637[[package]]
587[[package]]
638name = "gix-commitgraph"
588name = "gix-commitgraph"
639−version = "0.17.1"
589+version = "0.23.0"
640source = "registry+https://github.com/rust-lang/crates.io-index"
590source = "registry+https://github.com/rust-lang/crates.io-index"
641−checksum = "ed42baa50075d41c1a0931074ce1a97c5797c7c6fe7591d9f1f2dcd448532c26"
591+checksum = "e7559ea9cefee188cd88b05afcc8e3ef7a3cb4a5c647bccf06b981e591b02b77"
642dependencies = [
592dependencies = [
643 "bstr",
593 "bstr",
644 "gix-chunk",
594 "gix-chunk",
645 "gix-features",
595 "gix-features",
646 "gix-hash",
596 "gix-hash",
647− "memmap2 0.7.1",
597+ "memmap2",
648 "thiserror",
598 "thiserror",
649]
599]
650
600
651[[package]]
601[[package]]
652name = "gix-config"
602name = "gix-config"
653−version = "0.25.1"
603+version = "0.33.0"
654source = "registry+https://github.com/rust-lang/crates.io-index"
604source = "registry+https://github.com/rust-lang/crates.io-index"
655−checksum = "817688c7005a716d9363e267913526adea402dabd947f4ba63842d10cc5132af"
605+checksum = "9c35dc7f9c00a42bbc9cfa1ca2ec0a78ad1b76ff0736d3d35dfd612962244467"
656dependencies = [
606dependencies = [
657 "bstr",
607 "bstr",
658 "gix-config-value",
608 "gix-config-value",
@@ -661,49 +611,32 @@ dependencies = [
661 "gix-path",
611 "gix-path",
662 "gix-ref",
612 "gix-ref",
663 "gix-sec",
613 "gix-sec",
664− "log",
665 "memchr",
614 "memchr",
666− "nom",
667 "once_cell",
615 "once_cell",
668 "smallvec",
616 "smallvec",
669 "thiserror",
617 "thiserror",
670 "unicode-bom",
618 "unicode-bom",
619+ "winnow 0.5.28",
671]
620]
672
621
673[[package]]
622[[package]]
674name = "gix-config-value"
623name = "gix-config-value"
675−version = "0.12.3"
624+version = "0.14.2"
676source = "registry+https://github.com/rust-lang/crates.io-index"
625source = "registry+https://github.com/rust-lang/crates.io-index"
677−checksum = "83960be5e99266bcf55dae5a24731bbd39f643bfb68f27e939d6b06836b5b87d"
626+checksum = "39f388cb2396aee82d6f460a2e7770659bdf8854e9e5478f7d2b1324a9698284"
678dependencies = [
627dependencies = [
679− "bitflags 2.4.0",
628+ "bitflags 2.4.1",
680 "bstr",
629 "bstr",
681 "gix-path",
630 "gix-path",
682 "libc",
631 "libc",
683 "thiserror",
632 "thiserror",
684]
633]
685
634
686−[[package]]
687−name = "gix-credentials"
688−version = "0.16.1"
689−source = "registry+https://github.com/rust-lang/crates.io-index"
690−checksum = "75a75565e0e6e7f80cfa4eb1b05cc448c6846ddd48dcf413a28875fbc11ee9af"
691−dependencies = [
692− "bstr",
693− "gix-command",
694− "gix-config-value",
695− "gix-path",
696− "gix-prompt",
697− "gix-sec",
698− "gix-url",
699− "thiserror",
700−]
701−
702[[package]]
635[[package]]
703name = "gix-date"
636name = "gix-date"
704−version = "0.7.0"
637+version = "0.8.2"
705source = "registry+https://github.com/rust-lang/crates.io-index"
638source = "registry+https://github.com/rust-lang/crates.io-index"
706−checksum = "8e9a04a1d2387c955ec91059d56b673000dd24f3c07cad08ed253e36381782bf"
639+checksum = "9d85f4a01e0d05c3de585e28bae514d4baf01655e3fc3f14ce6f30bf62405345"
707dependencies = [
640dependencies = [
708 "bstr",
641 "bstr",
709 "itoa",
642 "itoa",
@@ -713,21 +646,21 @@ dependencies = [
713
646
714[[package]]
647[[package]]
715name = "gix-diff"
648name = "gix-diff"
716−version = "0.32.0"
649+version = "0.39.0"
717source = "registry+https://github.com/rust-lang/crates.io-index"
650source = "registry+https://github.com/rust-lang/crates.io-index"
718−checksum = "aaf5d9b9b521b284ebe53ee69eee33341835ec70edc314f36b2100ea81396121"
651+checksum = "ac0e75f5afd2f6c47c800b6b0a000a08045739d0450d20482e8faa42543f62d1"
719dependencies = [
652dependencies = [
653+ "bstr",
720 "gix-hash",
654 "gix-hash",
721 "gix-object",
655 "gix-object",
722− "imara-diff",
723 "thiserror",
656 "thiserror",
724]
657]
725
658
726[[package]]
659[[package]]
727name = "gix-discover"
660name = "gix-discover"
728−version = "0.21.1"
661+version = "0.28.0"
729source = "registry+https://github.com/rust-lang/crates.io-index"
662source = "registry+https://github.com/rust-lang/crates.io-index"
730−checksum = "272aad20dc63dedba76615373dd8885fb5aebe4795e5b5b0aa2a24e63c82085c"
663+checksum = "f0b63ce2ad81632ac1a84ac370f85a5e580c3261580bd85ea17ff35d3a0bba18"
731dependencies = [
664dependencies = [
732 "bstr",
665 "bstr",
733 "dunce",
666 "dunce",
@@ -740,9 +673,9 @@ dependencies = [
740
673
741[[package]]
674[[package]]
742name = "gix-features"
675name = "gix-features"
743−version = "0.31.1"
676+version = "0.37.0"
744source = "registry+https://github.com/rust-lang/crates.io-index"
677source = "registry+https://github.com/rust-lang/crates.io-index"
745−checksum = "06142d8cff5d17509399b04052b64d2f9b3a311d5cff0b1a32b220f62cd0d595"
678+checksum = "befe7edea299a824504b5acc96d7a3a538125b38c42f3a8379f6912a29c90c81"
746dependencies = [
679dependencies = [
747 "crc32fast",
680 "crc32fast",
748 "flate2",
681 "flate2",
@@ -758,20 +691,20 @@ dependencies = [
758
691
759[[package]]
692[[package]]
760name = "gix-fs"
693name = "gix-fs"
761−version = "0.3.0"
694+version = "0.9.0"
762source = "registry+https://github.com/rust-lang/crates.io-index"
695source = "registry+https://github.com/rust-lang/crates.io-index"
763−checksum = "bb15956bc0256594c62a2399fcf6958a02a11724217eddfdc2b49b21b6292496"
696+checksum = "007017ce93b819ea52c0ec68306f7d72212a2d307c3d70f1548c7141c015d0a1"
764dependencies = [
697dependencies = [
765 "gix-features",
698 "gix-features",
766]
699]
767
700
768[[package]]
701[[package]]
769name = "gix-glob"
702name = "gix-glob"
770−version = "0.9.1"
703+version = "0.15.0"
771source = "registry+https://github.com/rust-lang/crates.io-index"
704source = "registry+https://github.com/rust-lang/crates.io-index"
772−checksum = "c18bdff83143d61e7d60da6183b87542a870d026b2a2d0b30170b8e9c0cd321a"
705+checksum = "61fb116c2516d3a1170e010118f639944a6389872c875a008960cdab2a44ac72"
773dependencies = [
706dependencies = [
774− "bitflags 2.4.0",
707+ "bitflags 2.4.1",
775 "bstr",
708 "bstr",
776 "gix-features",
709 "gix-features",
777 "gix-path",
710 "gix-path",
@@ -779,64 +712,30 @@ dependencies = [
779
712
780[[package]]
713[[package]]
781name = "gix-hash"
714name = "gix-hash"
782−version = "0.11.3"
715+version = "0.14.0"
783source = "registry+https://github.com/rust-lang/crates.io-index"
716source = "registry+https://github.com/rust-lang/crates.io-index"
784−checksum = "a0dd58cdbe7ffa4032fc111864c80d5f8cecd9a2c9736c97ae7e5be834188272"
717+checksum = "c52c3170a17b6031833cd2eb4ad7bc23f2755d06e6e70f78dec21d42e8fe1b30"
785dependencies = [
718dependencies = [
786− "hex",
719+ "faster-hex",
787 "thiserror",
720 "thiserror",
788]
721]
789
722
790[[package]]
723[[package]]
791name = "gix-hashtable"
724name = "gix-hashtable"
792−version = "0.2.3"
725+version = "0.5.0"
793source = "registry+https://github.com/rust-lang/crates.io-index"
726source = "registry+https://github.com/rust-lang/crates.io-index"
794−checksum = "9e133bc56d938eaec1c675af7c681a51de9662b0ada779f45607b967a10da77a"
727+checksum = "40a838e6366a5e5b84668b6997ce0981b833136468e8ba949f424c0ef2927eba"
795dependencies = [
728dependencies = [
796 "gix-hash",
729 "gix-hash",
797− "hashbrown 0.14.0",
730+ "hashbrown 0.14.3",
798 "parking_lot",
731 "parking_lot",
799]
732]
800
733
801−[[package]]
802−name = "gix-ignore"
803−version = "0.4.1"
804−source = "registry+https://github.com/rust-lang/crates.io-index"
805−checksum = "ca801f2d0535210f77b33e2c067d565aedecacc82f1b3dbce26da1388ebc4634"
806−dependencies = [
807− "bstr",
808− "gix-glob",
809− "gix-path",
810− "unicode-bom",
811−]
812−
813−[[package]]
814−name = "gix-index"
815−version = "0.20.0"
816−source = "registry+https://github.com/rust-lang/crates.io-index"
817−checksum = "68099abdf6ee50ae3c897e8b05de96871cbe54d52a37cdf559101f911b883562"
818−dependencies = [
819− "bitflags 2.4.0",
820− "bstr",
821− "btoi",
822− "filetime",
823− "gix-bitmap",
824− "gix-features",
825− "gix-hash",
826− "gix-lock",
827− "gix-object",
828− "gix-traverse",
829− "itoa",
830− "memmap2 0.7.1",
831− "smallvec",
832− "thiserror",
833−]
834−
835[[package]]
734[[package]]
836name = "gix-lock"
735name = "gix-lock"
837−version = "7.0.0"
736+version = "12.0.0"
838source = "registry+https://github.com/rust-lang/crates.io-index"
737source = "registry+https://github.com/rust-lang/crates.io-index"
839−checksum = "328f50aad713ab606caeaf834459ef915ccdfbb9133ac6cd54616d601aa9249f"
738+checksum = "6cf112ddee94223c119a8534dad027740dc3aba3365ac5edeef8a7f6660c74db"
840dependencies = [
739dependencies = [
841 "gix-tempfile",
740 "gix-tempfile",
842 "gix-utils",
741 "gix-utils",
@@ -844,38 +743,21 @@ dependencies = [
844]
743]
845
744
846[[package]]
745[[package]]
847−name = "gix-mailmap"
746+name = "gix-macros"
848−version = "0.15.0"
849−source = "registry+https://github.com/rust-lang/crates.io-index"
850−checksum = "1787e3c37fc43b1f7c0e3be6196c6837b3ba5f869190dfeaa444b816f0a7f34b"
851−dependencies = [
852− "bstr",
853− "gix-actor",
854− "gix-date",
855− "thiserror",
856−]
857−
858−[[package]]
859−name = "gix-negotiate"
860−version = "0.4.0"
747+version = "0.1.2"
861source = "registry+https://github.com/rust-lang/crates.io-index"
748source = "registry+https://github.com/rust-lang/crates.io-index"
862−checksum = "4e7bce64d4452dd609f44d04b14b29da2e0ad2c45fcdf4ce1472a5f5f8ec21c2"
749+checksum = "fc207b64189cf71bcb17fc841ab99a5d63d0845546b611e2703ce467f659323a"
863dependencies = [
750dependencies = [
864− "bitflags 2.4.0",
751+ "proc-macro2",
865− "gix-commitgraph",
752+ "quote",
866− "gix-date",
753+ "syn 2.0.38",
867− "gix-hash",
868− "gix-object",
869− "gix-revwalk",
870− "smallvec",
871− "thiserror",
872]
754]
873
755
874[[package]]
756[[package]]
875name = "gix-object"
757name = "gix-object"
876−version = "0.32.0"
758+version = "0.40.0"
877source = "registry+https://github.com/rust-lang/crates.io-index"
759source = "registry+https://github.com/rust-lang/crates.io-index"
878−checksum = "a953f3d7ffad16734aa3ab1d05807972c80e339d1bd9dde03e0198716b99e2a6"
760+checksum = "e4c77e47ffba92127faf632a841fce23d19547e269bd8b88e68961a70eab4e93"
879dependencies = [
761dependencies = [
880 "bstr",
762 "bstr",
881 "btoi",
763 "btoi",
@@ -884,18 +766,17 @@ dependencies = [
884 "gix-features",
766 "gix-features",
885 "gix-hash",
767 "gix-hash",
886 "gix-validate",
768 "gix-validate",
887− "hex",
888 "itoa",
769 "itoa",
889− "nom",
890 "smallvec",
770 "smallvec",
891 "thiserror",
771 "thiserror",
772+ "winnow 0.5.28",
892]
773]
893
774
894[[package]]
775[[package]]
895name = "gix-odb"
776name = "gix-odb"
896−version = "0.49.1"
777+version = "0.56.0"
897source = "registry+https://github.com/rust-lang/crates.io-index"
778source = "registry+https://github.com/rust-lang/crates.io-index"
898−checksum = "f6418cff00ecc2713b58c8e04bff30dda808fbba1a080e7248b299d069894a01"
779+checksum = "a3254f2005cc7553ea78e85e816a09150c6f7a64e6b7627b8d1fdc56721bea73"
899dependencies = [
780dependencies = [
900 "arc-swap",
781 "arc-swap",
901 "gix-date",
782 "gix-date",
@@ -912,21 +793,19 @@ dependencies = [
912
793
913[[package]]
794[[package]]
914name = "gix-pack"
795name = "gix-pack"
915−version = "0.39.1"
796+version = "0.46.0"
916source = "registry+https://github.com/rust-lang/crates.io-index"
797source = "registry+https://github.com/rust-lang/crates.io-index"
917−checksum = "414935138d90043ea5898de7a93f02c2558e52652492719470e203ef26a8fd0a"
798+checksum = "02ebc8cd657eec207d82d8f876ca402361308ecd3c87a47935b0299506257b4f"
918dependencies = [
799dependencies = [
919 "clru",
800 "clru",
920 "gix-chunk",
801 "gix-chunk",
921− "gix-diff",
922 "gix-features",
802 "gix-features",
923 "gix-hash",
803 "gix-hash",
924 "gix-hashtable",
804 "gix-hashtable",
925 "gix-object",
805 "gix-object",
926 "gix-path",
806 "gix-path",
927 "gix-tempfile",
807 "gix-tempfile",
928− "gix-traverse",
929− "memmap2 0.7.1",
808+ "memmap2",
930 "parking_lot",
809 "parking_lot",
931 "smallvec",
810 "smallvec",
932 "thiserror",
811 "thiserror",
@@ -934,9 +813,9 @@ dependencies = [
934
813
935[[package]]
814[[package]]
936name = "gix-path"
815name = "gix-path"
937−version = "0.8.3"
816+version = "0.10.2"
938source = "registry+https://github.com/rust-lang/crates.io-index"
817source = "registry+https://github.com/rust-lang/crates.io-index"
939−checksum = "dfca182d2575ded2ed38280f1ebf75cd5d3790b77e0872de07854cf085821fbe"
818+checksum = "10931652a3da126990ac93bce1b1c600cc99d7c268d712b6360ed52174ce1b68"
940dependencies = [
819dependencies = [
941 "bstr",
820 "bstr",
942 "gix-trace",
821 "gix-trace",
@@ -945,24 +824,11 @@ dependencies = [
945 "thiserror",
824 "thiserror",
946]
825]
947
826
948−[[package]]
949−name = "gix-prompt"
950−version = "0.5.2"
951−source = "registry+https://github.com/rust-lang/crates.io-index"
952−checksum = "8dfd363fd89a40c1e7bff9c9c1b136cd2002480f724b0c627c1bc771cd5480ec"
953−dependencies = [
954− "gix-command",
955− "gix-config-value",
956− "parking_lot",
957− "rustix 0.37.15",
958− "thiserror",
959−]
960−
961[[package]]
827[[package]]
962name = "gix-quote"
828name = "gix-quote"
963−version = "0.4.5"
829+version = "0.4.9"
964source = "registry+https://github.com/rust-lang/crates.io-index"
830source = "registry+https://github.com/rust-lang/crates.io-index"
965−checksum = "3874de636c2526de26a3405b8024b23ef1a327bebf4845d770d00d48700b6a40"
831+checksum = "6c43530cb94a7759807e6f8d180e17ac9c65673b891645c6c433831dc0cf4342"
966dependencies = [
832dependencies = [
967 "bstr",
833 "bstr",
968 "btoi",
834 "btoi",
@@ -971,9 +837,9 @@ dependencies = [
971
837
972[[package]]
838[[package]]
973name = "gix-ref"
839name = "gix-ref"
974−version = "0.32.1"
840+version = "0.40.0"
975source = "registry+https://github.com/rust-lang/crates.io-index"
841source = "registry+https://github.com/rust-lang/crates.io-index"
976−checksum = "39453f4e5f23cddc2e6e4cca2ba20adfdbec29379e3ca829714dfe98ae068ccd"
842+checksum = "baa951b3b850d6d1be4f900768e49af20b76bf9505beac22af723d57249a2f1d"
977dependencies = [
843dependencies = [
978 "gix-actor",
844 "gix-actor",
979 "gix-date",
845 "gix-date",
@@ -985,16 +851,16 @@ dependencies = [
985 "gix-path",
851 "gix-path",
986 "gix-tempfile",
852 "gix-tempfile",
987 "gix-validate",
853 "gix-validate",
988− "memmap2 0.7.1",
854+ "memmap2",
989− "nom",
990 "thiserror",
855 "thiserror",
856+ "winnow 0.5.28",
991]
857]
992
858
993[[package]]
859[[package]]
994name = "gix-refspec"
860name = "gix-refspec"
995−version = "0.13.0"
861+version = "0.21.0"
996source = "registry+https://github.com/rust-lang/crates.io-index"
862source = "registry+https://github.com/rust-lang/crates.io-index"
997−checksum = "b8e76ff1f82fba295a121e31ab02f69642994e532c45c0c899aa393f4b740302"
863+checksum = "88c61f849d58c06e3068a0b601cf10127d2a07cdad00a725ed66cf303f76f6b3"
998dependencies = [
864dependencies = [
999 "bstr",
865 "bstr",
1000 "gix-hash",
866 "gix-hash",
@@ -1006,9 +872,9 @@ dependencies = [
1006
872
1007[[package]]
873[[package]]
1008name = "gix-revision"
874name = "gix-revision"
1009−version = "0.17.0"
875+version = "0.25.0"
1010source = "registry+https://github.com/rust-lang/crates.io-index"
876source = "registry+https://github.com/rust-lang/crates.io-index"
1011−checksum = "237428a7d3978e8572964e1e45d984027c2acc94df47e594baa6c4b0da7c9922"
877+checksum = "bcbbf91f4200c5c76802ef5f057b96f5a336827508881fe55a780be71a794d22"
1012dependencies = [
878dependencies = [
1013 "bstr",
879 "bstr",
1014 "gix-date",
880 "gix-date",
@@ -1016,14 +882,15 @@ dependencies = [
1016 "gix-hashtable",
882 "gix-hashtable",
1017 "gix-object",
883 "gix-object",
1018 "gix-revwalk",
884 "gix-revwalk",
885+ "gix-trace",
1019 "thiserror",
886 "thiserror",
1020]
887]
1021
888
1022[[package]]
889[[package]]
1023name = "gix-revwalk"
890name = "gix-revwalk"
1024−version = "0.3.0"
891+version = "0.11.0"
1025source = "registry+https://github.com/rust-lang/crates.io-index"
892source = "registry+https://github.com/rust-lang/crates.io-index"
1026−checksum = "028d50fcaf8326a8f79a359490d9ca9fb4e2b51ac9ac86503560d0bcc888d2eb"
893+checksum = "33ab66354d83f70f2730391747d0c75f94ef3c3dd40ebde2e206db9faaf7a0a7"
1027dependencies = [
894dependencies = [
1028 "gix-commitgraph",
895 "gix-commitgraph",
1029 "gix-date",
896 "gix-date",
@@ -1036,42 +903,40 @@ dependencies = [
1036
903
1037[[package]]
904[[package]]
1038name = "gix-sec"
905name = "gix-sec"
1039−version = "0.8.3"
906+version = "0.10.2"
1040source = "registry+https://github.com/rust-lang/crates.io-index"
907source = "registry+https://github.com/rust-lang/crates.io-index"
1041−checksum = "ede298863db2a0574a14070991710551e76d1f47c9783b62d4fcbca17f56371c"
908+checksum = "a9963f38a42144253ed4d571882d7db5ef644c12e6726e4b75135597cc9d0e1a"
1042dependencies = [
909dependencies = [
1043− "bitflags 2.4.0",
910+ "bitflags 2.4.1",
1044 "gix-path",
911 "gix-path",
1045 "libc",
912 "libc",
1046− "windows",
913+ "windows 0.52.0",
1047]
914]
1048
915
1049[[package]]
916[[package]]
1050name = "gix-tempfile"
917name = "gix-tempfile"
1051−version = "7.0.0"
918+version = "12.0.0"
1052source = "registry+https://github.com/rust-lang/crates.io-index"
919source = "registry+https://github.com/rust-lang/crates.io-index"
1053−checksum = "4fac8310c17406ea619af72f42ee46dac795110f68f41b4f4fa231b69889c6a2"
920+checksum = "e76a494bd530e1a1309188ff971825a24f159c76c2db0bf71fa5dfb469a2c915"
1054dependencies = [
921dependencies = [
1055 "gix-fs",
922 "gix-fs",
1056 "libc",
923 "libc",
1057 "once_cell",
924 "once_cell",
1058 "parking_lot",
925 "parking_lot",
1059− "signal-hook",
1060− "signal-hook-registry",
1061 "tempfile",
926 "tempfile",
1062]
927]
1063
928
1064[[package]]
929[[package]]
1065name = "gix-trace"
930name = "gix-trace"
1066−version = "0.1.2"
931+version = "0.1.5"
1067source = "registry+https://github.com/rust-lang/crates.io-index"
932source = "registry+https://github.com/rust-lang/crates.io-index"
1068−checksum = "103eac621617be3ebe0605c9065ca51a223279a23218aaf67d10daa6e452f663"
933+checksum = "bda62acb44dd86a40c7c3762a5403cfc1ac789ea559df54085cedf79864f809e"
1069
934
1070[[package]]
935[[package]]
1071name = "gix-traverse"
936name = "gix-traverse"
1072−version = "0.29.0"
937+version = "0.36.0"
1073source = "registry+https://github.com/rust-lang/crates.io-index"
938source = "registry+https://github.com/rust-lang/crates.io-index"
1074−checksum = "e3cdfd54598db4fae57d5ae6f52958422b2d13382d2745796bfe5c8015ffa86e"
939+checksum = "8661fab39985c9214e56d81a63ceb5886ac948cec2fba76c39494d1e0e307ea8"
1075dependencies = [
940dependencies = [
1076 "gix-commitgraph",
941 "gix-commitgraph",
1077 "gix-date",
942 "gix-date",
@@ -1085,9 +950,9 @@ dependencies = [
1085
950
1086[[package]]
951[[package]]
1087name = "gix-url"
952name = "gix-url"
1088−version = "0.20.1"
953+version = "0.26.0"
1089source = "registry+https://github.com/rust-lang/crates.io-index"
954source = "registry+https://github.com/rust-lang/crates.io-index"
1090−checksum = "beaede6dbc83f408b19adfd95bb52f1dbf01fb8862c3faf6c6243e2e67fcdfa1"
955+checksum = "10a0129c1e8b52736d7c5128300a4485dbc85863001371e2771ac1754bd89fd7"
1091dependencies = [
956dependencies = [
1092 "bstr",
957 "bstr",
1093 "gix-features",
958 "gix-features",
@@ -1099,94 +964,71 @@ dependencies = [
1099
964
1100[[package]]
965[[package]]
1101name = "gix-utils"
966name = "gix-utils"
1102−version = "0.1.4"
967+version = "0.1.7"
1103source = "registry+https://github.com/rust-lang/crates.io-index"
968source = "registry+https://github.com/rust-lang/crates.io-index"
1104−checksum = "7058c94f4164fcf5b8457d35f6d8f6e1007f9f7f938c9c7684a7e01d23c6ddde"
969+checksum = "ab9277a5e32e85d53f738096d872a4a9b76067ad471894ad31bd99c8fa2da1dc"
1105dependencies = [
970dependencies = [
1106 "fastrand",
971 "fastrand",
1107]
972]
1108
973
1109[[package]]
974[[package]]
1110name = "gix-validate"
975name = "gix-validate"
1111−version = "0.7.6"
976+version = "0.8.2"
1112source = "registry+https://github.com/rust-lang/crates.io-index"
977source = "registry+https://github.com/rust-lang/crates.io-index"
1113−checksum = "8d092b594c8af00a3a31fe526d363ee8a51a6f29d8496cdb991ed2f01ec0ec13"
978+checksum = "f805ebbdbaa4bfd98e2ee43e6d14099b8a4d9141f5d7b8202fea4d48e44263e7"
1114dependencies = [
979dependencies = [
1115 "bstr",
980 "bstr",
1116 "thiserror",
981 "thiserror",
1117]
982]
1118
983
1119−[[package]]
1120−name = "gix-worktree"
1121−version = "0.21.1"
1122−source = "registry+https://github.com/rust-lang/crates.io-index"
1123−checksum = "c1363b9aa66b9e14412ac04e1f759827203f491729d92172535a8ce6cde02efa"
1124−dependencies = [
1125− "bstr",
1126− "filetime",
1127− "gix-attributes",
1128− "gix-features",
1129− "gix-fs",
1130− "gix-glob",
1131− "gix-hash",
1132− "gix-ignore",
1133− "gix-index",
1134− "gix-object",
1135− "gix-path",
1136− "io-close",
1137− "thiserror",
1138−]
1139−
1140[[package]]
984[[package]]
1141name = "globset"
985name = "globset"
1142−version = "0.4.13"
986+version = "0.4.14"
1143source = "registry+https://github.com/rust-lang/crates.io-index"
987source = "registry+https://github.com/rust-lang/crates.io-index"
1144−checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
988+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
1145dependencies = [
989dependencies = [
1146− "aho-corasick 1.0.2",
990+ "aho-corasick",
1147 "bstr",
991 "bstr",
1148− "fnv",
1149 "log",
992 "log",
1150− "regex",
993+ "regex-automata",
994+ "regex-syntax",
1151]
995]
1152
996
1153[[package]]
997[[package]]
1154name = "grep-matcher"
998name = "grep-matcher"
1155−version = "0.1.6"
999+version = "0.1.7"
1156source = "registry+https://github.com/rust-lang/crates.io-index"
1000source = "registry+https://github.com/rust-lang/crates.io-index"
1157−checksum = "3902ca28f26945fe35cad349d776f163981d777fee382ccd6ef451126f51b319"
1001+checksum = "47a3141a10a43acfedc7c98a60a834d7ba00dfe7bec9071cbfc19b55b292ac02"
1158dependencies = [
1002dependencies = [
1159 "memchr",
1003 "memchr",
1160]
1004]
1161
1005
1162[[package]]
1006[[package]]
1163name = "grep-regex"
1007name = "grep-regex"
1164−version = "0.1.11"
1008+version = "0.1.12"
1165source = "registry+https://github.com/rust-lang/crates.io-index"
1009source = "registry+https://github.com/rust-lang/crates.io-index"
1166−checksum = "997598b41d53a37a2e3fc5300d5c11d825368c054420a9c65125b8fe1078463f"
1010+checksum = "f748bb135ca835da5cbc67ca0e6955f968db9c5df74ca4f56b18e1ddbc68230d"
1167dependencies = [
1011dependencies = [
1168− "aho-corasick 0.7.20",
1169 "bstr",
1012 "bstr",
1170 "grep-matcher",
1013 "grep-matcher",
1171 "log",
1014 "log",
1172− "regex",
1015+ "regex-automata",
1173− "regex-syntax 0.6.29",
1016+ "regex-syntax",
1174− "thread_local",
1175]
1017]
1176
1018
1177[[package]]
1019[[package]]
1178name = "grep-searcher"
1020name = "grep-searcher"
1179−version = "0.1.11"
1021+version = "0.1.13"
1180source = "registry+https://github.com/rust-lang/crates.io-index"
1022source = "registry+https://github.com/rust-lang/crates.io-index"
1181−checksum = "5601c4b9f480f0c9ebb40b1f6cbf447b8a50c5369223937a6c5214368c58779f"
1023+checksum = "ba536ae4f69bec62d8839584dd3153d3028ef31bb229f04e09fb5a9e5a193c54"
1182dependencies = [
1024dependencies = [
1183 "bstr",
1025 "bstr",
1184− "bytecount",
1185 "encoding_rs",
1026 "encoding_rs",
1186 "encoding_rs_io",
1027 "encoding_rs_io",
1187 "grep-matcher",
1028 "grep-matcher",
1188 "log",
1029 "log",
1030+ "memchr",
1189− "memmap2 0.5.10",
1031+ "memmap2",
1190]
1032]
1191
1033
1192[[package]]
1034[[package]]
@@ -1194,37 +1036,36 @@ name = "hashbrown"
1194version = "0.12.3"
1036version = "0.12.3"
1195source = "registry+https://github.com/rust-lang/crates.io-index"
1037source = "registry+https://github.com/rust-lang/crates.io-index"
1196checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1038checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
1197−dependencies = [
1198− "ahash 0.7.6",
1199−]
1200
1039
1201[[package]]
1040[[package]]
1202name = "hashbrown"
1041name = "hashbrown"
1203−version = "0.14.0"
1042+version = "0.14.3"
1204source = "registry+https://github.com/rust-lang/crates.io-index"
1043source = "registry+https://github.com/rust-lang/crates.io-index"
1205−checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
1044+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
1206dependencies = [
1045dependencies = [
1207− "ahash 0.8.3",
1046+ "ahash",
1208 "allocator-api2",
1047 "allocator-api2",
1209]
1048]
1210
1049
1211[[package]]
1050[[package]]
1212name = "helix-core"
1051name = "helix-core"
1213−version = "0.6.0"
1052+version = "23.10.0"
1214dependencies = [
1053dependencies = [
1215− "ahash 0.8.3",
1054+ "ahash",
1216 "arc-swap",
1055 "arc-swap",
1217− "bitflags 2.4.0",
1056+ "bitflags 2.4.1",
1218 "chrono",
1057 "chrono",
1219 "dunce",
1058 "dunce",
1220 "encoding_rs",
1059 "encoding_rs",
1221 "etcetera",
1060 "etcetera",
1222− "hashbrown 0.14.0",
1061+ "hashbrown 0.14.3",
1223 "helix-loader",
1062 "helix-loader",
1224 "imara-diff",
1063 "imara-diff",
1225 "indoc",
1064 "indoc",
1226 "log",
1065 "log",
1066+ "nucleo",
1227 "once_cell",
1067 "once_cell",
1068+ "parking_lot",
1228 "quickcheck",
1069 "quickcheck",
1229 "regex",
1070 "regex",
1230 "ropey",
1071 "ropey",
@@ -1243,7 +1084,7 @@ dependencies = [
1243
1084
1244[[package]]
1085[[package]]
1245name = "helix-dap"
1086name = "helix-dap"
1246−version = "0.6.0"
1087+version = "23.10.0"
1247dependencies = [
1088dependencies = [
1248 "anyhow",
1089 "anyhow",
1249 "fern",
1090 "fern",
@@ -1256,9 +1097,17 @@ dependencies = [
1256 "which",
1097 "which",
1257]
1098]
1258
1099
1100+[[package]]
1101+name = "helix-event"
1102+version = "23.10.0"
1103+dependencies = [
1104+ "parking_lot",
1105+ "tokio",
1106+]
1107+
1259[[package]]
1108[[package]]
1260name = "helix-loader"
1109name = "helix-loader"
1261−version = "0.6.0"
1110+version = "23.10.0"
1262dependencies = [
1111dependencies = [
1263 "anyhow",
1112 "anyhow",
1264 "cc",
1113 "cc",
@@ -1277,7 +1126,7 @@ dependencies = [
1277
1126
1278[[package]]
1127[[package]]
1279name = "helix-lsp"
1128name = "helix-lsp"
1280−version = "0.6.0"
1129+version = "23.10.0"
1281dependencies = [
1130dependencies = [
1282 "anyhow",
1131 "anyhow",
1283 "futures-executor",
1132 "futures-executor",
@@ -1299,11 +1148,11 @@ dependencies = [
1299
1148
1300[[package]]
1149[[package]]
1301name = "helix-parsec"
1150name = "helix-parsec"
1302−version = "0.6.0"
1151+version = "23.10.0"
1303
1152
1304[[package]]
1153[[package]]
1305name = "helix-term"
1154name = "helix-term"
1306−version = "0.6.0"
1155+version = "23.10.0"
1307dependencies = [
1156dependencies = [
1308 "anyhow",
1157 "anyhow",
1309 "arc-swap",
1158 "arc-swap",
@@ -1312,11 +1161,11 @@ dependencies = [
1312 "crossterm",
1161 "crossterm",
1313 "fern",
1162 "fern",
1314 "futures-util",
1163 "futures-util",
1315− "fuzzy-matcher",
1316 "grep-regex",
1164 "grep-regex",
1317 "grep-searcher",
1165 "grep-searcher",
1318 "helix-core",
1166 "helix-core",
1319 "helix-dap",
1167 "helix-dap",
1168+ "helix-event",
1320 "helix-loader",
1169 "helix-loader",
1321 "helix-lsp",
1170 "helix-lsp",
1322 "helix-tui",
1171 "helix-tui",
@@ -1326,7 +1175,9 @@ dependencies = [
1326 "indoc",
1175 "indoc",
1327 "libc",
1176 "libc",
1328 "log",
1177 "log",
1178+ "nucleo",
1329 "once_cell",
1179 "once_cell",
1180+ "open",
1330 "pulldown-cmark",
1181 "pulldown-cmark",
1331 "serde",
1182 "serde",
1332 "serde_json",
1183 "serde_json",
@@ -1337,14 +1188,15 @@ dependencies = [
1337 "tokio",
1188 "tokio",
1338 "tokio-stream",
1189 "tokio-stream",
1339 "toml",
1190 "toml",
1191+ "url",
1340 "which",
1192 "which",
1341]
1193]
1342
1194
1343[[package]]
1195[[package]]
1344name = "helix-tui"
1196name = "helix-tui"
1345−version = "0.6.0"
1197+version = "23.10.0"
1346dependencies = [
1198dependencies = [
1347− "bitflags 2.4.0",
1199+ "bitflags 2.4.1",
1348 "cassowary",
1200 "cassowary",
1349 "crossterm",
1201 "crossterm",
1350 "helix-core",
1202 "helix-core",
@@ -1358,12 +1210,13 @@ dependencies = [
1358
1210
1359[[package]]
1211[[package]]
1360name = "helix-vcs"
1212name = "helix-vcs"
1361−version = "0.6.0"
1213+version = "23.10.0"
1362dependencies = [
1214dependencies = [
1363 "anyhow",
1215 "anyhow",
1364 "arc-swap",
1216 "arc-swap",
1365 "gix",
1217 "gix",
1366 "helix-core",
1218 "helix-core",
1219+ "helix-event",
1367 "imara-diff",
1220 "imara-diff",
1368 "log",
1221 "log",
1369 "parking_lot",
1222 "parking_lot",
@@ -1373,17 +1226,18 @@ dependencies = [
1373
1226
1374[[package]]
1227[[package]]
1375name = "helix-view"
1228name = "helix-view"
1376−version = "0.6.0"
1229+version = "23.10.0"
1377dependencies = [
1230dependencies = [
1378 "anyhow",
1231 "anyhow",
1379 "arc-swap",
1232 "arc-swap",
1380− "bitflags 2.4.0",
1233+ "bitflags 2.4.1",
1381 "chardetng",
1234 "chardetng",
1382 "clipboard-win",
1235 "clipboard-win",
1383 "crossterm",
1236 "crossterm",
1384 "futures-util",
1237 "futures-util",
1385 "helix-core",
1238 "helix-core",
1386 "helix-dap",
1239 "helix-dap",
1240+ "helix-event",
1387 "helix-loader",
1241 "helix-loader",
1388 "helix-lsp",
1242 "helix-lsp",
1389 "helix-tui",
1243 "helix-tui",
@@ -1392,7 +1246,7 @@ dependencies = [
1392 "log",
1246 "log",
1393 "once_cell",
1247 "once_cell",
1394 "parking_lot",
1248 "parking_lot",
1395− "rustix 0.38.8",
1249+ "rustix",
1396 "serde",
1250 "serde",
1397 "serde_json",
1251 "serde_json",
1398 "slotmap",
1252 "slotmap",
@@ -1412,25 +1266,13 @@ dependencies = [
1412 "libc",
1266 "libc",
1413]
1267]
1414
1268
1415−[[package]]
1416−name = "hermit-abi"
1417−version = "0.3.2"
1418−source = "registry+https://github.com/rust-lang/crates.io-index"
1419−checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
1420−
1421−[[package]]
1422−name = "hex"
1423−version = "0.4.3"
1424−source = "registry+https://github.com/rust-lang/crates.io-index"
1425−checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
1426−
1427[[package]]
1269[[package]]
1428name = "home"
1270name = "home"
1429−version = "0.5.4"
1271+version = "0.5.5"
1430source = "registry+https://github.com/rust-lang/crates.io-index"
1272source = "registry+https://github.com/rust-lang/crates.io-index"
1431−checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
1273+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
1432dependencies = [
1274dependencies = [
1433− "winapi",
1275+ "windows-sys 0.48.0",
1434]
1276]
1435
1277
1436[[package]]
1278[[package]]
@@ -1444,7 +1286,7 @@ dependencies = [
1444 "iana-time-zone-haiku",
1286 "iana-time-zone-haiku",
1445 "js-sys",
1287 "js-sys",
1446 "wasm-bindgen",
1288 "wasm-bindgen",
1447− "windows",
1289+ "windows 0.48.0",
1448]
1290]
1449
1291
1450[[package]]
1292[[package]]
@@ -1459,9 +1301,9 @@ dependencies = [
1459
1301
1460[[package]]
1302[[package]]
1461name = "idna"
1303name = "idna"
1462−version = "0.4.0"
1304+version = "0.5.0"
1463source = "registry+https://github.com/rust-lang/crates.io-index"
1305source = "registry+https://github.com/rust-lang/crates.io-index"
1464−checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
1306+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
1465dependencies = [
1307dependencies = [
1466 "unicode-bidi",
1308 "unicode-bidi",
1467 "unicode-normalization",
1309 "unicode-normalization",
@@ -1469,17 +1311,16 @@ dependencies = [
1469
1311
1470[[package]]
1312[[package]]
1471name = "ignore"
1313name = "ignore"
1472−version = "0.4.20"
1314+version = "0.4.21"
1473source = "registry+https://github.com/rust-lang/crates.io-index"
1315source = "registry+https://github.com/rust-lang/crates.io-index"
1474−checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
1316+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
1475dependencies = [
1317dependencies = [
1318+ "crossbeam-deque",
1476 "globset",
1319 "globset",
1477− "lazy_static",
1478 "log",
1320 "log",
1479 "memchr",
1321 "memchr",
1480− "regex",
1322+ "regex-automata",
1481 "same-file",
1323 "same-file",
1482− "thread_local",
1483 "walkdir",
1324 "walkdir",
1484 "winapi-util",
1325 "winapi-util",
1485]
1326]
@@ -1490,7 +1331,7 @@ version = "0.1.5"
1490source = "registry+https://github.com/rust-lang/crates.io-index"
1331source = "registry+https://github.com/rust-lang/crates.io-index"
1491checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
1332checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
1492dependencies = [
1333dependencies = [
1493− "ahash 0.8.3",
1334+ "ahash",
1494 "hashbrown 0.12.3",
1335 "hashbrown 0.12.3",
1495]
1336]
1496
1337
@@ -1501,34 +1342,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1501checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
1342checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
1502dependencies = [
1343dependencies = [
1503 "equivalent",
1344 "equivalent",
1504− "hashbrown 0.14.0",
1345+ "hashbrown 0.14.3",
1505]
1346]
1506
1347
1507[[package]]
1348[[package]]
1508name = "indoc"
1349name = "indoc"
1509−version = "2.0.3"
1350+version = "2.0.4"
1510source = "registry+https://github.com/rust-lang/crates.io-index"
1351source = "registry+https://github.com/rust-lang/crates.io-index"
1511−checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"
1352+checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
1512
1353
1513[[package]]
1354[[package]]
1514−name = "io-close"
1355+name = "is-docker"
1515−version = "0.3.7"
1356+version = "0.2.0"
1516source = "registry+https://github.com/rust-lang/crates.io-index"
1357source = "registry+https://github.com/rust-lang/crates.io-index"
1517−checksum = "9cadcf447f06744f8ce713d2d6239bb5bde2c357a452397a9ed90c625da390bc"
1358+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
1518dependencies = [
1359dependencies = [
1519− "libc",
1360+ "once_cell",
1520− "winapi",
1521]
1361]
1522
1362
1523[[package]]
1363[[package]]
1524−name = "io-lifetimes"
1364+name = "is-wsl"
1525−version = "1.0.10"
1365+version = "0.4.0"
1526source = "registry+https://github.com/rust-lang/crates.io-index"
1366source = "registry+https://github.com/rust-lang/crates.io-index"
1527−checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
1367+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
1528dependencies = [
1368dependencies = [
1529− "hermit-abi 0.3.2",
1369+ "is-docker",
1530− "libc",
1370+ "once_cell",
1531− "windows-sys 0.48.0",
1532]
1371]
1533
1372
1534[[package]]
1373[[package]]
@@ -1546,32 +1385,17 @@ dependencies = [
1546 "wasm-bindgen",
1385 "wasm-bindgen",
1547]
1386]
1548
1387
1549−[[package]]
1550−name = "kstring"
1551−version = "2.0.0"
1552−source = "registry+https://github.com/rust-lang/crates.io-index"
1553−checksum = "ec3066350882a1cd6d950d055997f379ac37fd39f81cd4d8ed186032eb3c5747"
1554−dependencies = [
1555− "static_assertions",
1556−]
1557−
1558−[[package]]
1559−name = "lazy_static"
1560−version = "1.4.0"
1561−source = "registry+https://github.com/rust-lang/crates.io-index"
1562−checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
1563−
1564[[package]]
1388[[package]]
1565name = "libc"
1389name = "libc"
1566−version = "0.2.147"
1390+version = "0.2.151"
1567source = "registry+https://github.com/rust-lang/crates.io-index"
1391source = "registry+https://github.com/rust-lang/crates.io-index"
1568−checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
1392+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
1569
1393
1570[[package]]
1394[[package]]
1571name = "libloading"
1395name = "libloading"
1572−version = "0.8.0"
1396+version = "0.8.1"
1573source = "registry+https://github.com/rust-lang/crates.io-index"
1397source = "registry+https://github.com/rust-lang/crates.io-index"
1574−checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb"
1398+checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161"
1575dependencies = [
1399dependencies = [
1576 "cfg-if",
1400 "cfg-if",
1577 "windows-sys 0.48.0",
1401 "windows-sys 0.48.0",
@@ -1588,15 +1412,9 @@ dependencies = [
1588
1412
1589[[package]]
1413[[package]]
1590name = "linux-raw-sys"
1414name = "linux-raw-sys"
1591−version = "0.3.4"
1415+version = "0.4.11"
1592−source = "registry+https://github.com/rust-lang/crates.io-index"
1593−checksum = "36eb31c1778188ae1e64398743890d0877fef36d11521ac60406b42016e8c2cf"
1594−
1595−[[package]]
1596−name = "linux-raw-sys"
1597−version = "0.4.3"
1598source = "registry+https://github.com/rust-lang/crates.io-index"
1416source = "registry+https://github.com/rust-lang/crates.io-index"
1599−checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
1417+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"
1600
1418
1601[[package]]
1419[[package]]
1602name = "lock_api"
1420name = "lock_api"
@@ -1610,15 +1428,15 @@ dependencies = [
1610
1428
1611[[package]]
1429[[package]]
1612name = "log"
1430name = "log"
1613−version = "0.4.19"
1431+version = "0.4.20"
1614source = "registry+https://github.com/rust-lang/crates.io-index"
1432source = "registry+https://github.com/rust-lang/crates.io-index"
1615−checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
1433+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
1616
1434
1617[[package]]
1435[[package]]
1618name = "lsp-types"
1436name = "lsp-types"
1619−version = "0.94.1"
1437+version = "0.95.0"
1620source = "registry+https://github.com/rust-lang/crates.io-index"
1438source = "registry+https://github.com/rust-lang/crates.io-index"
1621−checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
1439+checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984"
1622dependencies = [
1440dependencies = [
1623 "bitflags 1.3.2",
1441 "bitflags 1.3.2",
1624 "serde",
1442 "serde",
@@ -1629,41 +1447,26 @@ dependencies = [
1629
1447
1630[[package]]
1448[[package]]
1631name = "memchr"
1449name = "memchr"
1632−version = "2.5.0"
1450+version = "2.6.3"
1633source = "registry+https://github.com/rust-lang/crates.io-index"
1451source = "registry+https://github.com/rust-lang/crates.io-index"
1634−checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
1452+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
1635
1453
1636[[package]]
1454[[package]]
1637name = "memmap2"
1455name = "memmap2"
1638−version = "0.5.10"
1456+version = "0.9.0"
1639−source = "registry+https://github.com/rust-lang/crates.io-index"
1640−checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
1641−dependencies = [
1642− "libc",
1643−]
1644−
1645−[[package]]
1646−name = "memmap2"
1647−version = "0.7.1"
1648source = "registry+https://github.com/rust-lang/crates.io-index"
1457source = "registry+https://github.com/rust-lang/crates.io-index"
1649−checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6"
1458+checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375"
1650dependencies = [
1459dependencies = [
1651 "libc",
1460 "libc",
1652]
1461]
1653
1462
1654[[package]]
1463[[package]]
1655−name = "minimal-lexical"
1464+name = "memoffset"
1656−version = "0.2.1"
1465+version = "0.9.0"
1657−source = "registry+https://github.com/rust-lang/crates.io-index"
1658−checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
1659−
1660−[[package]]
1661−name = "miniz_oxide"
1662−version = "0.6.2"
1663source = "registry+https://github.com/rust-lang/crates.io-index"
1466source = "registry+https://github.com/rust-lang/crates.io-index"
1664−checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
1467+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
1665dependencies = [
1468dependencies = [
1666− "adler",
1469+ "autocfg",
1667]
1470]
1668
1471
1669[[package]]
1472[[package]]
@@ -1677,24 +1480,36 @@ dependencies = [
1677
1480
1678[[package]]
1481[[package]]
1679name = "mio"
1482name = "mio"
1680−version = "0.8.6"
1483+version = "0.8.9"
1681source = "registry+https://github.com/rust-lang/crates.io-index"
1484source = "registry+https://github.com/rust-lang/crates.io-index"
1682−checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9"
1485+checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
1683dependencies = [
1486dependencies = [
1684 "libc",
1487 "libc",
1685 "log",
1488 "log",
1686 "wasi",
1489 "wasi",
1687− "windows-sys 0.45.0",
1490+ "windows-sys 0.48.0",
1688]
1491]
1689
1492
1690[[package]]
1493[[package]]
1691−name = "nom"
1494+name = "nucleo"
1692−version = "7.1.3"
1495+version = "0.2.1"
1693source = "registry+https://github.com/rust-lang/crates.io-index"
1496source = "registry+https://github.com/rust-lang/crates.io-index"
1694−checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
1497+checksum = "ae5331f4bcce475cf28cb29c95366c3091af4b0aa7703f1a6bc858f29718fdf3"
1695dependencies = [
1498dependencies = [
1499+ "nucleo-matcher",
1500+ "parking_lot",
1501+ "rayon",
1502+]
1503+
1504+[[package]]
1505+name = "nucleo-matcher"
1506+version = "0.2.0"
1507+source = "registry+https://github.com/rust-lang/crates.io-index"
1508+checksum = "1b702b402fe286162d1f00b552a046ce74365d2ac473a2607ff36ba650f9bd57"
1509+dependencies = [
1510+ "cov-mark",
1696 "memchr",
1511 "memchr",
1697− "minimal-lexical",
1512+ "unicode-segmentation",
1698]
1513]
1699
1514
1700[[package]]
1515[[package]]
@@ -1712,7 +1527,7 @@ version = "1.15.0"
1712source = "registry+https://github.com/rust-lang/crates.io-index"
1527source = "registry+https://github.com/rust-lang/crates.io-index"
1713checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
1528checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
1714dependencies = [
1529dependencies = [
1715− "hermit-abi 0.2.6",
1530+ "hermit-abi",
1716 "libc",
1531 "libc",
1717]
1532]
1718
1533
@@ -1736,9 +1551,20 @@ dependencies = [
1736
1551
1737[[package]]
1552[[package]]
1738name = "once_cell"
1553name = "once_cell"
1739−version = "1.18.0"
1554+version = "1.19.0"
1740source = "registry+https://github.com/rust-lang/crates.io-index"
1555source = "registry+https://github.com/rust-lang/crates.io-index"
1741−checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
1556+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
1557+
1558+[[package]]
1559+name = "open"
1560+version = "5.0.1"
1561+source = "registry+https://github.com/rust-lang/crates.io-index"
1562+checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349"
1563+dependencies = [
1564+ "is-wsl",
1565+ "libc",
1566+ "pathdiff",
1567+]
1742
1568
1743[[package]]
1569[[package]]
1744name = "parking_lot"
1570name = "parking_lot"
@@ -1763,11 +1589,17 @@ dependencies = [
1763 "windows-sys 0.45.0",
1589 "windows-sys 0.45.0",
1764]
1590]
1765
1591
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+
1766[[package]]
1598[[package]]
1767name = "percent-encoding"
1599name = "percent-encoding"
1768−version = "2.3.0"
1600+version = "2.3.1"
1769source = "registry+https://github.com/rust-lang/crates.io-index"
1601source = "registry+https://github.com/rust-lang/crates.io-index"
1770−checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
1602+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
1771
1603
1772[[package]]
1604[[package]]
1773name = "pin-project-lite"
1605name = "pin-project-lite"
@@ -1783,18 +1615,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
1783
1615
1784[[package]]
1616[[package]]
1785name = "proc-macro2"
1617name = "proc-macro2"
1786−version = "1.0.63"
1618+version = "1.0.69"
1787source = "registry+https://github.com/rust-lang/crates.io-index"
1619source = "registry+https://github.com/rust-lang/crates.io-index"
1788−checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
1620+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
1789dependencies = [
1621dependencies = [
1790 "unicode-ident",
1622 "unicode-ident",
1791]
1623]
1792
1624
1793[[package]]
1625[[package]]
1794name = "prodash"
1626name = "prodash"
1795−version = "25.0.0"
1627+version = "28.0.0"
1796source = "registry+https://github.com/rust-lang/crates.io-index"
1628source = "registry+https://github.com/rust-lang/crates.io-index"
1797−checksum = "3236ce1618b6da4c7b618e0143c4d5b5dc190f75f81c49f248221382f7e9e9ae"
1629+checksum = "744a264d26b88a6a7e37cbad97953fa233b94d585236310bcbc88474b4092d79"
1798
1630
1799[[package]]
1631[[package]]
1800name = "pulldown-cmark"
1632name = "pulldown-cmark"
@@ -1843,6 +1675,28 @@ dependencies = [
1843 "getrandom",
1675 "getrandom",
1844]
1676]
1845
1677
1678+[[package]]
1679+name = "rayon"
1680+version = "1.7.0"
1681+source = "registry+https://github.com/rust-lang/crates.io-index"
1682+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
1683+dependencies = [
1684+ "either",
1685+ "rayon-core",
1686+]
1687+
1688+[[package]]
1689+name = "rayon-core"
1690+version = "1.11.0"
1691+source = "registry+https://github.com/rust-lang/crates.io-index"
1692+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
1693+dependencies = [
1694+ "crossbeam-channel",
1695+ "crossbeam-deque",
1696+ "crossbeam-utils",
1697+ "num_cpus",
1698+]
1699+
1846[[package]]
1700[[package]]
1847name = "redox_syscall"
1701name = "redox_syscall"
1848version = "0.2.16"
1702version = "0.2.16"
@@ -1854,53 +1708,47 @@ dependencies = [
1854
1708
1855[[package]]
1709[[package]]
1856name = "redox_syscall"
1710name = "redox_syscall"
1857−version = "0.3.5"
1711+version = "0.4.1"
1858source = "registry+https://github.com/rust-lang/crates.io-index"
1712source = "registry+https://github.com/rust-lang/crates.io-index"
1859−checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
1713+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
1860dependencies = [
1714dependencies = [
1861 "bitflags 1.3.2",
1715 "bitflags 1.3.2",
1862]
1716]
1863
1717
1864[[package]]
1718[[package]]
1865name = "regex"
1719name = "regex"
1866−version = "1.9.3"
1720+version = "1.10.2"
1867source = "registry+https://github.com/rust-lang/crates.io-index"
1721source = "registry+https://github.com/rust-lang/crates.io-index"
1868−checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
1722+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
1869dependencies = [
1723dependencies = [
1870− "aho-corasick 1.0.2",
1724+ "aho-corasick",
1871 "memchr",
1725 "memchr",
1872 "regex-automata",
1726 "regex-automata",
1873− "regex-syntax 0.7.4",
1727+ "regex-syntax",
1874]
1728]
1875
1729
1876[[package]]
1730[[package]]
1877name = "regex-automata"
1731name = "regex-automata"
1878−version = "0.3.6"
1732+version = "0.4.3"
1879source = "registry+https://github.com/rust-lang/crates.io-index"
1733source = "registry+https://github.com/rust-lang/crates.io-index"
1880−checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
1734+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
1881dependencies = [
1735dependencies = [
1882− "aho-corasick 1.0.2",
1736+ "aho-corasick",
1883 "memchr",
1737 "memchr",
1884− "regex-syntax 0.7.4",
1738+ "regex-syntax",
1885]
1739]
1886
1740
1887[[package]]
1741[[package]]
1888name = "regex-syntax"
1742name = "regex-syntax"
1889−version = "0.6.29"
1743+version = "0.8.2"
1890−source = "registry+https://github.com/rust-lang/crates.io-index"
1891−checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
1892−
1893−[[package]]
1894−name = "regex-syntax"
1895−version = "0.7.4"
1896source = "registry+https://github.com/rust-lang/crates.io-index"
1744source = "registry+https://github.com/rust-lang/crates.io-index"
1897−checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
1745+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
1898
1746
1899[[package]]
1747[[package]]
1900name = "ropey"
1748name = "ropey"
1901−version = "1.6.0"
1749+version = "1.6.1"
1902source = "registry+https://github.com/rust-lang/crates.io-index"
1750source = "registry+https://github.com/rust-lang/crates.io-index"
1903−checksum = "53ce7a2c43a32e50d666e33c5a80251b31147bb4b49024bcab11fb6f20c671ed"
1751+checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5"
1904dependencies = [
1752dependencies = [
1905 "smallvec",
1753 "smallvec",
1906 "str_indices",
1754 "str_indices",
@@ -1914,29 +1762,15 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
1914
1762
1915[[package]]
1763[[package]]
1916name = "rustix"
1764name = "rustix"
1917−version = "0.37.15"
1765+version = "0.38.28"
1918source = "registry+https://github.com/rust-lang/crates.io-index"
1766source = "registry+https://github.com/rust-lang/crates.io-index"
1919−checksum = "a0661814f891c57c930a610266415528da53c4933e6dea5fb350cbfe048a9ece"
1767+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
1920dependencies = [
1768dependencies = [
1921− "bitflags 1.3.2",
1769+ "bitflags 2.4.1",
1922 "errno",
1770 "errno",
1923− "io-lifetimes",
1924 "libc",
1771 "libc",
1925− "linux-raw-sys 0.3.4",
1772+ "linux-raw-sys",
1926− "windows-sys 0.48.0",
1773+ "windows-sys 0.52.0",
1927−]
1928−
1929−[[package]]
1930−name = "rustix"
1931−version = "0.38.8"
1932−source = "registry+https://github.com/rust-lang/crates.io-index"
1933−checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
1934−dependencies = [
1935− "bitflags 2.4.0",
1936− "errno",
1937− "libc",
1938− "linux-raw-sys 0.4.3",
1939− "windows-sys 0.48.0",
1940]
1774]
1941
1775
1942[[package]]
1776[[package]]
@@ -1968,29 +1802,29 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
1968
1802
1969[[package]]
1803[[package]]
1970name = "serde"
1804name = "serde"
1971−version = "1.0.183"
1805+version = "1.0.193"
1972source = "registry+https://github.com/rust-lang/crates.io-index"
1806source = "registry+https://github.com/rust-lang/crates.io-index"
1973−checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
1807+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
1974dependencies = [
1808dependencies = [
1975 "serde_derive",
1809 "serde_derive",
1976]
1810]
1977
1811
1978[[package]]
1812[[package]]
1979name = "serde_derive"
1813name = "serde_derive"
1980−version = "1.0.183"
1814+version = "1.0.193"
1981source = "registry+https://github.com/rust-lang/crates.io-index"
1815source = "registry+https://github.com/rust-lang/crates.io-index"
1982−checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
1816+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
1983dependencies = [
1817dependencies = [
1984 "proc-macro2",
1818 "proc-macro2",
1985 "quote",
1819 "quote",
1986− "syn 2.0.28",
1820+ "syn 2.0.38",
1987]
1821]
1988
1822
1989[[package]]
1823[[package]]
1990name = "serde_json"
1824name = "serde_json"
1991−version = "1.0.104"
1825+version = "1.0.108"
1992source = "registry+https://github.com/rust-lang/crates.io-index"
1826source = "registry+https://github.com/rust-lang/crates.io-index"
1993−checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
1827+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
1994dependencies = [
1828dependencies = [
1995 "itoa",
1829 "itoa",
1996 "ryu",
1830 "ryu",
@@ -2005,7 +1839,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab"
2005dependencies = [
1839dependencies = [
2006 "proc-macro2",
1840 "proc-macro2",
2007 "quote",
1841 "quote",
2008− "syn 2.0.28",
1842+ "syn 2.0.38",
2009]
1843]
2010
1844
2011[[package]]
1845[[package]]
@@ -2076,18 +1910,18 @@ dependencies = [
2076
1910
2077[[package]]
1911[[package]]
2078name = "slotmap"
1912name = "slotmap"
2079−version = "1.0.6"
1913+version = "1.0.7"
2080source = "registry+https://github.com/rust-lang/crates.io-index"
1914source = "registry+https://github.com/rust-lang/crates.io-index"
2081−checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342"
1915+checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
2082dependencies = [
1916dependencies = [
2083 "version_check",
1917 "version_check",
2084]
1918]
2085
1919
2086[[package]]
1920[[package]]
2087name = "smallvec"
1921name = "smallvec"
2088−version = "1.11.0"
1922+version = "1.11.2"
2089source = "registry+https://github.com/rust-lang/crates.io-index"
1923source = "registry+https://github.com/rust-lang/crates.io-index"
2090−checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
1924+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
2091
1925
2092[[package]]
1926[[package]]
2093name = "smartstring"
1927name = "smartstring"
@@ -2108,9 +1942,9 @@ checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043"
2108
1942
2109[[package]]
1943[[package]]
2110name = "socket2"
1944name = "socket2"
2111−version = "0.5.3"
1945+version = "0.5.5"
2112source = "registry+https://github.com/rust-lang/crates.io-index"
1946source = "registry+https://github.com/rust-lang/crates.io-index"
2113−checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
1947+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
2114dependencies = [
1948dependencies = [
2115 "libc",
1949 "libc",
2116 "windows-sys 0.48.0",
1950 "windows-sys 0.48.0",
@@ -2122,12 +1956,6 @@ version = "1.1.0"
2122source = "registry+https://github.com/rust-lang/crates.io-index"
1956source = "registry+https://github.com/rust-lang/crates.io-index"
2123checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
1957checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
2124
1958
2125−[[package]]
2126−name = "str-buf"
2127−version = "1.0.6"
2128−source = "registry+https://github.com/rust-lang/crates.io-index"
2129−checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
2130−
2131[[package]]
1959[[package]]
2132name = "str_indices"
1960name = "str_indices"
2133version = "0.4.1"
1961version = "0.4.1"
@@ -2147,9 +1975,9 @@ dependencies = [
2147
1975
2148[[package]]
1976[[package]]
2149name = "syn"
1977name = "syn"
2150−version = "2.0.28"
1978+version = "2.0.38"
2151source = "registry+https://github.com/rust-lang/crates.io-index"
1979source = "registry+https://github.com/rust-lang/crates.io-index"
2152−checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
1980+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
2153dependencies = [
1981dependencies = [
2154 "proc-macro2",
1982 "proc-macro2",
2155 "quote",
1983 "quote",
@@ -2158,14 +1986,14 @@ dependencies = [
2158
1986
2159[[package]]
1987[[package]]
2160name = "tempfile"
1988name = "tempfile"
2161−version = "3.7.1"
1989+version = "3.8.1"
2162source = "registry+https://github.com/rust-lang/crates.io-index"
1990source = "registry+https://github.com/rust-lang/crates.io-index"
2163−checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651"
1991+checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5"
2164dependencies = [
1992dependencies = [
2165 "cfg-if",
1993 "cfg-if",
2166 "fastrand",
1994 "fastrand",
2167− "redox_syscall 0.3.5",
1995+ "redox_syscall 0.4.1",
2168− "rustix 0.38.8",
1996+ "rustix",
2169 "windows-sys 0.48.0",
1997 "windows-sys 0.48.0",
2170]
1998]
2171
1999
@@ -2200,32 +2028,22 @@ dependencies = [
2200
2028
2201[[package]]
2029[[package]]
2202name = "thiserror"
2030name = "thiserror"
2203−version = "1.0.44"
2031+version = "1.0.52"
2204source = "registry+https://github.com/rust-lang/crates.io-index"
2032source = "registry+https://github.com/rust-lang/crates.io-index"
2205−checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
2033+checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d"
2206dependencies = [
2034dependencies = [
2207 "thiserror-impl",
2035 "thiserror-impl",
2208]
2036]
2209
2037
2210[[package]]
2038[[package]]
2211name = "thiserror-impl"
2039name = "thiserror-impl"
2212−version = "1.0.44"
2040+version = "1.0.52"
2213source = "registry+https://github.com/rust-lang/crates.io-index"
2041source = "registry+https://github.com/rust-lang/crates.io-index"
2214−checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
2042+checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3"
2215dependencies = [
2043dependencies = [
2216 "proc-macro2",
2044 "proc-macro2",
2217 "quote",
2045 "quote",
2218− "syn 2.0.28",
2046+ "syn 2.0.38",
2219−]
2220−
2221−[[package]]
2222−name = "thread_local"
2223−version = "1.1.7"
2224−source = "registry+https://github.com/rust-lang/crates.io-index"
2225−checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
2226−dependencies = [
2227− "cfg-if",
2228− "once_cell",
2229]
2047]
2230
2048
2231[[package]]
2049[[package]]
@@ -2239,9 +2057,9 @@ dependencies = [
2239
2057
2240[[package]]
2058[[package]]
2241name = "time"
2059name = "time"
2242−version = "0.3.20"
2060+version = "0.3.23"
2243source = "registry+https://github.com/rust-lang/crates.io-index"
2061source = "registry+https://github.com/rust-lang/crates.io-index"
2244−checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
2062+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
2245dependencies = [
2063dependencies = [
2246 "itoa",
2064 "itoa",
2247 "libc",
2065 "libc",
@@ -2253,15 +2071,15 @@ dependencies = [
2253
2071
2254[[package]]
2072[[package]]
2255name = "time-core"
2073name = "time-core"
2256−version = "0.1.0"
2074+version = "0.1.1"
2257source = "registry+https://github.com/rust-lang/crates.io-index"
2075source = "registry+https://github.com/rust-lang/crates.io-index"
2258−checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
2076+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
2259
2077
2260[[package]]
2078[[package]]
2261name = "time-macros"
2079name = "time-macros"
2262−version = "0.2.8"
2080+version = "0.2.10"
2263source = "registry+https://github.com/rust-lang/crates.io-index"
2081source = "registry+https://github.com/rust-lang/crates.io-index"
2264−checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
2082+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
2265dependencies = [
2083dependencies = [
2266 "time-core",
2084 "time-core",
2267]
2085]
@@ -2283,9 +2101,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
2283
2101
2284[[package]]
2102[[package]]
2285name = "tokio"
2103name = "tokio"
2286−version = "1.31.0"
2104+version = "1.35.1"
2287source = "registry+https://github.com/rust-lang/crates.io-index"
2105source = "registry+https://github.com/rust-lang/crates.io-index"
2288−checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
2106+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
2289dependencies = [
2107dependencies = [
2290 "backtrace",
2108 "backtrace",
2291 "bytes",
2109 "bytes",
@@ -2302,13 +2120,13 @@ dependencies = [
2302
2120
2303[[package]]
2121[[package]]
2304name = "tokio-macros"
2122name = "tokio-macros"
2305−version = "2.1.0"
2123+version = "2.2.0"
2306source = "registry+https://github.com/rust-lang/crates.io-index"
2124source = "registry+https://github.com/rust-lang/crates.io-index"
2307−checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
2125+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
2308dependencies = [
2126dependencies = [
2309 "proc-macro2",
2127 "proc-macro2",
2310 "quote",
2128 "quote",
2311− "syn 2.0.28",
2129+ "syn 2.0.38",
2312]
2130]
2313
2131
2314[[package]]
2132[[package]]
@@ -2353,7 +2171,7 @@ dependencies = [
2353 "serde",
2171 "serde",
2354 "serde_spanned",
2172 "serde_spanned",
2355 "toml_datetime",
2173 "toml_datetime",
2356− "winnow",
2174+ "winnow 0.4.6",
2357]
2175]
2358
2176
2359[[package]]
2177[[package]]
@@ -2400,13 +2218,9 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
2400
2218
2401[[package]]
2219[[package]]
2402name = "unicode-linebreak"
2220name = "unicode-linebreak"
2403−version = "0.1.4"
2221+version = "0.1.5"
2404source = "registry+https://github.com/rust-lang/crates.io-index"
2222source = "registry+https://github.com/rust-lang/crates.io-index"
2405−checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137"
2223+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
2406−dependencies = [
2407− "hashbrown 0.12.3",
2408− "regex",
2409−]
2410
2224
2411[[package]]
2225[[package]]
2412name = "unicode-normalization"
2226name = "unicode-normalization"
@@ -2425,15 +2239,15 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
2425
2239
2426[[package]]
2240[[package]]
2427name = "unicode-width"
2241name = "unicode-width"
2428−version = "0.1.10"
2242+version = "0.1.11"
2429source = "registry+https://github.com/rust-lang/crates.io-index"
2243source = "registry+https://github.com/rust-lang/crates.io-index"
2430−checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
2244+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
2431
2245
2432[[package]]
2246[[package]]
2433name = "url"
2247name = "url"
2434−version = "2.4.0"
2248+version = "2.5.0"
2435source = "registry+https://github.com/rust-lang/crates.io-index"
2249source = "registry+https://github.com/rust-lang/crates.io-index"
2436−checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
2250+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
2437dependencies = [
2251dependencies = [
2438 "form_urlencoded",
2252 "form_urlencoded",
2439 "idna",
2253 "idna",
@@ -2449,9 +2263,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
2449
2263
2450[[package]]
2264[[package]]
2451name = "walkdir"
2265name = "walkdir"
2452−version = "2.3.3"
2266+version = "2.4.0"
2453source = "registry+https://github.com/rust-lang/crates.io-index"
2267source = "registry+https://github.com/rust-lang/crates.io-index"
2454−checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
2268+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
2455dependencies = [
2269dependencies = [
2456 "same-file",
2270 "same-file",
2457 "winapi-util",
2271 "winapi-util",
@@ -2519,13 +2333,15 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
2519
2333
2520[[package]]
2334[[package]]
2521name = "which"
2335name = "which"
2522−version = "4.4.0"
2336+version = "5.0.0"
2523source = "registry+https://github.com/rust-lang/crates.io-index"
2337source = "registry+https://github.com/rust-lang/crates.io-index"
2524−checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
2338+checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14"
2525dependencies = [
2339dependencies = [
2526 "either",
2340 "either",
2527− "libc",
2341+ "home",
2528 "once_cell",
2342 "once_cell",
2343+ "rustix",
2344+ "windows-sys 0.48.0",
2529]
2345]
2530
2346
2531[[package]]
2347[[package]]
@@ -2568,6 +2384,25 @@ dependencies = [
2568 "windows-targets 0.48.0",
2384 "windows-targets 0.48.0",
2569]
2385]
2570
2386
2387+[[package]]
2388+name = "windows"
2389+version = "0.52.0"
2390+source = "registry+https://github.com/rust-lang/crates.io-index"
2391+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
2392+dependencies = [
2393+ "windows-core",
2394+ "windows-targets 0.52.0",
2395+]
2396+
2397+[[package]]
2398+name = "windows-core"
2399+version = "0.52.0"
2400+source = "registry+https://github.com/rust-lang/crates.io-index"
2401+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
2402+dependencies = [
2403+ "windows-targets 0.52.0",
2404+]
2405+
2571[[package]]
2406[[package]]
2572name = "windows-sys"
2407name = "windows-sys"
2573version = "0.45.0"
2408version = "0.45.0"
@@ -2586,6 +2421,15 @@ dependencies = [
2586 "windows-targets 0.48.0",
2421 "windows-targets 0.48.0",
2587]
2422]
2588
2423
2424+[[package]]
2425+name = "windows-sys"
2426+version = "0.52.0"
2427+source = "registry+https://github.com/rust-lang/crates.io-index"
2428+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
2429+dependencies = [
2430+ "windows-targets 0.52.0",
2431+]
2432+
2589[[package]]
2433[[package]]
2590name = "windows-targets"
2434name = "windows-targets"
2591version = "0.42.2"
2435version = "0.42.2"
@@ -2616,6 +2460,21 @@ dependencies = [
2616 "windows_x86_64_msvc 0.48.0",
2460 "windows_x86_64_msvc 0.48.0",
2617]
2461]
2618
2462
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+
2619[[package]]
2478[[package]]
2620name = "windows_aarch64_gnullvm"
2479name = "windows_aarch64_gnullvm"
2621version = "0.42.2"
2480version = "0.42.2"
@@ -2628,6 +2487,12 @@ version = "0.48.0"
2628source = "registry+https://github.com/rust-lang/crates.io-index"
2487source = "registry+https://github.com/rust-lang/crates.io-index"
2629checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
2488checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
2630
2489
2490+[[package]]
2491+name = "windows_aarch64_gnullvm"
2492+version = "0.52.0"
2493+source = "registry+https://github.com/rust-lang/crates.io-index"
2494+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
2495+
2631[[package]]
2496[[package]]
2632name = "windows_aarch64_msvc"
2497name = "windows_aarch64_msvc"
2633version = "0.42.2"
2498version = "0.42.2"
@@ -2640,6 +2505,12 @@ version = "0.48.0"
2640source = "registry+https://github.com/rust-lang/crates.io-index"
2505source = "registry+https://github.com/rust-lang/crates.io-index"
2641checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
2506checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
2642
2507
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+
2643[[package]]
2514[[package]]
2644name = "windows_i686_gnu"
2515name = "windows_i686_gnu"
2645version = "0.42.2"
2516version = "0.42.2"
@@ -2652,6 +2523,12 @@ version = "0.48.0"
2652source = "registry+https://github.com/rust-lang/crates.io-index"
2523source = "registry+https://github.com/rust-lang/crates.io-index"
2653checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
2524checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
2654
2525
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+
2655[[package]]
2532[[package]]
2656name = "windows_i686_msvc"
2533name = "windows_i686_msvc"
2657version = "0.42.2"
2534version = "0.42.2"
@@ -2664,6 +2541,12 @@ version = "0.48.0"
2664source = "registry+https://github.com/rust-lang/crates.io-index"
2541source = "registry+https://github.com/rust-lang/crates.io-index"
2665checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
2542checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
2666
2543
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+
2667[[package]]
2550[[package]]
2668name = "windows_x86_64_gnu"
2551name = "windows_x86_64_gnu"
2669version = "0.42.2"
2552version = "0.42.2"
@@ -2676,6 +2559,12 @@ version = "0.48.0"
2676source = "registry+https://github.com/rust-lang/crates.io-index"
2559source = "registry+https://github.com/rust-lang/crates.io-index"
2677checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
2560checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
2678
2561
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+
2679[[package]]
2568[[package]]
2680name = "windows_x86_64_gnullvm"
2569name = "windows_x86_64_gnullvm"
2681version = "0.42.2"
2570version = "0.42.2"
@@ -2688,6 +2577,12 @@ version = "0.48.0"
2688source = "registry+https://github.com/rust-lang/crates.io-index"
2577source = "registry+https://github.com/rust-lang/crates.io-index"
2689checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
2578checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
2690
2579
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+
2691[[package]]
2586[[package]]
2692name = "windows_x86_64_msvc"
2587name = "windows_x86_64_msvc"
2693version = "0.42.2"
2588version = "0.42.2"
@@ -2700,6 +2595,12 @@ version = "0.48.0"
2700source = "registry+https://github.com/rust-lang/crates.io-index"
2595source = "registry+https://github.com/rust-lang/crates.io-index"
2701checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
2596checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
2702
2597
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+
2703[[package]]
2604[[package]]
2704name = "winnow"
2605name = "winnow"
2705version = "0.4.6"
2606version = "0.4.6"
@@ -2709,9 +2610,18 @@ dependencies = [
2709 "memchr",
2610 "memchr",
2710]
2611]
2711
2612
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+
2712[[package]]
2622[[package]]
2713name = "xtask"
2623name = "xtask"
2714−version = "0.6.0"
2624+version = "23.10.0"
2715dependencies = [
2625dependencies = [
2716 "helix-core",
2626 "helix-core",
2717 "helix-loader",
2627 "helix-loader",
@@ -2719,3 +2629,23 @@ dependencies = [
2719 "helix-view",
2629 "helix-view",
2720 "toml",
2630 "toml",
2721]
2631]
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+13
@@ -1,10 +1,12 @@
1[workspace]
1[workspace]
2+resolver = "2"
2members = [
3members = [
3 "helix-core",
4 "helix-core",
4 "helix-view",
5 "helix-view",
5 "helix-term",
6 "helix-term",
6 "helix-tui",
7 "helix-tui",
7 "helix-lsp",
8 "helix-lsp",
9+ "helix-event",
8 "helix-dap",
10 "helix-dap",
9 "helix-loader",
11 "helix-loader",
10 "helix-vcs",
12 "helix-vcs",
@@ -35,3 +37,14 @@ package.helix-term.opt-level = 2
35
37
36[workspace.dependencies]
38[workspace.dependencies]
37tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
39tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
40+nucleo = "0.2.0"
41+
42+[workspace.package]
43+version = "23.10.0"
44+edition = "2021"
45+authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
46+categories = ["editor"]
47+repository = "https://github.com/helix-editor/helix"
48+homepage = "https://helix-editor.com"
49+license = "MPL-2.0"
50+rust-version = "1.70"
README.md+1−1
@@ -18,7 +18,7 @@
18
18
19![Screenshot](./screenshot.png)
19![Screenshot](./screenshot.png)
20
20
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.
22
22
23The editing model is very heavily based on Kakoune; during development I found
23The editing model is very heavily based on Kakoune; during development I found
24myself agreeing with most of Kakoune's design decisions.
24myself agreeing with most of Kakoune's design decisions.
VERSIONdeleted−1
@@ -1 +0,0 @@
1−23.05
book/custom.css+1−1
@@ -164,7 +164,7 @@ code.hljs {
164 --searchresults-header-fg: #5f5f71;
164 --searchresults-header-fg: #5f5f71;
165 --searchresults-border-color: #5c5c68;
165 --searchresults-border-color: #5c5c68;
166 --searchresults-li-bg: #242430;
166 --searchresults-li-bg: #242430;
167− --search-mark-bg: #acff5;
167+ --search-mark-bg: #a2cff5;
168}
168}
169
169
170.colibri .content .header {
170.colibri .content .header {
book/src/configuration.md+27−9
@@ -51,7 +51,7 @@ Its settings will be merged with the configuration directory `config.toml` and t
51| `auto-completion` | Enable automatic pop up of auto-completion | `true` |
51| `auto-completion` | Enable automatic pop up of auto-completion | `true` |
52| `auto-format` | Enable automatic formatting on save | `true` |
52| `auto-format` | Enable automatic formatting on save | `true` |
53| `auto-save` | Enable automatic saving on the focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal | `false` |
53| `auto-save` | Enable automatic saving on the focus moving away from Helix. Requires [focus event support](https://github.com/helix-editor/helix/wiki/Terminal-Support) from your terminal | `false` |
54−| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `400` |
54+| `idle-timeout` | Time in milliseconds since last keypress before idle timers trigger. Used for autocompletion, set to 0 for instant | `250` |
55| `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |
55| `preview-completion-insert` | Whether to apply completion item instantly when selected | `true` |
56| `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
56| `completion-trigger-len` | The min-length of word under cursor to trigger autocompletion | `2` |
57| `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |
57| `completion-replace` | Set to `true` to make completions always replace the entire word and not just the part before the cursor | `false` |
@@ -64,6 +64,9 @@ Its settings will be merged with the configuration directory `config.toml` and t
64| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set | `80` |
64| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set | `80` |
65| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
65| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml` | `[]` |
66| `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
66| `default-line-ending` | The line ending to use for new documents. Can be `native`, `lf`, `crlf`, `ff`, `cr` or `nel`. `native` uses the platform's native line ending (`crlf` on Windows, otherwise `lf`). | `native` |
67+| `insert-final-newline` | Whether to automatically insert a trailing line-ending on write if missing | `true` |
68+| `popup-border` | Draw border around `popup`, `menu`, `all`, or `none` | `none` |
69+| `indent-heuristic` | How the indentation for a newly inserted line is computed: `simple` just copies the indentation level from the previous line, `tree-sitter` computes the indentation based on the syntax tree and `hybrid` combines both approaches. If the chosen heuristic is not available, a different one will be used as a fallback (the fallback order being `hybrid` -> `tree-sitter` -> `simple`). | `hybrid`
67
70
68### `[editor.statusline]` Section
71### `[editor.statusline]` Section
69
72
@@ -165,16 +168,31 @@ All git related options are only enabled in a git repository.
165
168
166| Key | Description | Default |
169| Key | Description | Default |
167|--|--|---------|
170|--|--|---------|
168−|`hidden` | Enables ignoring hidden files | true
171+|`hidden` | Enables ignoring hidden files | `true`
169−|`follow-symlinks` | Follow symlinks instead of ignoring them | true
172+|`follow-symlinks` | Follow symlinks instead of ignoring them | `true`
170−|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | true
173+|`deduplicate-links` | Ignore symlinks that point at files already shown in the picker | `true`
171−|`parents` | Enables reading ignore files from parent directories | true
174+|`parents` | Enables reading ignore files from parent directories | `true`
172−|`ignore` | Enables reading `.ignore` files | true
175+|`ignore` | Enables reading `.ignore` files | `true`
173−|`git-ignore` | Enables reading `.gitignore` files | true
176+|`git-ignore` | Enables reading `.gitignore` files | `true`
174−|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludefile` option | true
177+|`git-global` | Enables reading global `.gitignore`, whose path is specified in git's config: `core.excludesfile` option | `true`
175−|`git-exclude` | Enables reading `.git/info/exclude` files | true
178+|`git-exclude` | Enables reading `.git/info/exclude` files | `true`
176|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
179|`max-depth` | Set with an integer value for maximum depth to recurse | Defaults to `None`.
177
180
181+Ignore files can be placed locally as `.ignore` or put in your home directory as `~/.ignore`. They support the usual ignore and negative ignore (unignore) rules used in `.gitignore` files.
182+
183+Additionally, you can use Helix-specific ignore files by creating a local `.helix/ignore` file in the current workspace or a global `ignore` file located in your Helix config directory:
184+- Linux and Mac: `~/.config/helix/ignore`
185+- Windows: `%AppData%\helix\ignore`
186+
187+Example:
188+
189+```ini
190+# unignore in file picker and global search
191+!.github/
192+!.gitignore
193+!.gitattributes
194+```
195+
178### `[editor.auto-pairs]` Section
196### `[editor.auto-pairs]` Section
179
197
180Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a
198Enables automatic insertion of pairs to parentheses, brackets, etc. Can be a
book/src/generated/lang-support.md+23−11
@@ -1,5 +1,6 @@
1| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
1| Language | Syntax Highlighting | Treesitter Textobjects | Auto Indent | Default LSP |
2| --- | --- | --- | --- | --- |
2| --- | --- | --- | --- | --- |
3+| agda | ✓ | | | |
3| astro | ✓ | | | |
4| astro | ✓ | | | |
4| awk | ✓ | ✓ | | `awk-language-server` |
5| awk | ✓ | ✓ | | `awk-language-server` |
5| bash | ✓ | ✓ | ✓ | `bash-language-server` |
6| bash | ✓ | ✓ | ✓ | `bash-language-server` |
@@ -10,13 +11,13 @@
10| blueprint | ✓ | | | `blueprint-compiler` |
11| blueprint | ✓ | | | `blueprint-compiler` |
11| c | ✓ | ✓ | ✓ | `clangd` |
12| c | ✓ | ✓ | ✓ | `clangd` |
12| c-sharp | ✓ | ✓ | | `OmniSharp` |
13| c-sharp | ✓ | ✓ | | `OmniSharp` |
13−| cabal | | | | |
14+| cabal | | | | `haskell-language-server-wrapper` |
14| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
15| cairo | ✓ | ✓ | ✓ | `cairo-language-server` |
15| capnp | ✓ | | ✓ | |
16| capnp | ✓ | | ✓ | |
16| clojure | ✓ | | | `clojure-lsp` |
17| clojure | ✓ | | | `clojure-lsp` |
17| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
18| cmake | ✓ | ✓ | ✓ | `cmake-language-server` |
18| comment | ✓ | | | |
19| comment | ✓ | | | |
19−| common-lisp | ✓ | | | `cl-lsp` |
20+| common-lisp | ✓ | | ✓ | `cl-lsp` |
20| cpon | ✓ | | ✓ | |
21| cpon | ✓ | | ✓ | |
21| cpp | ✓ | ✓ | ✓ | `clangd` |
22| cpp | ✓ | ✓ | ✓ | `clangd` |
22| crystal | ✓ | ✓ | | `crystalline` |
23| crystal | ✓ | ✓ | | `crystalline` |
@@ -24,6 +25,7 @@
24| cue | ✓ | | | `cuelsp` |
25| cue | ✓ | | | `cuelsp` |
25| d | ✓ | ✓ | ✓ | `serve-d` |
26| d | ✓ | ✓ | ✓ | `serve-d` |
26| dart | ✓ | | ✓ | `dart` |
27| dart | ✓ | | ✓ | `dart` |
28+| dbml | ✓ | | | |
27| devicetree | ✓ | | | |
29| devicetree | ✓ | | | |
28| dhall | ✓ | ✓ | | `dhall-lsp-server` |
30| dhall | ✓ | ✓ | | `dhall-lsp-server` |
29| diff | ✓ | | | |
31| diff | ✓ | | | |
@@ -44,7 +46,9 @@
44| forth | ✓ | | | `forth-lsp` |
46| forth | ✓ | | | `forth-lsp` |
45| fortran | ✓ | | ✓ | `fortls` |
47| fortran | ✓ | | ✓ | `fortls` |
46| fsharp | ✓ | | | `fsautocomplete` |
48| fsharp | ✓ | | | `fsautocomplete` |
49+| gas | ✓ | ✓ | | |
47| gdscript | ✓ | ✓ | ✓ | |
50| gdscript | ✓ | ✓ | ✓ | |
51+| gemini | ✓ | | | |
48| git-attributes | ✓ | | | |
52| git-attributes | ✓ | | | |
49| git-commit | ✓ | ✓ | | |
53| git-commit | ✓ | ✓ | | |
50| git-config | ✓ | | | |
54| git-config | ✓ | | | |
@@ -52,12 +56,13 @@
52| git-rebase | ✓ | | | |
56| git-rebase | ✓ | | | |
53| gleam | ✓ | ✓ | | `gleam` |
57| gleam | ✓ | ✓ | | `gleam` |
54| glsl | ✓ | ✓ | ✓ | |
58| glsl | ✓ | ✓ | ✓ | |
55−| go | ✓ | ✓ | ✓ | `gopls` |
59+| gn | ✓ | | | |
60+| go | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
56| godot-resource | ✓ | | | |
61| godot-resource | ✓ | | | |
57| gomod | ✓ | | | `gopls` |
62| gomod | ✓ | | | `gopls` |
58| gotmpl | ✓ | | | `gopls` |
63| gotmpl | ✓ | | | `gopls` |
59| gowork | ✓ | | | `gopls` |
64| gowork | ✓ | | | `gopls` |
60−| graphql | ✓ | | | |
65+| graphql | ✓ | | | `graphql-lsp` |
61| hare | ✓ | | | |
66| hare | ✓ | | | |
62| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
67| haskell | ✓ | ✓ | | `haskell-language-server-wrapper` |
63| haskell-persistent | ✓ | | | |
68| haskell-persistent | ✓ | | | |
@@ -69,16 +74,18 @@
69| idris | | | | `idris2-lsp` |
74| idris | | | | `idris2-lsp` |
70| iex | ✓ | | | |
75| iex | ✓ | | | |
71| ini | ✓ | | | |
76| ini | ✓ | | | |
77+| janet | ✓ | | | |
72| java | ✓ | ✓ | ✓ | `jdtls` |
78| java | ✓ | ✓ | ✓ | `jdtls` |
73| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
79| javascript | ✓ | ✓ | ✓ | `typescript-language-server` |
74| jinja | ✓ | | | |
80| jinja | ✓ | | | |
75| jsdoc | ✓ | | | |
81| jsdoc | ✓ | | | |
76| json | ✓ | | ✓ | `vscode-json-language-server` |
82| json | ✓ | | ✓ | `vscode-json-language-server` |
83+| json5 | ✓ | | | |
77| jsonnet | ✓ | | | `jsonnet-language-server` |
84| jsonnet | ✓ | | | `jsonnet-language-server` |
78| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
85| jsx | ✓ | ✓ | ✓ | `typescript-language-server` |
79| julia | ✓ | ✓ | ✓ | `julia` |
86| julia | ✓ | ✓ | ✓ | `julia` |
80| just | ✓ | ✓ | ✓ | |
87| just | ✓ | ✓ | ✓ | |
81−| kdl | ✓ | | | |
88+| kdl | ✓ | ✓ | ✓ | |
82| kotlin | ✓ | | | `kotlin-language-server` |
89| kotlin | ✓ | | | `kotlin-language-server` |
83| latex | ✓ | ✓ | | `texlab` |
90| latex | ✓ | ✓ | | `texlab` |
84| lean | ✓ | | | `lean` |
91| lean | ✓ | | | `lean` |
@@ -86,6 +93,8 @@
86| llvm | ✓ | ✓ | ✓ | |
93| llvm | ✓ | ✓ | ✓ | |
87| llvm-mir | ✓ | ✓ | ✓ | |
94| llvm-mir | ✓ | ✓ | ✓ | |
88| llvm-mir-yaml | ✓ | | ✓ | |
95| llvm-mir-yaml | ✓ | | ✓ | |
96+| log | ✓ | | | |
97+| lpf | ✓ | | | |
89| lua | ✓ | ✓ | ✓ | `lua-language-server` |
98| lua | ✓ | ✓ | ✓ | `lua-language-server` |
90| make | ✓ | | | |
99| make | ✓ | | | |
91| markdoc | ✓ | | | `markdoc-ls` |
100| markdoc | ✓ | | | `markdoc-ls` |
@@ -100,7 +109,7 @@
100| nickel | ✓ | | ✓ | `nls` |
109| nickel | ✓ | | ✓ | `nls` |
101| nim | ✓ | ✓ | ✓ | `nimlangserver` |
110| nim | ✓ | ✓ | ✓ | `nimlangserver` |
102| nix | ✓ | | | `nil` |
111| nix | ✓ | | | `nil` |
103−| nu | ✓ | | | |
112+| nu | ✓ | | | `nu` |
104| nunjucks | ✓ | | | |
113| nunjucks | ✓ | | | |
105| ocaml | ✓ | | ✓ | `ocamllsp` |
114| ocaml | ✓ | | ✓ | `ocamllsp` |
106| ocaml-interface | ✓ | | | `ocamllsp` |
115| ocaml-interface | ✓ | | | `ocamllsp` |
@@ -111,7 +120,7 @@
111| pascal | ✓ | ✓ | | `pasls` |
120| pascal | ✓ | ✓ | | `pasls` |
112| passwd | ✓ | | | |
121| passwd | ✓ | | | |
113| pem | ✓ | | | |
122| pem | ✓ | | | |
114−| perl | ✓ | | | `perlnavigator` |
123+| perl | ✓ | ✓ | ✓ | `perlnavigator` |
115| php | ✓ | ✓ | ✓ | `intelephense` |
124| php | ✓ | ✓ | ✓ | `intelephense` |
116| po | ✓ | ✓ | | |
125| po | ✓ | ✓ | | |
117| pod | ✓ | | | |
126| pod | ✓ | | | |
@@ -120,11 +129,11 @@
120| prolog | | | | `swipl` |
129| prolog | | | | `swipl` |
121| protobuf | ✓ | | ✓ | `bufls`, `pb` |
130| protobuf | ✓ | | ✓ | `bufls`, `pb` |
122| prql | ✓ | | | |
131| prql | ✓ | | | |
123−| purescript | ✓ | | | `purescript-language-server` |
132+| purescript | ✓ | ✓ | | `purescript-language-server` |
124| python | ✓ | ✓ | ✓ | `pylsp` |
133| python | ✓ | ✓ | ✓ | `pylsp` |
125| qml | ✓ | | ✓ | `qmlls` |
134| qml | ✓ | | ✓ | `qmlls` |
126| r | ✓ | | | `R` |
135| r | ✓ | | | `R` |
127−| racket | ✓ | | | `racket` |
136+| racket | ✓ | | ✓ | `racket` |
128| regex | ✓ | | | |
137| regex | ✓ | | | |
129| rego | ✓ | | | `regols` |
138| rego | ✓ | | | `regols` |
130| rescript | ✓ | ✓ | | `rescript-language-server` |
139| rescript | ✓ | ✓ | | `rescript-language-server` |
@@ -136,9 +145,10 @@
136| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
145| rust | ✓ | ✓ | ✓ | `rust-analyzer` |
137| sage | ✓ | ✓ | | |
146| sage | ✓ | ✓ | | |
138| scala | ✓ | | ✓ | `metals` |
147| scala | ✓ | | ✓ | `metals` |
139−| scheme | ✓ | | | |
148+| scheme | ✓ | | ✓ | |
140| scss | ✓ | | | `vscode-css-language-server` |
149| scss | ✓ | | | `vscode-css-language-server` |
141| slint | ✓ | | ✓ | `slint-lsp` |
150| slint | ✓ | | ✓ | `slint-lsp` |
151+| smali | ✓ | | ✓ | |
142| smithy | ✓ | | | `cs` |
152| smithy | ✓ | | | `cs` |
143| sml | ✓ | | | |
153| sml | ✓ | | | |
144| solidity | ✓ | | | `solc` |
154| solidity | ✓ | | | `solc` |
@@ -152,6 +162,7 @@
152| t32 | ✓ | | | |
162| t32 | ✓ | | | |
153| tablegen | ✓ | ✓ | ✓ | |
163| tablegen | ✓ | ✓ | ✓ | |
154| task | ✓ | | | |
164| task | ✓ | | | |
165+| templ | ✓ | | | `templ` |
155| tfvars | ✓ | | ✓ | `terraform-ls` |
166| tfvars | ✓ | | ✓ | `terraform-ls` |
156| todotxt | ✓ | | | |
167| todotxt | ✓ | | | |
157| toml | ✓ | | | `taplo` |
168| toml | ✓ | | | `taplo` |
@@ -159,6 +170,7 @@
159| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
170| tsx | ✓ | ✓ | ✓ | `typescript-language-server` |
160| twig | ✓ | | | |
171| twig | ✓ | | | |
161| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
172| typescript | ✓ | ✓ | ✓ | `typescript-language-server` |
173+| typst | ✓ | | | `typst-lsp` |
162| ungrammar | ✓ | | | |
174| ungrammar | ✓ | | | |
163| unison | ✓ | | | |
175| unison | ✓ | | | |
164| uxntal | ✓ | | | |
176| uxntal | ✓ | | | |
@@ -176,6 +188,6 @@
176| wren | ✓ | ✓ | ✓ | |
188| wren | ✓ | ✓ | ✓ | |
177| xit | ✓ | | | |
189| xit | ✓ | | | |
178| xml | ✓ | | ✓ | |
190| xml | ✓ | | ✓ | |
179−| yaml | ✓ | | ✓ | `yaml-language-server` |
191+| yaml | ✓ | | ✓ | `yaml-language-server`, `ansible-language-server` |
180| yuck | ✓ | | | |
192| yuck | ✓ | | | |
181| zig | ✓ | ✓ | ✓ | `zls` |
193| zig | ✓ | ✓ | ✓ | `zls` |
book/src/generated/typable-cmd.md+4−1
@@ -17,7 +17,7 @@
17| `:write-buffer-close!`, `:wbc!` | Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt) |
17| `:write-buffer-close!`, `:wbc!` | Force write changes to disk creating necessary subdirectories and closes the buffer. Accepts an optional path (:write-buffer-close! some/path.txt) |
18| `:new`, `:n` | Create a new scratch buffer. |
18| `:new`, `:n` | Create a new scratch buffer. |
19| `:format`, `:fmt` | Format the file using the LSP formatter. |
19| `: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.) |
21| `:line-ending` | Set the document's default line ending. Options: crlf, lf. |
21| `:line-ending` | Set the document's default line ending. Options: crlf, lf. |
22| `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. |
22| `:earlier`, `:ear` | Jump back to an earlier point in edit history. Accepts a number of steps or a time span. |
23| `:later`, `:lat` | Jump to a later point in edit history. Accepts a number of steps or a time span. |
23| `:later`, `:lat` | Jump to a later point in edit history. Accepts a number of steps or a time span. |
@@ -55,6 +55,7 @@
55| `:lsp-restart` | Restarts the language servers used by the current doc |
55| `:lsp-restart` | Restarts the language servers used by the current doc |
56| `:lsp-stop` | Stops the language servers that are used by the current doc |
56| `:lsp-stop` | Stops the language servers that are used by the current doc |
57| `:tree-sitter-scopes` | Display tree sitter scopes, primarily for theming and development. |
57| `:tree-sitter-scopes` | Display tree sitter scopes, primarily for theming and development. |
58+| `:tree-sitter-highlight-name` | Display name of tree-sitter highlight scope under the cursor. |
58| `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
59| `:debug-start`, `:dbg` | Start a debug session from a given template with given parameters. |
59| `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
60| `:debug-remote`, `:dbg-tcp` | Connect to a debug adapter by TCP address and start a debugging session from a given template with given parameters. |
60| `:debug-eval` | Evaluate expression in current debug context. |
61| `:debug-eval` | Evaluate expression in current debug context. |
@@ -83,3 +84,5 @@
83| `:run-shell-command`, `:sh` | Run a shell command |
84| `:run-shell-command`, `:sh` | Run a shell command |
84| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
85| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
85| `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
86| `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
87+| `:redraw` | Clear and re-render the whole UI |
88+| `:move` | Move the current buffer and its corresponding file to a different path |
book/src/guides/adding_languages.md+2
@@ -36,6 +36,7 @@ below.
363. Refer to the
363. Refer to the
37 [tree-sitter website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)
37 [tree-sitter website](https://tree-sitter.github.io/tree-sitter/syntax-highlighting#queries)
38 for more information on writing queries.
38 for more information on writing queries.
39+4. A list of highlight captures can be found [on the themes page](https://docs.helix-editor.com/themes.html#scopes).
39
40
40> 💡 In Helix, the first matching query takes precedence when evaluating
41> 💡 In Helix, the first matching query takes precedence when evaluating
41> queries, which is different from other editors such as Neovim where the last
42> queries, which is different from other editors such as Neovim where the last
@@ -51,3 +52,4 @@ below.
51 grammars.
52 grammars.
52- If a parser is causing a segfault, or you want to remove it, make sure to
53- If a parser is causing a segfault, or you want to remove it, make sure to
53 remove the compiled parser located at `runtime/grammars/<name>.so`.
54 remove the compiled parser located at `runtime/grammars/<name>.so`.
55+- If you are attempting to add queries and Helix is unable to locate them, ensure that the environment variable `HELIX_RUNTIME` is set to the location of the `runtime` folder you're developing in.
book/src/guides/indent.md+9
@@ -12,6 +12,15 @@ Note that it matters where these added indents begin. For example,
12multiple indent level increases that start on the same line only increase
12multiple indent level increases that start on the same line only increase
13the total indent level by 1. See [Capture types](#capture-types).
13the total indent level by 1. See [Capture types](#capture-types).
14
14
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+
15## Indent queries
24## Indent queries
16
25
17When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine
26When Helix is inserting a new line through `o`, `O`, or `<ret>`, to determine
book/src/guides/injection.md+1−1
@@ -1,7 +1,7 @@
1# Adding Injection Queries
1# Adding Injection Queries
2
2
3Writing language injection queries allows one to highlight a specific node as a different language.
3Writing language injection queries allows one to highlight a specific node as a different language.
4−In addition to the [standard](upstream-docs) language injection options used by tree-sitter, there
4+In addition to the [standard][upstream-docs] language injection options used by tree-sitter, there
5are a few Helix specific extensions that allow for more control.
5are a few Helix specific extensions that allow for more control.
6
6
7And example of a simple query that would highlight all strings as bash in Nix:
7And example of a simple query that would highlight all strings as bash in Nix:
book/src/install.md+30−6
@@ -13,6 +13,7 @@
13 - [AppImage](#appimage)
13 - [AppImage](#appimage)
14- [macOS](#macos)
14- [macOS](#macos)
15 - [Homebrew Core](#homebrew-core)
15 - [Homebrew Core](#homebrew-core)
16+ - [MacPorts](#macports)
16- [Windows](#windows)
17- [Windows](#windows)
17 - [Winget](#winget)
18 - [Winget](#winget)
18 - [Scoop](#scoop)
19 - [Scoop](#scoop)
@@ -64,10 +65,7 @@ sudo apt install helix
64
65
65### Fedora/RHEL
66### Fedora/RHEL
66
67
67−Enable the `COPR` repository for Helix:
68−
69```sh
68```sh
70−sudo dnf copr enable varlad/helix
71sudo dnf install helix
69sudo dnf install helix
72```
70```
73
71
@@ -133,6 +131,12 @@ chmod +x helix-*.AppImage # change permission for executable mode
133brew install helix
131brew install helix
134```
132```
135
133
134+### MacPorts
135+
136+```sh
137+port install helix
138+```
139+
136## Windows
140## Windows
137
141
138Install on Windows using [Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/), [Scoop](https://scoop.sh/), [Chocolatey](https://chocolatey.org/)
142Install 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:
224ln -Ts $PWD/runtime ~/.config/helix/runtime
228ln -Ts $PWD/runtime ~/.config/helix/runtime
225```
229```
226
230
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.
228
232
229#### Windows
233#### Windows
230
234
@@ -257,12 +261,32 @@ following order:
2571. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
2611. `runtime/` sibling directory to `$CARGO_MANIFEST_DIR` directory (this is intended for
258 developing and testing helix only).
262 developing and testing helix only).
2592. `runtime/` subdirectory of OS-dependent helix user config directory.
2632. `runtime/` subdirectory of OS-dependent helix user config directory.
260−3. `$HELIX_RUNTIME`.
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)
261−4. `runtime/` subdirectory of path to Helix executable.
267+5. `runtime/` subdirectory of path to Helix executable.
262
268
263This order also sets the priority for selecting which file will be used if multiple runtime
269This order also sets the priority for selecting which file will be used if multiple runtime
264directories have files with the same name.
270directories have files with the same name.
265
271
272+#### Note to packagers
273+
274+If you are making a package of Helix for end users, to provide a good out of
275+the box experience, you should set the `HELIX_DEFAULT_RUNTIME` environment
276+variable at build time (before invoking `cargo build`) to a directory which
277+will store the final runtime files after installation. For example, say you want
278+to package the runtime into `/usr/lib/helix/runtime`. The rough steps a build
279+script could follow are:
280+
281+1. `export HELIX_DEFAULT_RUNTIME=/usr/lib/helix/runtime`
282+1. `cargo build --profile opt --locked --path helix-term`
283+1. `cp -r runtime $BUILD_DIR/usr/lib/helix/`
284+1. `cp target/opt/hx $BUILD_DIR/usr/bin/hx`
285+
286+This way the resulting `hx` binary will always look for its runtime directory in
287+`/usr/lib/helix/runtime` if the user has no custom runtime in `~/.config/helix`
288+or `HELIX_RUNTIME`.
289+
266### Validating the installation
290### Validating the installation
267
291
268To make sure everything is set up as expected you should run the Helix health
292To make sure everything is set up as expected you should run the Helix health
book/src/keymap.md+1−1
@@ -25,7 +25,7 @@
25
25
26## Normal mode
26## Normal mode
27
27
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.
29
29
30### Movement
30### Movement
31
31
book/src/languages.md+3−1
@@ -66,8 +66,10 @@ These configuration keys are available:
66| `language-servers` | The Language Servers used for this language. See below for more information in the section [Configuring Language Servers for a language](#configuring-language-servers-for-a-language) |
66| `language-servers` | The Language Servers used for this language. See below for more information in the section [Configuring Language Servers for a language](#configuring-language-servers-for-a-language) |
67| `grammar` | The tree-sitter grammar to use (defaults to the value of `name`) |
67| `grammar` | The tree-sitter grammar to use (defaults to the value of `name`) |
68| `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 |
68| `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)
69| `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` |
70| `text-width` | Maximum line length. Used for the `:reflow` command and soft-wrapping if `soft-wrap.wrap-at-text-width` is set, defaults to `editor.text-width` |
70| `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. |
71| `workspace-lsp-roots` | Directories relative to the workspace root that are treated as LSP roots. Should only be set in `.helix/config.toml`. Overwrites the setting of the same name in `config.toml` if set. |
72+| `persistent-diagnostic-sources` | An array of LSP diagnostic sources assumed unchanged when the language server resends the same set of diagnostics. Helix can track the position for these diagnostics internally instead. Useful for diagnostics that are recomputed on save.
71
73
72### File-type detection and the `file-types` key
74### File-type detection and the `file-types` key
73
75
@@ -127,7 +129,7 @@ These are the available options for a language server.
127| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
129| `environment` | Any environment variables that will be used when starting the language server `{ "KEY1" = "Value1", "KEY2" = "Value2" }` |
128
130
129A `format` sub-table within `config` can be used to pass extra formatting options to
131A `format` sub-table within `config` can be used to pass extra formatting options to
130−[Document Formatting Requests](https://github.com/microsoft/language-server-protocol/blob/gh-pages/_specifications/specification-3-17.md#document-formatting-request--leftwards_arrow_with_hook).
132+[Document Formatting Requests](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting).
131For example, with typescript:
133For example, with typescript:
132
134
133```toml
135```toml
book/src/themes.md+9−1
@@ -70,6 +70,7 @@ over it and is merged into the default palette.
70
70
71| Color Name |
71| Color Name |
72| --- |
72| --- |
73+| `default` |
73| `black` |
74| `black` |
74| `red` |
75| `red` |
75| `green` |
76| `green` |
@@ -154,6 +155,7 @@ We use a similar set of scopes as
154
155
155- `type` - Types
156- `type` - Types
156 - `builtin` - Primitive types provided by the language (`int`, `usize`)
157 - `builtin` - Primitive types provided by the language (`int`, `usize`)
158+ - `parameter` - Generic type parameters (`T`)
157 - `enum`
159 - `enum`
158 - `variant`
160 - `variant`
159- `constructor`
161- `constructor`
@@ -244,9 +246,12 @@ We use a similar set of scopes as
244
246
245- `diff` - version control changes
247- `diff` - version control changes
246 - `plus` - additions
248 - `plus` - additions
249+ - `gutter` - gutter indicator
247 - `minus` - deletions
250 - `minus` - deletions
251+ - `gutter` - gutter indicator
248 - `delta` - modifications
252 - `delta` - modifications
249 - `moved` - renamed or moved files/changes
253 - `moved` - renamed or moved files/changes
254+ - `gutter` - gutter indicator
250
255
251#### Interface
256#### Interface
252
257
@@ -291,11 +296,14 @@ These scopes are used for theming the editor interface:
291| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
296| `ui.statusline.insert` | Statusline mode during insert mode ([only if `editor.color-modes` is enabled][editor-section]) |
292| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
297| `ui.statusline.select` | Statusline mode during select mode ([only if `editor.color-modes` is enabled][editor-section]) |
293| `ui.statusline.separator` | Separator character in statusline |
298| `ui.statusline.separator` | Separator character in statusline |
299+| `ui.bufferline` | Style for the buffer line |
300+| `ui.bufferline.active` | Style for the active buffer in buffer line |
301+| `ui.bufferline.background` | Style for bufferline background |
294| `ui.popup` | Documentation popups (e.g. Space + k) |
302| `ui.popup` | Documentation popups (e.g. Space + k) |
295| `ui.popup.info` | Prompt for multiple key options |
303| `ui.popup.info` | Prompt for multiple key options |
296| `ui.window` | Borderlines separating splits |
304| `ui.window` | Borderlines separating splits |
297| `ui.help` | Description box for commands |
305| `ui.help` | Description box for commands |
298−| `ui.text` | Command prompts, popup text, etc. |
306+| `ui.text` | Default text style, command prompts, popup text, etc. |
299| `ui.text.focus` | The currently selected line in the picker |
307| `ui.text.focus` | The currently selected line in the picker |
300| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
308| `ui.text.inactive` | Same as `ui.text` but when the text is inactive (e.g. suggestions) |
301| `ui.text.info` | The key: command text in `ui.popup.info` boxes |
309| `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.
59| `#` | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
59| `#` | Selection indices (first selection is `1`, second is `2`, etc.) | This register is not writable |
60| `.` | Contents of the current selections | This register is not writable |
60| `.` | Contents of the current selections | This register is not writable |
61| `%` | Name of the current file | This register is not writable |
61| `%` | Name of the current file | This register is not writable |
62−| `*` | Reads from the system clipboard | Joins and yanks to the system clipboard |
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 |
63+| `*` | Reads from the primary clipboard | Joins and yanks to the primary clipboard |
64
64
65When yanking multiple selections to the clipboard registers, the selections
65When yanking multiple selections to the clipboard registers, the selections
66are joined with newlines. Pasting from these registers will paste multiple
66are joined with newlines. Pasting from these registers will paste multiple
book/theme/index.hbs+18−15
@@ -1,11 +1,11 @@
1<!DOCTYPE HTML>
1<!DOCTYPE HTML>
2−<html lang="{{ language }}" class="sidebar-visible no-js {{ default_theme }}">
2+<html lang="{{ language }}" class="{{ default_theme }}" dir="{{ text_direction }}">
3 <head>
3 <head>
4 <!-- Book generated using mdBook -->
4 <!-- Book generated using mdBook -->
5 <meta charset="UTF-8">
5 <meta charset="UTF-8">
6 <title>{{ title }}</title>
6 <title>{{ title }}</title>
7 {{#if is_print }}
7 {{#if is_print }}
8− <meta name="robots" content="noindex" />
8+ <meta name="robots" content="noindex">
9 {{/if}}
9 {{/if}}
10 {{#if base_url}}
10 {{#if base_url}}
11 <base href="{{ base_url }}">
11 <base href="{{ base_url }}">
@@ -17,7 +17,7 @@
17
17
18 <meta name="description" content="{{ description }}">
18 <meta name="description" content="{{ description }}">
19 <meta name="viewport" content="width=device-width, initial-scale=1">
19 <meta name="viewport" content="width=device-width, initial-scale=1">
20− <meta name="theme-color" content="#ffffff" />
20+ <meta name="theme-color" content="#ffffff">
21
21
22 {{#if favicon_svg}}
22 {{#if favicon_svg}}
23 <link rel="icon" href="{{ path_to_root }}favicon.svg">
23 <link rel="icon" href="{{ path_to_root }}favicon.svg">
@@ -34,8 +34,6 @@
34
34
35 <!-- Fonts -->
35 <!-- Fonts -->
36 <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
36 <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
37− <link rel="preconnect" href="https://fonts.gstatic.com">
38− <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;400;500;700&display=swap" rel="stylesheet">
39 {{#if copy_fonts}}
37 {{#if copy_fonts}}
40 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
38 <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
41 {{/if}}
39 {{/if}}
@@ -55,7 +53,7 @@
55 <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
53 <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
56 {{/if}}
54 {{/if}}
57 </head>
55 </head>
58− <body>
56+ <body class="sidebar-visible no-js">
59 <div id="body-container">
57 <div id="body-container">
60 <!-- Provide site root to javascript -->
58 <!-- Provide site root to javascript -->
61 <script>
59 <script>
@@ -85,24 +83,29 @@
85 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
83 try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
86 if (theme === null || theme === undefined) { theme = default_theme; }
84 if (theme === null || theme === undefined) { theme = default_theme; }
87 var html = document.querySelector('html');
85 var html = document.querySelector('html');
88− html.classList.remove('no-js')
89 html.classList.remove('{{ default_theme }}')
86 html.classList.remove('{{ default_theme }}')
90 html.classList.add(theme);
87 html.classList.add(theme);
88+ var body = document.querySelector('body');
89+ body.classList.remove('no-js')
91− html.classList.add('js');
90+ body.classList.add('js');
92 </script>
91 </script>
93
92
93+ <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
94+
94 <!-- Hide / unhide sidebar before it is displayed -->
95 <!-- Hide / unhide sidebar before it is displayed -->
95 <script>
96 <script>
96− var html = document.querySelector('html');
97+ var body = document.querySelector('body');
97 var sidebar = null;
98 var sidebar = null;
99+ var sidebar_toggle = document.getElementById("sidebar-toggle-anchor");
98 if (document.body.clientWidth >= 1080) {
100 if (document.body.clientWidth >= 1080) {
99 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
101 try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
100 sidebar = sidebar || 'visible';
102 sidebar = sidebar || 'visible';
101 } else {
103 } else {
102 sidebar = 'hidden';
104 sidebar = 'hidden';
103 }
105 }
106+ sidebar_toggle.checked = sidebar === 'visible';
104− html.classList.remove('sidebar-visible');
107+ body.classList.remove('sidebar-visible');
105− html.classList.add("sidebar-" + sidebar);
108+ body.classList.add("sidebar-" + sidebar);
106 </script>
109 </script>
107
110
108 <nav id="sidebar" class="sidebar" aria-label="Table of contents">
111 <nav id="sidebar" class="sidebar" aria-label="Table of contents">
@@ -141,9 +144,9 @@
141 <div id="menu-bar-hover-placeholder"></div>
144 <div id="menu-bar-hover-placeholder"></div>
142 <div id="menu-bar" class="menu-bar sticky">
145 <div id="menu-bar" class="menu-bar sticky">
143 <div class="left-buttons">
146 <div class="left-buttons">
144− <button id="sidebar-toggle" class="icon-button" type="button" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
147+ <label id="sidebar-toggle" class="icon-button" for="sidebar-toggle-anchor" title="Toggle Table of Contents" aria-label="Toggle Table of Contents" aria-controls="sidebar">
145 <i class="fa fa-bars"></i>
148 <i class="fa fa-bars"></i>
146− </button>
149+ </label>
147 <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
150 <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
148 <i class="fa fa-paint-brush"></i>
151 <i class="fa fa-paint-brush"></i>
149 </button>
152 </button>
@@ -220,7 +223,7 @@
220 {{/previous}}
223 {{/previous}}
221
224
222 {{#next}}
225 {{#next}}
223− <a rel="next" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
226+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="mobile-nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
224 <i class="fa fa-angle-right"></i>
227 <i class="fa fa-angle-right"></i>
225 </a>
228 </a>
226 {{/next}}
229 {{/next}}
@@ -238,7 +241,7 @@
238 {{/previous}}
241 {{/previous}}
239
242
240 {{#next}}
243 {{#next}}
241− <a rel="next" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
244+ <a rel="next prefetch" href="{{ path_to_root }}{{link}}" class="nav-chapters next" title="Next chapter" aria-label="Next chapter" aria-keyshortcuts="Right">
242 <i class="fa fa-angle-right"></i>
245 <i class="fa fa-angle-right"></i>
243 </a>
246 </a>
244 {{/next}}
247 {{/next}}
contrib/Helix.appdata.xml+15
@@ -5,6 +5,7 @@
5 <project_license>MPL-2.0</project_license>
5 <project_license>MPL-2.0</project_license>
6 <name>Helix</name>
6 <name>Helix</name>
7 <summary>A post-modern text editor</summary>
7 <summary>A post-modern text editor</summary>
8+ <summary xml:lang="ar">مُحَرِّرُ نُصُوصٍ سَابِقٌ لِعَهدِه</summary>
8
9
9 <description>
10 <description>
10 <p>
11 <p>
@@ -17,6 +18,17 @@
17 <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
18 <li>Smart, incremental syntax highlighting and code editing via tree-sitter</li>
18 </ul>
19 </ul>
19 </description>
20 </description>
21+ <description xml:lang="ar">
22+ <p>
23+ مُحَرِّرُ نُصُوصٍ يَعمَلُ فِي الطَّرَفِيَّة، مُستَلهَمٌ مِن Kakoune وَ Neovim وَمَكتُوبٌ بِلُغَةِ رَست البَرمَجِيَّة.
24+ </p>
25+ <ul>
26+ <li>تَحرِيرٌ وَضعِيٌّ شَبيهٌ بِـVim</li>
27+ <li>تَحدِيدَاتٌ لِلنَّصِ مُتَعَدِّدَة</li>
28+ <li>دَعْمٌ مُدمَجٌ لِخَوادِمِ اللُّغَات</li>
29+ <li>تَحرِيرُ التَّعلِيمَاتِ البَّرمَجِيَّةِ مَعَ تَمييزٍ لِلتَّركِيبِ النَّحُويِّ بِواسِطَةِ tree-sitter</li>
30+ </ul>
31+ </description>
20
32
21 <launchable type="desktop-id">Helix.desktop</launchable>
33 <launchable type="desktop-id">Helix.desktop</launchable>
22
34
@@ -36,6 +48,9 @@
36 <content_rating type="oars-1.1" />
48 <content_rating type="oars-1.1" />
37
49
38 <releases>
50 <releases>
51+ <release version="23.10" date="2023-10-24">
52+ <url>https://helix-editor.com/news/release-23-10-highlights/</url>
53+ </release>
39 <release version="23.05" date="2023-05-18">
54 <release version="23.05" date="2023-05-18">
40 <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
55 <url>https://github.com/helix-editor/helix/releases/tag/23.05</url>
41 </release>
56 </release>
contrib/Helix.desktop+3−1
@@ -1,6 +1,7 @@
1[Desktop Entry]
1[Desktop Entry]
2Name=Helix
2Name=Helix
3GenericName=Text Editor
3GenericName=Text Editor
4+GenericName[ar]=مُحَرِّرُ نُصُوص
4GenericName[de]=Texteditor
5GenericName[de]=Texteditor
5GenericName[fr]=Éditeur de texte
6GenericName[fr]=Éditeur de texte
6GenericName[ru]=Текстовый редактор
7GenericName[ru]=Текстовый редактор
@@ -9,7 +10,7 @@ GenericName[tr]=Metin Düzenleyici
9Comment=Edit text files
10Comment=Edit text files
10Comment[af]=Redigeer tekslêers
11Comment[af]=Redigeer tekslêers
11Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
12Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
12−Comment[ar]=حرّر ملفات نصية
13+Comment[ar]=مُحَرِّرُ مِلَفَّاتٍ نَصِّيَّة
13Comment[az]=Mətn fayllarını redaktə edin
14Comment[az]=Mətn fayllarını redaktə edin
14Comment[be]=Рэдагаваньне тэкставых файлаў
15Comment[be]=Рэдагаваньне тэкставых файлаў
15Comment[bg]=Редактиране на текстови файлове
16Comment[bg]=Редактиране на текстови файлове
@@ -79,6 +80,7 @@ Exec=hx %F
79Terminal=true
80Terminal=true
80Type=Application
81Type=Application
81Keywords=Text;editor;
82Keywords=Text;editor;
83+Keywords[ar]=نص;نصوص;محرر;
82Keywords[fr]=Texte;éditeur;
84Keywords[fr]=Texte;éditeur;
83Keywords[ru]=текст;текстовый редактор;
85Keywords[ru]=текст;текстовый редактор;
84Keywords[sr]=Текст;едитор;
86Keywords[sr]=Текст;едитор;
docs/CONTRIBUTING.md+10−3
@@ -29,9 +29,15 @@ files, run
29cargo xtask docgen
29cargo xtask docgen
30```
30```
31
31
32−inside the project. We use [xtask][xtask] as an ad-hoc task runner and
32+inside the project. We use [xtask][xtask] as an ad-hoc task runner.
33−thus do not require any dependencies other than `cargo` (You don't have
33+
34−to `cargo install` anything either).
34+To preview the book itself, install [mdbook][mdbook]. Then, run
35+
36+```shell
37+mdbook serve book
38+```
39+
40+and visit [http://localhost:3000](http://localhost:3000).
35
41
36# Testing
42# Testing
37
43
@@ -58,4 +64,5 @@ The current MSRV and future changes to the MSRV are listed in the [Firefox docum
58[architecture.md]: ./architecture.md
64[architecture.md]: ./architecture.md
59[docs]: https://docs.helix-editor.com/
65[docs]: https://docs.helix-editor.com/
60[xtask]: https://github.com/matklad/cargo-xtask
66[xtask]: https://github.com/matklad/cargo-xtask
67+[mdbook]: https://rust-lang.github.io/mdBook/guide/installation.html
61[helpers.rs]: ../helix-term/tests/test/helpers.rs
68[helpers.rs]: ../helix-term/tests/test/helpers.rs
docs/releases.md+12−5
@@ -1,16 +1,23 @@
1## Checklist
1## Checklist
2
2
3Helix releases are versioned in the Calendar Versioning scheme:
3Helix releases are versioned in the Calendar Versioning scheme:
4−`YY.0M(.MICRO)`, for example, `22.05` for May of 2022. In these instructions
4+`YY.0M(.MICRO)`, for example, `22.05` for May of 2022, or in a patch release,
5−we'll use `<tag>` as a placeholder for the tag being published.
5+`22.05.1`. In these instructions we'll use `<tag>` as a placeholder for the tag
6+being published.
6
7
7* Merge the changelog PR
8* Merge the changelog PR
8* 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)
9* 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)
9* Tag and push
10* Tag and push
10 * `git tag -s -m "<tag>" -a <tag> && git push`
11 * `git tag -s -m "<tag>" -a <tag> && git push`
11 * Make sure to switch to master and pull first
12 * Make sure to switch to master and pull first
12−* Edit the `VERSION` file and change the date to the next planned release
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.
13− * Releases are planned to happen every two months, so `22.05` would change to `22.07`
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`
14* Wait for the Release CI to finish
21* Wait for the Release CI to finish
15 * It will automatically turn the git tag into a GitHub release when it uploads artifacts
22 * It will automatically turn the git tag into a GitHub release when it uploads artifacts
16* Edit the new release
23* Edit the new release
@@ -57,4 +64,4 @@ versions for convenience:
57> release. For the full log, check out the git log.
64> release. For the full log, check out the git log.
58
65
59Typically, small changes like dependencies or documentation updates, refactors,
66Typically, 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 @@
2 "nodes": {
2 "nodes": {
3 "crane": {
3 "crane": {
4 "inputs": {
4 "inputs": {
5− "flake-compat": "flake-compat",
6− "flake-utils": [
7− "flake-utils"
8− ],
9 "nixpkgs": [
5 "nixpkgs": [
10 "nixpkgs"
6 "nixpkgs"
11− ],
12− "rust-overlay": [
13− "rust-overlay"
14 ]
7 ]
15 },
8 },
16 "locked": {
9 "locked": {
17− "lastModified": 1688772518,
10+ "lastModified": 1701025348,
18− "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
11+ "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=",
19 "owner": "ipetkov",
12 "owner": "ipetkov",
20 "repo": "crane",
13 "repo": "crane",
21− "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
14+ "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b",
22 "type": "github"
15 "type": "github"
23 },
16 },
24 "original": {
17 "original": {
@@ -27,32 +20,16 @@
27 "type": "github"
20 "type": "github"
28 }
21 }
29 },
22 },
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− },
46 "flake-utils": {
23 "flake-utils": {
47 "inputs": {
24 "inputs": {
48 "systems": "systems"
25 "systems": "systems"
49 },
26 },
50 "locked": {
27 "locked": {
51− "lastModified": 1689068808,
28+ "lastModified": 1694529238,
52− "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
29+ "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
53 "owner": "numtide",
30 "owner": "numtide",
54 "repo": "flake-utils",
31 "repo": "flake-utils",
55− "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
32+ "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
56 "type": "github"
33 "type": "github"
57 },
34 },
58 "original": {
35 "original": {
@@ -63,11 +40,11 @@
63 },
40 },
64 "nixpkgs": {
41 "nixpkgs": {
65 "locked": {
42 "locked": {
66− "lastModified": 1690272529,
43+ "lastModified": 1700794826,
67− "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=",
44+ "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
68 "owner": "nixos",
45 "owner": "nixos",
69 "repo": "nixpkgs",
46 "repo": "nixpkgs",
70− "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c",
47+ "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
71 "type": "github"
48 "type": "github"
72 },
49 },
73 "original": {
50 "original": {
@@ -95,11 +72,11 @@
95 ]
72 ]
96 },
73 },
97 "locked": {
74 "locked": {
98− "lastModified": 1690424156,
75+ "lastModified": 1701137803,
99− "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=",
76+ "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=",
100 "owner": "oxalica",
77 "owner": "oxalica",
101 "repo": "rust-overlay",
78 "repo": "rust-overlay",
102− "rev": "f335a0213504c7e6481c359dc1009be9cf34432c",
79+ "rev": "9dd940c967502f844eacea52a61e9596268d4f70",
103 "type": "github"
80 "type": "github"
104 },
81 },
105 "original": {
82 "original": {
flake.nix+27−24
@@ -13,8 +13,6 @@
13 };
13 };
14 crane = {
14 crane = {
15 url = "github:ipetkov/crane";
15 url = "github:ipetkov/crane";
16− inputs.rust-overlay.follows = "rust-overlay";
17− inputs.flake-utils.follows = "flake-utils";
18 inputs.nixpkgs.follows = "nixpkgs";
16 inputs.nixpkgs.follows = "nixpkgs";
19 };
17 };
20 };
18 };
@@ -43,7 +41,6 @@
43 ".ignore"
41 ".ignore"
44 ".github"
42 ".github"
45 ".gitignore"
43 ".gitignore"
46− "logo.svg"
47 "logo_dark.svg"
44 "logo_dark.svg"
48 "logo_light.svg"
45 "logo_light.svg"
49 "rust-toolchain.toml"
46 "rust-toolchain.toml"
@@ -51,7 +48,6 @@
51 "runtime"
48 "runtime"
52 "screenshot.png"
49 "screenshot.png"
53 "book"
50 "book"
54− "contrib"
55 "docs"
51 "docs"
56 "README.md"
52 "README.md"
57 "CHANGELOG.md"
53 "CHANGELOG.md"
@@ -123,25 +119,32 @@
123 then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
119 then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
124 else "$RUSTFLAGS";
120 else "$RUSTFLAGS";
125 rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
121 rustToolchain = pkgs.pkgsBuildHost.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
126− craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
122+ craneLibMSRV = (crane.mkLib pkgs).overrideToolchain rustToolchain;
123+ craneLibStable = (crane.mkLib pkgs).overrideToolchain pkgs.pkgsBuildHost.rust-bin.stable.latest.default;
127− commonArgs =
124+ commonArgs = {
128− {
125+ inherit stdenv;
129− inherit stdenv;
126+ inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;}) pname;
127+ inherit (craneLibMSRV.crateNameFromCargoToml {cargoToml = ./Cargo.toml;}) version;
130− src = filteredSource;
128+ src = filteredSource;
131− # disable fetching and building of tree-sitter grammars in the helix-term build.rs
129+ # disable fetching and building of tree-sitter grammars in the helix-term build.rs
132− HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
130+ HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";
133− buildInputs = [stdenv.cc.cc.lib];
131+ buildInputs = [stdenv.cc.cc.lib];
134− # disable tests
132+ # disable tests
135− doCheck = false;
133+ doCheck = false;
136− meta.mainProgram = "hx";
134+ meta.mainProgram = "hx";
137− }
135+ };
138− // craneLib.crateNameFromCargoToml {cargoToml = ./helix-term/Cargo.toml;};
139− cargoArtifacts = craneLib.buildDepsOnly commonArgs;
136+ cargoArtifacts = craneLibMSRV.buildDepsOnly commonArgs;
140 in {
137 in {
141 packages = {
138 packages = {
142− helix-unwrapped = craneLib.buildPackage (commonArgs
139+ helix-unwrapped = craneLibStable.buildPackage (commonArgs
143 // {
140 // {
144− inherit cargoArtifacts;
141+ cargoArtifacts = craneLibStable.buildDepsOnly commonArgs;
142+ postInstall = ''
143+ mkdir -p $out/share/applications $out/share/icons/hicolor/scalable/apps $out/share/icons/hicolor/256x256/apps
144+ cp contrib/Helix.desktop $out/share/applications
145+ cp logo.svg $out/share/icons/hicolor/scalable/apps/helix.svg
146+ cp contrib/helix.png $out/share/icons/hicolor/256x256/apps
147+ '';
145 });
148 });
146 helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
149 helix = makeOverridableHelix self.packages.${system}.helix-unwrapped {};
147 default = self.packages.${system}.helix;
150 default = self.packages.${system}.helix;
@@ -151,20 +154,20 @@
151 # Build the crate itself
154 # Build the crate itself
152 inherit (self.packages.${system}) helix;
155 inherit (self.packages.${system}) helix;
153
156
154− clippy = craneLib.cargoClippy (commonArgs
157+ clippy = craneLibMSRV.cargoClippy (commonArgs
155 // {
158 // {
156 inherit cargoArtifacts;
159 inherit cargoArtifacts;
157 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
160 cargoClippyExtraArgs = "--all-targets -- --deny warnings";
158 });
161 });
159
162
160− fmt = craneLib.cargoFmt commonArgs;
163+ fmt = craneLibMSRV.cargoFmt commonArgs;
161
164
162− doc = craneLib.cargoDoc (commonArgs
165+ doc = craneLibMSRV.cargoDoc (commonArgs
163 // {
166 // {
164 inherit cargoArtifacts;
167 inherit cargoArtifacts;
165 });
168 });
166
169
167− test = craneLib.cargoTest (commonArgs
170+ test = craneLibMSRV.cargoTest (commonArgs
168 // {
171 // {
169 inherit cargoArtifacts;
172 inherit cargoArtifacts;
170 });
173 });
grammars.nix+24−21
@@ -5,6 +5,7 @@
5 runCommand,
5 runCommand,
6 yj,
6 yj,
7 includeGrammarIf ? _: true,
7 includeGrammarIf ? _: true,
8+ grammarOverlays ? [],
8 ...
9 ...
9}: let
10}: let
10 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
11 # HACK: nix < 2.6 has a bug in the toml parser, so we convert to JSON
@@ -48,22 +49,22 @@
48 then sourceGitHub
49 then sourceGitHub
49 else sourceGit;
50 else sourceGit;
50 in
51 in
51− stdenv.mkDerivation rec {
52+ stdenv.mkDerivation {
52 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
53 # see https://github.com/NixOS/nixpkgs/blob/fbdd1a7c0bc29af5325e0d7dd70e804a972eb465/pkgs/development/tools/parsing/tree-sitter/grammar.nix
53
54
54 pname = "helix-tree-sitter-${grammar.name}";
55 pname = "helix-tree-sitter-${grammar.name}";
55 version = grammar.source.rev;
56 version = grammar.source.rev;
56
57
57− src =
58+ src = source;
58− if builtins.hasAttr "subpath" grammar.source
59+ sourceRoot = if builtins.hasAttr "subpath" grammar.source then
59− then "${source}/${grammar.source.subpath}"
60+ "source/${grammar.source.subpath}"
61+ else
60− else source;
62+ "source";
61
63
62− dontUnpack = true;
63 dontConfigure = true;
64 dontConfigure = true;
64
65
65 FLAGS = [
66 FLAGS = [
66− "-I${src}/src"
67+ "-Isrc"
67 "-g"
68 "-g"
68 "-O3"
69 "-O3"
69 "-fPIC"
70 "-fPIC"
@@ -76,13 +77,13 @@
76 buildPhase = ''
77 buildPhase = ''
77 runHook preBuild
78 runHook preBuild
78
79
79− if [[ -e "$src/src/scanner.cc" ]]; then
80+ if [[ -e src/scanner.cc ]]; then
80− $CXX -c "$src/src/scanner.cc" -o scanner.o $FLAGS
81+ $CXX -c src/scanner.cc -o scanner.o $FLAGS
81− elif [[ -e "$src/src/scanner.c" ]]; then
82+ elif [[ -e src/scanner.c ]]; then
82− $CC -c "$src/src/scanner.c" -o scanner.o $FLAGS
83+ $CC -c src/scanner.c -o scanner.o $FLAGS
83 fi
84 fi
84
85
85− $CC -c "$src/src/parser.c" -o parser.o $FLAGS
86+ $CC -c src/parser.c -o parser.o $FLAGS
86 $CXX -shared -o $NAME.so *.o
87 $CXX -shared -o $NAME.so *.o
87
88
88 ls -al
89 ls -al
@@ -105,15 +106,17 @@
105 '';
106 '';
106 };
107 };
107 grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
108 grammarsToBuild = builtins.filter includeGrammarIf gitGrammars;
108− builtGrammars =
109− builtins.map (grammar: {
109+ builtGrammars = builtins.map (grammar: {
110− inherit (grammar) name;
110+ inherit (grammar) name;
111− artifact = buildGrammar grammar;
111+ value = buildGrammar grammar;
112− })
113− grammarsToBuild;
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);
114− grammarLinks =
117+ grammarLinks = lib.mapAttrsToList
115− builtins.map (grammar: "ln -s ${grammar.artifact}/${grammar.name}.so $out/${grammar.name}.so")
118+ (name: artifact: "ln -s ${artifact}/${name}.so $out/${name}.so")
116− builtGrammars;
119+ (lib.filterAttrs (n: v: lib.isDerivation v) overlayedGrammars);
117in
120in
118 runCommand "consolidated-helix-grammars" {} ''
121 runCommand "consolidated-helix-grammars" {} ''
119 mkdir -p $out
122 mkdir -p $out
helix-core/Cargo.toml+17−13
@@ -1,23 +1,24 @@
1[package]
1[package]
2name = "helix-core"
2name = "helix-core"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
7description = "Helix editor core editing primitives"
3description = "Helix editor core editing primitives"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
11include = ["src/**/*", "README.md"]
4include = ["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
12
13
13[features]
14[features]
14unicode-lines = ["ropey/unicode_lines"]
15unicode-lines = ["ropey/unicode_lines"]
15integration = []
16integration = []
16
17
17[dependencies]
18[dependencies]
18−helix-loader = { version = "0.6", path = "../helix-loader" }
19+helix-loader = { path = "../helix-loader" }
19
20
20−ropey = { version = "1.6.0", default-features = false, features = ["simd"] }
21+ropey = { version = "1.6.1", default-features = false, features = ["simd"] }
21smallvec = "1.11"
22smallvec = "1.11"
22smartstring = "1.0.1"
23smartstring = "1.0.1"
23unicode-segmentation = "1.10"
24unicode-segmentation = "1.10"
@@ -26,12 +27,12 @@ unicode-general-category = "0.6"
26# slab = "0.4.2"
27# slab = "0.4.2"
27slotmap = "1.0"
28slotmap = "1.0"
28tree-sitter.workspace = true
29tree-sitter.workspace = true
29−once_cell = "1.18"
30+once_cell = "1.19"
30arc-swap = "1"
31arc-swap = "1"
31regex = "1"
32regex = "1"
32bitflags = "2.4"
33bitflags = "2.4"
33−ahash = "0.8.3"
34+ahash = "0.8.6"
34−hashbrown = { version = "0.14.0", features = ["raw"] }
35+hashbrown = { version = "0.14.3", features = ["raw"] }
35dunce = "1.0"
36dunce = "1.0"
36
37
37log = "0.4"
38log = "0.4"
@@ -48,6 +49,9 @@ chrono = { version = "0.4", default-features = false, features = ["alloc", "std"
48etcetera = "0.8"
49etcetera = "0.8"
49textwrap = "0.16.0"
50textwrap = "0.16.0"
50
51
52+nucleo.workspace = true
53+parking_lot = "0.12"
54+
51[dev-dependencies]
55[dev-dependencies]
52quickcheck = { version = "1", default-features = false }
56quickcheck = { version = "1", default-features = false }
53−indoc = "2.0.3"
57+indoc = "2.0.4"
helix-core/src/diagnostic.rs+4
@@ -39,6 +39,10 @@ pub enum DiagnosticTag {
39#[derive(Debug, Clone)]
39#[derive(Debug, Clone)]
40pub struct Diagnostic {
40pub struct Diagnostic {
41 pub range: Range,
41 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,
42 pub line: usize,
46 pub line: usize,
43 pub message: String,
47 pub message: String,
44 pub severity: Option<Severity>,
48 pub severity: Option<Severity>,
helix-core/src/fuzzy.rsnew file+43
@@ -0,0 +1,43 @@
1+use std::ops::DerefMut;
2+
3+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
4+use nucleo::Config;
5+use parking_lot::Mutex;
6+
7+pub struct LazyMutex<T> {
8+ inner: Mutex<Option<T>>,
9+ init: fn() -> T,
10+}
11+
12+impl<T> LazyMutex<T> {
13+ pub const fn new(init: fn() -> T) -> Self {
14+ Self {
15+ inner: Mutex::new(None),
16+ init,
17+ }
18+ }
19+
20+ pub fn lock(&self) -> impl DerefMut<Target = T> + '_ {
21+ parking_lot::MutexGuard::map(self.inner.lock(), |val| val.get_or_insert_with(self.init))
22+ }
23+}
24+
25+pub static MATCHER: LazyMutex<nucleo::Matcher> = LazyMutex::new(nucleo::Matcher::default);
26+
27+/// convenience function to easily fuzzy match
28+/// on a (relatively small list of inputs). This is not recommended for building a full tui
29+/// application that can match large numbers of matches as all matching is done on the current
30+/// thread, effectively blocking the UI
31+pub fn fuzzy_match<T: AsRef<str>>(
32+ pattern: &str,
33+ items: impl IntoIterator<Item = T>,
34+ path: bool,
35+) -> Vec<(T, u16)> {
36+ let mut matcher = MATCHER.lock();
37+ matcher.config = Config::DEFAULT;
38+ if path {
39+ matcher.config.set_match_paths();
40+ }
41+ let pattern = Atom::new(pattern, CaseMatching::Smart, AtomKind::Fuzzy, false);
42+ pattern.match_list(items, &mut matcher)
43+}
helix-core/src/indent.rs+316−103
@@ -4,10 +4,11 @@ use tree_sitter::{Query, QueryCursor, QueryPredicateArg};
4
4
5use crate::{
5use crate::{
6 chars::{char_is_line_ending, char_is_whitespace},
6 chars::{char_is_line_ending, char_is_whitespace},
7+ find_first_non_whitespace_char,
7 graphemes::{grapheme_width, tab_width_at},
8 graphemes::{grapheme_width, tab_width_at},
8− syntax::{LanguageConfiguration, RopeProvider, Syntax},
9+ syntax::{IndentationHeuristic, LanguageConfiguration, RopeProvider, Syntax},
9 tree_sitter::Node,
10 tree_sitter::Node,
10− Rope, RopeGraphemes, RopeSlice,
11+ Position, Rope, RopeGraphemes, RopeSlice,
11};
12};
12
13
13/// Enum representing indentation style.
14/// Enum representing indentation style.
@@ -21,7 +22,7 @@ pub enum IndentStyle {
21
22
22// 16 spaces
23// 16 spaces
23const INDENTS: &str = " ";
24const INDENTS: &str = " ";
24−const MAX_INDENT: u8 = 16;
25+pub const MAX_INDENT: u8 = 16;
25
26
26impl IndentStyle {
27impl IndentStyle {
27 /// Creates an `IndentStyle` from an indentation string.
28 /// 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
196 len / indent_width
197 len / indent_width
197}
198}
198
199
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+
199/// Computes for node and all ancestors whether they are the first node on their line.
250/// Computes for node and all ancestors whether they are the first node on their line.
200/// The first entry in the return value represents the root node, the last one the node itself
251/// The first entry in the return value represents the root node, the last one the node itself
201fn get_first_in_line(mut node: Node, new_line_byte_pos: Option<usize>) -> Vec<bool> {
252fn 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
241/// - max(0, indent - outdent) tabs, if tabs are used for indentation
292/// - max(0, indent - outdent) tabs, if tabs are used for indentation
242/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
293/// - max(0, indent - outdent)*indent_width spaces, if spaces are used for indentation
243#[derive(Default, Debug, PartialEq, Eq, Clone)]
294#[derive(Default, Debug, PartialEq, Eq, Clone)]
244−pub struct Indentation {
295+pub struct Indentation<'a> {
245 indent: usize,
296 indent: usize,
246 indent_always: usize,
297 indent_always: usize,
247 outdent: usize,
298 outdent: usize,
248 outdent_always: usize,
299 outdent_always: usize,
249 /// The alignment, as a string containing only tabs & spaces. Storing this as a string instead of e.g.
300 /// The alignment, as a string containing only tabs & spaces. Storing this as a string instead of e.g.
250 /// the (visual) width ensures that the alignment is preserved even if the tab width changes.
301 /// the (visual) width ensures that the alignment is preserved even if the tab width changes.
251− align: Option<String>,
302+ align: Option<RopeSlice<'a>>,
252}
303}
253
304
254−impl Indentation {
305+impl<'a> Indentation<'a> {
255 /// Add some other [Indentation] to this.
306 /// Add some other [Indentation] to this.
256 /// The added indent should be the total added indent from one line.
307 /// The added indent should be the total added indent from one line.
257 /// Indent should always be added starting from the bottom (or equivalently, the innermost tree-sitter node).
308 /// 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>) {
259 // Align overrides the indent from outer scopes.
310 // Align overrides the indent from outer scopes.
260 if self.align.is_some() {
311 if self.align.is_some() {
261 return;
312 return;
@@ -271,8 +322,10 @@ impl Indentation {
271 }
322 }
272
323
273 /// Add an indent capture to this indent.
324 /// Add an indent capture to this indent.
274− /// All the captures that are added in this way should be on the same line.
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).
275− fn add_capture(&mut self, added: IndentCaptureType) {
328+ fn add_capture(&mut self, added: IndentCaptureType<'a>) {
276 match added {
329 match added {
277 IndentCaptureType::Indent => {
330 IndentCaptureType::Indent => {
278 if self.indent_always == 0 {
331 if self.indent_always == 0 {
@@ -295,47 +348,68 @@ impl Indentation {
295 self.outdent = 0;
348 self.outdent = 0;
296 }
349 }
297 IndentCaptureType::Align(align) => {
350 IndentCaptureType::Align(align) => {
351+ if self.align.is_none() {
298− self.align = Some(align);
352+ self.align = Some(align);
353+ }
299 }
354 }
300 }
355 }
301 }
356 }
302− fn into_string(self, indent_style: &IndentStyle) -> String {
357+ fn net_indent(&self) -> isize {
303− let indent = self.indent_always + self.indent;
358+ (self.indent + self.indent_always) as isize
304− let outdent = self.outdent_always + self.outdent;
359+ - ((self.outdent + self.outdent_always) as isize)
305−
360+ }
306− let indent_level = if indent >= outdent {
361+ /// Convert `self` into a string, taking into account the computed and actual indentation of some other line.
307− indent - outdent
362+ fn relative_indent(
308− } else {
363+ &self,
309− log::warn!("Encountered more outdent than indent nodes while calculating indentation: {} outdent, {} indent", self.outdent, self.indent);
364+ other_computed_indent: &Self,
310− 0
365+ other_leading_whitespace: RopeSlice,
311− };
366+ indent_style: &IndentStyle,
312− let mut indent_string = if let Some(align) = self.align {
367+ tab_width: usize,
313− align
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+ ))
314 } else {
380 } else {
315− String::new()
381+ // If the alignment of both lines is different, we cannot compare their indentation in any meaningful way
316− };
382+ None
317− indent_string.push_str(&indent_style.as_str().repeat(indent_level));
383+ }
318− indent_string
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+ )
319 }
393 }
320}
394}
321
395
322/// An indent definition which corresponds to a capture from the indent query
396/// An indent definition which corresponds to a capture from the indent query
323#[derive(Debug)]
397#[derive(Debug)]
324−struct IndentCapture {
398+struct IndentCapture<'a> {
325− capture_type: IndentCaptureType,
399+ capture_type: IndentCaptureType<'a>,
326 scope: IndentScope,
400 scope: IndentScope,
327}
401}
328#[derive(Debug, Clone, PartialEq)]
402#[derive(Debug, Clone, PartialEq)]
329−enum IndentCaptureType {
403+enum IndentCaptureType<'a> {
330 Indent,
404 Indent,
331 IndentAlways,
405 IndentAlways,
332 Outdent,
406 Outdent,
333 OutdentAlways,
407 OutdentAlways,
334 /// Alignment given as a string of whitespace
408 /// Alignment given as a string of whitespace
335− Align(String),
409+ Align(RopeSlice<'a>),
336}
410}
337
411
338−impl IndentCaptureType {
412+impl<'a> IndentCaptureType<'a> {
339 fn default_scope(&self) -> IndentScope {
413 fn default_scope(&self) -> IndentScope {
340 match self {
414 match self {
341 IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
415 IndentCaptureType::Indent | IndentCaptureType::IndentAlways => IndentScope::Tail,
@@ -367,8 +441,8 @@ enum ExtendCapture {
367/// each node (identified by its ID) the relevant captures (already filtered
441/// each node (identified by its ID) the relevant captures (already filtered
368/// by predicates).
442/// by predicates).
369#[derive(Debug)]
443#[derive(Debug)]
370−struct IndentQueryResult {
444+struct IndentQueryResult<'a> {
371− indent_captures: HashMap<usize, Vec<IndentCapture>>,
445+ indent_captures: HashMap<usize, Vec<IndentCapture<'a>>>,
372 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
446 extend_captures: HashMap<usize, Vec<ExtendCapture>>,
373}
447}
374
448
@@ -389,14 +463,14 @@ fn get_node_end_line(node: Node, new_line_byte_pos: Option<usize>) -> usize {
389 node_line
463 node_line
390}
464}
391
465
392−fn query_indents(
466+fn query_indents<'a>(
393 query: &Query,
467 query: &Query,
394 syntax: &Syntax,
468 syntax: &Syntax,
395 cursor: &mut QueryCursor,
469 cursor: &mut QueryCursor,
396− text: RopeSlice,
470+ text: RopeSlice<'a>,
397 range: std::ops::Range<usize>,
471 range: std::ops::Range<usize>,
398 new_line_byte_pos: Option<usize>,
472 new_line_byte_pos: Option<usize>,
399−) -> IndentQueryResult {
473+) -> IndentQueryResult<'a> {
400 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
474 let mut indent_captures: HashMap<usize, Vec<IndentCapture>> = HashMap::new();
401 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
475 let mut extend_captures: HashMap<usize, Vec<ExtendCapture>> = HashMap::new();
402 cursor.set_byte_range(range);
476 cursor.set_byte_range(range);
@@ -484,7 +558,7 @@ fn query_indents(
484 "outdent" => IndentCaptureType::Outdent,
558 "outdent" => IndentCaptureType::Outdent,
485 "outdent.always" => IndentCaptureType::OutdentAlways,
559 "outdent.always" => IndentCaptureType::OutdentAlways,
486 // The alignment will be updated to the correct value at the end, when the anchor is known.
560 // 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("")),
488 "anchor" => {
562 "anchor" => {
489 if anchor.is_some() {
563 if anchor.is_some() {
490 log::error!("Invalid indent query: Encountered more than one @anchor in the same match.")
564 log::error!("Invalid indent query: Encountered more than one @anchor in the same match.")
@@ -556,22 +630,10 @@ fn query_indents(
556 }
630 }
557 Some(anchor) => anchor,
631 Some(anchor) => anchor,
558 };
632 };
559− // Create a string of tabs & spaces that should have the same width
633+ capture.capture_type = IndentCaptureType::Align(
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(
563 text.line(anchor.start_position().row)
634 text.line(anchor.start_position().row)
564 .byte_slice(0..anchor.start_position().column),
635 .byte_slice(0..anchor.start_position().column),
565− ) {
636+ );
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);
575 }
637 }
576 indent_captures
638 indent_captures
577 .entry(node_id)
639 .entry(node_id)
@@ -657,56 +719,20 @@ fn extend_nodes<'a>(
657 }
719 }
658}
720}
659
721
660−/// Use the syntax tree to determine the indentation for a given position.
722+/// Prepare an indent query by computing:
661−/// This can be used in 2 ways:
723+/// - The node from which to start the query (this is non-trivial due to `@extend` captures)
662−///
724+/// - The indent captures for all relevant nodes.
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−/// ```
696#[allow(clippy::too_many_arguments)]
725#[allow(clippy::too_many_arguments)]
697−pub fn treesitter_indent_for_pos(
726+fn init_indent_query<'a, 'b>(
698 query: &Query,
727 query: &Query,
699− syntax: &Syntax,
728+ syntax: &'a Syntax,
700− indent_style: &IndentStyle,
729+ text: RopeSlice<'b>,
701 tab_width: usize,
730 tab_width: usize,
702 indent_width: usize,
731 indent_width: usize,
703− text: RopeSlice,
704 line: usize,
732 line: usize,
705− pos: usize,
733+ byte_pos: usize,
706− new_line: bool,
734+ new_line_byte_pos: Option<usize>,
707−) -> Option<String> {
735+) -> Option<(Node<'a>, HashMap<usize, Vec<IndentCapture<'b>>>)> {
708− let byte_pos = text.char_to_byte(pos);
709− let new_line_byte_pos = new_line.then_some(byte_pos);
710 // The innermost tree-sitter node which is considered for the indent
736 // The innermost tree-sitter node which is considered for the indent
711 // computation. It may change if some predeceding node is extended
737 // computation. It may change if some predeceding node is extended
712 let mut node = syntax
738 let mut node = syntax
@@ -750,7 +776,6 @@ pub fn treesitter_indent_for_pos(
750 (query_result, deepest_preceding)
776 (query_result, deepest_preceding)
751 })
777 })
752 };
778 };
753− let mut indent_captures = query_result.indent_captures;
754 let extend_captures = query_result.extend_captures;
779 let extend_captures = query_result.extend_captures;
755
780
756 // Check for extend captures, potentially changing the node that the indent calculation starts with
781 // Check for extend captures, potentially changing the node that the indent calculation starts with
@@ -765,6 +790,68 @@ pub fn treesitter_indent_for_pos(
765 indent_width,
790 indent_width,
766 );
791 );
767 }
792 }
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+ )?;
768 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
855 let mut first_in_line = get_first_in_line(node, new_line.then_some(byte_pos));
769
856
770 let mut result = Indentation::default();
857 let mut result = Indentation::default();
@@ -832,7 +919,7 @@ pub fn treesitter_indent_for_pos(
832 break;
919 break;
833 }
920 }
834 }
921 }
835− Some(result.into_string(indent_style))
922+ Some(result)
836}
923}
837
924
838/// Returns the indentation for a new line.
925/// Returns the indentation for a new line.
@@ -841,6 +928,7 @@ pub fn treesitter_indent_for_pos(
841pub fn indent_for_newline(
928pub fn indent_for_newline(
842 language_config: Option<&LanguageConfiguration>,
929 language_config: Option<&LanguageConfiguration>,
843 syntax: Option<&Syntax>,
930 syntax: Option<&Syntax>,
931+ indent_heuristic: &IndentationHeuristic,
844 indent_style: &IndentStyle,
932 indent_style: &IndentStyle,
845 tab_width: usize,
933 tab_width: usize,
846 text: RopeSlice,
934 text: RopeSlice,
@@ -849,14 +937,18 @@ pub fn indent_for_newline(
849 current_line: usize,
937 current_line: usize,
850) -> String {
938) -> String {
851 let indent_width = indent_style.indent_width(tab_width);
939 let indent_width = indent_style.indent_width(tab_width);
940+ if let (
941+ IndentationHeuristic::TreeSitter | IndentationHeuristic::Hybrid,
942+ Some(query),
852− if let (Some(query), Some(syntax)) = (
943+ Some(syntax),
944+ ) = (
945+ indent_heuristic,
853 language_config.and_then(|config| config.indent_query()),
946 language_config.and_then(|config| config.indent_query()),
854 syntax,
947 syntax,
855 ) {
948 ) {
856 if let Some(indent) = treesitter_indent_for_pos(
949 if let Some(indent) = treesitter_indent_for_pos(
857 query,
950 query,
858 syntax,
951 syntax,
859− indent_style,
860 tab_width,
952 tab_width,
861 indent_width,
953 indent_width,
862 text,
954 text,
@@ -864,9 +956,57 @@ pub fn indent_for_newline(
864 line_before_end_pos,
956 line_before_end_pos,
865 true,
957 true,
866 ) {
958 ) {
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+ })() {
867− return indent;
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);
868 };
1007 };
869 }
1008 }
1009+ // Fallback in case we either don't have indent queries or they failed for some reason
870 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
1010 let indent_level = indent_level_for_line(text.line(current_line), tab_width, indent_width);
871 indent_style.as_str().repeat(indent_level)
1011 indent_style.as_str().repeat(indent_level)
872}
1012}
@@ -958,10 +1098,13 @@ mod test {
958 ..Default::default()
1098 ..Default::default()
959 };
1099 };
960
1100
1101+ fn add_capture<'a>(
961− let add_capture = |mut indent: Indentation, capture| {
1102+ mut indent: Indentation<'a>,
1103+ capture: IndentCaptureType<'a>,
1104+ ) -> Indentation<'a> {
962 indent.add_capture(capture);
1105 indent.add_capture(capture);
963 indent
1106 indent
964− };
1107+ }
965
1108
966 // adding an indent to no indent makes an indent
1109 // adding an indent to no indent makes an indent
967 assert_eq!(
1110 assert_eq!(
@@ -1056,4 +1199,74 @@ mod test {
1056 )
1199 )
1057 );
1200 );
1058 }
1201 }
1202+
1203+ #[test]
1204+ fn test_relative_indent() {
1205+ let indent_style = IndentStyle::Spaces(4);
1206+ let tab_width: usize = 4;
1207+ let no_align = [
1208+ Indentation::default(),
1209+ Indentation {
1210+ indent: 1,
1211+ ..Default::default()
1212+ },
1213+ Indentation {
1214+ indent: 5,
1215+ outdent: 1,
1216+ ..Default::default()
1217+ },
1218+ ];
1219+ let align = no_align.clone().map(|indent| Indentation {
1220+ align: Some(RopeSlice::from("12345")),
1221+ ..indent
1222+ });
1223+ let different_align = Indentation {
1224+ align: Some(RopeSlice::from("123456")),
1225+ ..Default::default()
1226+ };
1227+
1228+ // Check that relative and absolute indentation computation are the same when the line we compare to is
1229+ // indented as we expect.
1230+ let check_consistency = |indent: &Indentation, other: &Indentation| {
1231+ assert_eq!(
1232+ indent.relative_indent(
1233+ other,
1234+ RopeSlice::from(other.to_string(&indent_style, tab_width).as_str()),
1235+ &indent_style,
1236+ tab_width
1237+ ),
1238+ Some(indent.to_string(&indent_style, tab_width))
1239+ );
1240+ };
1241+ for a in &no_align {
1242+ for b in &no_align {
1243+ check_consistency(a, b);
1244+ }
1245+ }
1246+ for a in &align {
1247+ for b in &align {
1248+ check_consistency(a, b);
1249+ }
1250+ }
1251+
1252+ // Relative indent computation makes no sense if the alignment differs
1253+ assert_eq!(
1254+ align[0].relative_indent(
1255+ &no_align[0],
1256+ RopeSlice::from(" "),
1257+ &indent_style,
1258+ tab_width
1259+ ),
1260+ None
1261+ );
1262+ assert_eq!(
1263+ align[0].relative_indent(
1264+ &different_align,
1265+ RopeSlice::from(" "),
1266+ &indent_style,
1267+ tab_width
1268+ ),
1269+ None
1270+ );
1271+ }
1059}
1272}
helix-core/src/lib.rs+1
@@ -7,6 +7,7 @@ pub mod config;
7pub mod diagnostic;
7pub mod diagnostic;
8pub mod diff;
8pub mod diff;
9pub mod doc_formatter;
9pub mod doc_formatter;
10+pub mod fuzzy;
10pub mod graphemes;
11pub mod graphemes;
11pub mod history;
12pub mod history;
12pub mod increment;
13pub mod increment;
helix-core/src/syntax.rs+22−6
@@ -101,7 +101,8 @@ pub struct LanguageConfiguration {
101 pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
101 pub file_types: Vec<FileType>, // filename extension or ends_with? <Gemfile, rb, etc>
102 #[serde(default)]
102 #[serde(default)]
103 pub shebangs: Vec<String>, // interpreter(s) associated with language
103 pub shebangs: Vec<String>, // interpreter(s) associated with language
104+ #[serde(default)]
104− pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
105+ pub roots: Vec<String>, // these indicate project roots <.git, Cargo.toml>
105 pub comment_token: Option<String>,
106 pub comment_token: Option<String>,
106 pub text_width: Option<usize>,
107 pub text_width: Option<usize>,
107 pub soft_wrap: Option<SoftWrap>,
108 pub soft_wrap: Option<SoftWrap>,
@@ -154,6 +155,8 @@ pub struct LanguageConfiguration {
154 /// Hardcoded LSP root directories relative to the workspace root, like `examples` or `tools/fuzz`.
155 /// Hardcoded LSP root directories relative to the workspace root, like `examples` or `tools/fuzz`.
155 /// Falling back to the current working directory if none are configured.
156 /// Falling back to the current working directory if none are configured.
156 pub workspace_lsp_roots: Option<Vec<PathBuf>>,
157 pub workspace_lsp_roots: Option<Vec<PathBuf>>,
158+ #[serde(default)]
159+ pub persistent_diagnostic_sources: Vec<String>,
157}
160}
158
161
159#[derive(Debug, PartialEq, Eq, Hash)]
162#[derive(Debug, PartialEq, Eq, Hash)]
@@ -211,10 +214,7 @@ impl<'de> Deserialize<'de> for FileType {
211 {
214 {
212 match map.next_entry::<String, String>()? {
215 match map.next_entry::<String, String>()? {
213 Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
216 Some((key, suffix)) if key == "suffix" => Ok(FileType::Suffix({
214− // FIXME: use `suffix.replace('/', std::path::MAIN_SEPARATOR_STR)`
217+ 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))
218 })),
218 })),
219 Some((key, _value)) => Err(serde::de::Error::custom(format!(
219 Some((key, _value)) => Err(serde::de::Error::custom(format!(
220 "unknown key in `file-types` list: {}",
220 "unknown key in `file-types` list: {}",
@@ -444,6 +444,22 @@ pub struct IndentationConfiguration {
444 pub unit: String,
444 pub unit: String,
445}
445}
446
446
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+
447/// Configuration for auto pairs
463/// Configuration for auto pairs
448#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
464#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
449#[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
465#[serde(rename_all = "kebab-case", deny_unknown_fields, untagged)]
@@ -962,7 +978,7 @@ impl Syntax {
962 let res = syntax.update(source, source, &ChangeSet::new(source));
978 let res = syntax.update(source, source, &ChangeSet::new(source));
963
979
964 if res.is_err() {
980 if res.is_err() {
965− log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
981+ log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
966 return None;
982 return None;
967 }
983 }
968 Some(syntax)
984 Some(syntax)
helix-core/src/transaction.rs+73−14
@@ -1,7 +1,7 @@
1use ropey::RopeSlice;
1use ropey::RopeSlice;
2use smallvec::SmallVec;
2use smallvec::SmallVec;
3
3
4−use crate::{Range, Rope, Selection, Tendril};
4+use crate::{chars::char_is_word, Range, Rope, Selection, Tendril};
5use std::{borrow::Cow, iter::once};
5use std::{borrow::Cow, iter::once};
6
6
7/// (from, to, replacement)
7/// (from, to, replacement)
@@ -23,6 +23,30 @@ pub enum Operation {
23pub enum Assoc {
23pub enum Assoc {
24 Before,
24 Before,
25 After,
25 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+ }
26}
50}
27
51
28#[derive(Debug, Default, Clone, PartialEq, Eq)]
52#[derive(Debug, Default, Clone, PartialEq, Eq)]
@@ -415,8 +439,6 @@ impl ChangeSet {
415 map!(|pos, _| (old_end > pos).then_some(new_pos), i);
439 map!(|pos, _| (old_end > pos).then_some(new_pos), i);
416 }
440 }
417 Insert(s) => {
441 Insert(s) => {
418− let ins = s.chars().count();
419−
420 // a subsequent delete means a replace, consume it
442 // a subsequent delete means a replace, consume it
421 if let Some((_, Delete(len))) = iter.peek() {
443 if let Some((_, Delete(len))) = iter.peek() {
422 iter.next();
444 iter.next();
@@ -424,13 +446,13 @@ impl ChangeSet {
424 old_end = old_pos + len;
446 old_end = old_pos + len;
425 // in range of replaced text
447 // in range of replaced text
426 map!(
448 map!(
427− |pos, assoc| (old_end > pos).then(|| {
449+ |pos, assoc: Assoc| (old_end > pos).then(|| {
428 // at point or tracking before
450 // at point or tracking before
429− if pos == old_pos || assoc == Assoc::Before {
451+ if pos == old_pos && assoc.stay_at_gaps() {
430 new_pos
452 new_pos
431 } else {
453 } else {
432 // place to end of insert
454 // place to end of insert
433− new_pos + ins
455+ new_pos + assoc.insert_offset(s)
434 }
456 }
435 }),
457 }),
436 i
458 i
@@ -438,20 +460,15 @@ impl ChangeSet {
438 } else {
460 } else {
439 // at insert point
461 // at insert point
440 map!(
462 map!(
441− |pos, assoc| (old_pos == pos).then(|| {
463+ |pos, assoc: Assoc| (old_pos == pos).then(|| {
442 // return position before inserted text
464 // return position before inserted text
443− if assoc == Assoc::Before {
465+ new_pos + assoc.insert_offset(s)
444− new_pos
445− } else {
446− // after text
447− new_pos + ins
448− }
449 }),
466 }),
450 i
467 i
451 );
468 );
452 }
469 }
453
470
454− new_pos += ins;
471+ new_pos += s.chars().count();
455 }
472 }
456 }
473 }
457 old_pos = old_end;
474 old_pos = old_end;
@@ -884,6 +901,48 @@ mod test {
884 let mut positions = [4, 2];
901 let mut positions = [4, 2];
885 cs.update_positions(positions.iter_mut().map(|pos| (pos, Assoc::After)));
902 cs.update_positions(positions.iter_mut().map(|pos| (pos, Assoc::After)));
886 assert_eq!(positions, [4, 2]);
903 assert_eq!(positions, [4, 2]);
904+ // stays at word boundary
905+ let cs = ChangeSet {
906+ changes: vec![
907+ Retain(2), // <space><space>
908+ Insert(" ab".into()),
909+ Retain(2), // cd
910+ Insert("de ".into()),
911+ ],
912+ len: 4,
913+ len_after: 10,
914+ };
915+ assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 3);
916+ assert_eq!(cs.map_pos(4, Assoc::AfterWord), 9);
917+ let cs = ChangeSet {
918+ changes: vec![
919+ Retain(1), // <space>
920+ Insert(" b".into()),
921+ Delete(1), // c
922+ Retain(1), // d
923+ Insert("e ".into()),
924+ Delete(1), // <space>
925+ ],
926+ len: 5,
927+ len_after: 7,
928+ };
929+ assert_eq!(cs.map_pos(1, Assoc::BeforeWord), 2);
930+ assert_eq!(cs.map_pos(3, Assoc::AfterWord), 5);
931+ let cs = ChangeSet {
932+ changes: vec![
933+ Retain(1), // <space>
934+ Insert("a".into()),
935+ Delete(2), // <space>b
936+ Retain(1), // d
937+ Insert("e".into()),
938+ Delete(1), // f
939+ Retain(1), // <space>
940+ ],
941+ len: 5,
942+ len_after: 7,
943+ };
944+ assert_eq!(cs.map_pos(2, Assoc::BeforeWord), 1);
945+ assert_eq!(cs.map_pos(4, Assoc::AfterWord), 4);
887 }
946 }
888
947
889 #[test]
948 #[test]
helix-core/src/wrap.rs+3−1
@@ -1,7 +1,9 @@
1use smartstring::{LazyCompact, SmartString};
1use smartstring::{LazyCompact, SmartString};
2+use textwrap::{Options, WordSplitter::NoHyphenation};
2
3
3/// Given a slice of text, return the text re-wrapped to fit it
4/// Given a slice of text, return the text re-wrapped to fit it
4/// within the given width.
5/// within the given width.
5pub fn reflow_hard_wrap(text: &str, text_width: usize) -> SmartString<LazyCompact> {
6pub fn reflow_hard_wrap(text: &str, text_width: usize) -> SmartString<LazyCompact> {
7+ let options = Options::new(text_width).word_splitter(NoHyphenation);
6− textwrap::refill(text, text_width).into()
8+ textwrap::refill(text, options).into()
7}
9}
helix-core/tests/indent.rs+2−2
@@ -210,7 +210,6 @@ fn test_treesitter_indent(
210 let suggested_indent = treesitter_indent_for_pos(
210 let suggested_indent = treesitter_indent_for_pos(
211 indent_query,
211 indent_query,
212 &syntax,
212 &syntax,
213− &indent_style,
214 tab_width,
213 tab_width,
215 indent_style.indent_width(tab_width),
214 indent_style.indent_width(tab_width),
216 text,
215 text,
@@ -218,7 +217,8 @@ fn test_treesitter_indent(
218 text.line_to_char(i) + pos,
217 text.line_to_char(i) + pos,
219 false,
218 false,
220 )
219 )
221− .unwrap();
220+ .unwrap()
221+ .to_string(&indent_style, tab_width);
222 assert!(
222 assert!(
223 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
223 line.get_slice(..pos).map_or(false, |s| s == suggested_indent),
224 "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
224 "Wrong indentation for file {:?} on line {}:\n\"{}\" (original line)\n\"{}\" (suggested indentation)\n",
helix-dap/Cargo.toml+11−9
@@ -1,25 +1,27 @@
1[package]
1[package]
2name = "helix-dap"
2name = "helix-dap"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2018"
6−license = "MPL-2.0"
7description = "DAP client implementation for Helix project"
3description = "DAP client implementation for Helix project"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
8−categories = ["editor"]
9+categories.workspace = true
9−repository = "https://github.com/helix-editor/helix"
10+repository.workspace = true
10−homepage = "https://helix-editor.com"
11+homepage.workspace = true
11
12
12# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13
14
14[dependencies]
15[dependencies]
15−helix-core = { version = "0.6", path = "../helix-core" }
16+helix-core = { path = "../helix-core" }
17+
16anyhow = "1.0"
18anyhow = "1.0"
17log = "0.4"
19log = "0.4"
18serde = { version = "1.0", features = ["derive"] }
20serde = { version = "1.0", features = ["derive"] }
19serde_json = "1.0"
21serde_json = "1.0"
20thiserror = "1.0"
22thiserror = "1.0"
21tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot", "net", "sync"] }
23tokio = { 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"
23
25
24[dev-dependencies]
26[dev-dependencies]
25fern = "0.6"
27fern = "0.6"
helix-event/Cargo.tomlnew file+16
@@ -0,0 +1,16 @@
1+[package]
2+name = "helix-event"
3+version.workspace = true
4+authors.workspace = true
5+edition.workspace = true
6+license.workspace = true
7+rust-version.workspace = true
8+categories.workspace = true
9+repository.workspace = true
10+homepage.workspace = true
11+
12+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13+
14+[dependencies]
15+tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot"] }
16+parking_lot = { version = "0.12", features = ["send_guard"] }
helix-event/src/lib.rsnew file+8
@@ -0,0 +1,8 @@
1+//! `helix-event` contains systems that allow (often async) communication between
2+//! different editor components without strongly coupling them. Currently this
3+//! crate only contains some smaller facilities but the intend is to add more
4+//! functionality in the future ( like a generic hook system)
5+
6+pub use redraw::{lock_frame, redraw_requested, request_redraw, start_frame, RenderLockGuard};
7+
8+mod redraw;
helix-event/src/redraw.rsnew file+49
@@ -0,0 +1,49 @@
1+//! Signals that control when/if the editor redraws
2+
3+use std::future::Future;
4+
5+use parking_lot::{RwLock, RwLockReadGuard};
6+use tokio::sync::Notify;
7+
8+/// A `Notify` instance that can be used to (asynchronously) request
9+/// the editor the render a new frame.
10+static REDRAW_NOTIFY: Notify = Notify::const_new();
11+
12+/// A `RwLock` that prevents the next frame from being
13+/// drawn until an exclusive (write) lock can be acquired.
14+/// This allows asynchsonous tasks to acquire `non-exclusive`
15+/// locks (read) to prevent the next frame from being drawn
16+/// until a certain computation has finished.
17+static RENDER_LOCK: RwLock<()> = RwLock::new(());
18+
19+pub type RenderLockGuard = RwLockReadGuard<'static, ()>;
20+
21+/// Requests that the editor is redrawn. The redraws are debounced (currently to
22+/// 30FPS) so this can be called many times without causing a ton of frames to
23+/// be rendered.
24+pub fn request_redraw() {
25+ REDRAW_NOTIFY.notify_one();
26+}
27+
28+/// Returns a future that will yield once a redraw has been asynchronously
29+/// requested using [`request_redraw`].
30+pub fn redraw_requested() -> impl Future<Output = ()> {
31+ REDRAW_NOTIFY.notified()
32+}
33+
34+/// Wait until all locks acquired with [`lock_frame`] have been released.
35+/// This function is called before rendering and is intended to allow the frame
36+/// to wait for async computations that should be included in the current frame.
37+pub fn start_frame() {
38+ drop(RENDER_LOCK.write());
39+ // exhaust any leftover redraw notifications
40+ let notify = REDRAW_NOTIFY.notified();
41+ tokio::pin!(notify);
42+ notify.enable();
43+}
44+
45+/// Acquires the render lock which will prevent the next frame from being drawn
46+/// until the returned guard is dropped.
47+pub fn lock_frame() -> RenderLockGuard {
48+ RENDER_LOCK.read()
49+}
helix-loader/Cargo.toml+12−11
@@ -1,13 +1,14 @@
1[package]
1[package]
2name = "helix-loader"
2name = "helix-loader"
3−version = "0.6.0"
3+description = "Build bootstrapping for Helix crates"
4−description = "A post-modern text editor."
4+version.workspace = true
5−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5+authors.workspace = true
6−edition = "2021"
6+edition.workspace = true
7−license = "MPL-2.0"
7+license.workspace = true
8+rust-version.workspace = true
8−categories = ["editor"]
9+categories.workspace = true
9−repository = "https://github.com/helix-editor/helix"
10+repository.workspace = true
10−homepage = "https://helix-editor.com"
11+homepage.workspace = true
11
12
12[[bin]]
13[[bin]]
13name = "hx-loader"
14name = "hx-loader"
@@ -19,16 +20,16 @@ serde = { version = "1.0", features = ["derive"] }
19toml = "0.7"
20toml = "0.7"
20etcetera = "0.8"
21etcetera = "0.8"
21tree-sitter.workspace = true
22tree-sitter.workspace = true
22−once_cell = "1.18"
23+once_cell = "1.19"
23log = "0.4"
24log = "0.4"
24−which = "4.4"
25+which = "5.0.0"
25
26
26# TODO: these two should be on !wasm32 only
27# TODO: these two should be on !wasm32 only
27
28
28# cloning/compiling tree-sitter grammars
29# cloning/compiling tree-sitter grammars
29cc = { version = "1" }
30cc = { version = "1" }
30threadpool = { version = "1.0" }
31threadpool = { version = "1.0" }
31−tempfile = "3.7.1"
32+tempfile = "3.8.1"
32dunce = "1.0.4"
33dunce = "1.0.4"
33
34
34[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
35[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
helix-loader/build.rs+14−4
@@ -2,7 +2,17 @@ use std::borrow::Cow;
2use std::path::Path;
2use std::path::Path;
3use std::process::Command;
3use std::process::Command;
4
4
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+}
6
16
7fn main() {
17fn main() {
8 let git_hash = Command::new("git")
18 let git_hash = Command::new("git")
@@ -12,9 +22,10 @@ fn main() {
12 .filter(|output| output.status.success())
22 .filter(|output| output.status.success())
13 .and_then(|x| String::from_utf8(x.stdout).ok());
23 .and_then(|x| String::from_utf8(x.stdout).ok());
14
24
25+ let calver = get_calver();
15 let version: Cow<_> = match &git_hash {
26 let version: Cow<_> = match &git_hash {
16− Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(),
27+ Some(git_hash) => format!("{} ({})", calver, &git_hash[..8]).into(),
17− None => VERSION.into(),
28+ None => calver.into(),
18 };
29 };
19
30
20 println!(
31 println!(
@@ -22,7 +33,6 @@ fn main() {
22 std::env::var("TARGET").unwrap()
33 std::env::var("TARGET").unwrap()
23 );
34 );
24
35
25− println!("cargo:rerun-if-changed=../VERSION");
26 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
36 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);
27
37
28 if git_hash.is_none() {
38 if git_hash.is_none() {
helix-loader/src/lib.rs+13−4
@@ -33,9 +33,9 @@ pub fn current_working_dir() -> PathBuf {
33 path
33 path
34}
34}
35
35
36−pub fn set_current_working_dir(path: PathBuf) -> std::io::Result<()> {
36+pub fn set_current_working_dir(path: impl AsRef<Path>) -> std::io::Result<()> {
37 let path = dunce::canonicalize(path)?;
37 let path = dunce::canonicalize(path)?;
38− std::env::set_current_dir(path.clone())?;
38+ std::env::set_current_dir(&path)?;
39 let mut cwd = CWD.write().unwrap();
39 let mut cwd = CWD.write().unwrap();
40 *cwd = Some(path);
40 *cwd = Some(path);
41 Ok(())
41 Ok(())
@@ -60,7 +60,8 @@ pub fn initialize_log_file(specified_file: Option<PathBuf>) {
60/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
60/// 1. sibling directory to `CARGO_MANIFEST_DIR` (if environment variable is set)
61/// 2. subdirectory of user config directory (always included)
61/// 2. subdirectory of user config directory (always included)
62/// 3. `HELIX_RUNTIME` (if environment variable is set)
62/// 3. `HELIX_RUNTIME` (if environment variable is set)
63+/// 4. `HELIX_DEFAULT_RUNTIME` (if environment variable is set *at build time*)
63−/// 4. subdirectory of path to helix executable (always included)
64+/// 5. subdirectory of path to helix executable (always included)
64///
65///
65/// Postcondition: returns at least two paths (they might not exist).
66/// Postcondition: returns at least two paths (they might not exist).
66fn prioritize_runtime_dirs() -> Vec<PathBuf> {
67fn prioritize_runtime_dirs() -> Vec<PathBuf> {
@@ -81,6 +82,14 @@ fn prioritize_runtime_dirs() -> Vec<PathBuf> {
81 rt_dirs.push(dir.into());
82 rt_dirs.push(dir.into());
82 }
83 }
83
84
85+ // If this variable is set during build time, it will always be included
86+ // in the lookup list. This allows downstream packagers to set a fallback
87+ // directory to a location that is conventional on their distro so that they
88+ // need not resort to a wrapper script or a global environment variable.
89+ if let Some(dir) = std::option_env!("HELIX_DEFAULT_RUNTIME") {
90+ rt_dirs.push(dir.into());
91+ }
92+
84 // fallback to location of the executable being run
93 // fallback to location of the executable being run
85 // canonicalize the path in case the executable is symlinked
94 // canonicalize the path in case the executable is symlinked
86 let exe_rt_dir = std::env::current_exe()
95 let exe_rt_dir = std::env::current_exe()
@@ -280,7 +289,7 @@ mod merge_toml_tests {
280 let cwd = current_working_dir();
289 let cwd = current_working_dir();
281 assert_ne!(cwd, new_path);
290 assert_ne!(cwd, new_path);
282
291
283− set_current_working_dir(new_path.clone()).expect("Couldn't set new path");
292+ set_current_working_dir(&new_path).expect("Couldn't set new path");
284
293
285 let cwd = current_working_dir();
294 let cwd = current_working_dir();
286 assert_eq!(cwd, new_path);
295 assert_eq!(cwd, new_path);
helix-lsp/Cargo.toml+15−14
@@ -1,31 +1,32 @@
1[package]
1[package]
2name = "helix-lsp"
2name = "helix-lsp"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
7description = "LSP client implementation for Helix project"
3description = "LSP client implementation for Helix project"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
8−categories = ["editor"]
9+categories.workspace = true
9−repository = "https://github.com/helix-editor/helix"
10+repository.workspace = true
10−homepage = "https://helix-editor.com"
11+homepage.workspace = true
11
12
12# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
13
14
14[dependencies]
15[dependencies]
15−helix-core = { version = "0.6", path = "../helix-core" }
16+helix-core = { path = "../helix-core" }
16−helix-loader = { version = "0.6", path = "../helix-loader" }
17+helix-loader = { path = "../helix-loader" }
17−helix-parsec = { version = "0.6", path = "../helix-parsec" }
18+helix-parsec = { path = "../helix-parsec" }
18
19
19anyhow = "1.0"
20anyhow = "1.0"
20futures-executor = "0.3"
21futures-executor = "0.3"
21futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
22futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
22−globset = "0.4.13"
23+globset = "0.4.14"
23log = "0.4"
24log = "0.4"
24−lsp-types = { version = "0.94" }
25+lsp-types = { version = "0.95" }
25serde = { version = "1.0", features = ["derive"] }
26serde = { version = "1.0", features = ["derive"] }
26serde_json = "1.0"
27serde_json = "1.0"
27thiserror = "1.0"
28thiserror = "1.0"
28−tokio = { version = "1.31", 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"] }
29tokio-stream = "0.1.14"
30tokio-stream = "0.1.14"
30−which = "4.4"
31+which = "5.0.0"
31parking_lot = "0.12.1"
32parking_lot = "0.12.1"
helix-lsp/src/client.rs+87−13
@@ -401,12 +401,22 @@ impl Client {
401 &self,
401 &self,
402 params: R::Params,
402 params: R::Params,
403 ) -> impl Future<Output = Result<Value>>
403 ) -> 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>>
404 where
415 where
405 R::Params: serde::Serialize,
416 R::Params: serde::Serialize,
406 {
417 {
407 let server_tx = self.server_tx.clone();
418 let server_tx = self.server_tx.clone();
408 let id = self.next_request_id();
419 let id = self.next_request_id();
409− let timeout_secs = self.req_timeout;
410
420
411 async move {
421 async move {
412 use std::time::Duration;
422 use std::time::Duration;
@@ -548,6 +558,11 @@ impl Client {
548 dynamic_registration: Some(true),
558 dynamic_registration: Some(true),
549 relative_pattern_support: Some(false),
559 relative_pattern_support: Some(false),
550 }),
560 }),
561+ file_operations: Some(lsp::WorkspaceFileOperationsClientCapabilities {
562+ will_rename: Some(true),
563+ did_rename: Some(true),
564+ ..Default::default()
565+ }),
551 ..Default::default()
566 ..Default::default()
552 }),
567 }),
553 text_document: Some(lsp::TextDocumentClientCapabilities {
568 text_document: Some(lsp::TextDocumentClientCapabilities {
@@ -652,6 +667,7 @@ impl Client {
652 version: Some(String::from(VERSION_AND_GIT_HASH)),
667 version: Some(String::from(VERSION_AND_GIT_HASH)),
653 }),
668 }),
654 locale: None, // TODO
669 locale: None, // TODO
670+ work_done_progress_params: lsp::WorkDoneProgressParams::default(),
655 };
671 };
656
672
657 self.request::<lsp::request::Initialize>(params).await
673 self.request::<lsp::request::Initialize>(params).await
@@ -700,6 +716,65 @@ impl Client {
700 })
716 })
701 }
717 }
702
718
719+ pub fn prepare_file_rename(
720+ &self,
721+ old_uri: &lsp::Url,
722+ new_uri: &lsp::Url,
723+ ) -> Option<impl Future<Output = Result<lsp::WorkspaceEdit>>> {
724+ let capabilities = self.capabilities.get().unwrap();
725+
726+ // Return early if the server does not support willRename feature
727+ match &capabilities.workspace {
728+ Some(workspace) => match &workspace.file_operations {
729+ Some(op) => {
730+ op.will_rename.as_ref()?;
731+ }
732+ _ => return None,
733+ },
734+ _ => return None,
735+ }
736+
737+ let files = vec![lsp::FileRename {
738+ old_uri: old_uri.to_string(),
739+ new_uri: new_uri.to_string(),
740+ }];
741+ let request = self.call_with_timeout::<lsp::request::WillRenameFiles>(
742+ lsp::RenameFilesParams { files },
743+ 5,
744+ );
745+
746+ Some(async move {
747+ let json = request.await?;
748+ let response: Option<lsp::WorkspaceEdit> = serde_json::from_value(json)?;
749+ Ok(response.unwrap_or_default())
750+ })
751+ }
752+
753+ pub fn did_file_rename(
754+ &self,
755+ old_uri: &lsp::Url,
756+ new_uri: &lsp::Url,
757+ ) -> Option<impl Future<Output = std::result::Result<(), Error>>> {
758+ let capabilities = self.capabilities.get().unwrap();
759+
760+ // Return early if the server does not support DidRename feature
761+ match &capabilities.workspace {
762+ Some(workspace) => match &workspace.file_operations {
763+ Some(op) => {
764+ op.did_rename.as_ref()?;
765+ }
766+ _ => return None,
767+ },
768+ _ => return None,
769+ }
770+
771+ let files = vec![lsp::FileRename {
772+ old_uri: old_uri.to_string(),
773+ new_uri: new_uri.to_string(),
774+ }];
775+ Some(self.notify::<lsp::notification::DidRenameFiles>(lsp::RenameFilesParams { files }))
776+ }
777+
703 // -------------------------------------------------------------------------------------------
778 // -------------------------------------------------------------------------------------------
704 // Text document
779 // Text document
705 // -------------------------------------------------------------------------------------------
780 // -------------------------------------------------------------------------------------------
@@ -895,20 +970,19 @@ impl Client {
895 ) -> Option<impl Future<Output = Result<()>>> {
970 ) -> Option<impl Future<Output = Result<()>>> {
896 let capabilities = self.capabilities.get().unwrap();
971 let capabilities = self.capabilities.get().unwrap();
897
972
898− let include_text = match &capabilities.text_document_sync {
973+ let include_text = match &capabilities.text_document_sync.as_ref()? {
899− Some(lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
974+ lsp::TextDocumentSyncCapability::Options(lsp::TextDocumentSyncOptions {
900− save: Some(options),
975+ save: options,
901 ..
976 ..
902− })) => match options {
977+ }) => match options.as_ref()? {
903 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
978 lsp::TextDocumentSyncSaveOptions::Supported(true) => false,
904 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
979 lsp::TextDocumentSyncSaveOptions::SaveOptions(lsp_types::SaveOptions {
905 include_text,
980 include_text,
906 }) => include_text.unwrap_or(false),
981 }) => include_text.unwrap_or(false),
907− // Supported(false)
982+ lsp::TextDocumentSyncSaveOptions::Supported(false) => return None,
908− _ => return None,
909 },
983 },
910− // unsupported
984+ // see: https://github.com/microsoft/language-server-protocol/issues/288
911− _ => return None,
985+ lsp::TextDocumentSyncCapability::Kind(..) => false,
912 };
986 };
913
987
914 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
988 Some(self.notify::<lsp::notification::DidSaveTextDocument>(
@@ -971,12 +1045,12 @@ impl Client {
971 ) -> Option<impl Future<Output = Result<Value>>> {
1045 ) -> Option<impl Future<Output = Result<Value>>> {
972 let capabilities = self.capabilities.get().unwrap();
1046 let capabilities = self.capabilities.get().unwrap();
973
1047
974− // Return early if the server does not support resolving code action.
1048+ // Return early if the server does not support resolving code actions.
975− match capabilities.completion_provider {
1049+ match capabilities.code_action_provider {
976− Some(lsp::CompletionOptions {
1050+ Some(lsp::CodeActionProviderCapability::Options(lsp::CodeActionOptions {
977 resolve_provider: Some(true),
1051 resolve_provider: Some(true),
978 ..
1052 ..
979− }) => (),
1053+ })) => (),
980 _ => return None,
1054 _ => return None,
981 }
1055 }
982
1056
helix-lsp/src/lib.rs+32−28
@@ -445,36 +445,36 @@ pub mod util {
445 // the tabstop closest to the range simply replaces `head` while anchor remains in place
445 // the tabstop closest to the range simply replaces `head` while anchor remains in place
446 // the remaining tabstops receive their own single-width cursor
446 // the remaining tabstops receive their own single-width cursor
447 if range.head < range.anchor {
447 if range.head < range.anchor {
448+ let last_idx = tabstops.len() - 1;
448− let first_tabstop = tabstop_anchor + tabstops[0].1;
449+ let last_tabstop = tabstop_anchor + tabstops[last_idx].0;
449
450
450 // if selection is forward but was moved to the right it is
451 // if selection is forward but was moved to the right it is
451 // contained entirely in the replacement text, just do a point
452 // contained entirely in the replacement text, just do a point
452 // selection (fallback below)
453 // selection (fallback below)
453− if range.anchor >= first_tabstop {
454+ if range.anchor > last_tabstop {
454− let range = Range::new(range.anchor, first_tabstop);
455+ let range = Range::new(range.anchor, last_tabstop);
455 mapped_selection.push(range);
456 mapped_selection.push(range);
456− let rem_tabstops = tabstops[1..]
457+ let rem_tabstops = tabstops[..last_idx]
457 .iter()
458 .iter()
458− .map(|tabstop| Range::point(tabstop_anchor + tabstop.1));
459+ .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
459 mapped_selection.extend(rem_tabstops);
460 mapped_selection.extend(rem_tabstops);
460 continue;
461 continue;
461 }
462 }
462 } else {
463 } else {
463− let last_idx = tabstops.len() - 1;
464− let last_tabstop = tabstop_anchor + tabstops[last_idx].1;
464+ let first_tabstop = tabstop_anchor + tabstops[0].0;
465
465
466 // if selection is forward but was moved to the right it is
466 // if selection is forward but was moved to the right it is
467 // contained entirely in the replacement text, just do a point
467 // contained entirely in the replacement text, just do a point
468 // selection (fallback below)
468 // selection (fallback below)
469− if range.anchor <= last_tabstop {
469+ if range.anchor < first_tabstop {
470 // we can't properly compute the the next grapheme
470 // we can't properly compute the the next grapheme
471 // here because the transaction hasn't been applied yet
471 // here because the transaction hasn't been applied yet
472 // that is not a problem because the range gets grapheme aligned anyway
472 // that is not a problem because the range gets grapheme aligned anyway
473 // tough so just adding one will always cause head to be grapheme
473 // tough so just adding one will always cause head to be grapheme
474 // aligned correctly when applied to the document
474 // aligned correctly when applied to the document
475− let range = Range::new(range.anchor, last_tabstop + 1);
475+ let range = Range::new(range.anchor, first_tabstop + 1);
476 mapped_selection.push(range);
476 mapped_selection.push(range);
477− let rem_tabstops = tabstops[..last_idx]
477+ let rem_tabstops = tabstops[1..]
478 .iter()
478 .iter()
479 .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
479 .map(|tabstop| Range::point(tabstop_anchor + tabstop.0));
480 mapped_selection.extend(rem_tabstops);
480 mapped_selection.extend(rem_tabstops);
@@ -749,36 +749,40 @@ impl Registry {
749 }
749 }
750 }
750 }
751
751
752− pub fn get(
752+ pub fn get<'a>(
753− &mut self,
753+ &'a mut self,
754− language_config: &LanguageConfiguration,
754+ language_config: &'a LanguageConfiguration,
755− doc_path: Option<&std::path::PathBuf>,
755+ doc_path: Option<&'a std::path::PathBuf>,
756− root_dirs: &[PathBuf],
756+ root_dirs: &'a [PathBuf],
757 enable_snippets: bool,
757 enable_snippets: bool,
758− ) -> Result<HashMap<LanguageServerName, Arc<Client>>> {
758+ ) -> impl Iterator<Item = (LanguageServerName, Result<Arc<Client>>)> + 'a {
759− language_config
760− .language_servers
759+ language_config.language_servers.iter().map(
761− .iter()
762− .map(|LanguageServerFeatures { name, .. }| {
760+ move |LanguageServerFeatures { name, .. }| {
763 if let Some(clients) = self.inner.get(name) {
761 if let Some(clients) = self.inner.get(name) {
764 if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
762 if let Some((_, client)) = clients.iter().enumerate().find(|(i, client)| {
765 client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
763 client.try_add_doc(&language_config.roots, root_dirs, doc_path, *i == 0)
766 }) {
764 }) {
767− return Ok((name.to_owned(), client.clone()));
765+ return (name.to_owned(), Ok(client.clone()));
768 }
766 }
769 }
767 }
770− let client = self.start_client(
768+ match self.start_client(
771 name.clone(),
769 name.clone(),
772 language_config,
770 language_config,
773 doc_path,
771 doc_path,
774 root_dirs,
772 root_dirs,
775 enable_snippets,
773 enable_snippets,
776− )?;
774+ ) {
777− let clients = self.inner.entry(name.clone()).or_default();
775+ Ok(client) => {
776+ self.inner
777+ .entry(name.to_owned())
778+ .or_default()
778− clients.push(client.clone());
779+ .push(client.clone());
779− Ok((name.clone(), client))
780+ (name.clone(), Ok(client))
780− })
781+ }
781− .collect()
782+ Err(err) => (name.to_owned(), Err(err)),
783+ }
784+ },
785+ )
782 }
786 }
783
787
784 pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
788 pub fn iter_clients(&self) -> impl Iterator<Item = &Arc<Client>> {
helix-parsec/Cargo.toml+8−7
@@ -1,13 +1,14 @@
1[package]
1[package]
2name = "helix-parsec"
2name = "helix-parsec"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
7description = "Parser combinators for Helix"
3description = "Parser combinators for Helix"
8−categories = ["editor"]
9−repository = "https://github.com/helix-editor/helix"
10−homepage = "https://helix-editor.com"
11include = ["src/**/*", "README.md"]
4include = ["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
12
13
13[dependencies]
14[dependencies]
helix-term/Cargo.toml+30−25
@@ -1,16 +1,16 @@
1[package]
1[package]
2name = "helix-term"
2name = "helix-term"
3−version = "0.6.0"
4description = "A post-modern text editor."
3description = "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"
11include = ["src/**/*", "README.md"]
4include = ["src/**/*", "README.md"]
12default-run = "hx"
5default-run = "hx"
6+version.workspace = true
7+authors.workspace = true
8+edition.workspace = true
9+license.workspace = true
13−rust-version = "1.65"
10+rust-version.workspace = true
11+categories.workspace = true
12+repository.workspace = true
13+homepage.workspace = true
14
14
15[features]
15[features]
16default = ["git"]
16default = ["git"]
@@ -23,21 +23,22 @@ name = "hx"
23path = "src/main.rs"
23path = "src/main.rs"
24
24
25[dependencies]
25[dependencies]
26−helix-core = { version = "0.6", path = "../helix-core" }
26+helix-core = { path = "../helix-core" }
27+helix-event = { path = "../helix-event" }
27−helix-view = { version = "0.6", path = "../helix-view" }
28+helix-view = { path = "../helix-view" }
28−helix-lsp = { version = "0.6", path = "../helix-lsp" }
29+helix-lsp = { path = "../helix-lsp" }
29−helix-dap = { version = "0.6", path = "../helix-dap" }
30+helix-dap = { path = "../helix-dap" }
30−helix-vcs = { version = "0.6", path = "../helix-vcs" }
31+helix-vcs = { path = "../helix-vcs" }
31−helix-loader = { version = "0.6", path = "../helix-loader" }
32+helix-loader = { path = "../helix-loader" }
32
33
33anyhow = "1"
34anyhow = "1"
34−once_cell = "1.18"
35+once_cell = "1.19"
35
36
36−which = "4.4"
37+which = "5.0.0"
37
38
38tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
39tokio = { version = "1", features = ["rt", "rt-multi-thread", "io-util", "io-std", "time", "process", "macros", "fs", "parking_lot"] }
39tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
40tui = { path = "../helix-tui", package = "helix-tui", default-features = false, features = ["crossterm"] }
40−crossterm = { version = "0.26", features = ["event-stream"] }
41+crossterm = { version = "0.27", features = ["event-stream"] }
41signal-hook = "0.3"
42signal-hook = "0.3"
42tokio-stream = "0.1"
43tokio-stream = "0.1"
43futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
44futures-util = { version = "0.3", features = ["std", "async-await"], default-features = false }
@@ -49,13 +50,17 @@ chrono = { version = "0.4", default-features = false, features = ["clock"] }
49log = "0.4"
50log = "0.4"
50
51
51# File picker
52# File picker
52−fuzzy-matcher = "0.3"
53+nucleo.workspace = true
53ignore = "0.4"
54ignore = "0.4"
54# markdown doc rendering
55# markdown doc rendering
55pulldown-cmark = { version = "0.9", default-features = false }
56pulldown-cmark = { version = "0.9", default-features = false }
56# file type detection
57# file type detection
57content_inspector = "0.2.4"
58content_inspector = "0.2.4"
58
59
60+# opening URLs
61+open = "5.0.1"
62+url = "2.5.0"
63+
59# config
64# config
60toml = "0.7"
65toml = "0.7"
61
66
@@ -63,20 +68,20 @@ serde_json = "1.0"
63serde = { version = "1.0", features = ["derive"] }
68serde = { version = "1.0", features = ["derive"] }
64
69
65# ripgrep for global search
70# ripgrep for global search
66−grep-regex = "0.1.11"
71+grep-regex = "0.1.12"
67−grep-searcher = "0.1.11"
72+grep-searcher = "0.1.13"
68
73
69[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
74[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100
70signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
75signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }
71−libc = "0.2.147"
76+libc = "0.2.151"
72
77
73[target.'cfg(target_os = "macos")'.dependencies]
78[target.'cfg(target_os = "macos")'.dependencies]
74−crossterm = { version = "0.26", features = ["event-stream", "use-dev-tty"] }
79+crossterm = { version = "0.27", features = ["event-stream", "use-dev-tty"] }
75
80
76[build-dependencies]
81[build-dependencies]
77−helix-loader = { version = "0.6", path = "../helix-loader" }
82+helix-loader = { path = "../helix-loader" }
78
83
79[dev-dependencies]
84[dev-dependencies]
80smallvec = "1.11"
85smallvec = "1.11"
81−indoc = "2.0.3"
86+indoc = "2.0.4"
82−tempfile = "3.7.1"
87+tempfile = "3.8.1"
helix-term/src/application.rs+106−64
@@ -1,6 +1,7 @@
1use arc_swap::{access::Map, ArcSwap};
1use arc_swap::{access::Map, ArcSwap};
2use futures_util::Stream;
2use futures_util::Stream;
3use helix_core::{
3use helix_core::{
4+ chars::char_is_word,
4 diagnostic::{DiagnosticTag, NumberOrString},
5 diagnostic::{DiagnosticTag, NumberOrString},
5 path::get_relative_path,
6 path::get_relative_path,
6 pos_at_coords, syntax, Selection,
7 pos_at_coords, syntax, Selection,
@@ -162,15 +163,19 @@ impl Application {
162 // Unset path to prevent accidentally saving to the original tutor file.
163 // Unset path to prevent accidentally saving to the original tutor file.
163 doc_mut!(editor).set_path(None);
164 doc_mut!(editor).set_path(None);
164 } else if !args.files.is_empty() {
165 } else if !args.files.is_empty() {
165− let first = &args.files[0].0; // we know it's not empty
166+ let mut files_it = args.files.into_iter().peekable();
167+
168+ // If the first file is a directory, skip it and open a picker
166− if first.is_dir() {
169+ if let Some((first, _)) = files_it.next_if(|(p, _)| p.is_dir()) {
167− helix_loader::set_current_working_dir(first.clone())?;
168− editor.new_file(Action::VerticalSplit);
169− let picker = ui::file_picker(".".into(), &config.load().editor);
170+ let picker = ui::file_picker(first, &config.load().editor);
170 compositor.push(Box::new(overlaid(picker)));
171 compositor.push(Box::new(overlaid(picker)));
171− } else {
172+ }
173+
174+ // If there are any more files specified, open them
175+ if files_it.peek().is_some() {
172− let nr_of_files = args.files.len();
176+ let mut nr_of_files = 0;
173− for (i, (file, pos)) in args.files.into_iter().enumerate() {
177+ for (file, pos) in files_it {
178+ nr_of_files += 1;
174 if file.is_dir() {
179 if file.is_dir() {
175 return Err(anyhow::anyhow!(
180 return Err(anyhow::anyhow!(
176 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
181 "expected a path to file, found a directory. (to open a directory pass it as first argument)"
@@ -182,7 +187,7 @@ impl Application {
182 // option. If neither of those two arguments are passed
187 // option. If neither of those two arguments are passed
183 // in, just load the files normally.
188 // in, just load the files normally.
184 let action = match args.split {
189 let action = match args.split {
185− _ if i == 0 => Action::VerticalSplit,
190+ _ if nr_of_files == 1 => Action::VerticalSplit,
186 Some(Layout::Vertical) => Action::VerticalSplit,
191 Some(Layout::Vertical) => Action::VerticalSplit,
187 Some(Layout::Horizontal) => Action::HorizontalSplit,
192 Some(Layout::Horizontal) => Action::HorizontalSplit,
188 None => Action::Load,
193 None => Action::Load,
@@ -209,6 +214,8 @@ impl Application {
209 // does not affect views without pos since it is at the top
214 // does not affect views without pos since it is at the top
210 let (view, doc) = current!(editor);
215 let (view, doc) = current!(editor);
211 align_view(doc, view, Align::Center);
216 align_view(doc, view, Align::Center);
217+ } else {
218+ editor.new_file(Action::VerticalSplit);
212 }
219 }
213 } else if stdin().is_tty() || cfg!(feature = "integration") {
220 } else if stdin().is_tty() || cfg!(feature = "integration") {
214 editor.new_file(Action::VerticalSplit);
221 editor.new_file(Action::VerticalSplit);
@@ -251,22 +258,19 @@ impl Application {
251 }
258 }
252
259
253 async fn render(&mut self) {
260 async fn render(&mut self) {
261+ if self.compositor.full_redraw {
262+ self.terminal.clear().expect("Cannot clear the terminal");
263+ self.compositor.full_redraw = false;
264+ }
265+
254 let mut cx = crate::compositor::Context {
266 let mut cx = crate::compositor::Context {
255 editor: &mut self.editor,
267 editor: &mut self.editor,
256 jobs: &mut self.jobs,
268 jobs: &mut self.jobs,
257 scroll: None,
269 scroll: None,
258 };
270 };
259
271
260− // Acquire mutable access to the redraw_handle lock
272+ helix_event::start_frame();
261− // to ensure that there are no tasks running that want to block rendering
262− drop(cx.editor.redraw_handle.1.write().await);
263 cx.editor.needs_redraw = false;
273 cx.editor.needs_redraw = false;
264− {
265− // exhaust any leftover redraw notifications
266− let notify = cx.editor.redraw_handle.0.notified();
267− tokio::pin!(notify);
268− notify.enable();
269− }
270
274
271 let area = self
275 let area = self
272 .terminal
276 .terminal
@@ -288,7 +292,7 @@ impl Application {
288
292
289 pub async fn event_loop<S>(&mut self, input_stream: &mut S)
293 pub async fn event_loop<S>(&mut self, input_stream: &mut S)
290 where
294 where
291− S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
295+ S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
292 {
296 {
293 self.render().await;
297 self.render().await;
294
298
@@ -301,7 +305,7 @@ impl Application {
301
305
302 pub async fn event_loop_until_idle<S>(&mut self, input_stream: &mut S) -> bool
306 pub async fn event_loop_until_idle<S>(&mut self, input_stream: &mut S) -> bool
303 where
307 where
304− S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
308+ S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
305 {
309 {
306 loop {
310 loop {
307 if self.editor.should_close() {
311 if self.editor.should_close() {
@@ -590,7 +594,7 @@ impl Application {
590 EditorEvent::LanguageServerMessage((id, call)) => {
594 EditorEvent::LanguageServerMessage((id, call)) => {
591 self.handle_language_server_message(call, id).await;
595 self.handle_language_server_message(call, id).await;
592 // limit render calls for fast language server messages
596 // limit render calls for fast language server messages
593− self.editor.redraw_handle.0.notify_one();
597+ helix_event::request_redraw();
594 }
598 }
595 EditorEvent::DebuggerEvent(payload) => {
599 EditorEvent::DebuggerEvent(payload) => {
596 let needs_render = self.editor.handle_debugger_message(payload).await;
600 let needs_render = self.editor.handle_debugger_message(payload).await;
@@ -615,10 +619,7 @@ impl Application {
615 false
619 false
616 }
620 }
617
621
618− pub async fn handle_terminal_events(
622+ pub async fn handle_terminal_events(&mut self, event: std::io::Result<CrosstermEvent>) {
619− &mut self,
620− event: Result<CrosstermEvent, crossterm::ErrorKind>,
621− ) {
622 let mut cx = crate::compositor::Context {
623 let mut cx = crate::compositor::Context {
623 editor: &mut self.editor,
624 editor: &mut self.editor,
624 jobs: &mut self.jobs,
625 jobs: &mut self.jobs,
@@ -717,7 +718,7 @@ impl Application {
717 ));
718 ));
718 }
719 }
719 }
720 }
720− Notification::PublishDiagnostics(params) => {
721+ Notification::PublishDiagnostics(mut params) => {
721 let path = match params.uri.to_file_path() {
722 let path = match params.uri.to_file_path() {
722 Ok(path) => path,
723 Ok(path) => path,
723 Err(_) => {
724 Err(_) => {
@@ -731,31 +732,69 @@ impl Application {
731 return;
732 return;
732 }
733 }
733 let offset_encoding = language_server.offset_encoding();
734 let offset_encoding = language_server.offset_encoding();
734− let doc = self.editor.document_by_path_mut(&path).filter(|doc| {
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| {
735− if let Some(version) = params.version {
739+ if let Some(version) = params.version {
736− if version != doc.version() {
740+ if version != doc.version() {
737− log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
741+ log::info!("Version ({version}) is out of date for {path:?} (expected ({}), dropping PublishDiagnostic notification", doc.version());
738− return false;
742+ return false;
743+ }
739 }
744 }
740− }
741−
742− true
745+ true
743− });
746+ });
744
747
745 if let Some(doc) = doc {
748 if let Some(doc) = doc {
746− let lang_conf = doc.language_config();
749+ let lang_conf = doc.language.clone();
747− let text = doc.text();
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+ }
748
782
783+ let unchaged_diag_sources = &unchaged_diag_sources_;
749− let diagnostics = params
784+ let diagnostics =
750− .diagnostics
751− .iter()
752− .filter_map(|diagnostic| {
785+ params.diagnostics.iter().filter_map(move |diagnostic| {
753 use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
786 use helix_core::diagnostic::{Diagnostic, Range, Severity::*};
754 use lsp::DiagnosticSeverity;
787 use lsp::DiagnosticSeverity;
755
788
789+ if diagnostic.source.as_ref().map_or(false, |source| {
790+ unchaged_diag_sources.contains(source)
791+ }) {
792+ return None;
793+ }
794+
756 // TODO: convert inside server
795 // TODO: convert inside server
757 let start = if let Some(start) = lsp_pos_to_pos(
796 let start = if let Some(start) = lsp_pos_to_pos(
758− text,
797+ &text,
759 diagnostic.range.start,
798 diagnostic.range.start,
760 offset_encoding,
799 offset_encoding,
761 ) {
800 ) {
@@ -766,14 +805,13 @@ impl Application {
766 };
805 };
767
806
768 let end = if let Some(end) =
807 let end = if let Some(end) =
769− lsp_pos_to_pos(text, diagnostic.range.end, offset_encoding)
808+ lsp_pos_to_pos(&text, diagnostic.range.end, offset_encoding)
770 {
809 {
771 end
810 end
772 } else {
811 } else {
773 log::warn!("lsp position out of bounds - {:?}", diagnostic);
812 log::warn!("lsp position out of bounds - {:?}", diagnostic);
774 return None;
813 return None;
775 };
814 };
776−
777 let severity =
815 let severity =
778 diagnostic.severity.map(|severity| match severity {
816 diagnostic.severity.map(|severity| match severity {
779 DiagnosticSeverity::ERROR => Error,
817 DiagnosticSeverity::ERROR => Error,
@@ -786,7 +824,7 @@ impl Application {
786 ),
824 ),
787 });
825 });
788
826
789− if let Some(lang_conf) = lang_conf {
827+ if let Some(lang_conf) = &lang_conf {
790 if let Some(severity) = severity {
828 if let Some(severity) = severity {
791 if severity < lang_conf.diagnostic_severity {
829 if severity < lang_conf.diagnostic_severity {
792 return None;
830 return None;
@@ -825,8 +863,17 @@ impl Application {
825 Vec::new()
863 Vec::new()
826 };
864 };
827
865
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+
828 Some(Diagnostic {
872 Some(Diagnostic {
829 range: Range { start, end },
873 range: Range { start, end },
874+ ends_at_word,
875+ starts_at_word,
876+ zero_width: start == end,
830 line: diagnostic.range.start.line as usize,
877 line: diagnostic.range.start.line as usize,
831 message: diagnostic.message.clone(),
878 message: diagnostic.message.clone(),
832 severity,
879 severity,
@@ -836,38 +883,33 @@ impl Application {
836 data: diagnostic.data.clone(),
883 data: diagnostic.data.clone(),
837 language_server_id: server_id,
884 language_server_id: server_id,
838 })
885 })
839− })
886+ });
840− .collect();
841
887
842− doc.replace_diagnostics(diagnostics, server_id);
888+ doc.replace_diagnostics(diagnostics, unchaged_diag_sources, server_id);
843 }
889 }
844
890
845− let mut diagnostics = params
891+ let diagnostics = params.diagnostics.into_iter().map(|d| (d, server_id));
846− .diagnostics
847− .into_iter()
848− .map(|d| (d, server_id))
849− .collect();
850
892
851 // Insert the original lsp::Diagnostics here because we may have no open document
893 // Insert the original lsp::Diagnostics here because we may have no open document
852 // for diagnosic message and so we can't calculate the exact position.
894 // for diagnosic message and so we can't calculate the exact position.
853 // When using them later in the diagnostics picker, we calculate them on-demand.
895 // When using them later in the diagnostics picker, we calculate them on-demand.
854− match self.editor.diagnostics.entry(params.uri) {
896+ let diagnostics = match self.editor.diagnostics.entry(params.uri) {
855 Entry::Occupied(o) => {
897 Entry::Occupied(o) => {
856 let current_diagnostics = o.into_mut();
898 let current_diagnostics = o.into_mut();
857 // there may entries of other language servers, which is why we can't overwrite the whole entry
899 // there may entries of other language servers, which is why we can't overwrite the whole entry
858 current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
900 current_diagnostics.retain(|(_, lsp_id)| *lsp_id != server_id);
859− current_diagnostics.append(&mut diagnostics);
901+ current_diagnostics.extend(diagnostics);
860− // Sort diagnostics first by severity and then by line numbers.
861− // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
862 current_diagnostics
902 current_diagnostics
863− .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
903+ // Sort diagnostics first by severity and then by line numbers.
864− }
865− Entry::Vacant(v) => {
866− diagnostics
867− .sort_unstable_by_key(|(d, _)| (d.severity, d.range.start));
868− v.insert(diagnostics);
869 }
904 }
905+ Entry::Vacant(v) => v.insert(diagnostics.collect()),
870 };
906 };
907+
908+ // Sort diagnostics first by severity and then by line numbers.
909+ // Note: The `lsp::DiagnosticSeverity` enum is already defined in decreasing order
910+ diagnostics.sort_unstable_by_key(|(d, server_id)| {
911+ (d.severity, d.range.start, *server_id)
912+ });
871 }
913 }
872 Notification::ShowMessage(params) => {
914 Notification::ShowMessage(params) => {
873 log::warn!("unhandled window/showMessage: {:?}", params);
915 log::warn!("unhandled window/showMessage: {:?}", params);
@@ -1159,7 +1201,7 @@ impl Application {
1159
1201
1160 pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
1202 pub async fn run<S>(&mut self, input_stream: &mut S) -> Result<i32, Error>
1161 where
1203 where
1162− S: Stream<Item = crossterm::Result<crossterm::event::Event>> + Unpin,
1204+ S: Stream<Item = std::io::Result<crossterm::event::Event>> + Unpin,
1163 {
1205 {
1164 self.claim_term().await?;
1206 self.claim_term().await?;
1165
1207
helix-term/src/args.rs+29
@@ -17,12 +17,14 @@ pub struct Args {
17 pub log_file: Option<PathBuf>,
17 pub log_file: Option<PathBuf>,
18 pub config_file: Option<PathBuf>,
18 pub config_file: Option<PathBuf>,
19 pub files: Vec<(PathBuf, Position)>,
19 pub files: Vec<(PathBuf, Position)>,
20+ pub working_directory: Option<PathBuf>,
20}
21}
21
22
22impl Args {
23impl Args {
23 pub fn parse_args() -> Result<Args> {
24 pub fn parse_args() -> Result<Args> {
24 let mut args = Args::default();
25 let mut args = Args::default();
25 let mut argv = std::env::args().peekable();
26 let mut argv = std::env::args().peekable();
27+ let mut line_number = 0;
26
28
27 argv.next(); // skip the program, we don't care about that
29 argv.next(); // skip the program, we don't care about that
28
30
@@ -59,6 +61,20 @@ impl Args {
59 Some(path) => args.log_file = Some(path.into()),
61 Some(path) => args.log_file = Some(path.into()),
60 None => anyhow::bail!("--log must specify a path to write"),
62 None => anyhow::bail!("--log must specify a path to write"),
61 },
63 },
64+ "-w" | "--working-dir" => match argv.next().as_deref() {
65+ Some(path) => {
66+ args.working_directory = if Path::new(path).is_dir() {
67+ Some(PathBuf::from(path))
68+ } else {
69+ anyhow::bail!(
70+ "--working-dir specified does not exist or is not a directory"
71+ )
72+ }
73+ }
74+ None => {
75+ anyhow::bail!("--working-dir must specify an initial working directory")
76+ }
77+ },
62 arg if arg.starts_with("--") => {
78 arg if arg.starts_with("--") => {
63 anyhow::bail!("unexpected double dash argument: {}", arg)
79 anyhow::bail!("unexpected double dash argument: {}", arg)
64 }
80 }
@@ -73,6 +89,13 @@ impl Args {
73 }
89 }
74 }
90 }
75 }
91 }
92+ arg if arg.starts_with('+') => {
93+ let arg = &arg[1..];
94+ line_number = match arg.parse::<usize>() {
95+ Ok(n) => n.saturating_sub(1),
96+ _ => anyhow::bail!("bad line number after +"),
97+ };
98+ }
76 arg => args.files.push(parse_file(arg)),
99 arg => args.files.push(parse_file(arg)),
77 }
100 }
78 }
101 }
@@ -82,6 +105,12 @@ impl Args {
82 args.files.push(parse_file(&arg));
105 args.files.push(parse_file(&arg));
83 }
106 }
84
107
108+ if let Some(file) = args.files.first_mut() {
109+ if line_number != 0 {
110+ file.1.row = line_number;
111+ }
112+ }
113+
85 Ok(args)
114 Ok(args)
86 }
115 }
87}
116}
helix-term/src/commands.rs+300−144
@@ -43,7 +43,6 @@ use helix_view::{
43};
43};
44
44
45use anyhow::{anyhow, bail, ensure, Context as _};
45use anyhow::{anyhow, bail, ensure, Context as _};
46−use fuzzy_matcher::FuzzyMatcher;
47use insert::*;
46use insert::*;
48use movement::Movement;
47use movement::Movement;
49
48
@@ -60,9 +59,14 @@ use crate::{
60};
59};
61
60
62use crate::job::{self, Jobs};
61use crate::job::{self, Jobs};
63−use futures_util::{stream::FuturesUnordered, StreamExt, TryStreamExt};
62+use futures_util::{stream::FuturesUnordered, TryStreamExt};
63+use std::{
64−use std::{collections::HashMap, fmt, future::Future};
64+ collections::{HashMap, HashSet},
65+ fmt,
66+ future::Future,
67+ io::Read,
65−use std::{collections::HashSet, num::NonZeroUsize};
68+ num::NonZeroUsize,
69+};
66
70
67use std::{
71use std::{
68 borrow::Cow,
72 borrow::Cow,
@@ -71,11 +75,11 @@ use std::{
71
75
72use once_cell::sync::Lazy;
76use once_cell::sync::Lazy;
73use serde::de::{self, Deserialize, Deserializer};
77use serde::de::{self, Deserialize, Deserializer};
78+use url::Url;
74
79
75use grep_regex::RegexMatcherBuilder;
80use grep_regex::RegexMatcherBuilder;
76use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
81use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
77use ignore::{DirEntry, WalkBuilder, WalkState};
82use ignore::{DirEntry, WalkBuilder, WalkState};
78−use tokio_stream::wrappers::UnboundedReceiverStream;
79
83
80pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
84pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
81
85
@@ -333,7 +337,7 @@ impl MappableCommand {
333 goto_implementation, "Goto implementation",
337 goto_implementation, "Goto implementation",
334 goto_file_start, "Goto line number <n> else file start",
338 goto_file_start, "Goto line number <n> else file start",
335 goto_file_end, "Goto file end",
339 goto_file_end, "Goto file end",
336− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
337 goto_file_hsplit, "Goto files in selection (hsplit)",
341 goto_file_hsplit, "Goto files in selection (hsplit)",
338 goto_file_vsplit, "Goto files in selection (vsplit)",
342 goto_file_vsplit, "Goto files in selection (vsplit)",
339 goto_reference, "Goto references",
343 goto_reference, "Goto references",
@@ -986,6 +990,7 @@ fn align_selections(cx: &mut Context) {
986
990
987 let transaction = Transaction::change(doc.text(), changes.into_iter());
991 let transaction = Transaction::change(doc.text(), changes.into_iter());
988 doc.apply(&transaction, view.id);
992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
989}
994}
990
995
991fn goto_window(cx: &mut Context, align: Align) {
996fn goto_window(cx: &mut Context, align: Align) {
@@ -1191,10 +1196,53 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
1191 .to_string(),
1196 .to_string(),
1192 );
1197 );
1193 }
1198 }
1199+
1194 for sel in paths {
1200 for sel in paths {
1195 let p = sel.trim();
1201 let p = sel.trim();
1196− if !p.is_empty() {
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+
1197− let path = &rel_path.join(p);
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());
1198 if path.is_dir() {
1246 if path.is_dir() {
1199 let picker = ui::file_picker(path.into(), &cx.editor.config());
1247 let picker = ui::file_picker(path.into(), &cx.editor.config());
1200 cx.push_layer(Box::new(overlaid(picker)));
1248 cx.push_layer(Box::new(overlaid(picker)));
@@ -1205,6 +1253,23 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
1205 }
1253 }
1206}
1254}
1207
1255
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+
1208fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
1273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
1209where
1274where
1210 F: Fn(RopeSlice, Range, usize) -> Range,
1275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1253,6 +1318,65 @@ fn extend_next_long_word_end(cx: &mut Context) {
1253 extend_word_impl(cx, movement::move_next_long_word_end)
1318 extend_word_impl(cx, movement::move_next_long_word_end)
1254}
1319}
1255
1320
1321+/// Separate branch to find_char designed only for `<ret>` char.
1322+//
1323+// This is necessary because the one document can have different line endings inside. And we
1324+// cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
1325+// but on the next line it can be `crlf`. That's why [`find_char_impl`] cannot be applied here.
1326+fn find_char_line_ending(
1327+ cx: &mut Context,
1328+ count: usize,
1329+ direction: Direction,
1330+ inclusive: bool,
1331+ extend: bool,
1332+) {
1333+ let (view, doc) = current!(cx.editor);
1334+ let text = doc.text().slice(..);
1335+
1336+ let selection = doc.selection(view.id).clone().transform(|range| {
1337+ let cursor = range.cursor(text);
1338+ let cursor_line = range.cursor_line(text);
1339+
1340+ // Finding the line where we're going to find <ret>. Depends mostly on
1341+ // `count`, but also takes into account edge cases where we're already at the end
1342+ // of a line or the beginning of a line
1343+ let find_on_line = match direction {
1344+ Direction::Forward => {
1345+ let on_edge = line_end_char_index(&text, cursor_line) == cursor;
1346+ let line = cursor_line + count - 1 + (on_edge as usize);
1347+ if line >= text.len_lines() - 1 {
1348+ return range;
1349+ } else {
1350+ line
1351+ }
1352+ }
1353+ Direction::Backward => {
1354+ let on_edge = text.line_to_char(cursor_line) == cursor && !inclusive;
1355+ let line = cursor_line as isize - (count as isize - 1 + on_edge as isize);
1356+ if line <= 0 {
1357+ return range;
1358+ } else {
1359+ line as usize
1360+ }
1361+ }
1362+ };
1363+
1364+ let pos = match (direction, inclusive) {
1365+ (Direction::Forward, true) => line_end_char_index(&text, find_on_line),
1366+ (Direction::Forward, false) => line_end_char_index(&text, find_on_line) - 1,
1367+ (Direction::Backward, true) => line_end_char_index(&text, find_on_line - 1),
1368+ (Direction::Backward, false) => text.line_to_char(find_on_line),
1369+ };
1370+
1371+ if extend {
1372+ range.put_cursor(text, pos, true)
1373+ } else {
1374+ Range::point(range.cursor(text)).put_cursor(text, pos, true)
1375+ }
1376+ });
1377+ doc.set_selection(view.id, selection);
1378+}
1379+
1256fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bool) {
1380fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bool) {
1257 // TODO: count is reset to 1 before next key so we move it into the closure here.
1381 // TODO: count is reset to 1 before next key so we move it into the closure here.
1258 // Would be nice to carry over.
1382 // Would be nice to carry over.
@@ -1266,13 +1390,9 @@ fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bo
1266 KeyEvent {
1390 KeyEvent {
1267 code: KeyCode::Enter,
1391 code: KeyCode::Enter,
1268 ..
1392 ..
1269− } =>
1393+ } => {
1270− // TODO: this isn't quite correct when CRLF is involved.
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1271− // This hack will work in most cases, since documents don't
1395+ return;
1272− // usually mix line endings. But we should fix it eventually
1273− // anyway.
1274− {
1275− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1276 }
1396 }
1277
1397
1278 KeyEvent {
1398 KeyEvent {
@@ -1474,6 +1594,7 @@ where
1474 });
1594 });
1475
1595
1476 doc.apply(&transaction, view.id);
1596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
1477}
1598}
1478
1599
1479fn switch_case(cx: &mut Context) {
1600fn switch_case(cx: &mut Context) {
@@ -1715,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
1715 "select:".into(),
1836 "select:".into(),
1716 Some(reg),
1837 Some(reg),
1717 ui::completers::none,
1838 ui::completers::none,
1718− move |editor, regex, event| {
1839+ move |cx, regex, event| {
1719− let (view, doc) = current!(editor);
1840+ let (view, doc) = current!(cx.editor);
1720 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1721 return;
1842 return;
1722 }
1843 }
@@ -1737,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
1737 "split:".into(),
1858 "split:".into(),
1738 Some(reg),
1859 Some(reg),
1739 ui::completers::none,
1860 ui::completers::none,
1740− move |editor, regex, event| {
1861+ move |cx, regex, event| {
1741− let (view, doc) = current!(editor);
1862+ let (view, doc) = current!(cx.editor);
1742 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
1743 return;
1864 return;
1744 }
1865 }
@@ -1902,14 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
1902 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
2023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
1903 .collect()
2024 .collect()
1904 },
2025 },
1905− move |editor, regex, event| {
2026+ move |cx, regex, event| {
1906 if event == PromptEvent::Validate {
2027 if event == PromptEvent::Validate {
1907− editor.registers.last_search_register = reg;
2028+ cx.editor.registers.last_search_register = reg;
1908 } else if event != PromptEvent::Update {
2029 } else if event != PromptEvent::Update {
1909 return;
2030 return;
1910 }
2031 }
1911 search_impl(
2032 search_impl(
1912− editor,
2033+ cx.editor,
1913 &contents,
2034 &contents,
1914 &regex,
2035 &regex,
1915 Movement::Move,
2036 Movement::Move,
@@ -2078,13 +2199,11 @@ fn global_search(cx: &mut Context) {
2078 }
2199 }
2079 }
2200 }
2080
2201
2081− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
2082 let config = cx.editor.config();
2202 let config = cx.editor.config();
2083 let smart_case = config.search.smart_case;
2203 let smart_case = config.search.smart_case;
2084 let file_picker_config = config.file_picker.clone();
2204 let file_picker_config = config.file_picker.clone();
2085
2205
2086 let reg = cx.register.unwrap_or('/');
2206 let reg = cx.register.unwrap_or('/');
2087−
2088 let completions = search_completions(cx, Some(reg));
2207 let completions = search_completions(cx, Some(reg));
2089 ui::regex_prompt(
2208 ui::regex_prompt(
2090 cx,
2209 cx,
@@ -2097,53 +2216,66 @@ fn global_search(cx: &mut Context) {
2097 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
2216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
2098 .collect()
2217 .collect()
2099 },
2218 },
2100− move |editor, regex, event| {
2219+ move |cx, regex, event| {
2101 if event != PromptEvent::Validate {
2220 if event != PromptEvent::Validate {
2102 return;
2221 return;
2103 }
2222 }
2104− editor.registers.last_search_register = reg;
2223+ cx.editor.registers.last_search_register = reg;
2105
2224
2225+ let current_path = doc_mut!(cx.editor).path().cloned();
2106− let documents: Vec<_> = editor
2226+ let documents: Vec<_> = cx
2227+ .editor
2107 .documents()
2228 .documents()
2108− .map(|doc| (doc.path(), doc.text()))
2229+ .map(|doc| (doc.path().cloned(), doc.text().to_owned()))
2109 .collect();
2230 .collect();
2110
2231
2111 if let Ok(matcher) = RegexMatcherBuilder::new()
2232 if let Ok(matcher) = RegexMatcherBuilder::new()
2112 .case_smart(smart_case)
2233 .case_smart(smart_case)
2113 .build(regex.as_str())
2234 .build(regex.as_str())
2114 {
2235 {
2115− let searcher = SearcherBuilder::new()
2116− .binary_detection(BinaryDetection::quit(b'\x00'))
2117− .build();
2118−
2119 let search_root = helix_loader::current_working_dir();
2236 let search_root = helix_loader::current_working_dir();
2120 if !search_root.exists() {
2237 if !search_root.exists() {
2238+ cx.editor
2121− editor.set_error("Current working directory does not exist");
2239+ .set_error("Current working directory does not exist");
2122 return;
2240 return;
2123 }
2241 }
2124
2242
2243+ let (picker, injector) = Picker::stream(current_path);
2244+
2125 let dedup_symlinks = file_picker_config.deduplicate_links;
2245 let dedup_symlinks = file_picker_config.deduplicate_links;
2126 let absolute_root = search_root
2246 let absolute_root = search_root
2127 .canonicalize()
2247 .canonicalize()
2128 .unwrap_or_else(|_| search_root.clone());
2248 .unwrap_or_else(|_| search_root.clone());
2129−
2249+ let injector_ = injector.clone();
2250+
2251+ std::thread::spawn(move || {
2252+ let searcher = SearcherBuilder::new()
2253+ .binary_detection(BinaryDetection::quit(b'\x00'))
2254+ .build();
2255+
2130− WalkBuilder::new(search_root)
2256+ let mut walk_builder = WalkBuilder::new(search_root);
2257+
2258+ walk_builder
2131− .hidden(file_picker_config.hidden)
2259+ .hidden(file_picker_config.hidden)
2132− .parents(file_picker_config.parents)
2260+ .parents(file_picker_config.parents)
2133− .ignore(file_picker_config.ignore)
2261+ .ignore(file_picker_config.ignore)
2134− .follow_links(file_picker_config.follow_symlinks)
2262+ .follow_links(file_picker_config.follow_symlinks)
2135− .git_ignore(file_picker_config.git_ignore)
2263+ .git_ignore(file_picker_config.git_ignore)
2136− .git_global(file_picker_config.git_global)
2264+ .git_global(file_picker_config.git_global)
2137− .git_exclude(file_picker_config.git_exclude)
2265+ .git_exclude(file_picker_config.git_exclude)
2138− .max_depth(file_picker_config.max_depth)
2266+ .max_depth(file_picker_config.max_depth)
2139− .filter_entry(move |entry| {
2267+ .filter_entry(move |entry| {
2140− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2268+ filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2141− })
2269+ });
2270+
2271+ walk_builder
2272+ .add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
2273+ walk_builder.add_custom_ignore_filename(".helix/ignore");
2274+
2142− .build_parallel()
2275+ walk_builder.build_parallel().run(|| {
2143− .run(|| {
2144 let mut searcher = searcher.clone();
2276 let mut searcher = searcher.clone();
2145 let matcher = matcher.clone();
2277 let matcher = matcher.clone();
2146− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2147 let documents = &documents;
2279 let documents = &documents;
2148 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
2280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
2149 let entry = match entry {
2281 let entry = match entry {
@@ -2157,21 +2289,24 @@ fn global_search(cx: &mut Context) {
2157 _ => return WalkState::Continue,
2289 _ => return WalkState::Continue,
2158 };
2290 };
2159
2291
2292+ let mut stop = false;
2160 let sink = sinks::UTF8(|line_num, _| {
2293 let sink = sinks::UTF8(|line_num, _| {
2161− all_matches_sx
2294+ stop = injector
2162− .send(FileResult::new(entry.path(), line_num as usize - 1))
2295+ .push(FileResult::new(entry.path(), line_num as usize - 1))
2163− .unwrap();
2296+ .is_err();
2164
2297
2165− Ok(true)
2298+ Ok(!stop)
2166 });
2299 });
2167 let doc = documents.iter().find(|&(doc_path, _)| {
2300 let doc = documents.iter().find(|&(doc_path, _)| {
2301+ doc_path
2302+ .as_ref()
2168− doc_path.map_or(false, |doc_path| doc_path == entry.path())
2303+ .map_or(false, |doc_path| doc_path == entry.path())
2169 });
2304 });
2170
2305
2171 let result = if let Some((_, doc)) = doc {
2306 let result = if let Some((_, doc)) = doc {
2172 // there is already a buffer for this file
2307 // there is already a buffer for this file
2173 // search the buffer instead of the file because it's faster
2308 // search the buffer instead of the file because it's faster
2174− // and captures new edits without requireing a save
2309+ // and captures new edits without requiring a save
2175 if searcher.multi_line_with_matcher(&matcher) {
2310 if searcher.multi_line_with_matcher(&matcher) {
2176 // in this case a continous buffer is required
2311 // in this case a continous buffer is required
2177 // convert the rope to a string
2312 // convert the rope to a string
@@ -2195,68 +2330,66 @@ fn global_search(cx: &mut Context) {
2195 err
2330 err
2196 );
2331 );
2197 }
2332 }
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2198− WalkState::Continue
2336+ WalkState::Continue
2337+ }
2199 })
2338 })
2200 });
2339 });
2340+ });
2341+
2342+ cx.jobs.callback(async move {
2343+ let call = move |_: &mut Editor, compositor: &mut Compositor| {
2344+ let picker = Picker::with_stream(
2345+ picker,
2346+ injector,
2347+ move |cx, FileResult { path, line_num }, action| {
2348+ let doc = match cx.editor.open(path, action) {
2349+ Ok(id) => doc_mut!(cx.editor, &id),
2350+ Err(e) => {
2351+ cx.editor.set_error(format!(
2352+ "Failed to open file '{}': {}",
2353+ path.display(),
2354+ e
2355+ ));
2356+ return;
2357+ }
2358+ };
2359+
2360+ let line_num = *line_num;
2361+ let view = view_mut!(cx.editor);
2362+ let text = doc.text();
2363+ if line_num >= text.len_lines() {
2364+ cx.editor.set_error(
2365+ "The line you jumped to does not exist anymore because the file has changed.",
2366+ );
2367+ return;
2368+ }
2369+ let start = text.line_to_char(line_num);
2370+ let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2371+
2372+ doc.set_selection(view.id, Selection::single(start, end));
2373+ if action.align_view(view, doc.id()) {
2374+ align_view(doc, view, Align::Center);
2375+ }
2376+ },
2377+ )
2378+ .with_preview(
2379+ |_editor, FileResult { path, line_num }| {
2380+ Some((path.clone().into(), Some((*line_num, *line_num))))
2381+ },
2382+ );
2383+ compositor.push(Box::new(overlaid(picker)))
2384+ };
2385+ Ok(Callback::EditorCompositor(Box::new(call)))
2386+ })
2201 } else {
2387 } else {
2202 // Otherwise do nothing
2388 // Otherwise do nothing
2203 // log::warn!("Global Search Invalid Pattern")
2389 // log::warn!("Global Search Invalid Pattern")
2204 }
2390 }
2205 },
2391 },
2206 );
2392 );
2207−
2208− let current_path = doc_mut!(cx.editor).path().cloned();
2209−
2210− let show_picker = async move {
2211− let all_matches: Vec<FileResult> =
2212− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2213− let call: job::Callback = Callback::EditorCompositor(Box::new(
2214− move |editor: &mut Editor, compositor: &mut Compositor| {
2215− if all_matches.is_empty() {
2216− if !editor.is_err() {
2217− editor.set_status("No matches found");
2218− }
2219− return;
2220− }
2221−
2222− let picker = Picker::new(
2223− all_matches,
2224− current_path,
2225− move |cx, FileResult { path, line_num }, action| {
2226− let doc = match cx.editor.open(path, action) {
2227− Ok(id) => doc_mut!(cx.editor, &id),
2228− Err(e) => {
2229− cx.editor.set_error(format!(
2230− "Failed to open file '{}': {}",
2231− path.display(),
2232− e
2233− ));
2234− return;
2235− }
2236− };
2237− let line_num = *line_num;
2238− let view = view_mut!(cx.editor);
2239− let text = doc.text();
2240− if line_num >= text.len_lines() {
2241− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2242− return;
2243− }
2244− let start = text.line_to_char(line_num);
2245− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2246−
2247− doc.set_selection(view.id, Selection::single(start, end));
2248− if action.align_view(view, doc.id()){
2249− align_view(doc, view, Align::Center);
2250− }
2251− }).with_preview(|_editor, FileResult { path, line_num }| {
2252− Some((path.clone().into(), Some((*line_num, *line_num))))
2253− });
2254− compositor.push(Box::new(overlaid(picker)));
2255− },
2256− ));
2257− Ok(call)
2258− };
2259− cx.jobs.callback(show_picker);
2260}
2393}
2261
2394
2262enum Extend {
2395enum Extend {
@@ -2920,6 +3053,7 @@ fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
2920 let indent = indent::indent_for_newline(
3053 let indent = indent::indent_for_newline(
2921 language_config,
3054 language_config,
2922 syntax,
3055 syntax,
3056+ &doc.config.load().indent_heuristic,
2923 &doc.indent_style,
3057 &doc.indent_style,
2924 tab_width,
3058 tab_width,
2925 text,
3059 text,
@@ -3048,6 +3182,7 @@ fn open(cx: &mut Context, open: Open) {
3048 let indent = indent::indent_for_newline(
3182 let indent = indent::indent_for_newline(
3049 doc.language_config(),
3183 doc.language_config(),
3050 doc.syntax(),
3184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
3051 &doc.indent_style,
3186 &doc.indent_style,
3052 doc.tab_width(),
3187 doc.tab_width(),
3053 text,
3188 text,
@@ -3587,6 +3722,7 @@ pub mod insert {
3587 let indent = indent::indent_for_newline(
3722 let indent = indent::indent_for_newline(
3588 doc.language_config(),
3723 doc.language_config(),
3589 doc.syntax(),
3724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
3590 &doc.indent_style,
3726 &doc.indent_style,
3591 doc.tab_width(),
3727 doc.tab_width(),
3592 text,
3728 text,
@@ -3832,12 +3968,12 @@ fn yank(cx: &mut Context) {
3832}
3968}
3833
3969
3834fn yank_to_clipboard(cx: &mut Context) {
3970fn yank_to_clipboard(cx: &mut Context) {
3835− yank_impl(cx.editor, '*');
3971+ yank_impl(cx.editor, '+');
3836 exit_select_mode(cx);
3972 exit_select_mode(cx);
3837}
3973}
3838
3974
3839fn yank_to_primary_clipboard(cx: &mut Context) {
3975fn yank_to_primary_clipboard(cx: &mut Context) {
3840− yank_impl(cx.editor, '+');
3976+ yank_impl(cx.editor, '*');
3841 exit_select_mode(cx);
3977 exit_select_mode(cx);
3842}
3978}
3843
3979
@@ -3894,13 +4030,13 @@ fn yank_joined(cx: &mut Context) {
3894
4030
3895fn yank_joined_to_clipboard(cx: &mut Context) {
4031fn yank_joined_to_clipboard(cx: &mut Context) {
3896 let line_ending = doc!(cx.editor).line_ending;
4032 let line_ending = doc!(cx.editor).line_ending;
3897− yank_joined_impl(cx.editor, line_ending.as_str(), '*');
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
3898 exit_select_mode(cx);
4034 exit_select_mode(cx);
3899}
4035}
3900
4036
3901fn yank_joined_to_primary_clipboard(cx: &mut Context) {
4037fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3902 let line_ending = doc!(cx.editor).line_ending;
4038 let line_ending = doc!(cx.editor).line_ending;
3903− yank_joined_impl(cx.editor, line_ending.as_str(), '+');
4039+ yank_joined_impl(cx.editor, line_ending.as_str(), '*');
3904 exit_select_mode(cx);
4040 exit_select_mode(cx);
3905}
4041}
3906
4042
@@ -3917,12 +4053,12 @@ fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
3917}
4053}
3918
4054
3919fn yank_main_selection_to_clipboard(cx: &mut Context) {
4055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3920− yank_primary_selection_impl(cx.editor, '*');
4056+ yank_primary_selection_impl(cx.editor, '+');
3921 exit_select_mode(cx);
4057 exit_select_mode(cx);
3922}
4058}
3923
4059
3924fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
4060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3925− yank_primary_selection_impl(cx.editor, '+');
4061+ yank_primary_selection_impl(cx.editor, '*');
3926 exit_select_mode(cx);
4062 exit_select_mode(cx);
3927}
4063}
3928
4064
@@ -4020,22 +4156,27 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
4020 };
4156 };
4021 let (view, doc) = current!(cx.editor);
4157 let (view, doc) = current!(cx.editor);
4022 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
4158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
4159+ exit_select_mode(cx);
4023}
4160}
4024
4161
4025fn paste_clipboard_after(cx: &mut Context) {
4162fn paste_clipboard_after(cx: &mut Context) {
4026− paste(cx.editor, '*', Paste::After, cx.count());
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
4027}
4165}
4028
4166
4029fn paste_clipboard_before(cx: &mut Context) {
4167fn paste_clipboard_before(cx: &mut Context) {
4030− paste(cx.editor, '*', Paste::Before, cx.count());
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
4031}
4170}
4032
4171
4033fn paste_primary_clipboard_after(cx: &mut Context) {
4172fn paste_primary_clipboard_after(cx: &mut Context) {
4034− paste(cx.editor, '+', Paste::After, cx.count());
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
4035}
4175}
4036
4176
4037fn paste_primary_clipboard_before(cx: &mut Context) {
4177fn paste_primary_clipboard_before(cx: &mut Context) {
4038− paste(cx.editor, '+', Paste::Before, cx.count());
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
4039}
4180}
4040
4181
4041fn replace_with_yanked(cx: &mut Context) {
4182fn replace_with_yanked(cx: &mut Context) {
@@ -4073,11 +4214,13 @@ fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
4073}
4214}
4074
4215
4075fn replace_selections_with_clipboard(cx: &mut Context) {
4216fn replace_selections_with_clipboard(cx: &mut Context) {
4076− replace_with_yanked_impl(cx.editor, '*', cx.count());
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
4077}
4219}
4078
4220
4079fn replace_selections_with_primary_clipboard(cx: &mut Context) {
4221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
4080− replace_with_yanked_impl(cx.editor, '+', cx.count());
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
4081}
4224}
4082
4225
4083fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
4226fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
@@ -4095,6 +4238,7 @@ fn paste_after(cx: &mut Context) {
4095 Paste::After,
4238 Paste::After,
4096 cx.count(),
4239 cx.count(),
4097 );
4240 );
4241+ exit_select_mode(cx);
4098}
4242}
4099
4243
4100fn paste_before(cx: &mut Context) {
4244fn paste_before(cx: &mut Context) {
@@ -4104,6 +4248,7 @@ fn paste_before(cx: &mut Context) {
4104 Paste::Before,
4248 Paste::Before,
4105 cx.count(),
4249 cx.count(),
4106 );
4250 );
4251+ exit_select_mode(cx);
4107}
4252}
4108
4253
4109fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
4254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4142,6 +4287,7 @@ fn indent(cx: &mut Context) {
4142 }),
4287 }),
4143 );
4288 );
4144 doc.apply(&transaction, view.id);
4289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
4145}
4291}
4146
4292
4147fn unindent(cx: &mut Context) {
4293fn unindent(cx: &mut Context) {
@@ -4181,6 +4327,7 @@ fn unindent(cx: &mut Context) {
4181 let transaction = Transaction::change(doc.text(), changes.into_iter());
4327 let transaction = Transaction::change(doc.text(), changes.into_iter());
4182
4328
4183 doc.apply(&transaction, view.id);
4329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
4184}
4331}
4185
4332
4186fn format_selections(cx: &mut Context) {
4333fn format_selections(cx: &mut Context) {
@@ -4247,10 +4394,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4247 use movement::skip_while;
4394 use movement::skip_while;
4248 let (view, doc) = current!(cx.editor);
4395 let (view, doc) = current!(cx.editor);
4249 let text = doc.text();
4396 let text = doc.text();
4250− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
4251
4398
4252 let mut changes = Vec::new();
4399 let mut changes = Vec::new();
4253− let fragment = Tendril::from(" ");
4254
4400
4255 for selection in doc.selection(view.id) {
4401 for selection in doc.selection(view.id) {
4256 let (start, mut end) = selection.line_range(slice);
4402 let (start, mut end) = selection.line_range(slice);
@@ -4266,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4266 let mut end = text.line_to_char(line + 1);
4412 let mut end = text.line_to_char(line + 1);
4267 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
4413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
4268
4414
4269− // need to skip from start, not end
4415+ let separator = if end == line_end_char_index(&slice, line + 1) {
4270− let change = (start, end, Some(fragment.clone()));
4416+ // the joining line contains only space-characters => don't include a whitespace when joining
4417+ None
4418+ } else {
4419+ Some(Tendril::from(" "))
4420+ };
4271− changes.push(change);
4421+ changes.push((start, end, separator));
4272 }
4422 }
4273 }
4423 }
4274
4424
@@ -4280,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4280 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
4430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
4281 changes.dedup();
4431 changes.dedup();
4282
4432
4283− // TODO: joining multiple empty lines should be replaced by a single space.
4284− // need to merge change ranges that touch
4285−
4286 // select inserted spaces
4433 // select inserted spaces
4287 let transaction = if select_space {
4434 let transaction = if select_space {
4288 let ranges: SmallVec<_> = changes
4435 let ranges: SmallVec<_> = changes
@@ -4294,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
4294 })
4441 })
4295 .collect();
4442 .collect();
4296 let selection = Selection::new(ranges, 0);
4443 let selection = Selection::new(ranges, 0);
4297− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
4298 } else {
4445 } else {
4299− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
4300 };
4447 };
4301
4448
4302 doc.apply(&transaction, view.id);
4449 doc.apply(&transaction, view.id);
@@ -4310,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
4310 if remove { "remove:" } else { "keep:" }.into(),
4457 if remove { "remove:" } else { "keep:" }.into(),
4311 Some(reg),
4458 Some(reg),
4312 ui::completers::none,
4459 ui::completers::none,
4313− move |editor, regex, event| {
4460+ move |cx, regex, event| {
4314− let (view, doc) = current!(editor);
4461+ let (view, doc) = current!(cx.editor);
4315 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
4462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
4316 return;
4463 return;
4317 }
4464 }
@@ -4828,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
4828 cx.editor.transpose_view()
4975 cx.editor.transpose_view()
4829}
4976}
4830
4977
4831−// split helper, clear it later
4978+/// Open a new split in the given direction specified by the action.
4979+///
4980+/// Maintain the current view (both the cursor's position and view in document).
4832−fn split(cx: &mut Context, action: Action) {
4981+fn split(editor: &mut Editor, action: Action) {
4833− let (view, doc) = current!(cx.editor);
4982+ let (view, doc) = current!(editor);
4834 let id = doc.id();
4983 let id = doc.id();
4835 let selection = doc.selection(view.id).clone();
4984 let selection = doc.selection(view.id).clone();
4836 let offset = view.offset;
4985 let offset = view.offset;
4837
4986
4838− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
4839
4988
4840 // match the selection in the previous view
4989 // match the selection in the previous view
4841− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
4842 doc.set_selection(view.id, selection);
4991 doc.set_selection(view.id, selection);
4843 // match the view scroll offset (switch doesn't handle this fully
4992 // match the view scroll offset (switch doesn't handle this fully
4844 // since the selection is only matched after the split)
4993 // since the selection is only matched after the split)
@@ -4846,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
4846}
4995}
4847
4996
4848fn hsplit(cx: &mut Context) {
4997fn hsplit(cx: &mut Context) {
4849− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
4850}
4999}
4851
5000
4852fn hsplit_new(cx: &mut Context) {
5001fn hsplit_new(cx: &mut Context) {
@@ -4854,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
4854}
5003}
4855
5004
4856fn vsplit(cx: &mut Context) {
5005fn vsplit(cx: &mut Context) {
4857− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
4858}
5007}
4859
5008
4860fn vsplit_new(cx: &mut Context) {
5009fn vsplit_new(cx: &mut Context) {
@@ -5460,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
5460 };
5609 };
5461
5610
5462 // These `usize`s cannot underflow because selection ranges cannot overlap.
5611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5463− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5612+ let anchor = to
5464− // arithmetic to assert this.
5613+ .checked_add_signed(offset)
5465− let anchor = (to as isize + offset - deleted_len as isize) as usize;
5614+ .expect("Selection ranges cannot overlap")
5615+ .checked_sub(deleted_len)
5616+ .expect("Selection ranges cannot overlap");
5466 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
5617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
5467 ranges.push(new_range);
5618 ranges.push(new_range);
5468− 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");
5469
5624
5470 changes.push((from, to, Some(output)));
5625 changes.push((from, to, Some(output)));
5471 }
5626 }
@@ -5604,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
5604 let transaction = Transaction::change(doc.text(), changes.into_iter());
5759 let transaction = Transaction::change(doc.text(), changes.into_iter());
5605 let transaction = transaction.with_selection(new_selection);
5760 let transaction = transaction.with_selection(new_selection);
5606 doc.apply(&transaction, view.id);
5761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
5607 }
5763 }
5608}
5764}
5609
5765
helix-term/src/commands/dap.rs+7−2
@@ -8,7 +8,7 @@ use dap::{StackFrame, Thread, ThreadStates};
8use helix_core::syntax::{DebugArgumentValue, DebugConfigCompletion, DebugTemplate};
8use helix_core::syntax::{DebugArgumentValue, DebugConfigCompletion, DebugTemplate};
9use helix_dap::{self as dap, Client};
9use helix_dap::{self as dap, Client};
10use helix_lsp::block_on;
10use helix_lsp::block_on;
11−use helix_view::editor::Breakpoint;
11+use helix_view::{editor::Breakpoint, graphics::Margin};
12
12
13use serde_json::{to_value, Value};
13use serde_json::{to_value, Value};
14use tokio_stream::wrappers::UnboundedReceiverStream;
14use tokio_stream::wrappers::UnboundedReceiverStream;
@@ -581,7 +581,12 @@ pub fn dap_variables(cx: &mut Context) {
581 }
581 }
582
582
583 let contents = Text::from(tui::text::Text::from(variables));
583 let contents = Text::from(tui::text::Text::from(variables));
584+ let margin = if cx.editor.popup_border() {
585+ Margin::all(1)
586+ } else {
587+ Margin::none()
588+ };
584− let popup = Popup::new("dap-variables", contents);
589+ let popup = Popup::new("dap-variables", contents).margin(margin);
585 cx.replace_or_push_layer("dap-variables", popup);
590 cx.replace_or_push_layer("dap-variables", popup);
586}
591}
587
592
helix-term/src/commands/lsp.rs+12−2
@@ -23,6 +23,7 @@ use helix_core::{
23use helix_view::{
23use helix_view::{
24 document::{DocumentInlayHints, DocumentInlayHintsId, Mode},
24 document::{DocumentInlayHints, DocumentInlayHintsId, Mode},
25 editor::Action,
25 editor::Action,
26+ graphics::Margin,
26 theme::Style,
27 theme::Style,
27 Document, View,
28 Document, View,
28};
29};
@@ -49,7 +50,7 @@ use std::{
49/// If there is no configured language server that supports the feature, this displays a status message.
50/// If there is no configured language server that supports the feature, this displays a status message.
50/// Using this macro in a context where the editor automatically queries the LSP
51/// Using this macro in a context where the editor automatically queries the LSP
51/// (instead of when the user explicitly does so via a keybind like `gd`)
52/// (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.
53#[macro_export]
54#[macro_export]
54macro_rules! language_server_with_feature {
55macro_rules! language_server_with_feature {
55 ($editor:expr, $doc:expr, $feature:expr) => {{
56 ($editor:expr, $doc:expr, $feature:expr) => {{
@@ -744,7 +745,16 @@ pub fn code_action(cx: &mut Context) {
744 });
745 });
745 picker.move_down(); // pre-select the first item
746 picker.move_down(); // pre-select the first item
746
747
748+ let margin = if editor.menu_border() {
749+ Margin::vertical(1)
750+ } else {
751+ Margin::none()
752+ };
753+
747− let popup = Popup::new("code-action", picker).with_scrollbar(false);
754+ let popup = Popup::new("code-action", picker)
755+ .with_scrollbar(false)
756+ .margin(margin);
757+
748 compositor.replace_or_push("code-action", popup);
758 compositor.replace_or_push("code-action", popup);
749 };
759 };
750
760
helix-term/src/commands/typed.rs+269−73
@@ -5,7 +5,10 @@ use crate::job::Job;
5
5
6use super::*;
6use super::*;
7
7
8+use helix_core::fuzzy::fuzzy_match;
9+use helix_core::indent::MAX_INDENT;
8−use helix_core::{encoding, shellwords::Shellwords};
10+use helix_core::{encoding, line_ending, path::get_canonicalized_path, shellwords::Shellwords};
11+use helix_lsp::{OffsetEncoding, Url};
9use helix_view::document::DEFAULT_LANGUAGE_NAME;
12use helix_view::document::DEFAULT_LANGUAGE_NAME;
10use helix_view::editor::{Action, CloseError, ConfigEvent};
13use helix_view::editor::{Action, CloseError, ConfigEvent};
11use serde_json::Value;
14use serde_json::Value;
@@ -329,12 +332,16 @@ fn write_impl(
329 path: Option<&Cow<str>>,
332 path: Option<&Cow<str>>,
330 force: bool,
333 force: bool,
331) -> anyhow::Result<()> {
334) -> anyhow::Result<()> {
332− let editor_auto_fmt = cx.editor.config().auto_format;
335+ let config = cx.editor.config();
333 let jobs = &mut cx.jobs;
336 let jobs = &mut cx.jobs;
334 let (view, doc) = current!(cx.editor);
337 let (view, doc) = current!(cx.editor);
335 let path = path.map(AsRef::as_ref);
338 let path = path.map(AsRef::as_ref);
336
339
337− let fmt = if editor_auto_fmt {
340+ if config.insert_final_newline {
341+ insert_final_newline(doc, view);
342+ }
343+
344+ let fmt = if config.auto_format {
338 doc.auto_format().map(|fmt| {
345 doc.auto_format().map(|fmt| {
339 let callback = make_format_callback(
346 let callback = make_format_callback(
340 doc.id(),
347 doc.id(),
@@ -358,6 +365,16 @@ fn write_impl(
358 Ok(())
365 Ok(())
359}
366}
360
367
368+fn insert_final_newline(doc: &mut Document, view: &mut View) {
369+ let text = doc.text();
370+ if line_ending::get_line_ending(&text.slice(..)).is_none() {
371+ let eof = Selection::point(text.len_chars());
372+ let insert = Transaction::insert(text, &eof, doc.line_ending.as_str().into());
373+ doc.apply(&insert, view.id);
374+ doc.append_changes_to_history(view);
375+ }
376+}
377+
361fn write(
378fn write(
362 cx: &mut compositor::Context,
379 cx: &mut compositor::Context,
363 args: &[Cow<str>],
380 args: &[Cow<str>],
@@ -460,8 +477,7 @@ fn set_indent_style(
460 cx.editor.set_status(match style {
477 cx.editor.set_status(match style {
461 Tabs => "tabs".to_owned(),
478 Tabs => "tabs".to_owned(),
462 Spaces(1) => "1 space".to_owned(),
479 Spaces(1) => "1 space".to_owned(),
463− Spaces(n) if (2..=8).contains(&n) => format!("{} spaces", n),
480+ Spaces(n) => format!("{} spaces", n),
464− _ => unreachable!(), // Shouldn't happen.
465 });
481 });
466 return Ok(());
482 return Ok(());
467 }
483 }
@@ -473,7 +489,7 @@ fn set_indent_style(
473 Some(arg) => arg
489 Some(arg) => arg
474 .parse::<u8>()
490 .parse::<u8>()
475 .ok()
491 .ok()
476− .filter(|n| (1..=8).contains(n))
492+ .filter(|n| (1..=MAX_INDENT).contains(n))
477 .map(Spaces),
493 .map(Spaces),
478 _ => None,
494 _ => None,
479 };
495 };
@@ -558,7 +574,6 @@ fn set_line_ending(
558
574
559 Ok(())
575 Ok(())
560}
576}
561−
562fn earlier(
577fn earlier(
563 cx: &mut compositor::Context,
578 cx: &mut compositor::Context,
564 args: &[Cow<str>],
579 args: &[Cow<str>],
@@ -657,11 +672,10 @@ pub fn write_all_impl(
657 write_scratch: bool,
672 write_scratch: bool,
658) -> anyhow::Result<()> {
673) -> anyhow::Result<()> {
659 let mut errors: Vec<&'static str> = Vec::new();
674 let mut errors: Vec<&'static str> = Vec::new();
660− let auto_format = cx.editor.config().auto_format;
675+ let config = cx.editor.config();
661 let jobs = &mut cx.jobs;
676 let jobs = &mut cx.jobs;
662 let current_view = view!(cx.editor);
677 let current_view = view!(cx.editor);
663
678
664− // save all documents
665 let saves: Vec<_> = cx
679 let saves: Vec<_> = cx
666 .editor
680 .editor
667 .documents
681 .documents
@@ -692,32 +706,35 @@ pub fn write_all_impl(
692 current_view.id
706 current_view.id
693 };
707 };
694
708
695− let fmt = if auto_format {
696− doc.auto_format().map(|fmt| {
697− let callback = make_format_callback(
698− doc.id(),
699− doc.version(),
700− target_view,
709+ Some((doc.id(), target_view))
701− fmt,
702− Some((None, force)),
703− );
710+ })
704− jobs.add(Job::with_callback(callback).wait_before_exiting());
711+ .collect();
705− })
706− } else {
707− None
708− };
709
712
710− if fmt.is_none() {
713+ for (doc_id, target_view) in saves {
711− return Some(doc.id());
714+ let doc = doc_mut!(cx.editor, &doc_id);
712− }
713
715
716+ if config.insert_final_newline {
717+ insert_final_newline(doc, view_mut!(cx.editor, target_view));
718+ }
719+
720+ let fmt = if config.auto_format {
721+ doc.auto_format().map(|fmt| {
722+ let callback = make_format_callback(
723+ doc_id,
724+ doc.version(),
725+ target_view,
726+ fmt,
727+ Some((None, force)),
728+ );
729+ jobs.add(Job::with_callback(callback).wait_before_exiting());
730+ })
731+ } else {
714 None
732 None
715− })
733+ };
716− .collect();
717
734
718− // manually call save for the rest of docs that don't have a formatter
735+ if fmt.is_none() {
719− for id in saves {
720− cx.editor.save::<PathBuf>(id, None, force)?;
736+ cx.editor.save::<PathBuf>(doc_id, None, force)?;
737+ }
721 }
738 }
722
739
723 if !errors.is_empty() && !force {
740 if !errors.is_empty() && !force {
@@ -904,7 +921,7 @@ fn yank_main_selection_to_clipboard(
904 return Ok(());
921 return Ok(());
905 }
922 }
906
923
907− yank_primary_selection_impl(cx.editor, '*');
924+ yank_primary_selection_impl(cx.editor, '+');
908 Ok(())
925 Ok(())
909}
926}
910
927
@@ -939,7 +956,7 @@ fn yank_joined_to_clipboard(
939 let doc = doc!(cx.editor);
956 let doc = doc!(cx.editor);
940 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
957 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
941 let separator = args.first().unwrap_or(&default_sep);
958 let separator = args.first().unwrap_or(&default_sep);
942− yank_joined_impl(cx.editor, separator, '*');
959+ yank_joined_impl(cx.editor, separator, '+');
943 Ok(())
960 Ok(())
944}
961}
945
962
@@ -952,7 +969,7 @@ fn yank_main_selection_to_primary_clipboard(
952 return Ok(());
969 return Ok(());
953 }
970 }
954
971
955− yank_primary_selection_impl(cx.editor, '+');
972+ yank_primary_selection_impl(cx.editor, '*');
956 Ok(())
973 Ok(())
957}
974}
958
975
@@ -968,7 +985,7 @@ fn yank_joined_to_primary_clipboard(
968 let doc = doc!(cx.editor);
985 let doc = doc!(cx.editor);
969 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
986 let default_sep = Cow::Borrowed(doc.line_ending.as_str());
970 let separator = args.first().unwrap_or(&default_sep);
987 let separator = args.first().unwrap_or(&default_sep);
971− yank_joined_impl(cx.editor, separator, '+');
988+ yank_joined_impl(cx.editor, separator, '*');
972 Ok(())
989 Ok(())
973}
990}
974
991
@@ -981,7 +998,7 @@ fn paste_clipboard_after(
981 return Ok(());
998 return Ok(());
982 }
999 }
983
1000
984− paste(cx.editor, '*', Paste::After, 1);
1001+ paste(cx.editor, '+', Paste::After, 1);
985 Ok(())
1002 Ok(())
986}
1003}
987
1004
@@ -994,7 +1011,7 @@ fn paste_clipboard_before(
994 return Ok(());
1011 return Ok(());
995 }
1012 }
996
1013
997− paste(cx.editor, '*', Paste::Before, 1);
1014+ paste(cx.editor, '+', Paste::Before, 1);
998 Ok(())
1015 Ok(())
999}
1016}
1000
1017
@@ -1007,7 +1024,7 @@ fn paste_primary_clipboard_after(
1007 return Ok(());
1024 return Ok(());
1008 }
1025 }
1009
1026
1010− paste(cx.editor, '+', Paste::After, 1);
1027+ paste(cx.editor, '*', Paste::After, 1);
1011 Ok(())
1028 Ok(())
1012}
1029}
1013
1030
@@ -1020,7 +1037,7 @@ fn paste_primary_clipboard_before(
1020 return Ok(());
1037 return Ok(());
1021 }
1038 }
1022
1039
1023− paste(cx.editor, '+', Paste::Before, 1);
1040+ paste(cx.editor, '*', Paste::Before, 1);
1024 Ok(())
1041 Ok(())
1025}
1042}
1026
1043
@@ -1033,7 +1050,7 @@ fn replace_selections_with_clipboard(
1033 return Ok(());
1050 return Ok(());
1034 }
1051 }
1035
1052
1036− replace_with_yanked_impl(cx.editor, '*', 1);
1053+ replace_with_yanked_impl(cx.editor, '+', 1);
1037 Ok(())
1054 Ok(())
1038}
1055}
1039
1056
@@ -1046,7 +1063,7 @@ fn replace_selections_with_primary_clipboard(
1046 return Ok(());
1063 return Ok(());
1047 }
1064 }
1048
1065
1049− replace_with_yanked_impl(cx.editor, '+', 1);
1066+ replace_with_yanked_impl(cx.editor, '*', 1);
1050 Ok(())
1067 Ok(())
1051}
1068}
1052
1069
@@ -1265,12 +1282,10 @@ fn reload(
1265 }
1282 }
1266
1283
1267 let scrolloff = cx.editor.config().scrolloff;
1284 let scrolloff = cx.editor.config().scrolloff;
1268− let redraw_handle = cx.editor.redraw_handle.clone();
1269 let (view, doc) = current!(cx.editor);
1285 let (view, doc) = current!(cx.editor);
1270− doc.reload(view, &cx.editor.diff_providers, redraw_handle)
1286+ doc.reload(view, &cx.editor.diff_providers).map(|_| {
1271− .map(|_| {
1272− view.ensure_cursor_in_view(doc, scrolloff);
1287+ view.ensure_cursor_in_view(doc, scrolloff);
1273− })?;
1288+ })?;
1274 if let Some(path) = doc.path() {
1289 if let Some(path) = doc.path() {
1275 cx.editor
1290 cx.editor
1276 .language_servers
1291 .language_servers
@@ -1316,8 +1331,7 @@ fn reload_all(
1316 // Ensure that the view is synced with the document's history.
1331 // Ensure that the view is synced with the document's history.
1317 view.sync_changes(doc);
1332 view.sync_changes(doc);
1318
1333
1319− let redraw_handle = cx.editor.redraw_handle.clone();
1320− doc.reload(view, &cx.editor.diff_providers, redraw_handle)?;
1334+ doc.reload(view, &cx.editor.diff_providers)?;
1321 if let Some(path) = doc.path() {
1335 if let Some(path) = doc.path() {
1322 cx.editor
1336 cx.editor
1323 .language_servers
1337 .language_servers
@@ -1529,6 +1543,84 @@ fn tree_sitter_scopes(
1529 Ok(())
1543 Ok(())
1530}
1544}
1531
1545
1546+fn tree_sitter_highlight_name(
1547+ cx: &mut compositor::Context,
1548+ _args: &[Cow<str>],
1549+ event: PromptEvent,
1550+) -> anyhow::Result<()> {
1551+ fn find_highlight_at_cursor(
1552+ cx: &mut compositor::Context<'_>,
1553+ ) -> Option<helix_core::syntax::Highlight> {
1554+ use helix_core::syntax::HighlightEvent;
1555+
1556+ let (view, doc) = current!(cx.editor);
1557+ let syntax = doc.syntax()?;
1558+ let text = doc.text().slice(..);
1559+ let cursor = doc.selection(view.id).primary().cursor(text);
1560+ let byte = text.char_to_byte(cursor);
1561+ let node = syntax
1562+ .tree()
1563+ .root_node()
1564+ .descendant_for_byte_range(byte, byte)?;
1565+ // Query the same range as the one used in syntax highlighting.
1566+ let range = {
1567+ // Calculate viewport byte ranges:
1568+ let row = text.char_to_line(view.offset.anchor.min(text.len_chars()));
1569+ // Saturating subs to make it inclusive zero indexing.
1570+ let last_line = text.len_lines().saturating_sub(1);
1571+ let height = view.inner_area(doc).height;
1572+ let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
1573+ let start = text.line_to_byte(row.min(last_line));
1574+ let end = text.line_to_byte(last_visible_line + 1);
1575+
1576+ start..end
1577+ };
1578+
1579+ let mut highlight = None;
1580+
1581+ for event in syntax.highlight_iter(text, Some(range), None) {
1582+ match event.unwrap() {
1583+ HighlightEvent::Source { start, end }
1584+ if start == node.start_byte() && end == node.end_byte() =>
1585+ {
1586+ return highlight;
1587+ }
1588+ HighlightEvent::HighlightStart(hl) => {
1589+ highlight = Some(hl);
1590+ }
1591+ _ => (),
1592+ }
1593+ }
1594+
1595+ None
1596+ }
1597+
1598+ if event != PromptEvent::Validate {
1599+ return Ok(());
1600+ }
1601+
1602+ let Some(highlight) = find_highlight_at_cursor(cx) else {
1603+ return Ok(());
1604+ };
1605+
1606+ let content = cx.editor.theme.scope(highlight.0).to_string();
1607+
1608+ let callback = async move {
1609+ let call: job::Callback = Callback::EditorCompositor(Box::new(
1610+ move |editor: &mut Editor, compositor: &mut Compositor| {
1611+ let content = ui::Markdown::new(content, editor.syn_loader.clone());
1612+ let popup = Popup::new("hover", content).auto_close(true);
1613+ compositor.replace_or_push("hover", popup);
1614+ },
1615+ ));
1616+ Ok(call)
1617+ };
1618+
1619+ cx.jobs.callback(callback);
1620+
1621+ Ok(())
1622+}
1623+
1532fn vsplit(
1624fn vsplit(
1533 cx: &mut compositor::Context,
1625 cx: &mut compositor::Context,
1534 args: &[Cow<str>],
1626 args: &[Cow<str>],
@@ -1538,10 +1630,8 @@ fn vsplit(
1538 return Ok(());
1630 return Ok(());
1539 }
1631 }
1540
1632
1541− let id = view!(cx.editor).doc;
1542−
1543 if args.is_empty() {
1633 if args.is_empty() {
1544− cx.editor.switch(id, Action::VerticalSplit);
1634+ split(cx.editor, Action::VerticalSplit);
1545 } else {
1635 } else {
1546 for arg in args {
1636 for arg in args {
1547 cx.editor
1637 cx.editor
@@ -1561,10 +1651,8 @@ fn hsplit(
1561 return Ok(());
1651 return Ok(());
1562 }
1652 }
1563
1653
1564− let id = view!(cx.editor).doc;
1565−
1566 if args.is_empty() {
1654 if args.is_empty() {
1567− cx.editor.switch(id, Action::HorizontalSplit);
1655+ split(cx.editor, Action::HorizontalSplit);
1568 } else {
1656 } else {
1569 for arg in args {
1657 for arg in args {
1570 cx.editor
1658 cx.editor
@@ -2297,6 +2385,103 @@ fn clear_register(
2297 Ok(())
2385 Ok(())
2298}
2386}
2299
2387
2388+fn redraw(
2389+ cx: &mut compositor::Context,
2390+ _args: &[Cow<str>],
2391+ event: PromptEvent,
2392+) -> anyhow::Result<()> {
2393+ if event != PromptEvent::Validate {
2394+ return Ok(());
2395+ }
2396+
2397+ let callback = Box::pin(async move {
2398+ let call: job::Callback =
2399+ job::Callback::EditorCompositor(Box::new(|_editor, compositor| {
2400+ compositor.need_full_redraw();
2401+ }));
2402+
2403+ Ok(call)
2404+ });
2405+
2406+ cx.jobs.callback(callback);
2407+
2408+ Ok(())
2409+}
2410+
2411+fn move_buffer(
2412+ cx: &mut compositor::Context,
2413+ args: &[Cow<str>],
2414+ event: PromptEvent,
2415+) -> anyhow::Result<()> {
2416+ if event != PromptEvent::Validate {
2417+ return Ok(());
2418+ }
2419+
2420+ ensure!(args.len() == 1, format!(":move takes one argument"));
2421+ let doc = doc!(cx.editor);
2422+
2423+ let new_path = get_canonicalized_path(&PathBuf::from(args.first().unwrap().to_string()));
2424+ let old_path = doc
2425+ .path()
2426+ .ok_or_else(|| anyhow!("Scratch buffer cannot be moved. Use :write instead"))?
2427+ .clone();
2428+ let old_path_as_url = doc.url().unwrap();
2429+ let new_path_as_url = Url::from_file_path(&new_path).unwrap();
2430+
2431+ let edits: Vec<(
2432+ helix_lsp::Result<helix_lsp::lsp::WorkspaceEdit>,
2433+ OffsetEncoding,
2434+ String,
2435+ )> = doc
2436+ .language_servers()
2437+ .map(|lsp| {
2438+ (
2439+ lsp.prepare_file_rename(&old_path_as_url, &new_path_as_url),
2440+ lsp.offset_encoding(),
2441+ lsp.name().to_owned(),
2442+ )
2443+ })
2444+ .filter(|(f, _, _)| f.is_some())
2445+ .map(|(f, encoding, name)| (helix_lsp::block_on(f.unwrap()), encoding, name))
2446+ .collect();
2447+
2448+ for (lsp_reply, encoding, name) in edits {
2449+ match lsp_reply {
2450+ Ok(edit) => {
2451+ if let Err(e) = apply_workspace_edit(cx.editor, encoding, &edit) {
2452+ log::error!(
2453+ ":move command failed to apply edits from lsp {}: {:?}",
2454+ name,
2455+ e
2456+ );
2457+ };
2458+ }
2459+ Err(e) => {
2460+ log::error!("LSP {} failed to treat willRename request: {:?}", name, e);
2461+ }
2462+ };
2463+ }
2464+
2465+ let doc = doc_mut!(cx.editor);
2466+
2467+ doc.set_path(Some(new_path.as_path()));
2468+ if let Err(e) = std::fs::rename(&old_path, &new_path) {
2469+ doc.set_path(Some(old_path.as_path()));
2470+ bail!("Could not move file: {}", e);
2471+ };
2472+
2473+ doc.language_servers().for_each(|lsp| {
2474+ lsp.did_file_rename(&old_path_as_url, &new_path_as_url);
2475+ });
2476+
2477+ cx.editor
2478+ .language_servers
2479+ .file_event_handler
2480+ .file_changed(new_path);
2481+
2482+ Ok(())
2483+}
2484+
2300pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2485pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2301 TypableCommand {
2486 TypableCommand {
2302 name: "quit",
2487 name: "quit",
@@ -2420,7 +2605,7 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2420 TypableCommand {
2605 TypableCommand {
2421 name: "indent-style",
2606 name: "indent-style",
2422 aliases: &[],
2607 aliases: &[],
2423− 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.)",
2424 fun: set_indent_style,
2609 fun: set_indent_style,
2425 signature: CommandSignature::none(),
2610 signature: CommandSignature::none(),
2426 },
2611 },
@@ -2686,6 +2871,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2686 fun: tree_sitter_scopes,
2871 fun: tree_sitter_scopes,
2687 signature: CommandSignature::none(),
2872 signature: CommandSignature::none(),
2688 },
2873 },
2874+ TypableCommand {
2875+ name: "tree-sitter-highlight-name",
2876+ aliases: &[],
2877+ doc: "Display name of tree-sitter highlight scope under the cursor.",
2878+ fun: tree_sitter_highlight_name,
2879+ signature: CommandSignature::none(),
2880+ },
2689 TypableCommand {
2881 TypableCommand {
2690 name: "debug-start",
2882 name: "debug-start",
2691 aliases: &["dbg"],
2883 aliases: &["dbg"],
@@ -2883,6 +3075,20 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
2883 fun: clear_register,
3075 fun: clear_register,
2884 signature: CommandSignature::none(),
3076 signature: CommandSignature::none(),
2885 },
3077 },
3078+ TypableCommand {
3079+ name: "redraw",
3080+ aliases: &[],
3081+ doc: "Clear and re-render the whole UI",
3082+ fun: redraw,
3083+ signature: CommandSignature::none(),
3084+ },
3085+ TypableCommand {
3086+ name: "move",
3087+ aliases: &[],
3088+ doc: "Move the current buffer and its corresponding file to a different path",
3089+ fun: move_buffer,
3090+ signature: CommandSignature::positional(&[completers::filename]),
3091+ },
2886];
3092];
2887
3093
2888pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
3094pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
@@ -2902,28 +3108,18 @@ pub(super) fn command_mode(cx: &mut Context) {
2902 ":".into(),
3108 ":".into(),
2903 Some(':'),
3109 Some(':'),
2904 |editor: &Editor, input: &str| {
3110 |editor: &Editor, input: &str| {
2905− static FUZZY_MATCHER: Lazy<fuzzy_matcher::skim::SkimMatcherV2> =
2906− Lazy::new(fuzzy_matcher::skim::SkimMatcherV2::default);
2907−
2908 let shellwords = Shellwords::from(input);
3111 let shellwords = Shellwords::from(input);
2909 let words = shellwords.words();
3112 let words = shellwords.words();
2910
3113
2911 if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
3114 if words.is_empty() || (words.len() == 1 && !shellwords.ends_with_whitespace()) {
2912− // If the command has not been finished yet, complete commands.
3115+ fuzzy_match(
3116+ input,
2913− let mut matches: Vec<_> = typed::TYPABLE_COMMAND_LIST
3117+ TYPABLE_COMMAND_LIST.iter().map(|command| command.name),
2914− .iter()
3118+ false,
2915− .filter_map(|command| {
3119+ )
2916− FUZZY_MATCHER
2917− .fuzzy_match(command.name, input)
2918− .map(|score| (command.name, score))
2919− })
2920− .collect();
2921−
2922− matches.sort_unstable_by_key(|(_file, score)| std::cmp::Reverse(*score));
2923− matches
2924− .into_iter()
3120+ .into_iter()
2925− .map(|(name, _)| (0.., name.into()))
3121+ .map(|(name, _)| (0.., name.into()))
2926− .collect()
3122+ .collect()
2927 } else {
3123 } else {
2928 // Otherwise, use the command's completer and the last shellword
3124 // Otherwise, use the command's completer and the last shellword
2929 // as completion input.
3125 // as completion input.
helix-term/src/compositor.rs+12
@@ -16,6 +16,7 @@ pub enum EventResult {
16}
16}
17
17
18use crate::job::Jobs;
18use crate::job::Jobs;
19+use crate::ui::picker;
19use helix_view::Editor;
20use helix_view::Editor;
20
21
21pub use helix_view::input::Event;
22pub use helix_view::input::Event;
@@ -79,6 +80,7 @@ pub struct Compositor {
79 area: Rect,
80 area: Rect,
80
81
81 pub(crate) last_picker: Option<Box<dyn Component>>,
82 pub(crate) last_picker: Option<Box<dyn Component>>,
83+ pub(crate) full_redraw: bool,
82}
84}
83
85
84impl Compositor {
86impl Compositor {
@@ -87,6 +89,7 @@ impl Compositor {
87 layers: Vec::new(),
89 layers: Vec::new(),
88 area,
90 area,
89 last_picker: None,
91 last_picker: None,
92+ full_redraw: false,
90 }
93 }
91 }
94 }
92
95
@@ -100,6 +103,11 @@ impl Compositor {
100
103
101 /// Add a layer to be rendered in front of all existing layers.
104 /// Add a layer to be rendered in front of all existing layers.
102 pub fn push(&mut self, mut layer: Box<dyn Component>) {
105 pub fn push(&mut self, mut layer: Box<dyn Component>) {
106+ // immediately clear last_picker field to avoid excessive memory
107+ // consumption for picker with many items
108+ if layer.id() == Some(picker::ID) {
109+ self.last_picker = None;
110+ }
103 let size = self.size();
111 let size = self.size();
104 // trigger required_size on init
112 // trigger required_size on init
105 layer.required_size((size.width, size.height));
113 layer.required_size((size.width, size.height));
@@ -200,6 +208,10 @@ impl Compositor {
200 .find(|component| component.id() == Some(id))
208 .find(|component| component.id() == Some(id))
201 .and_then(|component| component.as_any_mut().downcast_mut())
209 .and_then(|component| component.as_any_mut().downcast_mut())
202 }
210 }
211+
212+ pub fn need_full_redraw(&mut self) {
213+ self.full_redraw = true;
214+ }
203}
215}
204
216
205// View casting, taken straight from Cursive
217// View casting, taken straight from Cursive
helix-term/src/health.rs+44−16
@@ -181,8 +181,8 @@ pub fn languages_all() -> std::io::Result<()> {
181 .language
181 .language
182 .sort_unstable_by_key(|l| l.language_id.clone());
182 .sort_unstable_by_key(|l| l.language_id.clone());
183
183
184− let check_binary = |cmd: Option<String>| match cmd {
184+ let check_binary = |cmd: Option<&str>| match cmd {
185− Some(cmd) => match which::which(&cmd) {
185+ Some(cmd) => match which::which(cmd) {
186 Ok(_) => column(&format!("✓ {}", cmd), Color::Green),
186 Ok(_) => column(&format!("✓ {}", cmd), Color::Green),
187 Err(_) => column(&format!("✘ {}", cmd), Color::Red),
187 Err(_) => column(&format!("✘ {}", cmd), Color::Red),
188 },
188 },
@@ -192,17 +192,15 @@ pub fn languages_all() -> std::io::Result<()> {
192 for lang in &syn_loader_conf.language {
192 for lang in &syn_loader_conf.language {
193 column(&lang.language_id, Color::Reset);
193 column(&lang.language_id, Color::Reset);
194
194
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| {
198 syn_loader_conf
196 syn_loader_conf
199 .language_server
197 .language_server
200 .get(&ls.name)
198 .get(&ls.name)
201− .map(|config| config.command.clone())
199+ .map(|config| config.command.as_str())
202 });
200 });
203− check_binary(lsp);
201+ check_binary(cmds.next());
204
202
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());
206 check_binary(dap);
204 check_binary(dap);
207
205
208 for ts_feat in TsFeature::all() {
206 for ts_feat in TsFeature::all() {
@@ -213,6 +211,12 @@ pub fn languages_all() -> std::io::Result<()> {
213 }
211 }
214
212
215 writeln!(stdout)?;
213 writeln!(stdout)?;
214+
215+ for cmd in cmds {
216+ column("", Color::Reset);
217+ check_binary(Some(cmd));
218+ writeln!(stdout)?;
219+ }
216 }
220 }
217
221
218 Ok(())
222 Ok(())
@@ -268,15 +272,12 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
268 }
272 }
269 };
273 };
270
274
271− // TODO multiple language servers
275+ probe_protocols(
272− probe_protocol(
273 "language server",
276 "language server",
274− lang.language_servers.first().and_then(|ls| {
277+ lang.language_servers
278+ .iter()
275− syn_loader_conf
279+ .filter_map(|ls| syn_loader_conf.language_server.get(&ls.name))
276− .language_server
277− .get(&ls.name)
278− .map(|config| config.command.clone())
280+ .map(|config| config.command.as_str()),
279− }),
280 )?;
281 )?;
281
282
282 probe_protocol(
283 probe_protocol(
@@ -291,6 +292,33 @@ pub fn language(lang_str: String) -> std::io::Result<()> {
291 Ok(())
292 Ok(())
292}
293}
293
294
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+
294/// Display diagnostics about LSP and DAP.
322/// Display diagnostics about LSP and DAP.
295fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::Result<()> {
323fn probe_protocol(protocol_name: &str, server_cmd: Option<String>) -> std::io::Result<()> {
296 let stdout = std::io::stdout();
324 let stdout = std::io::stdout();
helix-term/src/main.rs+17−1
@@ -66,6 +66,8 @@ FLAGS:
66 -V, --version Prints version information
66 -V, --version Prints version information
67 --vsplit Splits all given files vertically into different windows
67 --vsplit Splits all given files vertically into different windows
68 --hsplit Splits all given files horizontally into different windows
68 --hsplit Splits all given files horizontally into different windows
69+ -w, --working-dir <path> Specify an initial working directory
70+ +N Open the first given file at line number N
69",
71",
70 env!("CARGO_PKG_NAME"),
72 env!("CARGO_PKG_NAME"),
71 VERSION_AND_GIT_HASH,
73 VERSION_AND_GIT_HASH,
@@ -74,7 +76,7 @@ FLAGS:
74 helix_loader::default_log_file().display(),
76 helix_loader::default_log_file().display(),
75 );
77 );
76
78
77− let args = Args::parse_args().context("could not parse arguments")?;
79+ let mut args = Args::parse_args().context("could not parse arguments")?;
78
80
79 helix_loader::initialize_config_file(args.config_file.clone());
81 helix_loader::initialize_config_file(args.config_file.clone());
80 helix_loader::initialize_log_file(args.log_file.clone());
82 helix_loader::initialize_log_file(args.log_file.clone());
@@ -114,6 +116,20 @@ FLAGS:
114
116
115 setup_logging(args.verbosity).context("failed to initialize logging")?;
117 setup_logging(args.verbosity).context("failed to initialize logging")?;
116
118
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+
124+ // NOTE: Set the working directory early so the correct configuration is loaded. Be aware that
125+ // Application::new() depends on this logic so it must be updated if this changes.
126+ if let Some(path) = &args.working_directory {
127+ helix_loader::set_current_working_dir(path)?;
128+ } else if let Some((path, _)) = args.files.first().filter(|p| p.0.is_dir()) {
129+ // If the first file is a directory, it will be the working directory unless -w was specified
130+ helix_loader::set_current_working_dir(path)?;
131+ }
132+
117 let config = match Config::load_default() {
133 let config = match Config::load_default() {
118 Ok(config) => config,
134 Ok(config) => config,
119 Err(ConfigLoadError::Error(err)) if err.kind() == std::io::ErrorKind::NotFound => {
135 Err(ConfigLoadError::Error(err)) if err.kind() == std::io::ErrorKind::NotFound => {
helix-term/src/ui/completion.rs+17−1
@@ -2,6 +2,7 @@ use crate::compositor::{Component, Context, Event, EventResult};
2use helix_view::{
2use helix_view::{
3 document::SavePoint,
3 document::SavePoint,
4 editor::CompleteAction,
4 editor::CompleteAction,
5+ graphics::Margin,
5 theme::{Modifier, Style},
6 theme::{Modifier, Style},
6 ViewId,
7 ViewId,
7};
8};
@@ -326,9 +327,18 @@ impl Completion {
326 }
327 }
327 };
328 };
328 });
329 });
330+
331+ let margin = if editor.menu_border() {
332+ Margin::vertical(1)
333+ } else {
334+ Margin::none()
335+ };
336+
329 let popup = Popup::new(Self::ID, menu)
337 let popup = Popup::new(Self::ID, menu)
330 .with_scrollbar(false)
338 .with_scrollbar(false)
331− .ignore_escape_key(true);
339+ .ignore_escape_key(true)
340+ .margin(margin);
341+
332 let mut completion = Self {
342 let mut completion = Self {
333 popup,
343 popup,
334 start_offset,
344 start_offset,
@@ -569,6 +579,12 @@ impl Component for Completion {
569 // clear area
579 // clear area
570 let background = cx.editor.theme.get("ui.popup");
580 let background = cx.editor.theme.get("ui.popup");
571 surface.clear_with(doc_area, background);
581 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+
572 markdown_doc.render(doc_area, surface, cx);
588 markdown_doc.render(doc_area, surface, cx);
573 }
589 }
574}
590}
helix-term/src/ui/document.rs+60−24
@@ -97,7 +97,8 @@ pub fn render_document(
97 doc: &Document,
97 doc: &Document,
98 offset: ViewPosition,
98 offset: ViewPosition,
99 doc_annotations: &TextAnnotations,
99 doc_annotations: &TextAnnotations,
100+ syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
100− highlight_iter: impl Iterator<Item = HighlightEvent>,
101+ overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
101 theme: &Theme,
102 theme: &Theme,
102 line_decoration: &mut [Box<dyn LineDecoration + '_>],
103 line_decoration: &mut [Box<dyn LineDecoration + '_>],
103 translated_positions: &mut [TranslatedPosition],
104 translated_positions: &mut [TranslatedPosition],
@@ -109,7 +110,8 @@ pub fn render_document(
109 offset,
110 offset,
110 &doc.text_format(viewport.width, Some(theme)),
111 &doc.text_format(viewport.width, Some(theme)),
111 doc_annotations,
112 doc_annotations,
112− highlight_iter,
113+ syntax_highlight_iter,
114+ overlay_highlight_iter,
113 theme,
115 theme,
114 line_decoration,
116 line_decoration,
115 translated_positions,
117 translated_positions,
@@ -157,7 +159,8 @@ pub fn render_text<'t>(
157 offset: ViewPosition,
159 offset: ViewPosition,
158 text_fmt: &TextFormat,
160 text_fmt: &TextFormat,
159 text_annotations: &TextAnnotations,
161 text_annotations: &TextAnnotations,
162+ syntax_highlight_iter: impl Iterator<Item = HighlightEvent>,
160− highlight_iter: impl Iterator<Item = HighlightEvent>,
163+ overlay_highlight_iter: impl Iterator<Item = HighlightEvent>,
161 theme: &Theme,
164 theme: &Theme,
162 line_decorations: &mut [Box<dyn LineDecoration + '_>],
165 line_decorations: &mut [Box<dyn LineDecoration + '_>],
163 translated_positions: &mut [TranslatedPosition],
166 translated_positions: &mut [TranslatedPosition],
@@ -178,10 +181,16 @@ pub fn render_text<'t>(
178
181
179 let (mut formatter, mut first_visible_char_idx) =
182 let (mut formatter, mut first_visible_char_idx) =
180 DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
183 DocumentFormatter::new_at_prev_checkpoint(text, text_fmt, text_annotations, offset.anchor);
181− let mut styles = StyleIter {
184+ let mut syntax_styles = StyleIter {
182 text_style: renderer.text_style,
185 text_style: renderer.text_style,
183 active_highlights: Vec::with_capacity(64),
186 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,
185 theme,
194 theme,
186 };
195 };
187
196
@@ -193,7 +202,10 @@ pub fn render_text<'t>(
193 };
202 };
194 let mut is_in_indent_area = true;
203 let mut is_in_indent_area = true;
195 let mut last_line_indent_level = 0;
204 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
197 .next()
209 .next()
198 .unwrap_or_else(|| (Style::default(), usize::MAX));
210 .unwrap_or_else(|| (Style::default(), usize::MAX));
199
211
@@ -221,9 +233,16 @@ pub fn render_text<'t>(
221
233
222 // skip any graphemes on visual lines before the block start
234 // skip any graphemes on visual lines before the block start
223 if pos.row < row_off {
235 if pos.row < row_off {
224− if char_pos >= style_span.1 {
236+ if char_pos >= syntax_style_span.1 {
225− style_span = if let Some(style_span) = styles.next() {
237+ syntax_style_span = if let Some(syntax_style_span) = syntax_styles.next() {
226− style_span
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
227 } else {
246 } else {
228 break;
247 break;
229 }
248 }
@@ -260,8 +279,15 @@ pub fn render_text<'t>(
260 }
279 }
261
280
262 // acquire the correct grapheme style
281 // acquire the correct grapheme style
263− if char_pos >= style_span.1 {
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()
264− style_span = styles.next().unwrap_or((Style::default(), usize::MAX));
290+ .unwrap_or((Style::default(), usize::MAX));
265 }
291 }
266 char_pos += grapheme.doc_chars();
292 char_pos += grapheme.doc_chars();
267
293
@@ -275,22 +301,25 @@ pub fn render_text<'t>(
275 pos,
301 pos,
276 );
302 );
277
303
304+ let (syntax_style, overlay_style) =
278− let grapheme_style = if let GraphemeSource::VirtualText { highlight } = grapheme.source {
305+ if let GraphemeSource::VirtualText { highlight } = grapheme.source {
279− let style = renderer.text_style;
306+ let mut style = renderer.text_style;
280− if let Some(highlight) = highlight {
307+ if let Some(highlight) = highlight {
281− style.patch(theme.highlight(highlight.0))
308+ style = style.patch(theme.highlight(highlight.0))
309+ }
310+ (style, Style::default())
282 } else {
311 } else {
283− style
312+ (syntax_style_span.0, overlay_style_span.0)
284− }
285− } else {
286− style_span.0
287− };
313+ };
288
314
289− let virt = grapheme.is_virtual();
315+ let is_virtual = grapheme.is_virtual();
290 renderer.draw_grapheme(
316 renderer.draw_grapheme(
291 grapheme.grapheme,
317 grapheme.grapheme,
292− grapheme_style,
318+ GraphemeStyle {
293− virt,
319+ syntax_style,
320+ overlay_style,
321+ },
322+ is_virtual,
294 &mut last_line_indent_level,
323 &mut last_line_indent_level,
295 &mut is_in_indent_area,
324 &mut is_in_indent_area,
296 pos,
325 pos,
@@ -322,6 +351,11 @@ pub struct TextRenderer<'a> {
322 pub viewport: Rect,
351 pub viewport: Rect,
323}
352}
324
353
354+pub struct GraphemeStyle {
355+ syntax_style: Style,
356+ overlay_style: Style,
357+}
358+
325impl<'a> TextRenderer<'a> {
359impl<'a> TextRenderer<'a> {
326 pub fn new(
360 pub fn new(
327 surface: &'a mut Surface,
361 surface: &'a mut Surface,
@@ -395,7 +429,7 @@ impl<'a> TextRenderer<'a> {
395 pub fn draw_grapheme(
429 pub fn draw_grapheme(
396 &mut self,
430 &mut self,
397 grapheme: Grapheme,
431 grapheme: Grapheme,
398− mut style: Style,
432+ grapheme_style: GraphemeStyle,
399 is_virtual: bool,
433 is_virtual: bool,
400 last_indent_level: &mut usize,
434 last_indent_level: &mut usize,
401 is_in_indent_area: &mut bool,
435 is_in_indent_area: &mut bool,
@@ -405,9 +439,11 @@ impl<'a> TextRenderer<'a> {
405 let is_whitespace = grapheme.is_whitespace();
439 let is_whitespace = grapheme.is_whitespace();
406
440
407 // TODO is it correct to apply the whitespace style to all unicode white spaces?
441 // TODO is it correct to apply the whitespace style to all unicode white spaces?
442+ let mut style = grapheme_style.syntax_style;
408 if is_whitespace {
443 if is_whitespace {
409 style = style.patch(self.whitespace_style);
444 style = style.patch(self.whitespace_style);
410 }
445 }
446+ style = style.patch(grapheme_style.overlay_style);
411
447
412 let width = grapheme.width();
448 let width = grapheme.width();
413 let space = if is_virtual { " " } else { &self.space };
449 let space = if is_virtual { " " } else { &self.space };
helix-term/src/ui/editor.rs+91−46
@@ -43,6 +43,8 @@ pub struct EditorView {
43 pub(crate) last_insert: (commands::MappableCommand, Vec<InsertEvent>),
43 pub(crate) last_insert: (commands::MappableCommand, Vec<InsertEvent>),
44 pub(crate) completion: Option<Completion>,
44 pub(crate) completion: Option<Completion>,
45 spinners: ProgressSpinners,
45 spinners: ProgressSpinners,
46+ /// Tracks if the terminal window is focused by reaction to terminal focus events
47+ terminal_focused: bool,
46}
48}
47
49
48#[derive(Debug, Clone)]
50#[derive(Debug, Clone)]
@@ -71,6 +73,7 @@ impl EditorView {
71 last_insert: (commands::MappableCommand::normal_mode, Vec::new()),
73 last_insert: (commands::MappableCommand::normal_mode, Vec::new()),
72 completion: None,
74 completion: None,
73 spinners: ProgressSpinners::default(),
75 spinners: ProgressSpinners::default(),
76+ terminal_focused: true,
74 }
77 }
75 }
78 }
76
79
@@ -121,16 +124,20 @@ impl EditorView {
121 line_decorations.push(Box::new(line_decoration));
124 line_decorations.push(Box::new(line_decoration));
122 }
125 }
123
126
124− let mut highlights =
127+ let syntax_highlights =
125 Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
128 Self::doc_syntax_highlights(doc, view.offset.anchor, inner.height, theme);
129+
126− let overlay_highlights = Self::overlay_syntax_highlights(
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(
127 doc,
133 doc,
128 view.offset.anchor,
134 view.offset.anchor,
129 inner.height,
135 inner.height,
130 &text_annotations,
136 &text_annotations,
131 );
137 );
132− if !overlay_highlights.is_empty() {
138+ if !overlay_syntax_highlights.is_empty() {
133− highlights = Box::new(syntax::merge(highlights, overlay_highlights));
139+ overlay_highlights =
140+ Box::new(syntax::merge(overlay_highlights, overlay_syntax_highlights));
134 }
141 }
135
142
136 for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
143 for diagnostic in Self::doc_diagnostics_highlights(doc, theme) {
@@ -139,29 +146,28 @@ impl EditorView {
139 if diagnostic.is_empty() {
146 if diagnostic.is_empty() {
140 continue;
147 continue;
141 }
148 }
142− highlights = Box::new(syntax::merge(highlights, diagnostic));
149+ overlay_highlights = Box::new(syntax::merge(overlay_highlights, diagnostic));
143 }
150 }
144
151
145− let highlights: Box<dyn Iterator<Item = HighlightEvent>> = if is_focused {
152+ if is_focused {
146 let highlights = syntax::merge(
153 let highlights = syntax::merge(
147− highlights,
154+ overlay_highlights,
148 Self::doc_selection_highlights(
155 Self::doc_selection_highlights(
149 editor.mode(),
156 editor.mode(),
150 doc,
157 doc,
151 view,
158 view,
152 theme,
159 theme,
153 &config.cursor_shape,
160 &config.cursor_shape,
161+ self.terminal_focused,
154 ),
162 ),
155 );
163 );
156 let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
164 let focused_view_elements = Self::highlight_focused_view_elements(view, doc, theme);
157 if focused_view_elements.is_empty() {
165 if focused_view_elements.is_empty() {
158− Box::new(highlights)
166+ overlay_highlights = Box::new(highlights)
159 } else {
167 } else {
160− Box::new(syntax::merge(highlights, focused_view_elements))
168+ overlay_highlights = Box::new(syntax::merge(highlights, focused_view_elements))
161 }
169 }
162− } else {
170+ }
163− Box::new(highlights)
164− };
165
171
166 let gutter_overflow = view.gutter_offset(doc) == 0;
172 let gutter_overflow = view.gutter_offset(doc) == 0;
167 if !gutter_overflow {
173 if !gutter_overflow {
@@ -171,7 +177,7 @@ impl EditorView {
171 view,
177 view,
172 view.area,
178 view.area,
173 theme,
179 theme,
174− is_focused,
180+ is_focused & self.terminal_focused,
175 &mut line_decorations,
181 &mut line_decorations,
176 );
182 );
177 }
183 }
@@ -194,7 +200,8 @@ impl EditorView {
194 doc,
200 doc,
195 view.offset,
201 view.offset,
196 &text_annotations,
202 &text_annotations,
197− highlights,
203+ syntax_highlights,
204+ overlay_highlights,
198 theme,
205 theme,
199 &mut line_decorations,
206 &mut line_decorations,
200 &mut translated_positions,
207 &mut translated_positions,
@@ -254,27 +261,39 @@ impl EditorView {
254 .for_each(|area| surface.set_style(area, ruler_theme))
261 .for_each(|area| surface.set_style(area, ruler_theme))
255 }
262 }
256
263
257− 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(
258 doc: &Document,
280 doc: &Document,
259 anchor: usize,
281 anchor: usize,
260 height: u16,
282 height: u16,
261− text_annotations: &TextAnnotations,
283+ ) -> Box<dyn Iterator<Item = HighlightEvent>> {
262− ) -> Vec<(usize, std::ops::Range<usize>)> {
263 let text = doc.text().slice(..);
284 let text = doc.text().slice(..);
264 let row = text.char_to_line(anchor.min(text.len_chars()));
285 let row = text.char_to_line(anchor.min(text.len_chars()));
265
286
266− let range = {
267− // Calculate viewport byte ranges:
287+ // Calculate viewport byte ranges:
268− // Saturating subs to make it inclusive zero indexing.
288+ // Saturating subs to make it inclusive zero indexing.
269− let last_line = text.len_lines().saturating_sub(1);
289+ let range = Self::viewport_byte_range(text, row, height);
270− let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
290+ Box::new(
271− let start = text.line_to_byte(row.min(last_line));
291+ [HighlightEvent::Source {
272− let end = text.line_to_byte(last_visible_line + 1);
292+ start: text.byte_to_char(range.start),
273−
293+ end: text.byte_to_char(range.end),
274− start..end
275− };
294+ }]
276−
295+ .into_iter(),
277− text_annotations.collect_overlay_highlights(range)
296+ )
278 }
297 }
279
298
280 /// Get syntax highlights for a document in a view represented by the first line
299 /// Get syntax highlights for a document in a view represented by the first line
@@ -289,16 +308,7 @@ impl EditorView {
289 let text = doc.text().slice(..);
308 let text = doc.text().slice(..);
290 let row = text.char_to_line(anchor.min(text.len_chars()));
309 let row = text.char_to_line(anchor.min(text.len_chars()));
291
310
292− let range = {
311+ let range = Self::viewport_byte_range(text, row, height);
293− // Calculate viewport byte ranges:
294− // Saturating subs to make it inclusive zero indexing.
295− let last_line = text.len_lines().saturating_sub(1);
296− let last_visible_line = (row + height as usize).saturating_sub(1).min(last_line);
297− let start = text.line_to_byte(row.min(last_line));
298− let end = text.line_to_byte(last_visible_line + 1);
299−
300− start..end
301− };
302
312
303 match doc.syntax() {
313 match doc.syntax() {
304 Some(syntax) => {
314 Some(syntax) => {
@@ -331,6 +341,20 @@ impl EditorView {
331 }
341 }
332 }
342 }
333
343
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+
334 /// Get highlight spans for document diagnostics
358 /// Get highlight spans for document diagnostics
335 pub fn doc_diagnostics_highlights(
359 pub fn doc_diagnostics_highlights(
336 doc: &Document,
360 doc: &Document,
@@ -362,7 +386,7 @@ impl EditorView {
362 let mut warning_vec = Vec::new();
386 let mut warning_vec = Vec::new();
363 let mut error_vec = Vec::new();
387 let mut error_vec = Vec::new();
364
388
365− for diagnostic in doc.diagnostics() {
389+ for diagnostic in doc.shown_diagnostics() {
366 // Separate diagnostics into different Vecs by severity.
390 // Separate diagnostics into different Vecs by severity.
367 let (vec, scope) = match diagnostic.severity {
391 let (vec, scope) = match diagnostic.severity {
368 Some(Severity::Info) => (&mut info_vec, info),
392 Some(Severity::Info) => (&mut info_vec, info),
@@ -397,6 +421,7 @@ impl EditorView {
397 view: &View,
421 view: &View,
398 theme: &Theme,
422 theme: &Theme,
399 cursor_shape_config: &CursorShapeConfig,
423 cursor_shape_config: &CursorShapeConfig,
424+ is_terminal_focused: bool,
400 ) -> Vec<(usize, std::ops::Range<usize>)> {
425 ) -> Vec<(usize, std::ops::Range<usize>)> {
401 let text = doc.text().slice(..);
426 let text = doc.text().slice(..);
402 let selection = doc.selection(view.id);
427 let selection = doc.selection(view.id);
@@ -444,7 +469,7 @@ impl EditorView {
444
469
445 // Special-case: cursor at end of the rope.
470 // Special-case: cursor at end of the rope.
446 if range.head == range.anchor && range.head == text.len_chars() {
471 if range.head == range.anchor && range.head == text.len_chars() {
447− if !selection_is_primary || cursor_is_block {
472+ if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
448 // Bar and underline cursors are drawn by the terminal
473 // Bar and underline cursors are drawn by the terminal
449 // BUG: If the editor area loses focus while having a bar or
474 // BUG: If the editor area loses focus while having a bar or
450 // underline cursor (eg. when a regex prompt has focus) then
475 // underline cursor (eg. when a regex prompt has focus) then
@@ -467,13 +492,17 @@ impl EditorView {
467 cursor_start
492 cursor_start
468 };
493 };
469 spans.push((selection_scope, range.anchor..selection_end));
494 spans.push((selection_scope, range.anchor..selection_end));
495+ // add block cursors
496+ // skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
470− if !selection_is_primary || cursor_is_block {
497+ if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
471 spans.push((cursor_scope, cursor_start..range.head));
498 spans.push((cursor_scope, cursor_start..range.head));
472 }
499 }
473 } else {
500 } else {
474 // Reverse case.
501 // Reverse case.
475 let cursor_end = next_grapheme_boundary(text, range.head);
502 let cursor_end = next_grapheme_boundary(text, range.head);
503+ // add block cursors
504+ // skip primary cursor if terminal is unfocused - crossterm cursor is used in that case
476− if !selection_is_primary || cursor_is_block {
505+ if !selection_is_primary || (cursor_is_block && is_terminal_focused) {
477 spans.push((cursor_scope, range.head..cursor_end));
506 spans.push((cursor_scope, range.head..cursor_end));
478 }
507 }
479 // non block cursors look like they exclude the cursor
508 // non block cursors look like they exclude the cursor
@@ -1070,6 +1099,7 @@ impl EditorView {
1070 let editor = &mut cxt.editor;
1099 let editor = &mut cxt.editor;
1071
1100
1072 if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) {
1101 if let Some((pos, view_id)) = pos_and_view(editor, row, column, true) {
1102+ let prev_view_id = view!(editor).id;
1073 let doc = doc_mut!(editor, &view!(editor, view_id).doc);
1103 let doc = doc_mut!(editor, &view!(editor, view_id).doc);
1074
1104
1075 if modifiers == KeyModifiers::ALT {
1105 if modifiers == KeyModifiers::ALT {
@@ -1079,6 +1109,10 @@ impl EditorView {
1079 doc.set_selection(view_id, Selection::point(pos));
1109 doc.set_selection(view_id, Selection::point(pos));
1080 }
1110 }
1081
1111
1112+ if view_id != prev_view_id {
1113+ self.clear_completion(editor);
1114+ }
1115+
1082 editor.focus(view_id);
1116 editor.focus(view_id);
1083 editor.ensure_cursor_in_view(view_id);
1117 editor.ensure_cursor_in_view(view_id);
1084
1118
@@ -1372,13 +1406,17 @@ impl Component for EditorView {
1372
1406
1373 Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
1407 Event::Mouse(event) => self.handle_mouse_event(event, &mut cx),
1374 Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
1408 Event::IdleTimeout => self.handle_idle_timeout(&mut cx),
1375− Event::FocusGained => EventResult::Ignored(None),
1409+ Event::FocusGained => {
1410+ self.terminal_focused = true;
1411+ EventResult::Consumed(None)
1412+ }
1376 Event::FocusLost => {
1413 Event::FocusLost => {
1377 if context.editor.config().auto_save {
1414 if context.editor.config().auto_save {
1378 if let Err(e) = commands::typed::write_all_impl(context, false, false) {
1415 if let Err(e) = commands::typed::write_all_impl(context, false, false) {
1379 context.editor.set_error(format!("{}", e));
1416 context.editor.set_error(format!("{}", e));
1380 }
1417 }
1381 }
1418 }
1419+ self.terminal_focused = false;
1382 EventResult::Consumed(None)
1420 EventResult::Consumed(None)
1383 }
1421 }
1384 }
1422 }
@@ -1488,8 +1526,15 @@ impl Component for EditorView {
1488
1526
1489 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
1527 fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
1490 match editor.cursor() {
1528 match editor.cursor() {
1491− // All block cursors are drawn manually
1529+ // all block cursors are drawn manually
1530+ (pos, CursorKind::Block) => {
1531+ if self.terminal_focused {
1492− (pos, CursorKind::Block) => (pos, CursorKind::Hidden),
1532+ (pos, CursorKind::Hidden)
1533+ } else {
1534+ // use crossterm cursor when terminal loses focus
1535+ (pos, CursorKind::Underline)
1536+ }
1537+ }
1493 cursor => cursor,
1538 cursor => cursor,
1494 }
1539 }
1495 }
1540 }
helix-term/src/ui/fuzzy_match.rsdeleted−239
@@ -1,239 +0,0 @@
1−use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
2−use fuzzy_matcher::FuzzyMatcher;
3−
4−#[cfg(test)]
5−mod test;
6−
7−struct QueryAtom {
8− kind: QueryAtomKind,
9− atom: String,
10− ignore_case: bool,
11− inverse: bool,
12−}
13−impl QueryAtom {
14− fn new(atom: &str) -> Option<QueryAtom> {
15− let mut atom = atom.to_string();
16− let inverse = atom.starts_with('!');
17− if inverse {
18− atom.remove(0);
19− }
20−
21− let mut kind = match atom.chars().next() {
22− Some('^') => QueryAtomKind::Prefix,
23− Some('\'') => QueryAtomKind::Substring,
24− _ if inverse => QueryAtomKind::Substring,
25− _ => QueryAtomKind::Fuzzy,
26− };
27−
28− if atom.starts_with(['^', '\'']) {
29− atom.remove(0);
30− }
31−
32− if atom.is_empty() {
33− return None;
34− }
35−
36− if atom.ends_with('$') && !atom.ends_with("\\$") {
37− atom.pop();
38− kind = if kind == QueryAtomKind::Prefix {
39− QueryAtomKind::Exact
40− } else {
41− QueryAtomKind::Postfix
42− }
43− }
44−
45− Some(QueryAtom {
46− kind,
47− atom: atom.replace('\\', ""),
48− // not ideal but fuzzy_matches only knows ascii uppercase so more consistent
49− // to behave the same
50− ignore_case: kind != QueryAtomKind::Fuzzy
51− && atom.chars().all(|c| c.is_ascii_lowercase()),
52− inverse,
53− })
54− }
55−
56− fn indices(&self, matcher: &Matcher, item: &str, indices: &mut Vec<usize>) -> bool {
57− // for inverse there are no indices to return
58− // just return whether we matched
59− if self.inverse {
60− return self.matches(matcher, item);
61− }
62− let buf;
63− let item = if self.ignore_case {
64− buf = item.to_ascii_lowercase();
65− &buf
66− } else {
67− item
68− };
69− let off = match self.kind {
70− QueryAtomKind::Fuzzy => {
71− if let Some((_, fuzzy_indices)) = matcher.fuzzy_indices(item, &self.atom) {
72− indices.extend_from_slice(&fuzzy_indices);
73− return true;
74− } else {
75− return false;
76− }
77− }
78− QueryAtomKind::Substring => {
79− if let Some(off) = item.find(&self.atom) {
80− off
81− } else {
82− return false;
83− }
84− }
85− QueryAtomKind::Prefix if item.starts_with(&self.atom) => 0,
86− QueryAtomKind::Postfix if item.ends_with(&self.atom) => item.len() - self.atom.len(),
87− QueryAtomKind::Exact if item == self.atom => 0,
88− _ => return false,
89− };
90−
91− indices.extend(off..(off + self.atom.len()));
92− true
93− }
94−
95− fn matches(&self, matcher: &Matcher, item: &str) -> bool {
96− let buf;
97− let item = if self.ignore_case {
98− buf = item.to_ascii_lowercase();
99− &buf
100− } else {
101− item
102− };
103− let mut res = match self.kind {
104− QueryAtomKind::Fuzzy => matcher.fuzzy_match(item, &self.atom).is_some(),
105− QueryAtomKind::Substring => item.contains(&self.atom),
106− QueryAtomKind::Prefix => item.starts_with(&self.atom),
107− QueryAtomKind::Postfix => item.ends_with(&self.atom),
108− QueryAtomKind::Exact => item == self.atom,
109− };
110− if self.inverse {
111− res = !res;
112− }
113− res
114− }
115−}
116−
117−#[derive(Debug, PartialEq, Eq, Clone, Copy)]
118−enum QueryAtomKind {
119− /// Item is a fuzzy match of this behaviour
120− ///
121− /// Usage: `foo`
122− Fuzzy,
123− /// Item contains query atom as a continuous substring
124− ///
125− /// Usage `'foo`
126− Substring,
127− /// Item starts with query atom
128− ///
129− /// Usage: `^foo`
130− Prefix,
131− /// Item ends with query atom
132− ///
133− /// Usage: `foo$`
134− Postfix,
135− /// Item is equal to query atom
136− ///
137− /// Usage `^foo$`
138− Exact,
139−}
140−
141−#[derive(Default)]
142−pub struct FuzzyQuery {
143− first_fuzzy_atom: Option<String>,
144− query_atoms: Vec<QueryAtom>,
145−}
146−
147−fn query_atoms(query: &str) -> impl Iterator<Item = &str> + '_ {
148− let mut saw_backslash = false;
149− query.split(move |c| {
150− saw_backslash = match c {
151− ' ' if !saw_backslash => return true,
152− '\\' => true,
153− _ => false,
154− };
155− false
156− })
157−}
158−
159−impl FuzzyQuery {
160− pub fn refine(&self, query: &str, old_query: &str) -> (FuzzyQuery, bool) {
161− // TODO: we could be a lot smarter about this
162− let new_query = Self::new(query);
163− let mut is_refinement = query.starts_with(old_query);
164−
165− // if the last atom is an inverse atom adding more text to it
166− // will actually increase the number of matches and we can not refine
167− // the matches.
168− if is_refinement && !self.query_atoms.is_empty() {
169− let last_idx = self.query_atoms.len() - 1;
170− if self.query_atoms[last_idx].inverse
171− && self.query_atoms[last_idx].atom != new_query.query_atoms[last_idx].atom
172− {
173− is_refinement = false;
174− }
175− }
176−
177− (new_query, is_refinement)
178− }
179−
180− pub fn new(query: &str) -> FuzzyQuery {
181− let mut first_fuzzy_query = None;
182− let query_atoms = query_atoms(query)
183− .filter_map(|atom| {
184− let atom = QueryAtom::new(atom)?;
185− if atom.kind == QueryAtomKind::Fuzzy && first_fuzzy_query.is_none() {
186− first_fuzzy_query = Some(atom.atom);
187− None
188− } else {
189− Some(atom)
190− }
191− })
192− .collect();
193− FuzzyQuery {
194− first_fuzzy_atom: first_fuzzy_query,
195− query_atoms,
196− }
197− }
198−
199− pub fn fuzzy_match(&self, item: &str, matcher: &Matcher) -> Option<i64> {
200− // use the rank of the first fuzzzy query for the rank, because merging ranks is not really possible
201− // this behaviour matches fzf and skim
202− let score = self
203− .first_fuzzy_atom
204− .as_ref()
205− .map_or(Some(0), |atom| matcher.fuzzy_match(item, atom))?;
206− if self
207− .query_atoms
208− .iter()
209− .any(|atom| !atom.matches(matcher, item))
210− {
211− return None;
212− }
213− Some(score)
214− }
215−
216− pub fn fuzzy_indices(&self, item: &str, matcher: &Matcher) -> Option<(i64, Vec<usize>)> {
217− let (score, mut indices) = self.first_fuzzy_atom.as_ref().map_or_else(
218− || Some((0, Vec::new())),
219− |atom| matcher.fuzzy_indices(item, atom),
220− )?;
221−
222− // fast path for the common case of just a single atom
223− if self.query_atoms.is_empty() {
224− return Some((score, indices));
225− }
226−
227− for atom in &self.query_atoms {
228− if !atom.indices(matcher, item, &mut indices) {
229− return None;
230− }
231− }
232−
233− // deadup and remove duplicate matches
234− indices.sort_unstable();
235− indices.dedup();
236−
237− Some((score, indices))
238− }
239−}
helix-term/src/ui/fuzzy_match/test.rsdeleted−47
@@ -1,47 +0,0 @@
1−use crate::ui::fuzzy_match::FuzzyQuery;
2−use crate::ui::fuzzy_match::Matcher;
3−
4−fn run_test<'a>(query: &str, items: &'a [&'a str]) -> Vec<String> {
5− let query = FuzzyQuery::new(query);
6− let matcher = Matcher::default();
7− items
8− .iter()
9− .filter_map(|item| {
10− let (_, indices) = query.fuzzy_indices(item, &matcher)?;
11− let matched_string = indices
12− .iter()
13− .map(|&pos| item.chars().nth(pos).unwrap())
14− .collect();
15− Some(matched_string)
16− })
17− .collect()
18−}
19−
20−#[test]
21−fn match_single_value() {
22− let matches = run_test("foo", &["foobar", "foo", "bar"]);
23− assert_eq!(matches, &["foo", "foo"])
24−}
25−
26−#[test]
27−fn match_multiple_values() {
28− let matches = run_test(
29− "foo bar",
30− &["foo bar", "foo bar", "bar foo", "bar", "foo"],
31− );
32− assert_eq!(matches, &["foobar", "foobar", "barfoo"])
33−}
34−
35−#[test]
36−fn space_escape() {
37− let matches = run_test(r"foo\ bar", &["bar foo", "foo bar", "foobar"]);
38− assert_eq!(matches, &["foo bar"])
39−}
40−
41−#[test]
42−fn trim() {
43− let matches = run_test(r" foo bar ", &["bar foo", "foo bar", "foobar"]);
44− assert_eq!(matches, &["barfoo", "foobar", "foobar"]);
45− let matches = run_test(r" foo bar\ ", &["bar foo", "foo bar", "foobar"]);
46− assert_eq!(matches, &["bar foo"])
47−}
helix-term/src/ui/lsp.rs+3−1
@@ -92,7 +92,9 @@ impl Component for SignatureHelp {
92 Some(doc) => Markdown::new(doc.clone(), Arc::clone(&self.config_loader)),
92 Some(doc) => Markdown::new(doc.clone(), Arc::clone(&self.config_loader)),
93 };
93 };
94 let sig_doc = sig_doc.parse(Some(&cx.editor.theme));
94 let sig_doc = sig_doc.parse(Some(&cx.editor.theme));
95+ let sig_doc_area = area
95− let sig_doc_area = area.clip_top(sig_text_area.height + 2);
96+ .clip_top(sig_text_area.height + 2)
97+ .clip_bottom(u16::from(cx.editor.popup_border()));
96 let sig_doc_para = Paragraph::new(sig_doc)
98 let sig_doc_para = Paragraph::new(sig_doc)
97 .wrap(Wrap { trim: false })
99 .wrap(Wrap { trim: false })
98 .scroll((cx.scroll.unwrap_or_default() as u16, 0));
100 .scroll((cx.scroll.unwrap_or_default() as u16, 0));
helix-term/src/ui/markdown.rs+12−5
@@ -14,6 +14,7 @@ use helix_core::{
14};
14};
15use helix_view::{
15use helix_view::{
16 graphics::{Margin, Rect, Style},
16 graphics::{Margin, Rect, Style},
17+ theme::Modifier,
17 Theme,
18 Theme,
18};
19};
19
20
@@ -183,7 +184,9 @@ impl Markdown {
183 // Transform text in `<code>` blocks into `Event::Code`
184 // Transform text in `<code>` blocks into `Event::Code`
184 let mut in_code = false;
185 let mut in_code = false;
185 let parser = parser.filter_map(|event| match event {
186 let parser = parser.filter_map(|event| match event {
186− Event::Html(tag) if *tag == *"<code>" => {
187+ Event::Html(tag)
188+ if tag.starts_with("<code") && matches!(tag.chars().nth(5), Some(' ' | '>')) =>
189+ {
187 in_code = true;
190 in_code = true;
188 None
191 None
189 }
192 }
@@ -275,17 +278,21 @@ impl Markdown {
275 );
278 );
276 lines.extend(tui_text.lines.into_iter());
279 lines.extend(tui_text.lines.into_iter());
277 } else {
280 } else {
281+ let style = match tags.last() {
278− let style = if let Some(Tag::Heading(level, ..)) = tags.last() {
282+ Some(Tag::Heading(level, ..)) => match level {
279− match level {
280 HeadingLevel::H1 => heading_styles[0],
283 HeadingLevel::H1 => heading_styles[0],
281 HeadingLevel::H2 => heading_styles[1],
284 HeadingLevel::H2 => heading_styles[1],
282 HeadingLevel::H3 => heading_styles[2],
285 HeadingLevel::H3 => heading_styles[2],
283 HeadingLevel::H4 => heading_styles[3],
286 HeadingLevel::H4 => heading_styles[3],
284 HeadingLevel::H5 => heading_styles[4],
287 HeadingLevel::H5 => heading_styles[4],
285 HeadingLevel::H6 => heading_styles[5],
288 HeadingLevel::H6 => heading_styles[5],
289+ },
290+ Some(Tag::Emphasis) => text_style.add_modifier(Modifier::ITALIC),
291+ Some(Tag::Strong) => text_style.add_modifier(Modifier::BOLD),
292+ Some(Tag::Strikethrough) => {
293+ text_style.add_modifier(Modifier::CROSSED_OUT)
286 }
294 }
287− } else {
288− text_style
295+ _ => text_style,
289 };
296 };
290 spans.push(Span::styled(text, style));
297 spans.push(Span::styled(text, style));
291 }
298 }
helix-term/src/ui/menu.rs+58−40
@@ -1,22 +1,29 @@
1−use std::{borrow::Cow, path::PathBuf};
1+use std::{borrow::Cow, cmp::Reverse, path::PathBuf};
2
2
3use crate::{
3use crate::{
4 compositor::{Callback, Component, Compositor, Context, Event, EventResult},
4 compositor::{Callback, Component, Compositor, Context, Event, EventResult},
5 ctrl, key, shift,
5 ctrl, key, shift,
6};
6};
7+use helix_core::fuzzy::MATCHER;
8+use nucleo::pattern::{Atom, AtomKind, CaseMatching};
9+use nucleo::{Config, Utf32Str};
10+use tui::{
7−use tui::{buffer::Buffer as Surface, widgets::Table};
11+ buffer::Buffer as Surface,
12+ widgets::{Block, Borders, Table, Widget},
13+};
8
14
9pub use tui::widgets::{Cell, Row};
15pub use tui::widgets::{Cell, Row};
10
16
11−use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
17+use helix_view::{
12−use fuzzy_matcher::FuzzyMatcher;
13−
14−use helix_view::{editor::SmartTabConfig, graphics::Rect, Editor};
18+ editor::SmartTabConfig,
19+ graphics::{Margin, Rect},
20+ Editor,
21+};
15use tui::layout::Constraint;
22use tui::layout::Constraint;
16
23
17−pub trait Item {
24+pub trait Item: Sync + Send + 'static {
18 /// Additional editor state that is used for label calculation.
25 /// Additional editor state that is used for label calculation.
19− type Data;
26+ type Data: Sync + Send + 'static;
20
27
21 fn format(&self, data: &Self::Data) -> Row;
28 fn format(&self, data: &Self::Data) -> Row;
22
29
@@ -51,9 +58,8 @@ pub struct Menu<T: Item> {
51
58
52 cursor: Option<usize>,
59 cursor: Option<usize>,
53
60
54− matcher: Box<Matcher>,
55 /// (index, score)
61 /// (index, score)
56− matches: Vec<(usize, i64)>,
62+ matches: Vec<(u32, u32)>,
57
63
58 widths: Vec<Constraint>,
64 widths: Vec<Constraint>,
59
65
@@ -75,11 +81,10 @@ impl<T: Item> Menu<T> {
75 editor_data: <T as Item>::Data,
81 editor_data: <T as Item>::Data,
76 callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
82 callback_fn: impl Fn(&mut Editor, Option<&T>, MenuEvent) + 'static,
77 ) -> Self {
83 ) -> Self {
78− let matches = (0..options.len()).map(|i| (i, 0)).collect();
84+ let matches = (0..options.len() as u32).map(|i| (i, 0)).collect();
79 Self {
85 Self {
80 options,
86 options,
81 editor_data,
87 editor_data,
82− matcher: Box::new(Matcher::default().ignore_case()),
83 matches,
88 matches,
84 cursor: None,
89 cursor: None,
85 widths: Vec::new(),
90 widths: Vec::new(),
@@ -94,20 +99,19 @@ impl<T: Item> Menu<T> {
94 pub fn score(&mut self, pattern: &str) {
99 pub fn score(&mut self, pattern: &str) {
95 // reuse the matches allocation
100 // reuse the matches allocation
96 self.matches.clear();
101 self.matches.clear();
97− self.matches.extend(
102+ let mut matcher = MATCHER.lock();
98− self.options
103+ matcher.config = Config::DEFAULT;
99− .iter()
104+ let pattern = Atom::new(pattern, CaseMatching::Ignore, AtomKind::Fuzzy, false);
100− .enumerate()
105+ let mut buf = Vec::new();
101− .filter_map(|(index, option)| {
106+ let matches = self.options.iter().enumerate().filter_map(|(i, option)| {
102− let text = option.filter_text(&self.editor_data);
107+ let text = option.filter_text(&self.editor_data);
103− // TODO: using fuzzy_indices could give us the char idx for match highlighting
108+ pattern
104− self.matcher
109+ .score(Utf32Str::new(&text, &mut buf), &mut matcher)
105− .fuzzy_match(&text, pattern)
106− .map(|score| (index, score))
110+ .map(|score| (i as u32, score as u32))
107− }),
111+ });
108− );
112+ self.matches.extend(matches);
109− // Order of equal elements needs to be preserved as LSP preselected items come in order of high to low priority
110− self.matches.sort_by_key(|(_, score)| -score);
113+ self.matches
114+ .sort_unstable_by_key(|&(i, score)| (Reverse(score), i));
111
115
112 // reset cursor position
116 // reset cursor position
113 self.cursor = None;
117 self.cursor = None;
@@ -201,7 +205,7 @@ impl<T: Item> Menu<T> {
201 self.cursor.and_then(|cursor| {
205 self.cursor.and_then(|cursor| {
202 self.matches
206 self.matches
203 .get(cursor)
207 .get(cursor)
204− .map(|(index, _score)| &self.options[*index])
208+ .map(|(index, _score)| &self.options[*index as usize])
205 })
209 })
206 }
210 }
207
211
@@ -209,7 +213,7 @@ impl<T: Item> Menu<T> {
209 self.cursor.and_then(|cursor| {
213 self.cursor.and_then(|cursor| {
210 self.matches
214 self.matches
211 .get(cursor)
215 .get(cursor)
212− .map(|(index, _score)| &mut self.options[*index])
216+ .map(|(index, _score)| &mut self.options[*index as usize])
213 })
217 })
214 }
218 }
215
219
@@ -325,6 +329,15 @@ impl<T: Item + 'static> Component for Menu<T> {
325 let selected = theme.get("ui.menu.selected");
329 let selected = theme.get("ui.menu.selected");
326 surface.clear_with(area, style);
330 surface.clear_with(area, style);
327
331
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+
328 let scroll = self.scroll;
341 let scroll = self.scroll;
329
342
330 let options: Vec<_> = self
343 let options: Vec<_> = self
@@ -332,7 +345,7 @@ impl<T: Item + 'static> Component for Menu<T> {
332 .iter()
345 .iter()
333 .map(|(index, _score)| {
346 .map(|(index, _score)| {
334 // (index, self.options.get(*index).unwrap()) // get_unchecked
347 // (index, self.options.get(*index).unwrap()) // get_unchecked
335− &self.options[*index] // get_unchecked
348+ &self.options[*index as usize] // get_unchecked
336 })
349 })
337 .collect();
350 .collect();
338
351
@@ -365,15 +378,19 @@ impl<T: Item + 'static> Component for Menu<T> {
365 false,
378 false,
366 );
379 );
367
380
381+ let render_borders = cx.editor.menu_border();
382+
383+ if !render_borders {
368− if let Some(cursor) = self.cursor {
384+ if let Some(cursor) = self.cursor {
369− let offset_from_top = cursor - scroll;
385+ let offset_from_top = cursor - scroll;
370− let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
386+ let left = &mut surface[(area.left(), area.y + offset_from_top as u16)];
371− left.set_style(selected);
387+ left.set_style(selected);
372− let right = &mut surface[(
388+ let right = &mut surface[(
373− area.right().saturating_sub(1),
389+ area.right().saturating_sub(1),
374− area.y + offset_from_top as u16,
390+ area.y + offset_from_top as u16,
375− )];
391+ )];
376− right.set_style(selected);
392+ right.set_style(selected);
393+ }
377 }
394 }
378
395
379 let fits = len <= win_height;
396 let fits = len <= win_height;
@@ -388,12 +405,13 @@ impl<T: Item + 'static> Component for Menu<T> {
388 for i in 0..win_height {
405 for i in 0..win_height {
389 cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
406 cell = &mut surface[(area.right() - 1, area.top() + i as u16)];
390
407
391− cell.set_symbol("▐"); // right half block
408+ let half_block = if render_borders { "▌" } else { "▐" };
392
409
393 if scroll_line <= i && i < scroll_line + scroll_height {
410 if scroll_line <= i && i < scroll_line + scroll_height {
394 // Draw scroll thumb
411 // Draw scroll thumb
412+ cell.set_symbol(half_block);
395 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
413 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
396− } else {
414+ } else if !render_borders {
397 // Draw scroll track
415 // Draw scroll track
398 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
416 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
399 }
417 }
helix-term/src/ui/mod.rs+63−142
@@ -1,13 +1,12 @@
1mod completion;
1mod completion;
2mod document;
2mod document;
3pub(crate) mod editor;
3pub(crate) mod editor;
4−mod fuzzy_match;
5mod info;
4mod info;
6pub mod lsp;
5pub mod lsp;
7mod markdown;
6mod markdown;
8pub mod menu;
7pub mod menu;
9pub mod overlay;
8pub mod overlay;
10−mod picker;
9+pub mod picker;
11pub mod popup;
10pub mod popup;
12mod prompt;
11mod prompt;
13mod spinner;
12mod spinner;
@@ -64,7 +63,7 @@ pub fn regex_prompt(
64 prompt: std::borrow::Cow<'static, str>,
63 prompt: std::borrow::Cow<'static, str>,
65 history_register: Option<char>,
64 history_register: Option<char>,
66 completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
65 completion_fn: impl FnMut(&Editor, &str) -> Vec<prompt::Completion> + 'static,
67− fun: impl Fn(&mut Editor, Regex, PromptEvent) + 'static,
66+ fun: impl Fn(&mut crate::compositor::Context, Regex, PromptEvent) + 'static,
68) {
67) {
69 let (view, doc) = current!(cx.editor);
68 let (view, doc) = current!(cx.editor);
70 let doc_id = view.doc;
69 let doc_id = view.doc;
@@ -111,7 +110,7 @@ pub fn regex_prompt(
111 view.jumps.push((doc_id, snapshot.clone()));
110 view.jumps.push((doc_id, snapshot.clone()));
112 }
111 }
113
112
114− fun(cx.editor, regex, event);
113+ fun(cx, regex, event);
115
114
116 let (view, doc) = current!(cx.editor);
115 let (view, doc) = current!(cx.editor);
117 view.ensure_cursor_in_view(doc, config.scrolloff);
116 view.ensure_cursor_in_view(doc, config.scrolloff);
@@ -174,9 +173,13 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
174 .git_ignore(config.file_picker.git_ignore)
173 .git_ignore(config.file_picker.git_ignore)
175 .git_global(config.file_picker.git_global)
174 .git_global(config.file_picker.git_global)
176 .git_exclude(config.file_picker.git_exclude)
175 .git_exclude(config.file_picker.git_exclude)
176+ .sort_by_file_name(|name1, name2| name1.cmp(name2))
177 .max_depth(config.file_picker.max_depth)
177 .max_depth(config.file_picker.max_depth)
178 .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
178 .filter_entry(move |entry| filter_picker_entry(entry, &absolute_root, dedup_symlinks));
179
179
180+ walk_builder.add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
181+ walk_builder.add_custom_ignore_filename(".helix/ignore");
182+
180 // We want to exclude files that the editor can't handle yet
183 // We want to exclude files that the editor can't handle yet
181 let mut type_builder = TypesBuilder::new();
184 let mut type_builder = TypesBuilder::new();
182 type_builder
185 type_builder
@@ -190,32 +193,16 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
190 .build()
193 .build()
191 .expect("failed to build excluded_types");
194 .expect("failed to build excluded_types");
192 walk_builder.types(excluded_types);
195 walk_builder.types(excluded_types);
193−
194− // We want files along with their modification date for sorting
195− let files = walk_builder.build().filter_map(|entry| {
196+ let mut files = walk_builder.build().filter_map(|entry| {
196 let entry = entry.ok()?;
197 let entry = entry.ok()?;
197− // This is faster than entry.path().is_dir() since it uses cached fs::Metadata fetched by ignore/walkdir
198− if entry.file_type()?.is_file() {
198+ if !entry.file_type()?.is_file() {
199− Some(entry.into_path())
200− } else {
201− None
199+ return None;
202 }
200 }
201+ Some(entry.into_path())
203 });
202 });
204−
205− // Cap the number of files if we aren't in a git project, preventing
206− // hangs when using the picker in your home directory
207− let mut files: Vec<PathBuf> = if root.join(".git").exists() {
208− files.collect()
209− } else {
210− // const MAX: usize = 8192;
211− const MAX: usize = 100_000;
212− files.take(MAX).collect()
213− };
214− files.sort();
215−
216 log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
203 log::debug!("file_picker init {:?}", Instant::now().duration_since(now));
217
204
218− Picker::new(files, root, move |cx, path: &PathBuf, action| {
205+ let picker = Picker::new(Vec::new(), root, move |cx, path: &PathBuf, action| {
219 if let Err(e) = cx.editor.open(path, action) {
206 if let Err(e) = cx.editor.open(path, action) {
220 let err = if let Some(err) = e.source() {
207 let err = if let Some(err) = e.source() {
221 format!("{}", err)
208 format!("{}", err)
@@ -225,20 +212,41 @@ pub fn file_picker(root: PathBuf, config: &helix_view::editor::Config) -> Picker
225 cx.editor.set_error(err);
212 cx.editor.set_error(err);
226 }
213 }
227 })
214 })
228− .with_preview(|_editor, path| Some((path.clone().into(), None)))
215+ .with_preview(|_editor, path| Some((path.clone().into(), None)));
216+ let injector = picker.injector();
217+ let timeout = std::time::Instant::now() + std::time::Duration::from_millis(30);
218+
219+ let mut hit_timeout = false;
220+ for file in &mut files {
221+ if injector.push(file).is_err() {
222+ break;
223+ }
224+ if std::time::Instant::now() >= timeout {
225+ hit_timeout = true;
226+ break;
227+ }
228+ }
229+ if hit_timeout {
230+ std::thread::spawn(move || {
231+ for file in files {
232+ if injector.push(file).is_err() {
233+ break;
234+ }
235+ }
236+ });
237+ }
238+ picker
229}
239}
230
240
231pub mod completers {
241pub mod completers {
232 use crate::ui::prompt::Completion;
242 use crate::ui::prompt::Completion;
233− use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
243+ use helix_core::fuzzy::fuzzy_match;
234− use fuzzy_matcher::FuzzyMatcher;
235 use helix_core::syntax::LanguageServerFeature;
244 use helix_core::syntax::LanguageServerFeature;
236 use helix_view::document::SCRATCH_BUFFER_NAME;
245 use helix_view::document::SCRATCH_BUFFER_NAME;
237 use helix_view::theme;
246 use helix_view::theme;
238 use helix_view::{editor::Config, Editor};
247 use helix_view::{editor::Config, Editor};
239 use once_cell::sync::Lazy;
248 use once_cell::sync::Lazy;
240 use std::borrow::Cow;
249 use std::borrow::Cow;
241− use std::cmp::Reverse;
242
250
243 pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
251 pub type Completer = fn(&Editor, &str) -> Vec<Completion>;
244
252
@@ -247,31 +255,16 @@ pub mod completers {
247 }
255 }
248
256
249 pub fn buffer(editor: &Editor, input: &str) -> Vec<Completion> {
257 pub fn buffer(editor: &Editor, input: &str) -> Vec<Completion> {
250− let mut names: Vec<_> = editor
258+ let names = editor.documents.values().map(|doc| {
251− .documents
252− .values()
253− .map(|doc| {
254− let name = doc
255− .relative_path()
259+ doc.relative_path()
256− .map(|p| p.display().to_string())
260+ .map(|p| p.display().to_string().into())
257− .unwrap_or_else(|| String::from(SCRATCH_BUFFER_NAME));
261+ .unwrap_or_else(|| Cow::from(SCRATCH_BUFFER_NAME))
258− ((0..), Cow::from(name))
259− })
260− .collect();
261−
262− let matcher = Matcher::default();
263−
264− let mut matches: Vec<_> = names
265− .into_iter()
266− .filter_map(|(_range, name)| {
267− matcher.fuzzy_match(&name, input).map(|score| (name, score))
268− })
262+ });
269− .collect();
270−
271− matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
272− names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
273
263
274− names
264+ fuzzy_match(input, names, true)
265+ .into_iter()
266+ .map(|(name, _)| ((0..), name))
267+ .collect()
275 }
268 }
276
269
277 pub fn theme(_editor: &Editor, input: &str) -> Vec<Completion> {
270 pub fn theme(_editor: &Editor, input: &str) -> Vec<Completion> {
@@ -284,26 +277,10 @@ pub mod completers {
284 names.sort();
277 names.sort();
285 names.dedup();
278 names.dedup();
286
279
287− let mut names: Vec<_> = names
280+ fuzzy_match(input, names, false)
288 .into_iter()
281 .into_iter()
289− .map(|name| ((0..), Cow::from(name)))
282+ .map(|(name, _)| ((0..), name.into()))
290− .collect();
283+ .collect()
291−
292− let matcher = Matcher::default();
293−
294− let mut matches: Vec<_> = names
295− .into_iter()
296− .filter_map(|(_range, name)| {
297− matcher.fuzzy_match(&name, input).map(|score| (name, score))
298− })
299− .collect();
300−
301− matches.sort_unstable_by(|(name1, score1), (name2, score2)| {
302− (Reverse(*score1), name1).cmp(&(Reverse(*score2), name2))
303− });
304− names = matches.into_iter().map(|(name, _)| ((0..), name)).collect();
305−
306− names
307 }
284 }
308
285
309 /// Recursive function to get all keys from this value and add them to vec
286 /// Recursive function to get all keys from this value and add them to vec
@@ -330,15 +307,7 @@ pub mod completers {
330 keys
307 keys
331 });
308 });
332
309
333− let matcher = Matcher::default();
310+ fuzzy_match(input, &*KEYS, false)
334−
335− let mut matches: Vec<_> = KEYS
336− .iter()
337− .filter_map(|name| matcher.fuzzy_match(name, input).map(|score| (name, score)))
338− .collect();
339−
340− matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
341− matches
342 .into_iter()
311 .into_iter()
343 .map(|(name, _)| ((0..), name.into()))
312 .map(|(name, _)| ((0..), name.into()))
344 .collect()
313 .collect()
@@ -365,8 +334,6 @@ pub mod completers {
365 }
334 }
366
335
367 pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
336 pub fn language(editor: &Editor, input: &str) -> Vec<Completion> {
368− let matcher = Matcher::default();
369−
370 let text: String = "text".into();
337 let text: String = "text".into();
371
338
372 let language_ids = editor
339 let language_ids = editor
@@ -375,27 +342,13 @@ pub mod completers {
375 .map(|config| &config.language_id)
342 .map(|config| &config.language_id)
376 .chain(std::iter::once(&text));
343 .chain(std::iter::once(&text));
377
344
378− let mut matches: Vec<_> = language_ids
379− .filter_map(|language_id| {
380− matcher
381− .fuzzy_match(language_id, input)
345+ fuzzy_match(input, language_ids, false)
382− .map(|score| (language_id, score))
383− })
384− .collect();
385−
386− matches.sort_unstable_by(|(language1, score1), (language2, score2)| {
387− (Reverse(*score1), language1).cmp(&(Reverse(*score2), language2))
388− });
389−
390− matches
391 .into_iter()
346 .into_iter()
392− .map(|(language, _score)| ((0..), language.clone().into()))
347+ .map(|(name, _)| ((0..), name.to_owned().into()))
393 .collect()
348 .collect()
394 }
349 }
395
350
396 pub fn lsp_workspace_command(editor: &Editor, input: &str) -> Vec<Completion> {
351 pub fn lsp_workspace_command(editor: &Editor, input: &str) -> Vec<Completion> {
397− let matcher = Matcher::default();
398−
399 let Some(options) = doc!(editor)
352 let Some(options) = doc!(editor)
400 .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)
353 .language_servers_with_feature(LanguageServerFeature::WorkspaceCommand)
401 .find_map(|ls| ls.capabilities().execute_command_provider.as_ref())
354 .find_map(|ls| ls.capabilities().execute_command_provider.as_ref())
@@ -403,23 +356,9 @@ pub mod completers {
403 return vec![];
356 return vec![];
404 };
357 };
405
358
406− let mut matches: Vec<_> = options
407− .commands
408− .iter()
409− .filter_map(|command| {
410− matcher
411− .fuzzy_match(command, input)
359+ fuzzy_match(input, &options.commands, false)
412− .map(|score| (command, score))
413− })
414− .collect();
415−
416− matches.sort_unstable_by(|(command1, score1), (command2, score2)| {
417− (Reverse(*score1), command1).cmp(&(Reverse(*score2), command2))
418− });
419−
420− matches
421 .into_iter()
360 .into_iter()
422− .map(|(command, _score)| ((0..), command.clone().into()))
361+ .map(|(name, _)| ((0..), name.to_owned().into()))
423 .collect()
362 .collect()
424 }
363 }
425
364
@@ -500,7 +439,7 @@ pub mod completers {
500
439
501 let end = input.len()..;
440 let end = input.len()..;
502
441
503− let mut files: Vec<_> = WalkBuilder::new(&dir)
442+ let files = WalkBuilder::new(&dir)
504 .hidden(false)
443 .hidden(false)
505 .follow_links(false) // We're scanning over depth 1
444 .follow_links(false) // We're scanning over depth 1
506 .git_ignore(git_ignore)
445 .git_ignore(git_ignore)
@@ -532,43 +471,25 @@ pub mod completers {
532 path.push("");
471 path.push("");
533 }
472 }
534
473
535− let path = path.to_str()?.to_owned();
474+ let path = path.into_os_string().into_string().ok()?;
536− Some((end.clone(), Cow::from(path)))
475+ Some(Cow::from(path))
537 })
476 })
538 }) // TODO: unwrap or skip
477 }) // TODO: unwrap or skip
539− .filter(|(_, path)| !path.is_empty()) // TODO
478+ .filter(|path| !path.is_empty());
540− .collect();
541
479
542 // if empty, return a list of dirs and files in current dir
480 // if empty, return a list of dirs and files in current dir
543 if let Some(file_name) = file_name {
481 if let Some(file_name) = file_name {
544− let matcher = Matcher::default();
545−
546− // inefficient, but we need to calculate the scores, filter out None, then sort.
547− let mut matches: Vec<_> = files
548− .into_iter()
549− .filter_map(|(_range, file)| {
550− matcher
551− .fuzzy_match(&file, &file_name)
552− .map(|score| (file, score))
553− })
554− .collect();
555−
556 let range = (input.len().saturating_sub(file_name.len()))..;
482 let range = (input.len().saturating_sub(file_name.len()))..;
557−
483+ fuzzy_match(&file_name, files, true)
558− matches.sort_unstable_by(|(file1, score1), (file2, score2)| {
559− (Reverse(*score1), file1).cmp(&(Reverse(*score2), file2))
560− });
561−
562− files = matches
563 .into_iter()
484 .into_iter()
564− .map(|(file, _)| (range.clone(), file))
485+ .map(|(name, _)| (range.clone(), name))
565− .collect();
486+ .collect()
566
487
567 // TODO: complete to longest common match
488 // TODO: complete to longest common match
568 } else {
489 } else {
490+ let mut files: Vec<_> = files.map(|file| (end.clone(), file)).collect();
569 files.sort_unstable_by(|(_, path1), (_, path2)| path1.cmp(path2));
491 files.sort_unstable_by(|(_, path1), (_, path2)| path1.cmp(path2));
492+ files
570 }
493 }
571−
572− files
573 }
494 }
574}
495}
helix-term/src/ui/picker.rs+348−314
@@ -7,11 +7,12 @@ use crate::{
7 ui::{
7 ui::{
8 self,
8 self,
9 document::{render_document, LineDecoration, LinePos, TextRenderer},
9 document::{render_document, LineDecoration, LinePos, TextRenderer},
10− fuzzy_match::FuzzyQuery,
11 EditorView,
10 EditorView,
12 },
11 },
13};
12};
14use futures_util::{future::BoxFuture, FutureExt};
13use futures_util::{future::BoxFuture, FutureExt};
14+use nucleo::pattern::CaseMatching;
15+use nucleo::{Config, Nucleo, Utf32String};
15use tui::{
16use tui::{
16 buffer::Buffer as Surface,
17 buffer::Buffer as Surface,
17 layout::Constraint,
18 layout::Constraint,
@@ -19,16 +20,23 @@ use tui::{
19 widgets::{Block, BorderType, Borders, Cell, Table},
20 widgets::{Block, BorderType, Borders, Cell, Table},
20};
21};
21
22
22−use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
23use tui::widgets::Widget;
23use tui::widgets::Widget;
24
24
25−use std::cmp::{self, Ordering};
25+use std::{
26−use std::{collections::HashMap, io::Read, path::PathBuf};
26+ collections::HashMap,
27+ io::Read,
28+ path::PathBuf,
29+ sync::{
30+ atomic::{self, AtomicBool},
31+ Arc,
32+ },
33+};
27
34
28use crate::ui::{Prompt, PromptEvent};
35use crate::ui::{Prompt, PromptEvent};
29use helix_core::{
36use helix_core::{
30− char_idx_at_visual_offset, movement::Direction, text_annotations::TextAnnotations,
37+ char_idx_at_visual_offset, fuzzy::MATCHER, movement::Direction,
31− unicode::segmentation::UnicodeSegmentation, Position, Syntax,
38+ text_annotations::TextAnnotations, unicode::segmentation::UnicodeSegmentation, Position,
39+ Syntax,
32};
40};
33use helix_view::{
41use helix_view::{
34 editor::Action,
42 editor::Action,
@@ -38,6 +46,7 @@ use helix_view::{
38 Document, DocumentId, Editor,
46 Document, DocumentId, Editor,
39};
47};
40
48
49+pub const ID: &str = "picker";
41use super::{menu::Item, overlay::Overlay};
50use super::{menu::Item, overlay::Overlay};
42
51
43pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
52pub const MIN_AREA_WIDTH_FOR_PREVIEW: u16 = 72;
@@ -103,9 +112,9 @@ impl Preview<'_, '_> {
103 /// Alternate text to show for the preview.
112 /// Alternate text to show for the preview.
104 fn placeholder(&self) -> &str {
113 fn placeholder(&self) -> &str {
105 match *self {
114 match *self {
106− Self::EditorDocument(_) => "<File preview>",
115+ Self::EditorDocument(_) => "<Invalid file location>",
107 Self::Cached(preview) => match preview {
116 Self::Cached(preview) => match preview {
108− CachedPreview::Document(_) => "<File preview>",
117+ CachedPreview::Document(_) => "<Invalid file location>",
109 CachedPreview::Binary => "<Binary file>",
118 CachedPreview::Binary => "<Binary file>",
110 CachedPreview::LargeFile => "<File too large to preview>",
119 CachedPreview::LargeFile => "<File too large to preview>",
111 CachedPreview::NotFound => "<File not found>",
120 CachedPreview::NotFound => "<File not found>",
@@ -114,20 +123,71 @@ impl Preview<'_, '_> {
114 }
123 }
115}
124}
116
125
126+fn item_to_nucleo<T: Item>(item: T, editor_data: &T::Data) -> Option<(T, Utf32String)> {
127+ let row = item.format(editor_data);
128+ let mut cells = row.cells.iter();
129+ let mut text = String::with_capacity(row.cell_text().map(|cell| cell.len()).sum());
130+ let cell = cells.next()?;
131+ if let Some(cell) = cell.content.lines.first() {
132+ for span in &cell.0 {
133+ text.push_str(&span.content);
134+ }
135+ }
136+
137+ for cell in cells {
138+ text.push(' ');
139+ if let Some(cell) = cell.content.lines.first() {
140+ for span in &cell.0 {
141+ text.push_str(&span.content);
142+ }
143+ }
144+ }
145+ Some((item, text.into()))
146+}
147+
148+pub struct Injector<T: Item> {
149+ dst: nucleo::Injector<T>,
150+ editor_data: Arc<T::Data>,
151+ shutown: Arc<AtomicBool>,
152+}
153+
154+impl<T: Item> Clone for Injector<T> {
155+ fn clone(&self) -> Self {
156+ Injector {
157+ dst: self.dst.clone(),
158+ editor_data: self.editor_data.clone(),
159+ shutown: self.shutown.clone(),
160+ }
161+ }
162+}
163+
164+pub struct InjectorShutdown;
165+
166+impl<T: Item> Injector<T> {
167+ pub fn push(&self, item: T) -> Result<(), InjectorShutdown> {
168+ if self.shutown.load(atomic::Ordering::Relaxed) {
169+ return Err(InjectorShutdown);
170+ }
171+
172+ if let Some((item, matcher_text)) = item_to_nucleo(item, &self.editor_data) {
173+ self.dst.push(item, |dst| dst[0] = matcher_text);
174+ }
175+ Ok(())
176+ }
177+}
178+
117pub struct Picker<T: Item> {
179pub struct Picker<T: Item> {
118− options: Vec<T>,
119− editor_data: T::Data,
180+ editor_data: Arc<T::Data>,
120− // filter: String,
181+ shutdown: Arc<AtomicBool>,
121− matcher: Box<Matcher>,
182+ matcher: Nucleo<T>,
122− matches: Vec<PickerMatch>,
123
183
124 /// Current height of the completions box
184 /// Current height of the completions box
125 completion_height: u16,
185 completion_height: u16,
126
186
127− cursor: usize,
187+ cursor: u32,
128− // pattern: String,
129 prompt: Prompt,
188 prompt: Prompt,
130− previous_pattern: (String, FuzzyQuery),
189+ previous_pattern: String,
190+
131 /// Whether to show the preview panel (default true)
191 /// Whether to show the preview panel (default true)
132 show_preview: bool,
192 show_preview: bool,
133 /// Constraints for tabular formatting
193 /// Constraints for tabular formatting
@@ -144,10 +204,59 @@ pub struct Picker<T: Item> {
144}
204}
145
205
146impl<T: Item + 'static> Picker<T> {
206impl<T: Item + 'static> Picker<T> {
207+ pub fn stream(editor_data: T::Data) -> (Nucleo<T>, Injector<T>) {
208+ let matcher = Nucleo::new(
209+ Config::DEFAULT,
210+ Arc::new(helix_event::request_redraw),
211+ None,
212+ 1,
213+ );
214+ let streamer = Injector {
215+ dst: matcher.injector(),
216+ editor_data: Arc::new(editor_data),
217+ shutown: Arc::new(AtomicBool::new(false)),
218+ };
219+ (matcher, streamer)
220+ }
221+
147 pub fn new(
222 pub fn new(
148 options: Vec<T>,
223 options: Vec<T>,
149 editor_data: T::Data,
224 editor_data: T::Data,
150 callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
225 callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
226+ ) -> Self {
227+ let matcher = Nucleo::new(
228+ Config::DEFAULT,
229+ Arc::new(helix_event::request_redraw),
230+ None,
231+ 1,
232+ );
233+ let injector = matcher.injector();
234+ for item in options {
235+ if let Some((item, matcher_text)) = item_to_nucleo(item, &editor_data) {
236+ injector.push(item, |dst| dst[0] = matcher_text);
237+ }
238+ }
239+ Self::with(
240+ matcher,
241+ Arc::new(editor_data),
242+ Arc::new(AtomicBool::new(false)),
243+ callback_fn,
244+ )
245+ }
246+
247+ pub fn with_stream(
248+ matcher: Nucleo<T>,
249+ injector: Injector<T>,
250+ callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
251+ ) -> Self {
252+ Self::with(matcher, injector.editor_data, injector.shutown, callback_fn)
253+ }
254+
255+ fn with(
256+ matcher: Nucleo<T>,
257+ editor_data: Arc<T::Data>,
258+ shutdown: Arc<AtomicBool>,
259+ callback_fn: impl Fn(&mut Context, &T, Action) + 'static,
151 ) -> Self {
260 ) -> Self {
152 let prompt = Prompt::new(
261 let prompt = Prompt::new(
153 "".into(),
262 "".into(),
@@ -156,14 +265,13 @@ impl<T: Item + 'static> Picker<T> {
156 |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
265 |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {},
157 );
266 );
158
267
159− let mut picker = Self {
268+ Self {
160− options,
269+ matcher,
161 editor_data,
270 editor_data,
162− matcher: Box::default(),
271+ shutdown,
163− matches: Vec::new(),
164 cursor: 0,
272 cursor: 0,
165 prompt,
273 prompt,
166− previous_pattern: (String::new(), FuzzyQuery::default()),
274+ previous_pattern: String::new(),
167 truncate_start: true,
275 truncate_start: true,
168 show_preview: true,
276 show_preview: true,
169 callback_fn: Box::new(callback_fn),
277 callback_fn: Box::new(callback_fn),
@@ -172,24 +280,15 @@ impl<T: Item + 'static> Picker<T> {
172 preview_cache: HashMap::new(),
280 preview_cache: HashMap::new(),
173 read_buffer: Vec::with_capacity(1024),
281 read_buffer: Vec::with_capacity(1024),
174 file_fn: None,
282 file_fn: None,
175− };
283+ }
176−
177− picker.calculate_column_widths();
178−
179− // scoring on empty input
180− // TODO: just reuse score()
181− picker
182− .matches
183− .extend(picker.options.iter().enumerate().map(|(index, option)| {
184− let text = option.filter_text(&picker.editor_data);
185− PickerMatch {
186− index,
187− score: 0,
188− len: text.chars().count(),
189− }
190− }));
284+ }
191
285
192− picker
286+ pub fn injector(&self) -> Injector<T> {
287+ Injector {
288+ dst: self.matcher.injector(),
289+ editor_data: self.editor_data.clone(),
290+ shutown: self.shutdown.clone(),
291+ }
193 }
292 }
194
293
195 pub fn truncate_start(mut self, truncate_start: bool) -> Self {
294 pub fn truncate_start(mut self, truncate_start: bool) -> Self {
@@ -202,122 +301,25 @@ impl<T: Item + 'static> Picker<T> {
202 preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
301 preview_fn: impl Fn(&Editor, &T) -> Option<FileLocation> + 'static,
203 ) -> Self {
302 ) -> Self {
204 self.file_fn = Some(Box::new(preview_fn));
303 self.file_fn = Some(Box::new(preview_fn));
304+ // assumption: if we have a preview we are matching paths... If this is ever
305+ // not true this could be a separate builder function
306+ self.matcher.update_config(Config::DEFAULT.match_paths());
205 self
307 self
206 }
308 }
207
309
208 pub fn set_options(&mut self, new_options: Vec<T>) {
310 pub fn set_options(&mut self, new_options: Vec<T>) {
311+ self.matcher.restart(false);
312+ let injector = self.matcher.injector();
209− self.options = new_options;
313+ for item in new_options {
210− self.cursor = 0;
314+ if let Some((item, matcher_text)) = item_to_nucleo(item, &self.editor_data) {
211− self.force_score();
315+ injector.push(item, |dst| dst[0] = matcher_text);
212− self.calculate_column_widths();
213− }
214−
215− /// Calculate the width constraints using the maximum widths of each column
216− /// for the current options.
217− fn calculate_column_widths(&mut self) {
218− let n = self
219− .options
220− .first()
221− .map(|option| option.format(&self.editor_data).cells.len())
222− .unwrap_or_default();
223− let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
224− let row = option.format(&self.editor_data);
225− // maintain max for each column
226− for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
227− let width = cell.content.width();
228− if width > *acc {
229− *acc = width;
230− }
231 }
316 }
232− acc
233− });
234− self.widths = max_lens
235− .into_iter()
236− .map(|len| Constraint::Length(len as u16))
237− .collect();
238− }
239−
240− pub fn score(&mut self) {
241− let pattern = self.prompt.line();
242−
243− if pattern == &self.previous_pattern.0 {
244− return;
245 }
317 }
246−
247− let (query, is_refined) = self
248− .previous_pattern
249− .1
250− .refine(pattern, &self.previous_pattern.0);
251−
252− if pattern.is_empty() {
253− // Fast path for no pattern.
254− self.matches.clear();
255− self.matches
256− .extend(self.options.iter().enumerate().map(|(index, option)| {
257− let text = option.filter_text(&self.editor_data);
258− PickerMatch {
259− index,
260− score: 0,
261− len: text.chars().count(),
262− }
263− }));
264− } else if is_refined {
265− // optimization: if the pattern is a more specific version of the previous one
266− // then we can score the filtered set.
267− self.matches.retain_mut(|pmatch| {
268− let option = &self.options[pmatch.index];
269− let text = option.sort_text(&self.editor_data);
270−
271− match query.fuzzy_match(&text, &self.matcher) {
272− Some(s) => {
273− // Update the score
274− pmatch.score = s;
275− true
276− }
277− None => false,
278− }
279− });
280−
281− self.matches.sort_unstable();
282− } else {
283− self.force_score();
284− }
285−
286− // reset cursor position
287− self.cursor = 0;
288− let pattern = self.prompt.line();
289− self.previous_pattern.0.clone_from(pattern);
290− self.previous_pattern.1 = query;
291− }
292−
293− pub fn force_score(&mut self) {
294− let pattern = self.prompt.line();
295−
296− let query = FuzzyQuery::new(pattern);
297− self.matches.clear();
298− self.matches.extend(
299− self.options
300− .iter()
301− .enumerate()
302− .filter_map(|(index, option)| {
303− let text = option.filter_text(&self.editor_data);
304−
305− query
306− .fuzzy_match(&text, &self.matcher)
307− .map(|score| PickerMatch {
308− index,
309− score,
310− len: text.chars().count(),
311− })
312− }),
313− );
314−
315− self.matches.sort_unstable();
316 }
318 }
317
319
318 /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
320 /// Move the cursor by a number of lines, either down (`Forward`) or up (`Backward`)
319− pub fn move_by(&mut self, amount: usize, direction: Direction) {
321+ pub fn move_by(&mut self, amount: u32, direction: Direction) {
320− let len = self.matches.len();
322+ let len = self.matcher.snapshot().matched_item_count();
321
323
322 if len == 0 {
324 if len == 0 {
323 // No results, can't move.
325 // No results, can't move.
@@ -336,12 +338,12 @@ impl<T: Item + 'static> Picker<T> {
336
338
337 /// Move the cursor down by exactly one page. After the last page comes the first page.
339 /// Move the cursor down by exactly one page. After the last page comes the first page.
338 pub fn page_up(&mut self) {
340 pub fn page_up(&mut self) {
339− self.move_by(self.completion_height as usize, Direction::Backward);
341+ self.move_by(self.completion_height as u32, Direction::Backward);
340 }
342 }
341
343
342 /// Move the cursor up by exactly one page. After the first page comes the last page.
344 /// Move the cursor up by exactly one page. After the first page comes the last page.
343 pub fn page_down(&mut self) {
345 pub fn page_down(&mut self) {
344− self.move_by(self.completion_height as usize, Direction::Forward);
346+ self.move_by(self.completion_height as u32, Direction::Forward);
345 }
347 }
346
348
347 /// Move the cursor to the first entry
349 /// Move the cursor to the first entry
@@ -351,13 +353,18 @@ impl<T: Item + 'static> Picker<T> {
351
353
352 /// Move the cursor to the last entry
354 /// Move the cursor to the last entry
353 pub fn to_end(&mut self) {
355 pub fn to_end(&mut self) {
356+ self.cursor = self
357+ .matcher
358+ .snapshot()
359+ .matched_item_count()
354− self.cursor = self.matches.len().saturating_sub(1);
360+ .saturating_sub(1);
355 }
361 }
356
362
357 pub fn selection(&self) -> Option<&T> {
363 pub fn selection(&self) -> Option<&T> {
358− self.matches
364+ self.matcher
365+ .snapshot()
359− .get(self.cursor)
366+ .get_matched_item(self.cursor)
360− .map(|pmatch| &self.options[pmatch.index])
367+ .map(|item| item.data)
361 }
368 }
362
369
363 pub fn toggle_preview(&mut self) {
370 pub fn toggle_preview(&mut self) {
@@ -366,8 +373,17 @@ impl<T: Item + 'static> Picker<T> {
366
373
367 fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
374 fn prompt_handle_event(&mut self, event: &Event, cx: &mut Context) -> EventResult {
368 if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
375 if let EventResult::Consumed(_) = self.prompt.handle_event(event, cx) {
376+ let pattern = self.prompt.line();
369− // TODO: recalculate only if pattern changed
377+ // TODO: better track how the pattern has changed
370− self.score();
378+ if pattern != &self.previous_pattern {
379+ self.matcher.pattern.reparse(
380+ 0,
381+ pattern,
382+ CaseMatching::Smart,
383+ pattern.starts_with(&self.previous_pattern),
384+ );
385+ self.previous_pattern = pattern.clone();
386+ }
371 }
387 }
372 EventResult::Consumed(None)
388 EventResult::Consumed(None)
373 }
389 }
@@ -411,12 +427,9 @@ impl<T: Item + 'static> Picker<T> {
411 (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
427 (size, _) if size > MAX_FILE_SIZE_FOR_PREVIEW => {
412 CachedPreview::LargeFile
428 CachedPreview::LargeFile
413 }
429 }
414− _ => {
415− // TODO: enable syntax highlighting; blocked by async rendering
416− Document::open(path, None, None, editor.config.clone())
430+ _ => Document::open(path, None, None, editor.config.clone())
417− .map(|doc| CachedPreview::Document(Box::new(doc)))
431+ .map(|doc| CachedPreview::Document(Box::new(doc)))
418− .unwrap_or(CachedPreview::NotFound)
432+ .unwrap_or(CachedPreview::NotFound),
419− }
420 },
433 },
421 )
434 )
422 .unwrap_or(CachedPreview::NotFound);
435 .unwrap_or(CachedPreview::NotFound);
@@ -461,9 +474,13 @@ impl<T: Item + 'static> Picker<T> {
461 log::info!("highlighting picker item failed");
474 log::info!("highlighting picker item failed");
462 return;
475 return;
463 };
476 };
464− let Some(Overlay {
465− content: picker, ..
466− }) = compositor.find::<Overlay<Self>>()
477+ let picker = match compositor.find::<Overlay<Self>>() {
478+ Some(Overlay { content, .. }) => Some(content),
479+ None => compositor
480+ .find::<Overlay<DynamicPicker<T>>>()
481+ .map(|overlay| &mut overlay.content.file_picker),
482+ };
483+ let Some(picker) = picker
467 else {
484 else {
468 log::info!("picker closed before syntax highlighting finished");
485 log::info!("picker closed before syntax highlighting finished");
469 return;
486 return;
@@ -495,6 +512,14 @@ impl<T: Item + 'static> Picker<T> {
495 }
512 }
496
513
497 fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
514 fn render_picker(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
515+ let status = self.matcher.tick(10);
516+ let snapshot = self.matcher.snapshot();
517+ if status.changed {
518+ self.cursor = self
519+ .cursor
520+ .min(snapshot.matched_item_count().saturating_sub(1))
521+ }
522+
498 let text_style = cx.editor.theme.get("ui.text");
523 let text_style = cx.editor.theme.get("ui.text");
499 let selected = cx.editor.theme.get("ui.text.focus");
524 let selected = cx.editor.theme.get("ui.text.focus");
500 let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
525 let highlight_style = cx.editor.theme.get("special").add_modifier(Modifier::BOLD);
@@ -515,8 +540,15 @@ impl<T: Item + 'static> Picker<T> {
515 // -- Render the input bar:
540 // -- Render the input bar:
516
541
517 let area = inner.clip_left(1).with_height(1);
542 let area = inner.clip_left(1).with_height(1);
543+ // render the prompt first since it will clear its background
544+ self.prompt.render(area, surface, cx);
518
545
519− let count = format!("{}/{}", self.matches.len(), self.options.len());
546+ let count = format!(
547+ "{}{}/{}",
548+ if status.running { "(running) " } else { "" },
549+ snapshot.matched_item_count(),
550+ snapshot.item_count(),
551+ );
520 surface.set_stringn(
552 surface.set_stringn(
521 (area.x + area.width).saturating_sub(count.len() as u16 + 1),
553 (area.x + area.width).saturating_sub(count.len() as u16 + 1),
522 area.y,
554 area.y,
@@ -525,8 +557,6 @@ impl<T: Item + 'static> Picker<T> {
525 text_style,
557 text_style,
526 );
558 );
527
559
528− self.prompt.render(area, surface, cx);
529−
530 // -- Separator
560 // -- Separator
531 let sep_style = cx.editor.theme.get("ui.background.separator");
561 let sep_style = cx.editor.theme.get("ui.background.separator");
532 let borders = BorderType::line_symbols(BorderType::Plain);
562 let borders = BorderType::line_symbols(BorderType::Plain);
@@ -539,106 +569,89 @@ impl<T: Item + 'static> Picker<T> {
539 // -- Render the contents:
569 // -- Render the contents:
540 // subtract area of prompt from top
570 // subtract area of prompt from top
541 let inner = inner.clip_top(2);
571 let inner = inner.clip_top(2);
542−
543− let rows = inner.height;
572+ let rows = inner.height as u32;
544− let offset = self.cursor - (self.cursor % std::cmp::max(1, rows as usize));
573+ let offset = self.cursor - (self.cursor % std::cmp::max(1, rows));
545 let cursor = self.cursor.saturating_sub(offset);
574 let cursor = self.cursor.saturating_sub(offset);
575+ let end = offset
576+ .saturating_add(rows)
577+ .min(snapshot.matched_item_count());
578+ let mut indices = Vec::new();
579+ let mut matcher = MATCHER.lock();
580+ matcher.config = Config::DEFAULT;
581+ if self.file_fn.is_some() {
582+ matcher.config.set_match_paths()
583+ }
546
584
547− let options = self
585+ let options = snapshot.matched_items(offset..end).map(|item| {
548− .matches
586+ snapshot.pattern().column_pattern(0).indices(
549− .iter()
587+ item.matcher_columns[0].slice(..),
550− .skip(offset)
588+ &mut matcher,
551− .take(rows as usize)
589+ &mut indices,
552− .map(|pmatch| &self.options[pmatch.index])
590+ );
591+ indices.sort_unstable();
592+ indices.dedup();
553− .map(|option| option.format(&self.editor_data))
593+ let mut row = item.data.format(&self.editor_data);
554− .map(|mut row| {
594+
555− const TEMP_CELL_SEP: &str = " ";
595+ let mut grapheme_idx = 0u32;
556−
596+ let mut indices = indices.drain(..);
557− let line = row.cell_text().fold(String::new(), |mut s, frag| {
597+ let mut next_highlight_idx = indices.next().unwrap_or(u32::MAX);
558− s.push_str(&frag);
598+ if self.widths.len() < row.cells.len() {
559− s.push_str(TEMP_CELL_SEP);
599+ self.widths.resize(row.cells.len(), Constraint::Length(0));
560− s
600+ }
561− });
601+ let mut widths = self.widths.iter_mut();
562−
602+ for cell in &mut row.cells {
563− // Items are filtered by using the text returned by menu::Item::filter_text
603+ let Some(Constraint::Length(max_width)) = widths.next() else {
564− // but we do highlighting here using the text in Row and therefore there
604+ unreachable!();
565− // might be inconsistencies. This is the best we can do since only the
566− // text in Row is displayed to the end user.
567− let (_score, highlights) = FuzzyQuery::new(self.prompt.line())
568− .fuzzy_indices(&line, &self.matcher)
569− .unwrap_or_default();
570−
571− let highlight_byte_ranges: Vec<_> = line
572− .char_indices()
573− .enumerate()
574− .filter_map(|(char_idx, (byte_offset, ch))| {
575− highlights
576− .contains(&char_idx)
577− .then(|| byte_offset..byte_offset + ch.len_utf8())
578− })
579− .collect();
580−
581− // The starting byte index of the current (iterating) cell
582− let mut cell_start_byte_offset = 0;
583− for cell in row.cells.iter_mut() {
584− let spans = match cell.content.lines.get(0) {
585− Some(s) => s,
586− None => {
587− cell_start_byte_offset += TEMP_CELL_SEP.len();
588− continue;
589− }
590− };
605+ };
591
606
607+ // merge index highlights on top of existing hightlights
608+ let mut span_list = Vec::new();
609+ let mut current_span = String::new();
610+ let mut current_style = Style::default();
592− let mut cell_len = 0;
611+ let mut width = 0;
593−
612+
594− let graphemes_with_style: Vec<_> = spans
613+ let spans: &[Span] = cell.content.lines.first().map_or(&[], |it| it.0.as_slice());
595− .0
614+ for span in spans {
596− .iter()
615+ // this looks like a bug on first glance, we are iterating
597− .flat_map(|span| {
616+ // graphemes but treating them as char indices. The reason that
617+ // this is correct is that nucleo will only ever consider the first char
618+ // of a grapheme (and discard the rest of the grapheme) so the indices
619+ // returned by nucleo are essentially grapheme indecies
598− span.content
620+ for grapheme in span.content.graphemes(true) {
599− .grapheme_indices(true)
621+ let style = if grapheme_idx == next_highlight_idx {
600− .zip(std::iter::repeat(span.style))
622+ next_highlight_idx = indices.next().unwrap_or(u32::MAX);
601− })
602− .map(|((grapheme_byte_offset, grapheme), style)| {
603− cell_len += grapheme.len();
604− let start = cell_start_byte_offset;
605−
606− let grapheme_byte_range =
607− grapheme_byte_offset..grapheme_byte_offset + grapheme.len();
608−
609− if highlight_byte_ranges.iter().any(|hl_rng| {
610− hl_rng.start >= start + grapheme_byte_range.start
611− && hl_rng.end <= start + grapheme_byte_range.end
612− }) {
613− (grapheme, style.patch(highlight_style))
623+ span.style.patch(highlight_style)
614− } else {
615− (grapheme, style)
616− }
617− })
618− .collect();
619−
620− let mut span_list: Vec<(String, Style)> = Vec::new();
621− for (grapheme, style) in graphemes_with_style {
622− if span_list.last().map(|(_, sty)| sty) == Some(&style) {
623− let (string, _) = span_list.last_mut().unwrap();
624− string.push_str(grapheme);
625 } else {
624 } else {
626− span_list.push((String::from(grapheme), style))
625+ span.style
626+ };
627+ if style != current_style {
628+ if !current_span.is_empty() {
629+ span_list.push(Span::styled(current_span, current_style))
630+ }
631+ current_span = String::new();
632+ current_style = style;
627 }
633 }
634+ current_span.push_str(grapheme);
635+ grapheme_idx += 1;
628 }
636 }
637+ width += span.width();
638+ }
629
639
630− let spans: Vec<Span> = span_list
640+ span_list.push(Span::styled(current_span, current_style));
631− .into_iter()
641+ if width as u16 > *max_width {
632− .map(|(string, style)| Span::styled(string, style))
642+ *max_width = width as u16;
633− .collect();
643+ }
634− let spans: Spans = spans.into();
635− *cell = Cell::from(spans);
644+ *cell = Cell::from(Spans::from(span_list));
636
645
637− cell_start_byte_offset += cell_len + TEMP_CELL_SEP.len();
646+ // spacer
647+ if grapheme_idx == next_highlight_idx {
648+ next_highlight_idx = indices.next().unwrap_or(u32::MAX);
638 }
649 }
650+ grapheme_idx += 1;
651+ }
639
652
640− row
653+ row
641− });
654+ });
642
655
643 let table = Table::new(options)
656 let table = Table::new(options)
644 .style(text_style)
657 .style(text_style)
@@ -654,7 +667,7 @@ impl<T: Item + 'static> Picker<T> {
654 surface,
667 surface,
655 &mut TableState {
668 &mut TableState {
656 offset: 0,
669 offset: 0,
657− selected: Some(cursor),
670+ selected: Some(cursor as usize),
658 },
671 },
659 self.truncate_start,
672 self.truncate_start,
660 );
673 );
@@ -680,8 +693,14 @@ impl<T: Item + 'static> Picker<T> {
680 if let Some((path, range)) = self.current_file(cx.editor) {
693 if let Some((path, range)) = self.current_file(cx.editor) {
681 let preview = self.get_preview(path, cx.editor);
694 let preview = self.get_preview(path, cx.editor);
682 let doc = match preview.document() {
695 let doc = match preview.document() {
683− Some(doc) => doc,
696+ Some(doc)
684− None => {
697+ if range.map_or(true, |(start, end)| {
698+ start <= end && end <= doc.text().len_lines()
699+ }) =>
700+ {
701+ doc
702+ }
703+ _ => {
685 let alt_text = preview.placeholder();
704 let alt_text = preview.placeholder();
686 let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2;
705 let x = inner.x + inner.width.saturating_sub(alt_text.len() as u16) / 2;
687 let y = inner.y + inner.height / 2;
706 let y = inner.y + inner.height / 2;
@@ -691,31 +710,46 @@ impl<T: Item + 'static> Picker<T> {
691 };
710 };
692
711
693 let mut offset = ViewPosition::default();
712 let mut offset = ViewPosition::default();
694− if let Some(range) = range {
713+ if let Some((start_line, end_line)) = range {
714+ let height = end_line - start_line;
715+ let text = doc.text().slice(..);
716+ let start = text.line_to_char(start_line);
717+ let middle = text.line_to_char(start_line + height / 2);
718+ if height < inner.height as usize {
695− let text_fmt = doc.text_format(inner.width, None);
719+ let text_fmt = doc.text_format(inner.width, None);
696− let annotations = TextAnnotations::default();
720+ let annotations = TextAnnotations::default();
697− (offset.anchor, offset.vertical_offset) = char_idx_at_visual_offset(
721+ (offset.anchor, offset.vertical_offset) = char_idx_at_visual_offset(
698− doc.text().slice(..),
722+ text,
699− doc.text().line_to_char(range.0),
723+ middle,
700− // align to middle
724+ // align to middle
701− -(inner.height as isize / 2),
725+ -(inner.height as isize / 2),
702− 0,
726+ 0,
703− &text_fmt,
727+ &text_fmt,
704− &annotations,
728+ &annotations,
705− );
729+ );
730+ if start < offset.anchor {
731+ offset.anchor = start;
732+ offset.vertical_offset = 0;
733+ }
734+ } else {
735+ offset.anchor = start;
736+ }
706 }
737 }
707
738
708− let mut highlights = EditorView::doc_syntax_highlights(
739+ let syntax_highlights = EditorView::doc_syntax_highlights(
709 doc,
740 doc,
710 offset.anchor,
741 offset.anchor,
711 area.height,
742 area.height,
712 &cx.editor.theme,
743 &cx.editor.theme,
713 );
744 );
745+
746+ let mut overlay_highlights =
747+ EditorView::empty_highlight_iter(doc, offset.anchor, area.height);
714 for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
748 for spans in EditorView::doc_diagnostics_highlights(doc, &cx.editor.theme) {
715 if spans.is_empty() {
749 if spans.is_empty() {
716 continue;
750 continue;
717 }
751 }
718− highlights = Box::new(helix_core::syntax::merge(highlights, spans));
752+ overlay_highlights = Box::new(helix_core::syntax::merge(overlay_highlights, spans));
719 }
753 }
720 let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
754 let mut decorations: Vec<Box<dyn LineDecoration>> = Vec::new();
721
755
@@ -746,7 +780,8 @@ impl<T: Item + 'static> Picker<T> {
746 offset,
780 offset,
747 // TODO: compute text annotations asynchronously here (like inlay hints)
781 // TODO: compute text annotations asynchronously here (like inlay hints)
748 &TextAnnotations::default(),
782 &TextAnnotations::default(),
749− highlights,
783+ syntax_highlights,
784+ overlay_highlights,
750 &cx.editor.theme,
785 &cx.editor.theme,
751 &mut decorations,
786 &mut decorations,
752 &mut [],
787 &mut [],
@@ -755,7 +790,7 @@ impl<T: Item + 'static> Picker<T> {
755 }
790 }
756}
791}
757
792
758−impl<T: Item + 'static> Component for Picker<T> {
793+impl<T: Item + 'static + Send + Sync> Component for Picker<T> {
759 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
794 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
760 // +---------+ +---------+
795 // +---------+ +---------+
761 // |prompt | |preview |
796 // |prompt | |preview |
@@ -764,7 +799,8 @@ impl<T: Item + 'static> Component for Picker<T> {
764 // | | | |
799 // | | | |
765 // +---------+ +---------+
800 // +---------+ +---------+
766
801
802+ let render_preview =
767− let render_preview = self.show_preview && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
803+ self.show_preview && self.file_fn.is_some() && area.width > MIN_AREA_WIDTH_FOR_PREVIEW;
768
804
769 let picker_width = if render_preview {
805 let picker_width = if render_preview {
770 area.width / 2
806 area.width / 2
@@ -794,11 +830,28 @@ impl<T: Item + 'static> Component for Picker<T> {
794 _ => return EventResult::Ignored(None),
830 _ => return EventResult::Ignored(None),
795 };
831 };
796
832
797− let close_fn =
833+ let close_fn = |picker: &mut Self| {
834+ // if the picker is very large don't store it as last_picker to avoid
835+ // excessive memory consumption
836+ let callback: compositor::Callback = if picker.matcher.snapshot().item_count() > 100_000
837+ {
838+ Box::new(|compositor: &mut Compositor, _ctx| {
839+ // remove the layer
840+ compositor.pop();
841+ })
842+ } else {
843+ // stop streaming in new items in the background, really we should
844+ // be restarting the stream somehow once the picker gets
845+ // reopened instead (like for an FS crawl) that would also remove the
846+ // need for the special case above but that is pretty tricky
847+ picker.shutdown.store(true, atomic::Ordering::Relaxed);
848+ Box::new(|compositor: &mut Compositor, _ctx| {
849+ // remove the layer
850+ compositor.last_picker = compositor.pop();
851+ })
852+ };
798− EventResult::Consumed(Some(Box::new(|compositor: &mut Compositor, _ctx| {
853+ EventResult::Consumed(Some(callback))
799− // remove the layer
800− compositor.last_picker = compositor.pop();
801− })));
854+ };
802
855
803 // So that idle timeout retriggers
856 // So that idle timeout retriggers
804 ctx.editor.reset_idle_timer();
857 ctx.editor.reset_idle_timer();
@@ -822,9 +875,7 @@ impl<T: Item + 'static> Component for Picker<T> {
822 key!(End) => {
875 key!(End) => {
823 self.to_end();
876 self.to_end();
824 }
877 }
825− key!(Esc) | ctrl!('c') => {
826− return close_fn;
878+ key!(Esc) | ctrl!('c') => return close_fn(self),
827− }
828 alt!(Enter) => {
879 alt!(Enter) => {
829 if let Some(option) = self.selection() {
880 if let Some(option) = self.selection() {
830 (self.callback_fn)(ctx, option, Action::Load);
881 (self.callback_fn)(ctx, option, Action::Load);
@@ -834,19 +885,19 @@ impl<T: Item + 'static> Component for Picker<T> {
834 if let Some(option) = self.selection() {
885 if let Some(option) = self.selection() {
835 (self.callback_fn)(ctx, option, Action::Replace);
886 (self.callback_fn)(ctx, option, Action::Replace);
836 }
887 }
837− return close_fn;
888+ return close_fn(self);
838 }
889 }
839 ctrl!('s') => {
890 ctrl!('s') => {
840 if let Some(option) = self.selection() {
891 if let Some(option) = self.selection() {
841 (self.callback_fn)(ctx, option, Action::HorizontalSplit);
892 (self.callback_fn)(ctx, option, Action::HorizontalSplit);
842 }
893 }
843− return close_fn;
894+ return close_fn(self);
844 }
895 }
845 ctrl!('v') => {
896 ctrl!('v') => {
846 if let Some(option) = self.selection() {
897 if let Some(option) = self.selection() {
847 (self.callback_fn)(ctx, option, Action::VerticalSplit);
898 (self.callback_fn)(ctx, option, Action::VerticalSplit);
848 }
899 }
849− return close_fn;
900+ return close_fn(self);
850 }
901 }
851 ctrl!('t') => {
902 ctrl!('t') => {
852 self.toggle_preview();
903 self.toggle_preview();
@@ -874,30 +925,15 @@ impl<T: Item + 'static> Component for Picker<T> {
874 self.completion_height = height.saturating_sub(4);
925 self.completion_height = height.saturating_sub(4);
875 Some((width, height))
926 Some((width, height))
876 }
927 }
877−}
878−
879−#[derive(PartialEq, Eq, Debug)]
880−struct PickerMatch {
881− score: i64,
882− index: usize,
883− len: usize,
884−}
885−
886−impl PickerMatch {
887− fn key(&self) -> impl Ord {
888− (cmp::Reverse(self.score), self.len, self.index)
889− }
890−}
891
928
892−impl PartialOrd for PickerMatch {
929+ fn id(&self) -> Option<&'static str> {
893− fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
930+ Some(ID)
894− Some(self.cmp(other))
895 }
931 }
896}
932}
897−
933+impl<T: Item> Drop for Picker<T> {
898−impl Ord for PickerMatch {
934+ fn drop(&mut self) {
899− fn cmp(&self, other: &Self) -> Ordering {
935+ // ensure we cancel any ongoing background threads streaming into the picker
900− self.key().cmp(&other.key())
936+ self.shutdown.store(true, atomic::Ordering::Relaxed)
901 }
937 }
902}
938}
903
939
@@ -910,15 +946,13 @@ pub type DynQueryCallback<T> =
910
946
911/// A picker that updates its contents via a callback whenever the
947/// A picker that updates its contents via a callback whenever the
912/// query string changes. Useful for live grep, workspace symbols, etc.
948/// query string changes. Useful for live grep, workspace symbols, etc.
913−pub struct DynamicPicker<T: ui::menu::Item + Send> {
949+pub struct DynamicPicker<T: ui::menu::Item + Send + Sync> {
914 file_picker: Picker<T>,
950 file_picker: Picker<T>,
915 query_callback: DynQueryCallback<T>,
951 query_callback: DynQueryCallback<T>,
916 query: String,
952 query: String,
917}
953}
918
954
919−impl<T: ui::menu::Item + Send> DynamicPicker<T> {
955+impl<T: ui::menu::Item + Send + Sync> DynamicPicker<T> {
920− pub const ID: &'static str = "dynamic-picker";
921−
922 pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
956 pub fn new(file_picker: Picker<T>, query_callback: DynQueryCallback<T>) -> Self {
923 Self {
957 Self {
924 file_picker,
958 file_picker,
@@ -928,7 +962,7 @@ impl<T: ui::menu::Item + Send> DynamicPicker<T> {
928 }
962 }
929}
963}
930
964
931−impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
965+impl<T: Item + Send + Sync + 'static> Component for DynamicPicker<T> {
932 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
966 fn render(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) {
933 self.file_picker.render(area, surface, cx);
967 self.file_picker.render(area, surface, cx);
934 }
968 }
@@ -950,7 +984,7 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
950 let callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
984 let callback = Callback::EditorCompositor(Box::new(move |editor, compositor| {
951 // Wrapping of pickers in overlay is done outside the picker code,
985 // Wrapping of pickers in overlay is done outside the picker code,
952 // so this is fragile and will break if wrapped in some other widget.
986 // so this is fragile and will break if wrapped in some other widget.
953− let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(Self::ID) {
987+ let picker = match compositor.find_id::<Overlay<DynamicPicker<T>>>(ID) {
954 Some(overlay) => &mut overlay.content.file_picker,
988 Some(overlay) => &mut overlay.content.file_picker,
955 None => return,
989 None => return,
956 };
990 };
@@ -971,6 +1005,6 @@ impl<T: Item + Send + 'static> Component for DynamicPicker<T> {
971 }
1005 }
972
1006
973 fn id(&self) -> Option<&'static str> {
1007 fn id(&self) -> Option<&'static str> {
974− Some(Self::ID)
1008+ Some(ID)
975 }
1009 }
976}
1010}
helix-term/src/ui/popup.rs+27−7
@@ -3,7 +3,10 @@ use crate::{
3 compositor::{Callback, Component, Context, Event, EventResult},
3 compositor::{Callback, Component, Context, Event, EventResult},
4 ctrl, key,
4 ctrl, key,
5};
5};
6+use tui::{
6−use tui::buffer::Buffer as Surface;
7+ buffer::Buffer as Surface,
8+ widgets::{Block, Borders, Widget},
9+};
7
10
8use helix_core::Position;
11use helix_core::Position;
9use helix_view::{
12use helix_view::{
@@ -252,13 +255,29 @@ impl<T: Component> Component for Popup<T> {
252 let background = cx.editor.theme.get("ui.popup");
255 let background = cx.editor.theme.get("ui.popup");
253 surface.clear_with(area, background);
256 surface.clear_with(area, background);
254
257
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 {
255− let inner = area.inner(&self.margin);
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+
256 self.contents.render(inner, surface, cx);
275 self.contents.render(inner, surface, cx);
257
276
258 // render scrollbar if contents do not fit
277 // render scrollbar if contents do not fit
259 if self.has_scrollbar {
278 if self.has_scrollbar {
260− let win_height = inner.height as usize;
279+ let win_height = (inner.height as usize).saturating_sub(2 * border);
261− let len = self.child_size.1 as usize;
280+ let len = (self.child_size.1 as usize).saturating_sub(2 * border);
262 let fits = len <= win_height;
281 let fits = len <= win_height;
263 let scroll = self.scroll;
282 let scroll = self.scroll;
264 let scroll_style = cx.editor.theme.get("ui.menu.scroll");
283 let scroll_style = cx.editor.theme.get("ui.menu.scroll");
@@ -274,14 +293,15 @@ impl<T: Component> Component for Popup<T> {
274
293
275 let mut cell;
294 let mut cell;
276 for i in 0..win_height {
295 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)];
278
297
279− cell.set_symbol("▐"); // right half block
298+ let half_block = if render_borders { "▌" } else { "▐" };
280
299
281 if scroll_line <= i && i < scroll_line + scroll_height {
300 if scroll_line <= i && i < scroll_line + scroll_height {
282 // Draw scroll thumb
301 // Draw scroll thumb
302+ cell.set_symbol(half_block);
283 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
303 cell.set_fg(scroll_style.fg.unwrap_or(helix_view::theme::Color::Reset));
284− } else {
304+ } else if !render_borders {
285 // Draw scroll track
305 // Draw scroll track
286 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
306 cell.set_fg(scroll_style.bg.unwrap_or(helix_view::theme::Color::Reset));
287 }
307 }
helix-term/tests/integration.rs−1
@@ -20,7 +20,6 @@ mod test {
20 mod commands;
20 mod commands;
21 mod languages;
21 mod languages;
22 mod movement;
22 mod movement;
23− mod picker;
24 mod prompt;
23 mod prompt;
25 mod splits;
24 mod splits;
26}
25}
helix-term/tests/test/commands.rs+46
@@ -480,3 +480,49 @@ fn bar() {#(\n|)#\
480
480
481 Ok(())
481 Ok(())
482}
482}
483+
484+#[tokio::test(flavor = "multi_thread")]
485+async fn test_join_selections() -> anyhow::Result<()> {
486+ // normal join
487+ test((
488+ platform_line(indoc! {"\
489+ #[a|]#bc
490+ def
491+ "}),
492+ "J",
493+ platform_line(indoc! {"\
494+ #[a|]#bc def
495+ "}),
496+ ))
497+ .await?;
498+
499+ // join with empty line
500+ test((
501+ platform_line(indoc! {"\
502+ #[a|]#bc
503+
504+ def
505+ "}),
506+ "JJ",
507+ platform_line(indoc! {"\
508+ #[a|]#bc def
509+ "}),
510+ ))
511+ .await?;
512+
513+ // join with additional space in non-empty line
514+ test((
515+ platform_line(indoc! {"\
516+ #[a|]#bc
517+
518+ def
519+ "}),
520+ "JJ",
521+ platform_line(indoc! {"\
522+ #[a|]#bc def
523+ "}),
524+ ))
525+ .await?;
526+
527+ Ok(())
528+}
helix-term/tests/test/commands/write.rs+122−3
@@ -93,7 +93,7 @@ async fn test_buffer_close_concurrent() -> anyhow::Result<()> {
93 )
93 )
94 .await?;
94 .await?;
95
95
96− helpers::assert_file_has_content(file.as_file_mut(), &RANGE.end().to_string())?;
96+ helpers::assert_file_has_content(file.as_file_mut(), &platform_line(&RANGE.end().to_string()))?;
97
97
98 Ok(())
98 Ok(())
99}
99}
@@ -209,7 +209,7 @@ async fn test_write_concurrent() -> anyhow::Result<()> {
209
209
210 let mut file_content = String::new();
210 let mut file_content = String::new();
211 file.as_file_mut().read_to_string(&mut file_content)?;
211 file.as_file_mut().read_to_string(&mut file_content)?;
212− assert_eq!(RANGE.end().to_string(), file_content);
212+ assert_eq!(platform_line(&RANGE.end().to_string()), file_content);
213
213
214 Ok(())
214 Ok(())
215}
215}
@@ -424,13 +424,132 @@ async fn test_write_utf_bom_file() -> anyhow::Result<()> {
424 Ok(())
424 Ok(())
425}
425}
426
426
427+#[tokio::test(flavor = "multi_thread")]
428+async fn test_write_insert_final_newline_added_if_missing() -> anyhow::Result<()> {
429+ let mut file = tempfile::NamedTempFile::new()?;
430+ let mut app = helpers::AppBuilder::new()
431+ .with_file(file.path(), None)
432+ .with_input_text("#[h|]#ave you tried chamomile tea?")
433+ .build()?;
434+
435+ test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
436+
437+ helpers::assert_file_has_content(
438+ file.as_file_mut(),
439+ &helpers::platform_line("have you tried chamomile tea?\n"),
440+ )?;
441+
442+ Ok(())
443+}
444+
445+#[tokio::test(flavor = "multi_thread")]
446+async fn test_write_insert_final_newline_unchanged_if_not_missing() -> anyhow::Result<()> {
447+ let mut file = tempfile::NamedTempFile::new()?;
448+ let mut app = helpers::AppBuilder::new()
449+ .with_file(file.path(), None)
450+ .with_input_text(&helpers::platform_line("#[t|]#en minutes, please\n"))
451+ .build()?;
452+
453+ test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
454+
455+ helpers::assert_file_has_content(
456+ file.as_file_mut(),
457+ &helpers::platform_line("ten minutes, please\n"),
458+ )?;
459+
460+ Ok(())
461+}
462+
463+#[tokio::test(flavor = "multi_thread")]
464+async fn test_write_insert_final_newline_unchanged_if_missing_and_false() -> anyhow::Result<()> {
465+ let mut file = tempfile::NamedTempFile::new()?;
466+ let mut app = helpers::AppBuilder::new()
467+ .with_config(Config {
468+ editor: helix_view::editor::Config {
469+ insert_final_newline: false,
470+ ..Default::default()
471+ },
472+ ..Default::default()
473+ })
474+ .with_file(file.path(), None)
475+ .with_input_text("#[t|]#he quiet rain continued through the night")
476+ .build()?;
477+
478+ test_key_sequence(&mut app, Some(":w<ret>"), None, false).await?;
479+
480+ helpers::assert_file_has_content(
481+ file.as_file_mut(),
482+ "the quiet rain continued through the night",
483+ )?;
484+
485+ Ok(())
486+}
487+
488+#[tokio::test(flavor = "multi_thread")]
489+async fn test_write_all_insert_final_newline_add_if_missing_and_modified() -> anyhow::Result<()> {
490+ let mut file1 = tempfile::NamedTempFile::new()?;
491+ let mut file2 = tempfile::NamedTempFile::new()?;
492+ let mut app = helpers::AppBuilder::new()
493+ .with_file(file1.path(), None)
494+ .with_input_text("#[w|]#e don't serve time travelers here")
495+ .build()?;
496+
497+ test_key_sequence(
498+ &mut app,
499+ Some(&format!(
500+ ":o {}<ret>ia time traveler walks into a bar<esc>:wa<ret>",
501+ file2.path().to_string_lossy()
502+ )),
503+ None,
504+ false,
505+ )
506+ .await?;
507+
508+ helpers::assert_file_has_content(
509+ file1.as_file_mut(),
510+ &helpers::platform_line("we don't serve time travelers here\n"),
511+ )?;
512+
513+ helpers::assert_file_has_content(
514+ file2.as_file_mut(),
515+ &helpers::platform_line("a time traveler walks into a bar\n"),
516+ )?;
517+
518+ Ok(())
519+}
520+
521+#[tokio::test(flavor = "multi_thread")]
522+async fn test_write_all_insert_final_newline_do_not_add_if_unmodified() -> anyhow::Result<()> {
523+ let mut file = tempfile::NamedTempFile::new()?;
524+ let mut app = helpers::AppBuilder::new()
525+ .with_file(file.path(), None)
526+ .build()?;
527+
528+ file.write_all(b"i lost on Jeopardy!")?;
529+ file.rewind()?;
530+
531+ test_key_sequence(&mut app, Some(":wa<ret>"), None, false).await?;
532+
533+ helpers::assert_file_has_content(file.as_file_mut(), "i lost on Jeopardy!")?;
534+
535+ Ok(())
536+}
537+
427async fn edit_file_with_content(file_content: &[u8]) -> anyhow::Result<()> {
538async fn edit_file_with_content(file_content: &[u8]) -> anyhow::Result<()> {
428 let mut file = tempfile::NamedTempFile::new()?;
539 let mut file = tempfile::NamedTempFile::new()?;
429
540
430 file.as_file_mut().write_all(&file_content)?;
541 file.as_file_mut().write_all(&file_content)?;
431
542
432 helpers::test_key_sequence(
543 helpers::test_key_sequence(
433− &mut helpers::AppBuilder::new().build()?,
544+ &mut helpers::AppBuilder::new()
545+ .with_config(Config {
546+ editor: helix_view::editor::Config {
547+ insert_final_newline: false,
548+ ..Default::default()
549+ },
550+ ..Default::default()
551+ })
552+ .build()?,
434 Some(&format!(":o {}<ret>:x<ret>", file.path().to_string_lossy())),
553 Some(&format!(":o {}<ret>:x<ret>", file.path().to_string_lossy())),
435 None,
554 None,
436 true,
555 true,
helix-term/tests/test/helpers.rs+9−1
@@ -320,6 +320,14 @@ impl AppBuilder {
320 }
320 }
321
321
322 pub fn build(self) -> anyhow::Result<Application> {
322 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+
323 let mut app = Application::new(self.args, self.config, self.syn_conf)?;
331 let mut app = Application::new(self.args, self.config, self.syn_conf)?;
324
332
325 if let Some((text, selection)) = self.input {
333 if let Some((text, selection)) = self.input {
@@ -350,7 +358,7 @@ pub fn assert_file_has_content(file: &mut File, content: &str) -> anyhow::Result
350
358
351 let mut file_content = String::new();
359 let mut file_content = String::new();
352 file.read_to_string(&mut file_content)?;
360 file.read_to_string(&mut file_content)?;
353− assert_eq!(content, file_content);
361+ assert_eq!(file_content, content);
354
362
355 Ok(())
363 Ok(())
356}
364}
helix-term/tests/test/movement.rs+39
@@ -513,3 +513,42 @@ async fn select_mode_tree_sitter_prev_function_goes_backwards_to_object() -> any
513
513
514 Ok(())
514 Ok(())
515}
515}
516+
517+#[tokio::test(flavor = "multi_thread")]
518+async fn find_char_line_ending() -> anyhow::Result<()> {
519+ test((
520+ helpers::platform_line(indoc! {
521+ "\
522+ one
523+ #[|t]#wo
524+ three"
525+ }),
526+ "T<ret>gll2f<ret>",
527+ helpers::platform_line(indoc! {
528+ "\
529+ one
530+ two#[
531+ |]#three"
532+ }),
533+ ))
534+ .await?;
535+
536+ test((
537+ helpers::platform_line(indoc! {
538+ "\
539+ #[|o]#ne
540+ two
541+ three"
542+ }),
543+ "f<ret>2t<ret>ghT<ret>F<ret>",
544+ helpers::platform_line(indoc! {
545+ "\
546+ one#[|
547+ t]#wo
548+ three"
549+ }),
550+ ))
551+ .await?;
552+
553+ Ok(())
554+}
helix-term/tests/test/picker.rsdeleted−80
@@ -1,80 +0,0 @@
1−use std::fs;
2−
3−use helix_core::{path::get_canonicalized_path, Range};
4−use helix_loader::{current_working_dir, set_current_working_dir};
5−use helix_view::{current_ref, editor::Action};
6−use tempfile::{Builder, TempDir};
7−
8−use super::*;
9−
10−#[tokio::test(flavor = "multi_thread")]
11−async fn test_picker_alt_ret() -> anyhow::Result<()> {
12− // Create two files, open the first and run a global search for a word
13− // from the second file. Press <alt-ret> to have helix open the second file in the
14− // new buffer, but not change focus. Then check whether the word is highlighted
15− // correctly and the view of the first file has not changed.
16− let tmp_dir = TempDir::new()?;
17− set_current_working_dir(tmp_dir.path().into())?;
18−
19− let mut app = AppBuilder::new().build()?;
20−
21− log::debug!(
22− "set current working directory to {:?}",
23− current_working_dir()
24− );
25−
26− // Add prefix so helix doesn't hide these files in a picker
27− let files = [
28− Builder::new().prefix("1").tempfile_in(&tmp_dir)?,
29− Builder::new().prefix("2").tempfile_in(&tmp_dir)?,
30− ];
31− let paths = files
32− .iter()
33− .map(|f| get_canonicalized_path(f.path()))
34− .collect::<Vec<_>>();
35−
36− fs::write(&paths[0], "1\n2\n3\n4")?;
37− fs::write(&paths[1], "first\nsecond")?;
38−
39− log::debug!(
40− "created and wrote two temporary files: {:?} & {:?}",
41− paths[0],
42− paths[1]
43− );
44−
45− // Manually open to save the offset, otherwise we won't be able to change the state in the Fn trait
46− app.editor.open(files[0].path(), Action::Replace)?;
47− let view_offset = current_ref!(app.editor).0.offset;
48−
49− test_key_sequences(
50− &mut app,
51− vec![
52− (Some("<space>/"), None),
53− (Some("second<ret>"), None),
54− (
55− Some("<A-ret><esc>"),
56− Some(&|app| {
57− let (view, doc) = current_ref!(app.editor);
58− assert_eq!(doc.path().unwrap(), &paths[0]);
59− let select_ranges = doc.selection(view.id).ranges();
60− assert_eq!(select_ranges[0], Range::new(0, 1));
61− assert_eq!(view.offset, view_offset);
62− }),
63− ),
64− (
65− Some(":buffer<minus>next<ret>"),
66− Some(&|app| {
67− let (view, doc) = current_ref!(app.editor);
68− assert_eq!(doc.path().unwrap(), &paths[1]);
69− let select_ranges = doc.selection(view.id).ranges();
70− assert_eq!(select_ranges.len(), 1);
71− assert_eq!(select_ranges[0], Range::new(6, 12));
72− }),
73− ),
74− ],
75− false,
76− )
77− .await?;
78−
79− Ok(())
80−}
helix-term/tests/test/splits.rs+3−3
@@ -62,9 +62,9 @@ async fn test_split_write_quit_all() -> anyhow::Result<()> {
62 )
62 )
63 .await?;
63 .await?;
64
64
65− helpers::assert_file_has_content(file1.as_file_mut(), "hello1")?;
65+ helpers::assert_file_has_content(file1.as_file_mut(), &platform_line("hello1"))?;
66− helpers::assert_file_has_content(file2.as_file_mut(), "hello2")?;
66+ helpers::assert_file_has_content(file2.as_file_mut(), &platform_line("hello2"))?;
67− helpers::assert_file_has_content(file3.as_file_mut(), "hello3")?;
67+ helpers::assert_file_has_content(file3.as_file_mut(), &platform_line("hello3"))?;
68
68
69 Ok(())
69 Ok(())
70}
70}
helix-tui/Cargo.toml+14−14
@@ -1,28 +1,28 @@
1[package]
1[package]
2name = "helix-tui"
2name = "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
3+description = """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"
13include = ["src/**/*", "README.md"]
4include = ["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
14
13
15[features]
14[features]
16default = ["crossterm"]
15default = ["crossterm"]
17
16
18[dependencies]
17[dependencies]
18+helix-view = { path = "../helix-view", features = ["term"] }
19+helix-core = { path = "../helix-core" }
20+
19bitflags = "2.4"
21bitflags = "2.4"
20cassowary = "0.3"
22cassowary = "0.3"
21unicode-segmentation = "1.10"
23unicode-segmentation = "1.10"
22−crossterm = { version = "0.26", optional = true }
24+crossterm = { version = "0.27", optional = true }
23termini = "1.0"
25termini = "1.0"
24serde = { version = "1", "optional" = true, features = ["derive"]}
26serde = { version = "1", "optional" = true, features = ["derive"]}
25−once_cell = "1.18"
27+once_cell = "1.19"
26log = "~0.4"
28log = "~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+51−33
@@ -32,10 +32,21 @@ fn vte_version() -> Option<usize> {
32}
32}
33
33
34/// Describes terminal capabilities like extended underline, truecolor, etc.
34/// Describes terminal capabilities like extended underline, truecolor, etc.
35−#[derive(Copy, Clone, Debug, Default)]
35+#[derive(Clone, Debug)]
36struct Capabilities {
36struct Capabilities {
37 /// Support for undercurled, underdashed, etc.
37 /// Support for undercurled, underdashed, etc.
38 has_extended_underlines: bool,
38 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+ }
39}
50}
40
51
41impl Capabilities {
52impl Capabilities {
@@ -54,6 +65,10 @@ impl Capabilities {
54 || t.extended_cap("Su").is_some()
65 || t.extended_cap("Su").is_some()
55 || vte_version() >= Some(5102)
66 || vte_version() >= Some(5102)
56 || matches!(term_program().as_deref(), Some("WezTerm")),
67 || 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(),
57 },
72 },
58 }
73 }
59 }
74 }
@@ -154,7 +169,8 @@ where
154
169
155 fn restore(&mut self, config: Config) -> io::Result<()> {
170 fn restore(&mut self, config: Config) -> io::Result<()> {
156 // reset cursor shape
171 // reset cursor shape
157− write!(self.buffer, "\x1B[0 q")?;
172+ self.buffer
173+ .write_all(self.capabilities.reset_cursor_command.as_bytes())?;
158 if config.enable_mouse_capture {
174 if config.enable_mouse_capture {
159 execute!(self.buffer, DisableMouseCapture)?;
175 execute!(self.buffer, DisableMouseCapture)?;
160 }
176 }
@@ -201,7 +217,7 @@ where
201 for (x, y, cell) in content {
217 for (x, y, cell) in content {
202 // Move the cursor if the previous location was not (x - 1, y)
218 // Move the cursor if the previous location was not (x - 1, y)
203 if !matches!(last_pos, Some(p) if x == p.0 + 1 && y == p.1) {
219 if !matches!(last_pos, Some(p) if x == p.0 + 1 && y == p.1) {
204− map_error(queue!(self.buffer, MoveTo(x, y)))?;
220+ queue!(self.buffer, MoveTo(x, y))?;
205 }
221 }
206 last_pos = Some((x, y));
222 last_pos = Some((x, y));
207 if cell.modifier != modifier {
223 if cell.modifier != modifier {
@@ -214,12 +230,12 @@ where
214 }
230 }
215 if cell.fg != fg {
231 if cell.fg != fg {
216 let color = CColor::from(cell.fg);
232 let color = CColor::from(cell.fg);
217− map_error(queue!(self.buffer, SetForegroundColor(color)))?;
233+ queue!(self.buffer, SetForegroundColor(color))?;
218 fg = cell.fg;
234 fg = cell.fg;
219 }
235 }
220 if cell.bg != bg {
236 if cell.bg != bg {
221 let color = CColor::from(cell.bg);
237 let color = CColor::from(cell.bg);
222− map_error(queue!(self.buffer, SetBackgroundColor(color)))?;
238+ queue!(self.buffer, SetBackgroundColor(color))?;
223 bg = cell.bg;
239 bg = cell.bg;
224 }
240 }
225
241
@@ -227,7 +243,7 @@ where
227 if self.capabilities.has_extended_underlines {
243 if self.capabilities.has_extended_underlines {
228 if cell.underline_color != underline_color {
244 if cell.underline_color != underline_color {
229 let color = CColor::from(cell.underline_color);
245 let color = CColor::from(cell.underline_color);
230− map_error(queue!(self.buffer, SetUnderlineColor(color)))?;
246+ queue!(self.buffer, SetUnderlineColor(color))?;
231 underline_color = cell.underline_color;
247 underline_color = cell.underline_color;
232 }
248 }
233 } else {
249 } else {
@@ -239,24 +255,24 @@ where
239
255
240 if new_underline_style != underline_style {
256 if new_underline_style != underline_style {
241 let attr = CAttribute::from(new_underline_style);
257 let attr = CAttribute::from(new_underline_style);
242− map_error(queue!(self.buffer, SetAttribute(attr)))?;
258+ queue!(self.buffer, SetAttribute(attr))?;
243 underline_style = new_underline_style;
259 underline_style = new_underline_style;
244 }
260 }
245
261
246− map_error(queue!(self.buffer, Print(&cell.symbol)))?;
262+ queue!(self.buffer, Print(&cell.symbol))?;
247 }
263 }
248
264
249− map_error(queue!(
265+ queue!(
250 self.buffer,
266 self.buffer,
251 SetUnderlineColor(CColor::Reset),
267 SetUnderlineColor(CColor::Reset),
252 SetForegroundColor(CColor::Reset),
268 SetForegroundColor(CColor::Reset),
253 SetBackgroundColor(CColor::Reset),
269 SetBackgroundColor(CColor::Reset),
254 SetAttribute(CAttribute::Reset)
270 SetAttribute(CAttribute::Reset)
255− ))
271+ )
256 }
272 }
257
273
258 fn hide_cursor(&mut self) -> io::Result<()> {
274 fn hide_cursor(&mut self) -> io::Result<()> {
259− map_error(execute!(self.buffer, Hide))
275+ execute!(self.buffer, Hide)
260 }
276 }
261
277
262 fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
278 fn show_cursor(&mut self, kind: CursorKind) -> io::Result<()> {
@@ -266,7 +282,7 @@ where
266 CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
282 CursorKind::Underline => SetCursorStyle::SteadyUnderScore,
267 CursorKind::Hidden => unreachable!(),
283 CursorKind::Hidden => unreachable!(),
268 };
284 };
269− map_error(execute!(self.buffer, Show, shape))
285+ execute!(self.buffer, Show, shape)
270 }
286 }
271
287
272 fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
288 fn get_cursor(&mut self) -> io::Result<(u16, u16)> {
@@ -275,11 +291,11 @@ where
275 }
291 }
276
292
277 fn set_cursor(&mut self, x: u16, y: u16) -> io::Result<()> {
293 fn set_cursor(&mut self, x: u16, y: u16) -> io::Result<()> {
278− map_error(execute!(self.buffer, MoveTo(x, y)))
294+ execute!(self.buffer, MoveTo(x, y))
279 }
295 }
280
296
281 fn clear(&mut self) -> io::Result<()> {
297 fn clear(&mut self) -> io::Result<()> {
282− map_error(execute!(self.buffer, Clear(ClearType::All)))
298+ execute!(self.buffer, Clear(ClearType::All))
283 }
299 }
284
300
285 fn size(&self) -> io::Result<Rect> {
301 fn size(&self) -> io::Result<Rect> {
@@ -294,10 +310,6 @@ where
294 }
310 }
295}
311}
296
312
297−fn map_error(error: crossterm::Result<()>) -> io::Result<()> {
298− error.map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))
299−}
300−
301#[derive(Debug)]
313#[derive(Debug)]
302struct ModifierDiff {
314struct ModifierDiff {
303 pub from: Modifier,
315 pub from: Modifier,
@@ -312,48 +324,54 @@ impl ModifierDiff {
312 //use crossterm::Attribute;
324 //use crossterm::Attribute;
313 let removed = self.from - self.to;
325 let removed = self.from - self.to;
314 if removed.contains(Modifier::REVERSED) {
326 if removed.contains(Modifier::REVERSED) {
315− map_error(queue!(w, SetAttribute(CAttribute::NoReverse)))?;
327+ queue!(w, SetAttribute(CAttribute::NoReverse))?;
316 }
328 }
317 if removed.contains(Modifier::BOLD) {
329 if removed.contains(Modifier::BOLD) {
318− map_error(queue!(w, SetAttribute(CAttribute::NormalIntensity)))?;
330+ queue!(w, SetAttribute(CAttribute::NormalIntensity))?;
319 if self.to.contains(Modifier::DIM) {
331 if self.to.contains(Modifier::DIM) {
320− map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
332+ queue!(w, SetAttribute(CAttribute::Dim))?;
321 }
333 }
322 }
334 }
323 if removed.contains(Modifier::ITALIC) {
335 if removed.contains(Modifier::ITALIC) {
324− map_error(queue!(w, SetAttribute(CAttribute::NoItalic)))?;
336+ queue!(w, SetAttribute(CAttribute::NoItalic))?;
325 }
337 }
326 if removed.contains(Modifier::DIM) {
338 if removed.contains(Modifier::DIM) {
327− map_error(queue!(w, SetAttribute(CAttribute::NormalIntensity)))?;
339+ queue!(w, SetAttribute(CAttribute::NormalIntensity))?;
328 }
340 }
329 if removed.contains(Modifier::CROSSED_OUT) {
341 if removed.contains(Modifier::CROSSED_OUT) {
330− map_error(queue!(w, SetAttribute(CAttribute::NotCrossedOut)))?;
342+ queue!(w, SetAttribute(CAttribute::NotCrossedOut))?;
331 }
343 }
332 if removed.contains(Modifier::SLOW_BLINK) || removed.contains(Modifier::RAPID_BLINK) {
344 if removed.contains(Modifier::SLOW_BLINK) || removed.contains(Modifier::RAPID_BLINK) {
333− map_error(queue!(w, SetAttribute(CAttribute::NoBlink)))?;
345+ queue!(w, SetAttribute(CAttribute::NoBlink))?;
346+ }
347+ if removed.contains(Modifier::HIDDEN) {
348+ queue!(w, SetAttribute(CAttribute::NoHidden))?;
334 }
349 }
335
350
336 let added = self.to - self.from;
351 let added = self.to - self.from;
337 if added.contains(Modifier::REVERSED) {
352 if added.contains(Modifier::REVERSED) {
338− map_error(queue!(w, SetAttribute(CAttribute::Reverse)))?;
353+ queue!(w, SetAttribute(CAttribute::Reverse))?;
339 }
354 }
340 if added.contains(Modifier::BOLD) {
355 if added.contains(Modifier::BOLD) {
341− map_error(queue!(w, SetAttribute(CAttribute::Bold)))?;
356+ queue!(w, SetAttribute(CAttribute::Bold))?;
342 }
357 }
343 if added.contains(Modifier::ITALIC) {
358 if added.contains(Modifier::ITALIC) {
344− map_error(queue!(w, SetAttribute(CAttribute::Italic)))?;
359+ queue!(w, SetAttribute(CAttribute::Italic))?;
345 }
360 }
346 if added.contains(Modifier::DIM) {
361 if added.contains(Modifier::DIM) {
347− map_error(queue!(w, SetAttribute(CAttribute::Dim)))?;
362+ queue!(w, SetAttribute(CAttribute::Dim))?;
348 }
363 }
349 if added.contains(Modifier::CROSSED_OUT) {
364 if added.contains(Modifier::CROSSED_OUT) {
350− map_error(queue!(w, SetAttribute(CAttribute::CrossedOut)))?;
365+ queue!(w, SetAttribute(CAttribute::CrossedOut))?;
351 }
366 }
352 if added.contains(Modifier::SLOW_BLINK) {
367 if added.contains(Modifier::SLOW_BLINK) {
353− map_error(queue!(w, SetAttribute(CAttribute::SlowBlink)))?;
368+ queue!(w, SetAttribute(CAttribute::SlowBlink))?;
354 }
369 }
355 if added.contains(Modifier::RAPID_BLINK) {
370 if added.contains(Modifier::RAPID_BLINK) {
356− map_error(queue!(w, SetAttribute(CAttribute::RapidBlink)))?;
371+ queue!(w, SetAttribute(CAttribute::RapidBlink))?;
372+ }
373+ if added.contains(Modifier::HIDDEN) {
374+ queue!(w, SetAttribute(CAttribute::Hidden))?;
357 }
375 }
358
376
359 Ok(())
377 Ok(())
@@ -407,7 +425,7 @@ impl Command for SetUnderlineColor {
407 }
425 }
408
426
409 #[cfg(windows)]
427 #[cfg(windows)]
410− fn execute_winapi(&self) -> crossterm::Result<()> {
428+ fn execute_winapi(&self) -> io::Result<()> {
411 Err(std::io::Error::new(
429 Err(std::io::Error::new(
412 std::io::ErrorKind::Other,
430 std::io::ErrorKind::Other,
413 "SetUnderlineColor not supported by winapi.",
431 "SetUnderlineColor not supported by winapi.",
helix-tui/src/buffer.rs+2−2
@@ -213,7 +213,7 @@ impl Buffer {
213 && y < self.area.bottom()
213 && y < self.area.bottom()
214 }
214 }
215
215
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.
217 ///
217 ///
218 /// Global coordinates are offset by the Buffer's area offset (`x`/`y`).
218 /// Global coordinates are offset by the Buffer's area offset (`x`/`y`).
219 ///
219 ///
@@ -242,7 +242,7 @@ impl Buffer {
242 ((y - self.area.y) as usize) * (self.area.width as usize) + ((x - self.area.x) as usize)
242 ((y - self.area.y) as usize) * (self.area.width as usize) + ((x - self.area.x) as usize)
243 }
243 }
244
244
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,
246 /// or `None` if the coordinates are outside the buffer's area.
246 /// or `None` if the coordinates are outside the buffer's area.
247 fn index_of_opt(&self, x: u16, y: u16) -> Option<usize> {
247 fn index_of_opt(&self, x: u16, y: u16) -> Option<usize> {
248 if self.in_bounds(x, y) {
248 if self.in_bounds(x, y) {
helix-vcs/Cargo.toml+12−10
@@ -1,23 +1,25 @@
1[package]
1[package]
2name = "helix-vcs"
2name = "helix-vcs"
3−version = "0.6.0"
3+version.workspace = true
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
4+authors.workspace = true
5−edition = "2021"
5+edition.workspace = true
6−license = "MPL-2.0"
6+license.workspace = true
7+rust-version.workspace = true
7−categories = ["editor"]
8+categories.workspace = true
8−repository = "https://github.com/helix-editor/helix"
9+repository.workspace = true
9−homepage = "https://helix-editor.com"
10+homepage.workspace = true
10
11
11# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
12# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
12
13
13[dependencies]
14[dependencies]
14−helix-core = { version = "0.6", path = "../helix-core" }
15+helix-core = { path = "../helix-core" }
16+helix-event = { path = "../helix-event" }
15
17
16tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
18tokio = { version = "1", features = ["rt", "rt-multi-thread", "time", "sync", "parking_lot", "macros"] }
17parking_lot = "0.12"
19parking_lot = "0.12"
18arc-swap = { version = "1.6.0" }
20arc-swap = { version = "1.6.0" }
19
21
20−gix = { version = "0.48.0", default-features = false , optional = true }
22+gix = { version = "0.57.0", default-features = false , optional = true }
21imara-diff = "0.1.5"
23imara-diff = "0.1.5"
22anyhow = "1"
24anyhow = "1"
23
25
@@ -27,4 +29,4 @@ log = "0.4"
27git = ["gix"]
29git = ["gix"]
28
30
29[dev-dependencies]
31[dev-dependencies]
30−tempfile = "3.7"
32+tempfile = "3.8"
helix-vcs/src/diff.rs+6−19
@@ -2,10 +2,10 @@ use std::ops::Range;
2use std::sync::Arc;
2use std::sync::Arc;
3
3
4use helix_core::Rope;
4use helix_core::Rope;
5+use helix_event::RenderLockGuard;
5use imara_diff::Algorithm;
6use imara_diff::Algorithm;
6use parking_lot::{Mutex, MutexGuard};
7use parking_lot::{Mutex, MutexGuard};
7use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
8use tokio::sync::mpsc::{unbounded_channel, UnboundedSender};
8−use tokio::sync::{Notify, OwnedRwLockReadGuard, RwLock};
9use tokio::task::JoinHandle;
9use tokio::task::JoinHandle;
10use tokio::time::Instant;
10use tokio::time::Instant;
11
11
@@ -14,11 +14,9 @@ use crate::diff::worker::DiffWorker;
14mod line_cache;
14mod line_cache;
15mod worker;
15mod worker;
16
16
17−type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
18−
19/// A rendering lock passed to the differ the prevents redraws from occurring
17/// A rendering lock passed to the differ the prevents redraws from occurring
20struct RenderLock {
18struct RenderLock {
21− pub lock: OwnedRwLockReadGuard<()>,
19+ pub lock: RenderLockGuard,
22 pub timeout: Option<Instant>,
20 pub timeout: Option<Instant>,
23}
21}
24
22
@@ -38,28 +36,22 @@ struct DiffInner {
38#[derive(Clone, Debug)]
36#[derive(Clone, Debug)]
39pub struct DiffHandle {
37pub struct DiffHandle {
40 channel: UnboundedSender<Event>,
38 channel: UnboundedSender<Event>,
41− render_lock: Arc<RwLock<()>>,
42 diff: Arc<Mutex<DiffInner>>,
39 diff: Arc<Mutex<DiffInner>>,
43 inverted: bool,
40 inverted: bool,
44}
41}
45
42
46impl DiffHandle {
43impl DiffHandle {
47− pub fn new(diff_base: Rope, doc: Rope, redraw_handle: RedrawHandle) -> DiffHandle {
44+ pub fn new(diff_base: Rope, doc: Rope) -> DiffHandle {
48− DiffHandle::new_with_handle(diff_base, doc, redraw_handle).0
45+ DiffHandle::new_with_handle(diff_base, doc).0
49 }
46 }
50
47
51− fn new_with_handle(
52− diff_base: Rope,
53− doc: Rope,
54− redraw_handle: RedrawHandle,
55− ) -> (DiffHandle, JoinHandle<()>) {
48+ fn new_with_handle(diff_base: Rope, doc: Rope) -> (DiffHandle, JoinHandle<()>) {
56 let (sender, receiver) = unbounded_channel();
49 let (sender, receiver) = unbounded_channel();
57 let diff: Arc<Mutex<DiffInner>> = Arc::default();
50 let diff: Arc<Mutex<DiffInner>> = Arc::default();
58 let worker = DiffWorker {
51 let worker = DiffWorker {
59 channel: receiver,
52 channel: receiver,
60 diff: diff.clone(),
53 diff: diff.clone(),
61 new_hunks: Vec::default(),
54 new_hunks: Vec::default(),
62− redraw_notify: redraw_handle.0,
63 diff_finished_notify: Arc::default(),
55 diff_finished_notify: Arc::default(),
64 };
56 };
65 let handle = tokio::spawn(worker.run(diff_base, doc));
57 let handle = tokio::spawn(worker.run(diff_base, doc));
@@ -67,7 +59,6 @@ impl DiffHandle {
67 channel: sender,
59 channel: sender,
68 diff,
60 diff,
69 inverted: false,
61 inverted: false,
70− render_lock: redraw_handle.1,
71 };
62 };
72 (differ, handle)
63 (differ, handle)
73 }
64 }
@@ -87,11 +78,7 @@ impl DiffHandle {
87 /// This function is only intended to be called from within the rendering loop
78 /// This function is only intended to be called from within the rendering loop
88 /// if called from elsewhere it may fail to acquire the render lock and panic
79 /// if called from elsewhere it may fail to acquire the render lock and panic
89 pub fn update_document(&self, doc: Rope, block: bool) -> bool {
80 pub fn update_document(&self, doc: Rope, block: bool) -> bool {
90− // unwrap is ok here because the rendering lock is
81+ let lock = helix_event::lock_frame();
91− // only exclusively locked during redraw.
92− // This function is only intended to be called
93− // from the core rendering loop where no redraw can happen in parallel
94− let lock = self.render_lock.clone().try_read_owned().unwrap();
95 let timeout = if block {
82 let timeout = if block {
96 None
83 None
97 } else {
84 } else {
helix-vcs/src/diff/worker.rs+3−9
@@ -23,7 +23,6 @@ pub(super) struct DiffWorker {
23 pub channel: UnboundedReceiver<Event>,
23 pub channel: UnboundedReceiver<Event>,
24 pub diff: Arc<Mutex<DiffInner>>,
24 pub diff: Arc<Mutex<DiffInner>>,
25 pub new_hunks: Vec<Hunk>,
25 pub new_hunks: Vec<Hunk>,
26− pub redraw_notify: Arc<Notify>,
27 pub diff_finished_notify: Arc<Notify>,
26 pub diff_finished_notify: Arc<Notify>,
28}
27}
29
28
@@ -32,11 +31,7 @@ impl DiffWorker {
32 let mut accumulator = EventAccumulator::new();
31 let mut accumulator = EventAccumulator::new();
33 accumulator.handle_event(event).await;
32 accumulator.handle_event(event).await;
34 accumulator
33 accumulator
35− .accumulate_debounced_events(
36− &mut self.channel,
37− self.redraw_notify.clone(),
38− self.diff_finished_notify.clone(),
34+ .accumulate_debounced_events(&mut self.channel, self.diff_finished_notify.clone())
39− )
40 .await;
35 .await;
41 (accumulator.doc, accumulator.diff_base)
36 (accumulator.doc, accumulator.diff_base)
42 }
37 }
@@ -137,7 +132,6 @@ impl<'a> EventAccumulator {
137 async fn accumulate_debounced_events(
132 async fn accumulate_debounced_events(
138 &mut self,
133 &mut self,
139 channel: &mut UnboundedReceiver<Event>,
134 channel: &mut UnboundedReceiver<Event>,
140− redraw_notify: Arc<Notify>,
141 diff_finished_notify: Arc<Notify>,
135 diff_finished_notify: Arc<Notify>,
142 ) {
136 ) {
143 let async_debounce = Duration::from_millis(DIFF_DEBOUNCE_TIME_ASYNC);
137 let async_debounce = Duration::from_millis(DIFF_DEBOUNCE_TIME_ASYNC);
@@ -164,7 +158,7 @@ impl<'a> EventAccumulator {
164 None => {
158 None => {
165 tokio::spawn(async move {
159 tokio::spawn(async move {
166 diff_finished_notify.notified().await;
160 diff_finished_notify.notified().await;
167− redraw_notify.notify_one();
161+ helix_event::request_redraw();
168 });
162 });
169 }
163 }
170 // diff is performed inside the rendering loop
164 // diff is performed inside the rendering loop
@@ -190,7 +184,7 @@ impl<'a> EventAccumulator {
190 // and wait until the diff occurs to trigger an async redraw
184 // and wait until the diff occurs to trigger an async redraw
191 log::info!("Diff computation timed out, update of diffs might appear delayed");
185 log::info!("Diff computation timed out, update of diffs might appear delayed");
192 diff_finished_notify.notified().await;
186 diff_finished_notify.notified().await;
193− redraw_notify.notify_one();
187+ helix_event::request_redraw()
194 });
188 });
195 }
189 }
196 // a blocking diff is performed inside the rendering loop
190 // a blocking diff is performed inside the rendering loop
helix-vcs/src/diff/worker/test.rs+1−5
@@ -5,11 +5,7 @@ use crate::diff::{DiffHandle, Hunk};
5
5
6impl DiffHandle {
6impl DiffHandle {
7 fn new_test(diff_base: &str, doc: &str) -> (DiffHandle, JoinHandle<()>) {
7 fn new_test(diff_base: &str, doc: &str) -> (DiffHandle, JoinHandle<()>) {
8− DiffHandle::new_with_handle(
8+ DiffHandle::new_with_handle(Rope::from_str(diff_base), Rope::from_str(doc))
9− Rope::from_str(diff_base),
10− Rope::from_str(doc),
11− Default::default(),
12− )
13 }
9 }
14 async fn into_diff(self, handle: JoinHandle<()>) -> Vec<Hunk> {
10 async fn into_diff(self, handle: JoinHandle<()>) -> Vec<Hunk> {
15 let diff = self.diff;
11 let diff = self.diff;
helix-vcs/src/git.rs+5−5
@@ -3,7 +3,7 @@ use arc_swap::ArcSwap;
3use std::path::Path;
3use std::path::Path;
4use std::sync::Arc;
4use std::sync::Arc;
5
5
6−use gix::objs::tree::EntryMode;
6+use gix::objs::tree::EntryKind;
7use gix::sec::trust::DefaultForLevel;
7use gix::sec::trust::DefaultForLevel;
8use gix::{Commit, ObjectId, Repository, ThreadSafeRepository};
8use gix::{Commit, ObjectId, Repository, ThreadSafeRepository};
9
9
@@ -126,14 +126,14 @@ fn find_file_in_commit(repo: &Repository, commit: &Commit, file: &Path) -> Resul
126 let rel_path = file.strip_prefix(repo_dir)?;
126 let rel_path = file.strip_prefix(repo_dir)?;
127 let tree = commit.tree()?;
127 let tree = commit.tree()?;
128 let tree_entry = tree
128 let tree_entry = tree
129− .lookup_entry_by_path(rel_path)?
129+ .lookup_entry_by_path(rel_path, &mut Vec::new())?
130 .context("file is untracked")?;
130 .context("file is untracked")?;
131− match tree_entry.mode() {
131+ match tree_entry.mode().kind() {
132 // not a file, everything is new, do not show diff
132 // 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) => {
134 bail!("entry at {} is not a file but a {mode:?}", file.display())
134 bail!("entry at {} is not a file but a {mode:?}", file.display())
135 }
135 }
136 // found a file
136 // found a file
137− EntryMode::Blob | EntryMode::BlobExecutable => Ok(tree_entry.object_id()),
137+ EntryKind::Blob | EntryKind::BlobExecutable => Ok(tree_entry.object_id()),
138 }
138 }
139}
139}
helix-view/Cargo.toml+20−17
@@ -1,31 +1,34 @@
1[package]
1[package]
2name = "helix-view"
2name = "helix-view"
3−version = "0.6.0"
4−authors = ["Blaž Hrastnik <blaz@mxxn.io>"]
5−edition = "2021"
6−license = "MPL-2.0"
7description = "UI abstractions for use in backends"
3description = "UI abstractions for use in backends"
4+version.workspace = true
5+authors.workspace = true
6+edition.workspace = true
7+license.workspace = true
8+rust-version.workspace = true
8−categories = ["editor"]
9+categories.workspace = true
9−repository = "https://github.com/helix-editor/helix"
10+repository.workspace = true
10−homepage = "https://helix-editor.com"
11+homepage.workspace = true
11
12
12[features]
13[features]
13default = []
14default = []
14term = ["crossterm"]
15term = ["crossterm"]
15
16
16[dependencies]
17[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+
17bitflags = "2.4"
25bitflags = "2.4"
18anyhow = "1"
26anyhow = "1"
19−helix-core = { version = "0.6", path = "../helix-core" }
20−helix-loader = { version = "0.6", path = "../helix-loader" }
21−helix-lsp = { version = "0.6", path = "../helix-lsp" }
22−helix-dap = { version = "0.6", path = "../helix-dap" }
23−crossterm = { version = "0.26", optional = true }
27+crossterm = { version = "0.27", optional = true }
24−helix-vcs = { version = "0.6", path = "../helix-vcs" }
25
28
26# Conversion traits
29# Conversion traits
27−once_cell = "1.18"
30+once_cell = "1.19"
28−url = "2"
31+url = "2.5.0"
29
32
30arc-swap = { version = "1.6.0" }
33arc-swap = { version = "1.6.0" }
31
34
@@ -42,12 +45,12 @@ serde_json = "1.0"
42toml = "0.7"
45toml = "0.7"
43log = "~0.4"
46log = "~0.4"
44
47
45−which = "4.4"
48+which = "5.0.0"
46parking_lot = "0.12.1"
49parking_lot = "0.12.1"
47
50
48
51
49[target.'cfg(windows)'.dependencies]
52[target.'cfg(windows)'.dependencies]
50−clipboard-win = { version = "4.5", features = ["std"] }
53+clipboard-win = { version = "5.0", features = ["std"] }
51
54
52[target.'cfg(unix)'.dependencies]
55[target.'cfg(unix)'.dependencies]
53libc = "0.2"
56libc = "0.2"
helix-view/src/clipboard.rs+7−2
@@ -73,9 +73,14 @@ pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
73
73
74#[cfg(target_os = "macos")]
74#[cfg(target_os = "macos")]
75pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
75pub fn get_clipboard_provider() -> Box<dyn ClipboardProvider> {
76− use crate::env::binary_exists;
76+ use crate::env::{binary_exists, env_var_is_set};
77
77
78+ if env_var_is_set("TMUX") && binary_exists("tmux") {
79+ command_provider! {
80+ paste => "tmux", "save-buffer", "-";
81+ copy => "tmux", "load-buffer", "-w", "-";
82+ }
78− if binary_exists("pbcopy") && binary_exists("pbpaste") {
83+ } else if binary_exists("pbcopy") && binary_exists("pbpaste") {
79 command_provider! {
84 command_provider! {
80 paste => "pbpaste";
85 paste => "pbpaste";
81 copy => "pbcopy";
86 copy => "pbcopy";
helix-view/src/document.rs+68−32
@@ -33,7 +33,7 @@ use helix_core::{
33 ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction,
33 ChangeSet, Diagnostic, LineEnding, Range, Rope, RopeBuilder, Selection, Syntax, Transaction,
34};
34};
35
35
36−use crate::editor::{Config, RedrawHandle};
36+use crate::editor::Config;
37use crate::{DocumentId, Editor, Theme, View, ViewId};
37use crate::{DocumentId, Editor, Theme, View, ViewId};
38
38
39/// 8kB of buffer space for encoding and decoding `Rope`s.
39/// 8kB of buffer space for encoding and decoding `Rope`s.
@@ -733,16 +733,16 @@ impl Document {
733 // We can't use anyhow::Result here since the output of the future has to be
733 // We can't use anyhow::Result here since the output of the future has to be
734 // clonable to be used as shared future. So use a custom error type.
734 // clonable to be used as shared future. So use a custom error type.
735 pub fn format(&self) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
735 pub fn format(&self) -> Option<BoxFuture<'static, Result<Transaction, FormatterError>>> {
736− if let Some(formatter) = self
736+ if let Some((fmt_cmd, fmt_args)) = self
737 .language_config()
737 .language_config()
738− .and_then(|c| c.formatter.clone())
738+ .and_then(|c| c.formatter.as_ref())
739− .filter(|formatter| which::which(&formatter.command).is_ok())
739+ .and_then(|formatter| Some((which::which(&formatter.command).ok()?, &formatter.args)))
740 {
740 {
741 use std::process::Stdio;
741 use std::process::Stdio;
742 let text = self.text().clone();
742 let text = self.text().clone();
743− let mut process = tokio::process::Command::new(&formatter.command);
743+ let mut process = tokio::process::Command::new(&fmt_cmd);
744 process
744 process
745− .args(&formatter.args)
745+ .args(fmt_args)
746 .stdin(Stdio::piped())
746 .stdin(Stdio::piped())
747 .stdout(Stdio::piped())
747 .stdout(Stdio::piped())
748 .stderr(Stdio::piped());
748 .stderr(Stdio::piped());
@@ -751,7 +751,7 @@ impl Document {
751 let mut process = process
751 let mut process = process
752 .spawn()
752 .spawn()
753 .map_err(|e| FormatterError::SpawningFailed {
753 .map_err(|e| FormatterError::SpawningFailed {
754− command: formatter.command.clone(),
754+ command: fmt_cmd.to_string_lossy().into(),
755 error: e.kind(),
755 error: e.kind(),
756 })?;
756 })?;
757 {
757 {
@@ -995,7 +995,6 @@ impl Document {
995 &mut self,
995 &mut self,
996 view: &mut View,
996 view: &mut View,
997 provider_registry: &DiffProviderRegistry,
997 provider_registry: &DiffProviderRegistry,
998− redraw_handle: RedrawHandle,
999 ) -> Result<(), Error> {
998 ) -> Result<(), Error> {
1000 let encoding = self.encoding;
999 let encoding = self.encoding;
1001 let path = self
1000 let path = self
@@ -1023,7 +1022,7 @@ impl Document {
1023 self.detect_indent_and_line_ending();
1022 self.detect_indent_and_line_ending();
1024
1023
1025 match provider_registry.get_diff_base(&path) {
1024 match provider_registry.get_diff_base(&path) {
1026− Some(diff_base) => self.set_diff_base(diff_base, redraw_handle),
1025+ Some(diff_base) => self.set_diff_base(diff_base),
1027 None => self.diff_handle = None,
1026 None => self.diff_handle = None,
1028 }
1027 }
1029
1028
@@ -1207,30 +1206,47 @@ impl Document {
1207 transaction.changes(),
1206 transaction.changes(),
1208 );
1207 );
1209 if res.is_err() {
1208 if res.is_err() {
1210− log::error!("TS parser failed, disabeling TS for the current buffer: {res:?}");
1209+ log::error!("TS parser failed, disabling TS for the current buffer: {res:?}");
1211 self.syntax = None;
1210 self.syntax = None;
1212 }
1211 }
1213 }
1212 }
1214
1213
1215 let changes = transaction.changes();
1214 let changes = transaction.changes();
1216
1215
1217− changes.update_positions(
1218− self.diagnostics
1219− .iter_mut()
1220− .map(|diagnostic| (&mut diagnostic.range.start, Assoc::After)),
1221− );
1222− changes.update_positions(
1223− self.diagnostics
1224− .iter_mut()
1225− .map(|diagnostic| (&mut diagnostic.range.end, Assoc::After)),
1226− );
1227− // map state.diagnostics over changes::map_pos too
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+ }));
1228− for diagnostic in &mut self.diagnostics {
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+ }
1229 diagnostic.line = self.text.char_to_line(diagnostic.range.start);
1239 diagnostic.line = self.text.char_to_line(diagnostic.range.start);
1240+ true
1230− }
1241+ });
1231
1242
1232− self.diagnostics
1233− .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+ });
1234
1250
1235 // Update the inlay hint annotations' positions, helping ensure they are displayed in the proper place
1251 // Update the inlay hint annotations' positions, helping ensure they are displayed in the proper place
1236 let apply_inlay_hint_changes = |annotations: &mut Rc<[InlineAnnotation]>| {
1252 let apply_inlay_hint_changes = |annotations: &mut Rc<[InlineAnnotation]>| {
@@ -1583,13 +1599,13 @@ impl Document {
1583 }
1599 }
1584
1600
1585 /// Intialize/updates the differ for this document with a new base.
1601 /// Intialize/updates the differ for this document with a new base.
1586− pub fn set_diff_base(&mut self, diff_base: Vec<u8>, redraw_handle: RedrawHandle) {
1602+ pub fn set_diff_base(&mut self, diff_base: Vec<u8>) {
1587 if let Ok((diff_base, ..)) = from_reader(&mut diff_base.as_slice(), Some(self.encoding)) {
1603 if let Ok((diff_base, ..)) = from_reader(&mut diff_base.as_slice(), Some(self.encoding)) {
1588 if let Some(differ) = &self.diff_handle {
1604 if let Some(differ) = &self.diff_handle {
1589 differ.update_diff_base(diff_base);
1605 differ.update_diff_base(diff_base);
1590 return;
1606 return;
1591 }
1607 }
1592− self.diff_handle = Some(DiffHandle::new(diff_base, self.text.clone(), redraw_handle))
1608+ self.diff_handle = Some(DiffHandle::new(diff_base, self.text.clone()))
1593 } else {
1609 } else {
1594 self.diff_handle = None;
1610 self.diff_handle = None;
1595 }
1611 }
@@ -1707,13 +1723,33 @@ impl Document {
1707
1723
1708 pub fn replace_diagnostics(
1724 pub fn replace_diagnostics(
1709 &mut self,
1725 &mut self,
1710− mut diagnostics: Vec<Diagnostic>,
1726+ diagnostics: impl IntoIterator<Item = Diagnostic>,
1727+ unchanged_sources: &[String],
1711 language_server_id: usize,
1728 language_server_id: usize,
1712 ) {
1729 ) {
1730+ if unchanged_sources.is_empty() {
1713− self.clear_diagnostics(language_server_id);
1731+ self.clear_diagnostics(language_server_id);
1732+ } else {
1714− self.diagnostics.append(&mut diagnostics);
1733+ self.diagnostics.retain(|d| {
1715− self.diagnostics
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);
1716− .sort_unstable_by_key(|diagnostic| diagnostic.range);
1746+ self.diagnostics.sort_unstable_by_key(|diagnostic| {
1747+ (
1748+ diagnostic.range,
1749+ diagnostic.severity,
1750+ diagnostic.language_server_id,
1751+ )
1752+ });
1717 }
1753 }
1718
1754
1719 pub fn clear_diagnostics(&mut self, language_server_id: usize) {
1755 pub fn clear_diagnostics(&mut self, language_server_id: usize) {
helix-view/src/editor.rs+91−66
@@ -32,7 +32,7 @@ use std::{
32use tokio::{
32use tokio::{
33 sync::{
33 sync::{
34 mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
34 mpsc::{unbounded_channel, UnboundedReceiver, UnboundedSender},
35− oneshot, Notify, RwLock,
35+ oneshot,
36 },
36 },
37 time::{sleep, Duration, Instant, Sleep},
37 time::{sleep, Duration, Instant, Sleep},
38};
38};
@@ -42,10 +42,9 @@ use anyhow::{anyhow, bail, Error};
42pub use helix_core::diagnostic::Severity;
42pub use helix_core::diagnostic::Severity;
43use helix_core::{
43use helix_core::{
44 auto_pairs::AutoPairs,
44 auto_pairs::AutoPairs,
45− syntax::{self, AutoPairConfig, SoftWrap},
45+ syntax::{self, AutoPairConfig, IndentationHeuristic, SoftWrap},
46− Change, LineEnding, NATIVE_LINE_ENDING,
46+ Change, LineEnding, Position, Selection, NATIVE_LINE_ENDING,
47};
47};
48−use helix_core::{Position, Selection};
49use helix_dap as dap;
48use helix_dap as dap;
50use helix_lsp::lsp;
49use helix_lsp::lsp;
51
50
@@ -244,7 +243,7 @@ pub struct Config {
244 /// Set a global text_width
243 /// Set a global text_width
245 pub text_width: usize,
244 pub text_width: usize,
246 /// Time in milliseconds since last keypress before idle timers trigger.
245 /// Time in milliseconds since last keypress before idle timers trigger.
247− /// Used for autocompletion, set to 0 for instant. Defaults to 400ms.
246+ /// Used for autocompletion, set to 0 for instant. Defaults to 250ms.
248 #[serde(
247 #[serde(
249 serialize_with = "serialize_duration_millis",
248 serialize_with = "serialize_duration_millis",
250 deserialize_with = "deserialize_duration_millis"
249 deserialize_with = "deserialize_duration_millis"
@@ -287,8 +286,15 @@ pub struct Config {
287 pub workspace_lsp_roots: Vec<PathBuf>,
286 pub workspace_lsp_roots: Vec<PathBuf>,
288 /// Which line ending to choose for new documents. Defaults to `native`. i.e. `crlf` on Windows, otherwise `lf`.
287 /// Which line ending to choose for new documents. Defaults to `native`. i.e. `crlf` on Windows, otherwise `lf`.
289 pub default_line_ending: LineEndingConfig,
288 pub default_line_ending: LineEndingConfig,
289+ /// Whether to automatically insert a trailing line-ending on write if missing. Defaults to `true`.
290+ pub insert_final_newline: bool,
290 /// Enables smart tab
291 /// Enables smart tab
291 pub smart_tab: Option<SmartTabConfig>,
292 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,
292}
298}
293
299
294#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
300#[derive(Debug, Clone, PartialEq, Deserialize, Serialize, Eq, PartialOrd, Ord)]
@@ -725,7 +731,7 @@ pub struct WhitespaceCharacters {
725impl Default for WhitespaceCharacters {
731impl Default for WhitespaceCharacters {
726 fn default() -> Self {
732 fn default() -> Self {
727 Self {
733 Self {
728− space: '·', // U+00B7
734+ space: '·', // U+00B7
729 nbsp: '⍽', // U+237D
735 nbsp: '⍽', // U+237D
730 tab: '→', // U+2192
736 tab: '→', // U+2192
731 newline: '⏎', // U+23CE
737 newline: '⏎', // U+23CE
@@ -753,12 +759,13 @@ impl Default for IndentGuidesConfig {
753}
759}
754
760
755/// Line ending configuration.
761/// Line ending configuration.
756−#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
762+#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
757#[serde(rename_all = "lowercase")]
763#[serde(rename_all = "lowercase")]
758pub enum LineEndingConfig {
764pub enum LineEndingConfig {
759 /// The platform's native line ending.
765 /// The platform's native line ending.
760 ///
766 ///
761 /// `crlf` on Windows, otherwise `lf`.
767 /// `crlf` on Windows, otherwise `lf`.
768+ #[default]
762 Native,
769 Native,
763 /// Line feed.
770 /// Line feed.
764 LF,
771 LF,
@@ -775,12 +782,6 @@ pub enum LineEndingConfig {
775 Nel,
782 Nel,
776}
783}
777
784
778−impl Default for LineEndingConfig {
779− fn default() -> Self {
780− LineEndingConfig::Native
781− }
782−}
783−
784impl From<LineEndingConfig> for LineEnding {
785impl From<LineEndingConfig> for LineEnding {
785 fn from(line_ending: LineEndingConfig) -> Self {
786 fn from(line_ending: LineEndingConfig) -> Self {
786 match line_ending {
787 match line_ending {
@@ -797,6 +798,15 @@ impl From<LineEndingConfig> for LineEnding {
797 }
798 }
798}
799}
799
800
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+
800impl Default for Config {
810impl Default for Config {
801 fn default() -> Self {
811 fn default() -> Self {
802 Self {
812 Self {
@@ -817,7 +827,7 @@ impl Default for Config {
817 auto_completion: true,
827 auto_completion: true,
818 auto_format: true,
828 auto_format: true,
819 auto_save: false,
829 auto_save: false,
820− idle_timeout: Duration::from_millis(400),
830+ idle_timeout: Duration::from_millis(250),
821 preview_completion_insert: true,
831 preview_completion_insert: true,
822 completion_trigger_len: 2,
832 completion_trigger_len: 2,
823 auto_info: true,
833 auto_info: true,
@@ -842,7 +852,10 @@ impl Default for Config {
842 completion_replace: false,
852 completion_replace: false,
843 workspace_lsp_roots: Vec::new(),
853 workspace_lsp_roots: Vec::new(),
844 default_line_ending: LineEndingConfig::default(),
854 default_line_ending: LineEndingConfig::default(),
855+ insert_final_newline: true,
845 smart_tab: Some(SmartTabConfig::default()),
856 smart_tab: Some(SmartTabConfig::default()),
857+ popup_border: PopupBorderConfig::None,
858+ indent_heuristic: IndentationHeuristic::default(),
846 }
859 }
847 }
860 }
848}
861}
@@ -925,10 +938,6 @@ pub struct Editor {
925 pub exit_code: i32,
938 pub exit_code: i32,
926
939
927 pub config_events: (UnboundedSender<ConfigEvent>, UnboundedReceiver<ConfigEvent>),
940 pub config_events: (UnboundedSender<ConfigEvent>, UnboundedReceiver<ConfigEvent>),
928− /// Allows asynchronous tasks to control the rendering
929− /// The `Notify` allows asynchronous tasks to request the editor to perform a redraw
930− /// The `RwLock` blocks the editor from performing the render until an exclusive lock can be acquired
931− pub redraw_handle: RedrawHandle,
932 pub needs_redraw: bool,
941 pub needs_redraw: bool,
933 /// Cached position of the cursor calculated during rendering.
942 /// Cached position of the cursor calculated during rendering.
934 /// The content of `cursor_cache` is returned by `Editor::cursor` if
943 /// The content of `cursor_cache` is returned by `Editor::cursor` if
@@ -955,8 +964,6 @@ pub struct Editor {
955
964
956pub type Motion = Box<dyn Fn(&mut Editor)>;
965pub type Motion = Box<dyn Fn(&mut Editor)>;
957
966
958−pub type RedrawHandle = (Arc<Notify>, Arc<RwLock<()>>);
959−
960#[derive(Debug)]
967#[derive(Debug)]
961pub enum EditorEvent {
968pub enum EditorEvent {
962 DocumentSaved(DocumentSavedEventResult),
969 DocumentSaved(DocumentSavedEventResult),
@@ -1062,13 +1069,22 @@ impl Editor {
1062 auto_pairs,
1069 auto_pairs,
1063 exit_code: 0,
1070 exit_code: 0,
1064 config_events: unbounded_channel(),
1071 config_events: unbounded_channel(),
1065− redraw_handle: Default::default(),
1066 needs_redraw: false,
1072 needs_redraw: false,
1067 cursor_cache: Cell::new(None),
1073 cursor_cache: Cell::new(None),
1068 completion_request_handle: None,
1074 completion_request_handle: None,
1069 }
1075 }
1070 }
1076 }
1071
1077
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+
1072 pub fn apply_motion<F: Fn(&mut Self) + 'static>(&mut self, motion: F) {
1088 pub fn apply_motion<F: Fn(&mut Self) + 'static>(&mut self, motion: F) {
1073 motion(self);
1089 motion(self);
1074 self.last_motion = Some(Box::new(motion));
1090 self.last_motion = Some(Box::new(motion));
@@ -1192,71 +1208,80 @@ impl Editor {
1192 }
1208 }
1193
1209
1194 /// Refreshes the language server for a given document
1210 /// Refreshes the language server for a given document
1195− pub fn refresh_language_servers(&mut self, doc_id: DocumentId) -> Option<()> {
1211+ pub fn refresh_language_servers(&mut self, doc_id: DocumentId) {
1196 self.launch_language_servers(doc_id)
1212 self.launch_language_servers(doc_id)
1197 }
1213 }
1198
1214
1199 /// Launch a language server for a given document
1215 /// Launch a language server for a given document
1200− fn launch_language_servers(&mut self, doc_id: DocumentId) -> Option<()> {
1216+ fn launch_language_servers(&mut self, doc_id: DocumentId) {
1201 if !self.config().lsp.enable {
1217 if !self.config().lsp.enable {
1202− return None;
1218+ return;
1203 }
1219 }
1204 // if doc doesn't have a URL it's a scratch buffer, ignore it
1220 // if doc doesn't have a URL it's a scratch buffer, ignore it
1205− let doc = self.documents.get_mut(&doc_id)?;
1221+ let Some(doc) = self.documents.get_mut(&doc_id) else {
1222+ return;
1223+ };
1206− let doc_url = doc.url()?;
1224+ let Some(doc_url) = doc.url() else {
1225+ return;
1226+ };
1207 let (lang, path) = (doc.language.clone(), doc.path().cloned());
1227 let (lang, path) = (doc.language.clone(), doc.path().cloned());
1208 let config = doc.config.load();
1228 let config = doc.config.load();
1209 let root_dirs = &config.workspace_lsp_roots;
1229 let root_dirs = &config.workspace_lsp_roots;
1210
1230
1211− // try to find language servers based on the language name
1231+ // store only successfully started language servers
1212− let language_servers = lang.as_ref().and_then(|language| {
1232+ let language_servers = lang.as_ref().map_or_else(HashMap::default, |language| {
1213 self.language_servers
1233 self.language_servers
1214 .get(language, path.as_ref(), root_dirs, config.lsp.snippets)
1234 .get(language, path.as_ref(), root_dirs, config.lsp.snippets)
1215− .map_err(|e| {
1235+ .filter_map(|(lang, client)| match client {
1236+ Ok(client) => Some((lang, client)),
1237+ Err(err) => {
1216− log::error!(
1238+ log::error!(
1217− "Failed to initialize the language servers for `{}` {{ {} }}",
1239+ "Failed to initialize the language servers for `{}` - `{}` {{ {} }}",
1218− language.scope(),
1240+ language.scope(),
1219− e
1241+ lang,
1220− )
1242+ err
1243+ );
1244+ None
1245+ }
1221 })
1246 })
1222− .ok()
1247+ .collect::<HashMap<_, _>>()
1223 });
1248 });
1224
1249
1225− if let Some(language_servers) = language_servers {
1250+ if language_servers.is_empty() {
1226− let language_id = doc.language_id().map(ToOwned::to_owned).unwrap_or_default();
1251+ return;
1227−
1228− // only spawn new language servers if the servers aren't the same
1229−
1230− let doc_language_servers_not_in_registry =
1231− doc.language_servers.iter().filter(|(name, doc_ls)| {
1232− language_servers
1233− .get(*name)
1234− .map_or(true, |ls| ls.id() != doc_ls.id())
1235− });
1252+ }
1236
1253
1237− for (_, language_server) in doc_language_servers_not_in_registry {
1254+ let language_id = doc.language_id().map(ToOwned::to_owned).unwrap_or_default();
1238− tokio::spawn(language_server.text_document_did_close(doc.identifier()));
1239− }
1240
1255
1256+ // only spawn new language servers if the servers aren't the same
1257+ let doc_language_servers_not_in_registry =
1241− let language_servers_not_in_doc = language_servers.iter().filter(|(name, ls)| {
1258+ doc.language_servers.iter().filter(|(name, doc_ls)| {
1242− doc.language_servers
1259+ language_servers
1243 .get(*name)
1260 .get(*name)
1244− .map_or(true, |doc_ls| ls.id() != doc_ls.id())
1261+ .map_or(true, |ls| ls.id() != doc_ls.id())
1245 });
1262 });
1246
1263
1247− for (_, language_server) in language_servers_not_in_doc {
1264+ for (_, language_server) in doc_language_servers_not_in_registry {
1248− // TODO: this now races with on_init code if the init happens too quickly
1249− tokio::spawn(language_server.text_document_did_open(
1265+ tokio::spawn(language_server.text_document_did_close(doc.identifier()));
1250− doc_url.clone(),
1266+ }
1251− doc.version(),
1267+
1252− doc.text(),
1268+ let language_servers_not_in_doc = language_servers.iter().filter(|(name, ls)| {
1253− language_id.clone(),
1269+ doc.language_servers
1254− ));
1270+ .get(*name)
1271+ .map_or(true, |doc_ls| ls.id() != doc_ls.id())
1255− }
1272+ });
1256
1273
1257− doc.language_servers = language_servers;
1274+ for (_, language_server) in language_servers_not_in_doc {
1275+ // TODO: this now races with on_init code if the init happens too quickly
1276+ tokio::spawn(language_server.text_document_did_open(
1277+ doc_url.clone(),
1278+ doc.version(),
1279+ doc.text(),
1280+ language_id.clone(),
1281+ ));
1258 }
1282 }
1259− Some(())
1283+
1284+ doc.language_servers = language_servers;
1260 }
1285 }
1261
1286
1262 fn _refresh(&mut self) {
1287 fn _refresh(&mut self) {
@@ -1453,12 +1478,12 @@ impl Editor {
1453 )?;
1478 )?;
1454
1479
1455 if let Some(diff_base) = self.diff_providers.get_diff_base(&path) {
1480 if let Some(diff_base) = self.diff_providers.get_diff_base(&path) {
1456− doc.set_diff_base(diff_base, self.redraw_handle.clone());
1481+ doc.set_diff_base(diff_base);
1457 }
1482 }
1458 doc.set_version_control_head(self.diff_providers.get_current_head_name(&path));
1483 doc.set_version_control_head(self.diff_providers.get_current_head_name(&path));
1459
1484
1460 let id = self.new_document(doc);
1485 let id = self.new_document(doc);
1461− let _ = self.launch_language_servers(id);
1486+ self.launch_language_servers(id);
1462
1487
1463 id
1488 id
1464 };
1489 };
@@ -1752,7 +1777,7 @@ impl Editor {
1752 return EditorEvent::DebuggerEvent(event)
1777 return EditorEvent::DebuggerEvent(event)
1753 }
1778 }
1754
1779
1755− _ = self.redraw_handle.0.notified() => {
1780+ _ = helix_event::redraw_requested() => {
1756 if !self.needs_redraw{
1781 if !self.needs_redraw{
1757 self.needs_redraw = true;
1782 self.needs_redraw = true;
1758 let timeout = Instant::now() + Duration::from_millis(33);
1783 let timeout = Instant::now() + Duration::from_millis(33);
helix-view/src/gutter.rs+4−5
@@ -9,8 +9,7 @@ use crate::{
9};
9};
10
10
11fn count_digits(n: usize) -> usize {
11fn count_digits(n: usize) -> usize {
12− // TODO: use checked_log10 when MSRV reaches 1.67
12+ (usize::checked_ilog10(n).unwrap_or(0) + 1) as usize
13− std::iter::successors(Some(n), |&n| (n >= 10).then_some(n / 10)).count()
14}
13}
15
14
16pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, bool, &mut String) -> Option<Style> + 'doc>;
15pub type GutterFn<'doc> = Box<dyn FnMut(usize, bool, bool, &mut String) -> Option<Style> + 'doc>;
@@ -94,9 +93,9 @@ pub fn diff<'doc>(
94 theme: &Theme,
93 theme: &Theme,
95 _is_focused: bool,
94 _is_focused: bool,
96) -> GutterFn<'doc> {
95) -> GutterFn<'doc> {
97− let added = theme.get("diff.plus");
96+ let added = theme.get("diff.plus.gutter");
98− let deleted = theme.get("diff.minus");
97+ let deleted = theme.get("diff.minus.gutter");
99− let modified = theme.get("diff.delta");
98+ let modified = theme.get("diff.delta.gutter");
100 if let Some(diff_handle) = doc.diff_handle() {
99 if let Some(diff_handle) = doc.diff_handle() {
101 let hunks = diff_handle.load();
100 let hunks = diff_handle.load();
102 let mut hunk_i = 0;
101 let mut hunk_i = 0;
helix-view/src/handlers/dap.rs+1−3
@@ -369,9 +369,7 @@ impl Editor {
369 {
369 {
370 Ok(process) => process,
370 Ok(process) => process,
371 Err(err) => {
371 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));
375 return true;
373 return true;
376 }
374 }
377 };
375 };
helix-view/src/input.rs+65−1
@@ -43,6 +43,10 @@ pub enum MouseEventKind {
43 ScrollDown,
43 ScrollDown,
44 /// Scrolled mouse wheel upwards (away from the user).
44 /// Scrolled mouse wheel upwards (away from the user).
45 ScrollUp,
45 ScrollUp,
46+ /// Scrolled mouse wheel leftwards.
47+ ScrollLeft,
48+ /// Scrolled mouse wheel rightwards.
49+ ScrollRight,
46}
50}
47
51
48/// Represents a mouse button.
52/// Represents a mouse button.
@@ -458,6 +462,8 @@ impl From<crossterm::event::MouseEventKind> for MouseEventKind {
458 crossterm::event::MouseEventKind::Moved => Self::Moved,
462 crossterm::event::MouseEventKind::Moved => Self::Moved,
459 crossterm::event::MouseEventKind::ScrollDown => Self::ScrollDown,
463 crossterm::event::MouseEventKind::ScrollDown => Self::ScrollDown,
460 crossterm::event::MouseEventKind::ScrollUp => Self::ScrollUp,
464 crossterm::event::MouseEventKind::ScrollUp => Self::ScrollUp,
465+ crossterm::event::MouseEventKind::ScrollLeft => Self::ScrollLeft,
466+ crossterm::event::MouseEventKind::ScrollRight => Self::ScrollRight,
461 }
467 }
462 }
468 }
463}
469}
@@ -543,7 +549,7 @@ pub fn parse_macro(keys_str: &str) -> anyhow::Result<Vec<KeyEvent>> {
543 if c == ">" {
549 if c == ">" {
544 keys_res = Err(anyhow!("Unmatched '>'"));
550 keys_res = Err(anyhow!("Unmatched '>'"));
545 } else if c != "<" {
551 } else if c != "<" {
546− keys.push(c);
552+ keys.push(if c == "-" { keys::MINUS } else { c });
547 i += end_i;
553 i += end_i;
548 } else {
554 } else {
549 match s.find('>').context("'>' expected") {
555 match s.find('>').context("'>' expected") {
@@ -807,6 +813,64 @@ mod test {
807 },
813 },
808 ])
814 ])
809 );
815 );
816+
817+ assert_eq!(
818+ parse_macro(":w aa-bb.txt<ret>").ok(),
819+ Some(vec![
820+ KeyEvent {
821+ code: KeyCode::Char(':'),
822+ modifiers: KeyModifiers::NONE,
823+ },
824+ KeyEvent {
825+ code: KeyCode::Char('w'),
826+ modifiers: KeyModifiers::NONE,
827+ },
828+ KeyEvent {
829+ code: KeyCode::Char(' '),
830+ modifiers: KeyModifiers::NONE,
831+ },
832+ KeyEvent {
833+ code: KeyCode::Char('a'),
834+ modifiers: KeyModifiers::NONE,
835+ },
836+ KeyEvent {
837+ code: KeyCode::Char('a'),
838+ modifiers: KeyModifiers::NONE,
839+ },
840+ KeyEvent {
841+ code: KeyCode::Char('-'),
842+ modifiers: KeyModifiers::NONE,
843+ },
844+ KeyEvent {
845+ code: KeyCode::Char('b'),
846+ modifiers: KeyModifiers::NONE,
847+ },
848+ KeyEvent {
849+ code: KeyCode::Char('b'),
850+ modifiers: KeyModifiers::NONE,
851+ },
852+ KeyEvent {
853+ code: KeyCode::Char('.'),
854+ modifiers: KeyModifiers::NONE,
855+ },
856+ KeyEvent {
857+ code: KeyCode::Char('t'),
858+ modifiers: KeyModifiers::NONE,
859+ },
860+ KeyEvent {
861+ code: KeyCode::Char('x'),
862+ modifiers: KeyModifiers::NONE,
863+ },
864+ KeyEvent {
865+ code: KeyCode::Char('t'),
866+ modifiers: KeyModifiers::NONE,
867+ },
868+ KeyEvent {
869+ code: KeyCode::Enter,
870+ modifiers: KeyModifiers::NONE,
871+ },
872+ ])
873+ );
810 }
874 }
811
875
812 #[test]
876 #[test]
helix-view/src/register.rs+10−10
@@ -75,8 +75,8 @@ impl Registers {
75 self.clipboard_provider.as_ref(),
75 self.clipboard_provider.as_ref(),
76 self.inner.get(&name),
76 self.inner.get(&name),
77 match name {
77 match name {
78− '*' => ClipboardType::Clipboard,
78+ '+' => ClipboardType::Clipboard,
79− '+' => ClipboardType::Selection,
79+ '*' => ClipboardType::Selection,
80 _ => unreachable!(),
80 _ => unreachable!(),
81 },
81 },
82 )),
82 )),
@@ -95,8 +95,8 @@ impl Registers {
95 self.clipboard_provider.set_contents(
95 self.clipboard_provider.set_contents(
96 values.join(NATIVE_LINE_ENDING.as_str()),
96 values.join(NATIVE_LINE_ENDING.as_str()),
97 match name {
97 match name {
98− '*' => ClipboardType::Clipboard,
98+ '+' => ClipboardType::Clipboard,
99− '+' => ClipboardType::Selection,
99+ '*' => ClipboardType::Selection,
100 _ => unreachable!(),
100 _ => unreachable!(),
101 },
101 },
102 )?;
102 )?;
@@ -118,8 +118,8 @@ impl Registers {
118 '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
118 '#' | '.' | '%' => Err(anyhow::anyhow!("Register {name} does not support pushing")),
119 '*' | '+' => {
119 '*' | '+' => {
120 let clipboard_type = match name {
120 let clipboard_type = match name {
121− '*' => ClipboardType::Clipboard,
121+ '+' => ClipboardType::Clipboard,
122− '+' => ClipboardType::Selection,
122+ '*' => ClipboardType::Selection,
123 _ => unreachable!(),
123 _ => unreachable!(),
124 };
124 };
125 let contents = self.clipboard_provider.get_contents(clipboard_type)?;
125 let contents = self.clipboard_provider.get_contents(clipboard_type)?;
@@ -172,8 +172,8 @@ impl Registers {
172 ('#', "<selection indices>"),
172 ('#', "<selection indices>"),
173 ('.', "<selection contents>"),
173 ('.', "<selection contents>"),
174 ('%', "<document path>"),
174 ('%', "<document path>"),
175− ('*', "<system clipboard>"),
175+ ('+', "<system clipboard>"),
176− ('+', "<primary clipboard>"),
176+ ('*', "<primary clipboard>"),
177 ]
177 ]
178 .iter()
178 .iter()
179 .copied(),
179 .copied(),
@@ -190,8 +190,8 @@ impl Registers {
190 match name {
190 match name {
191 '*' | '+' => {
191 '*' | '+' => {
192 self.clear_clipboard(match name {
192 self.clear_clipboard(match name {
193− '*' => ClipboardType::Clipboard,
193+ '+' => ClipboardType::Clipboard,
194− '+' => ClipboardType::Selection,
194+ '*' => ClipboardType::Selection,
195 _ => unreachable!(),
195 _ => unreachable!(),
196 });
196 });
197 self.inner.remove(&name);
197 self.inner.remove(&name);
helix-view/src/theme.rs+6
@@ -297,6 +297,11 @@ impl Theme {
297 self.highlights[index]
297 self.highlights[index]
298 }
298 }
299
299
300+ #[inline]
301+ pub fn scope(&self, index: usize) -> &str {
302+ &self.scopes[index]
303+ }
304+
300 pub fn name(&self) -> &str {
305 pub fn name(&self) -> &str {
301 &self.name
306 &self.name
302 }
307 }
@@ -359,6 +364,7 @@ impl Default for ThemePalette {
359 fn default() -> Self {
364 fn default() -> Self {
360 Self {
365 Self {
361 palette: hashmap! {
366 palette: hashmap! {
367+ "default".to_string() => Color::Reset,
362 "black".to_string() => Color::Black,
368 "black".to_string() => Color::Black,
363 "red".to_string() => Color::Red,
369 "red".to_string() => Color::Red,
364 "green".to_string() => Color::Green,
370 "green".to_string() => Color::Green,
languages.toml+407−194
@@ -3,6 +3,7 @@
3
3
4[language-server]
4[language-server]
5
5
6+als = { command = "als" }
6awk-language-server = { command = "awk-language-server" }
7awk-language-server = { command = "awk-language-server" }
7bash-language-server = { command = "bash-language-server", args = ["start"] }
8bash-language-server = { command = "bash-language-server", args = ["start"] }
8bass = { command = "bass", args = ["--lsp"] }
9bass = { command = "bass", args = ["--lsp"] }
@@ -30,6 +31,7 @@ forth-lsp = { command = "forth-lsp" }
30fortls = { command = "fortls", args = ["--lowercase_intrinsics"] }
31fortls = { command = "fortls", args = ["--lowercase_intrinsics"] }
31fsharp-ls = { command = "fsautocomplete", config = { AutomaticWorkspaceInit = true } }
32fsharp-ls = { command = "fsautocomplete", config = { AutomaticWorkspaceInit = true } }
32gleam = { command = "gleam", args = ["lsp"] }
33gleam = { command = "gleam", args = ["lsp"] }
34+graphql-language-service = { command = "graphql-lsp", args = ["server", "-m", "stream"] }
33haskell-language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }
35haskell-language-server = { command = "haskell-language-server-wrapper", args = ["--lsp"] }
34idris2-lsp = { command = "idris2-lsp" }
36idris2-lsp = { command = "idris2-lsp" }
35intelephense = { command = "intelephense", args = ["--stdio"] }
37intelephense = { command = "intelephense", args = ["--stdio"] }
@@ -38,6 +40,7 @@ jsonnet-language-server = { command = "jsonnet-language-server", args= ["-t", "-
38julia = { command = "julia", timeout = 60, args = [ "--startup-file=no", "--history-file=no", "--quiet", "-e", "using LanguageServer; runserver()", ] }
40julia = { command = "julia", timeout = 60, args = [ "--startup-file=no", "--history-file=no", "--quiet", "-e", "using LanguageServer; runserver()", ] }
39kotlin-language-server = { command = "kotlin-language-server" }
41kotlin-language-server = { command = "kotlin-language-server" }
40lean = { command = "lean", args = [ "--server" ] }
42lean = { command = "lean", args = [ "--server" ] }
43+ltex-ls = { command = "ltex-ls" }
41markdoc-ls = { command = "markdoc-ls", args = ["--stdio"] }
44markdoc-ls = { command = "markdoc-ls", args = ["--stdio"] }
42marksman = { command = "marksman", args = ["server"] }
45marksman = { command = "marksman", args = ["server"] }
43metals = { command = "metals", config = { "isHttpEnabled" = true } }
46metals = { command = "metals", config = { "isHttpEnabled" = true } }
@@ -45,6 +48,7 @@ mint = { command = "mint", args = ["ls"] }
45nil = { command = "nil" }
48nil = { command = "nil" }
46nimlangserver = { command = "nimlangserver" }
49nimlangserver = { command = "nimlangserver" }
47nls = { command = "nls" }
50nls = { command = "nls" }
51+nu-lsp = { command = "nu", args = [ "--lsp" ] }
48ocamllsp = { command = "ocamllsp" }
52ocamllsp = { command = "ocamllsp" }
49ols = { command = "ols", args = [] }
53ols = { command = "ols", args = [] }
50omnisharp = { command = "OmniSharp", args = [ "--languageserver" ] }
54omnisharp = { command = "OmniSharp", args = [ "--languageserver" ] }
@@ -70,24 +74,30 @@ solc = { command = "solc", args = ["--lsp"] }
70sourcekit-lsp = { command = "sourcekit-lsp" }
74sourcekit-lsp = { command = "sourcekit-lsp" }
71svlangserver = { command = "svlangserver", args = [] }
75svlangserver = { command = "svlangserver", args = [] }
72swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
76swipl = { command = "swipl", args = [ "-g", "use_module(library(lsp_server))", "-g", "lsp_server:main", "-t", "halt", "--", "stdio" ] }
77+tailwindcss-ls = { command = "tailwindcss-language-server", args = ["--stdio"] }
73taplo = { command = "taplo", args = ["lsp", "stdio"] }
78taplo = { command = "taplo", args = ["lsp", "stdio"] }
79+templ = { command = "templ", args = ["lsp"] }
74terraform-ls = { command = "terraform-ls", args = ["serve"] }
80terraform-ls = { command = "terraform-ls", args = ["serve"] }
75texlab = { command = "texlab" }
81texlab = { command = "texlab" }
76vala-language-server = { command = "vala-language-server" }
82vala-language-server = { command = "vala-language-server" }
77vhdl_ls = { command = "vhdl_ls", args = [] }
83vhdl_ls = { command = "vhdl_ls", args = [] }
78vlang-language-server = { command = "v-analyzer" }
84vlang-language-server = { command = "v-analyzer" }
79−vscode-css-language-server = { command = "vscode-css-language-server", args = ["--stdio"], config = { "provideFormatter" = true }}
85+vscode-css-language-server = { command = "vscode-css-language-server", args = ["--stdio"], config = { provideFormatter = true, css = { validate = { enable = true } } } }
80vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
86vscode-html-language-server = { command = "vscode-html-language-server", args = ["--stdio"], config = { provideFormatter = true } }
81−vscode-json-language-server = { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true } }
87+vscode-json-language-server = { command = "vscode-json-language-server", args = ["--stdio"], config = { provideFormatter = true, json = { validate = { enable = true } } } }
82vuels = { command = "vue-language-server", args = ["--stdio"], config = { typescript = { tsdk = "node_modules/typescript/lib/" } } }
88vuels = { command = "vue-language-server", args = ["--stdio"], config = { typescript = { tsdk = "node_modules/typescript/lib/" } } }
83wgsl_analyzer = { command = "wgsl_analyzer" }
89wgsl_analyzer = { command = "wgsl_analyzer" }
84yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
90yaml-language-server = { command = "yaml-language-server", args = ["--stdio"] }
85zls = { command = "zls" }
91zls = { command = "zls" }
86blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
92blueprint-compiler = { command = "blueprint-compiler", args = ["lsp"] }
93+typst-lsp = { command = "typst-lsp" }
87
94
95+[language-server.ansible-language-server]
96+command = "ansible-language-server"
97+args = ["--stdio"]
88
98
89[language-server.lua-language-server]
99[language-server.lua-language-server]
90−command = "lua-language-server"
100+command = "lua-language-server"
91
101
92[language-server.lua-language-server.config.Lua.hint]
102[language-server.lua-language-server.config.Lua.hint]
93enable = true
103enable = true
@@ -109,6 +119,12 @@ functionTypeParameters = true
109parameterNames = true
119parameterNames = true
110rangeVariableTypes = true
120rangeVariableTypes = true
111
121
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+
112
128
113[language-server.rust-analyzer]
129[language-server.rust-analyzer]
114command = "rust-analyzer"
130command = "rust-analyzer"
@@ -175,6 +191,7 @@ auto-format = true
175comment-token = "//"
191comment-token = "//"
176language-servers = [ "rust-analyzer" ]
192language-servers = [ "rust-analyzer" ]
177indent = { tab-width = 4, unit = " " }
193indent = { tab-width = 4, unit = " " }
194+persistent-diagnostic-sources = ["rustc", "clippy"]
178
195
179[language.auto-pairs]
196[language.auto-pairs]
180'(' = ')'
197'(' = ')'
@@ -235,7 +252,6 @@ name = "toml"
235scope = "source.toml"
252scope = "source.toml"
236injection-regex = "toml"
253injection-regex = "toml"
237file-types = ["toml", "poetry.lock", "Cargo.lock"]
254file-types = ["toml", "poetry.lock", "Cargo.lock"]
238−roots = []
239comment-token = "#"
255comment-token = "#"
240language-servers = [ "taplo" ]
256language-servers = [ "taplo" ]
241indent = { tab-width = 2, unit = " " }
257indent = { tab-width = 2, unit = " " }
@@ -249,7 +265,6 @@ name = "awk"
249scope = "source.awk"
265scope = "source.awk"
250injection-regex = "awk"
266injection-regex = "awk"
251file-types = ["awk", "gawk", "nawk", "mawk"]
267file-types = ["awk", "gawk", "nawk", "mawk"]
252−roots = []
253comment-token = "#"
268comment-token = "#"
254language-servers = [ "awk-language-server" ]
269language-servers = [ "awk-language-server" ]
255indent = { tab-width = 2, unit = " " }
270indent = { tab-width = 2, unit = " " }
@@ -264,7 +279,6 @@ scope = "source.proto"
264injection-regex = "protobuf"
279injection-regex = "protobuf"
265file-types = ["proto"]
280file-types = ["proto"]
266language-servers = [ "bufls", "pbkit" ]
281language-servers = [ "bufls", "pbkit" ]
267−roots = []
268comment-token = "//"
282comment-token = "//"
269indent = { tab-width = 2, unit = " " }
283indent = { tab-width = 2, unit = " " }
270
284
@@ -293,7 +307,6 @@ scope = "source.fish"
293injection-regex = "fish"
307injection-regex = "fish"
294file-types = ["fish"]
308file-types = ["fish"]
295shebangs = ["fish"]
309shebangs = ["fish"]
296−roots = []
297comment-token = "#"
310comment-token = "#"
298indent = { tab-width = 4, unit = " " }
311indent = { tab-width = 4, unit = " " }
299
312
@@ -307,7 +320,6 @@ scope = "source.mint"
307injection-regex = "mint"
320injection-regex = "mint"
308file-types = ["mint"]
321file-types = ["mint"]
309shebangs = []
322shebangs = []
310−roots = []
311comment-token = "//"
323comment-token = "//"
312language-servers = [ "mint" ]
324language-servers = [ "mint" ]
313indent = { tab-width = 2, unit = " " }
325indent = { tab-width = 2, unit = " " }
@@ -316,8 +328,28 @@ indent = { tab-width = 2, unit = " " }
316name = "json"
328name = "json"
317scope = "source.json"
329scope = "source.json"
318injection-regex = "json"
330injection-regex = "json"
319−file-types = ["json", "jsonc", "arb", "ipynb", "geojson", "gltf"]
331+file-types = [
320−roots = []
332+ "json",
333+ "jsonc",
334+ "arb",
335+ "ipynb",
336+ "geojson",
337+ "gltf",
338+ "webmanifest",
339+ "flake.lock",
340+ ".babelrc",
341+ ".bowerrc",
342+ ".jscrc",
343+ "js.map",
344+ "ts.map",
345+ "css.map",
346+ ".jslintrc",
347+ "jsonld",
348+ ".vuerc",
349+ "composer.lock",
350+ ".watchmanconfig",
351+ "avsc"
352+]
321language-servers = [ "vscode-json-language-server" ]
353language-servers = [ "vscode-json-language-server" ]
322auto-format = true
354auto-format = true
323indent = { tab-width = 2, unit = " " }
355indent = { tab-width = 2, unit = " " }
@@ -326,12 +358,26 @@ indent = { tab-width = 2, unit = " " }
326name = "json"
358name = "json"
327source = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "73076754005a460947cafe8e03a8cf5fa4fa2938" }
359source = { git = "https://github.com/tree-sitter/tree-sitter-json", rev = "73076754005a460947cafe8e03a8cf5fa4fa2938" }
328
360
361+
362+[[language]]
363+name = "json5"
364+scope = "source.json5"
365+injection-regex = "json5"
366+file-types = ["json5"]
367+language-servers = []
368+comment-token = "//"
369+indent = { tab-width = 4, unit = " " }
370+# https://json5.org
371+
372+[[grammar]]
373+name = "json5"
374+source = { git = "https://github.com/Joakker/tree-sitter-json5", rev = "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d" }
375+
329[[language]]
376[[language]]
330name = "c"
377name = "c"
331scope = "source.c"
378scope = "source.c"
332injection-regex = "c"
379injection-regex = "c"
333file-types = ["c"] # TODO: ["h"]
380file-types = ["c"] # TODO: ["h"]
334−roots = []
335comment-token = "//"
381comment-token = "//"
336language-servers = [ "clangd" ]
382language-servers = [ "clangd" ]
337indent = { tab-width = 2, unit = " " }
383indent = { tab-width = 2, unit = " " }
@@ -367,8 +413,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-c", rev = "7175a6dd
367name = "cpp"
413name = "cpp"
368scope = "source.cpp"
414scope = "source.cpp"
369injection-regex = "cpp"
415injection-regex = "cpp"
370−file-types = ["cc", "hh", "c++", "cpp", "hpp", "h", "ipp", "tpp", "cxx", "hxx", "ixx", "txx", "ino", "C", "H", "cu", "cuh", "cppm"]
416+file-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" }]
371−roots = []
372comment-token = "//"
417comment-token = "//"
373language-servers = [ "clangd" ]
418language-servers = [ "clangd" ]
374indent = { tab-width = 2, unit = " " }
419indent = { tab-width = 2, unit = " " }
@@ -414,7 +459,7 @@ language-servers = [ "crystalline" ]
414name = "c-sharp"
459name = "c-sharp"
415scope = "source.csharp"
460scope = "source.csharp"
416injection-regex = "c-?sharp"
461injection-regex = "c-?sharp"
417−file-types = ["cs"]
462+file-types = ["cs", "csx", "cake"]
418roots = ["sln", "csproj"]
463roots = ["sln", "csproj"]
419comment-token = "//"
464comment-token = "//"
420indent = { tab-width = 4, unit = "\t" }
465indent = { tab-width = 4, unit = "\t" }
@@ -451,7 +496,7 @@ file-types = ["go"]
451roots = ["go.work", "go.mod"]
496roots = ["go.work", "go.mod"]
452auto-format = true
497auto-format = true
453comment-token = "//"
498comment-token = "//"
454−language-servers = [ "gopls" ]
499+language-servers = [ "gopls", "golangci-lint-lsp" ]
455# TODO: gopls needs utf-8 offsets?
500# TODO: gopls needs utf-8 offsets?
456indent = { tab-width = 4, unit = "\t" }
501indent = { tab-width = 4, unit = "\t" }
457
502
@@ -501,7 +546,6 @@ name = "gomod"
501scope = "source.gomod"
546scope = "source.gomod"
502injection-regex = "gomod"
547injection-regex = "gomod"
503file-types = ["go.mod"]
548file-types = ["go.mod"]
504−roots = []
505auto-format = true
549auto-format = true
506comment-token = "//"
550comment-token = "//"
507language-servers = [ "gopls" ]
551language-servers = [ "gopls" ]
@@ -516,7 +560,6 @@ name = "gotmpl"
516scope = "source.gotmpl"
560scope = "source.gotmpl"
517injection-regex = "gotmpl"
561injection-regex = "gotmpl"
518file-types = ["gotmpl"]
562file-types = ["gotmpl"]
519−roots = []
520comment-token = "//"
563comment-token = "//"
521language-servers = [ "gopls" ]
564language-servers = [ "gopls" ]
522indent = { tab-width = 2, unit = " " }
565indent = { tab-width = 2, unit = " " }
@@ -530,7 +573,6 @@ name = "gowork"
530scope = "source.gowork"
573scope = "source.gowork"
531injection-regex = "gowork"
574injection-regex = "gowork"
532file-types = ["go.work"]
575file-types = ["go.work"]
533−roots = []
534auto-format = true
576auto-format = true
535comment-token = "//"
577comment-token = "//"
536language-servers = [ "gopls" ]
578language-servers = [ "gopls" ]
@@ -545,9 +587,8 @@ name = "javascript"
545scope = "source.js"
587scope = "source.js"
546injection-regex = "(js|javascript)"
588injection-regex = "(js|javascript)"
547language-id = "javascript"
589language-id = "javascript"
548−file-types = ["js", "mjs", "cjs"]
590+file-types = ["js", "mjs", "cjs", "rules", "es6", "pac", "jakefile"]
549shebangs = ["node"]
591shebangs = ["node"]
550−roots = []
551comment-token = "//"
592comment-token = "//"
552language-servers = [ "typescript-language-server" ]
593language-servers = [ "typescript-language-server" ]
553indent = { tab-width = 2, unit = " " }
594indent = { tab-width = 2, unit = " " }
@@ -574,7 +615,6 @@ scope = "source.jsx"
574injection-regex = "jsx"
615injection-regex = "jsx"
575language-id = "javascriptreact"
616language-id = "javascriptreact"
576file-types = ["jsx"]
617file-types = ["jsx"]
577−roots = []
578comment-token = "//"
618comment-token = "//"
579language-servers = [ "typescript-language-server" ]
619language-servers = [ "typescript-language-server" ]
580indent = { tab-width = 2, unit = " " }
620indent = { tab-width = 2, unit = " " }
@@ -586,8 +626,7 @@ scope = "source.ts"
586injection-regex = "(ts|typescript)"
626injection-regex = "(ts|typescript)"
587file-types = ["ts", "mts", "cts"]
627file-types = ["ts", "mts", "cts"]
588language-id = "typescript"
628language-id = "typescript"
589−shebangs = []
629+shebangs = ["deno", "ts-node"]
590−roots = []
591language-servers = [ "typescript-language-server" ]
630language-servers = [ "typescript-language-server" ]
592indent = { tab-width = 2, unit = " " }
631indent = { tab-width = 2, unit = " " }
593
632
@@ -601,7 +640,6 @@ scope = "source.tsx"
601injection-regex = "(tsx)" # |typescript
640injection-regex = "(tsx)" # |typescript
602language-id = "typescriptreact"
641language-id = "typescriptreact"
603file-types = ["tsx"]
642file-types = ["tsx"]
604−roots = []
605language-servers = [ "typescript-language-server" ]
643language-servers = [ "typescript-language-server" ]
606indent = { tab-width = 2, unit = " " }
644indent = { tab-width = 2, unit = " " }
607
645
@@ -614,7 +652,6 @@ name = "css"
614scope = "source.css"
652scope = "source.css"
615injection-regex = "css"
653injection-regex = "css"
616file-types = ["css", "scss"]
654file-types = ["css", "scss"]
617−roots = []
618language-servers = [ "vscode-css-language-server" ]
655language-servers = [ "vscode-css-language-server" ]
619auto-format = true
656auto-format = true
620indent = { tab-width = 2, unit = " " }
657indent = { tab-width = 2, unit = " " }
@@ -628,7 +665,6 @@ name = "scss"
628scope = "source.scss"
665scope = "source.scss"
629injection-regex = "scss"
666injection-regex = "scss"
630file-types = ["scss"]
667file-types = ["scss"]
631−roots = []
632language-servers = [ "vscode-css-language-server" ]
668language-servers = [ "vscode-css-language-server" ]
633auto-format = true
669auto-format = true
634indent = { tab-width = 2, unit = " " }
670indent = { tab-width = 2, unit = " " }
@@ -641,8 +677,7 @@ source = { git = "https://github.com/serenadeai/tree-sitter-scss", rev = "c478c6
641name = "html"
677name = "html"
642scope = "text.html.basic"
678scope = "text.html.basic"
643injection-regex = "html"
679injection-regex = "html"
644−file-types = ["html"]
680+file-types = ["html", "htm", "shtml", "xhtml", "xht", "jsp", "asp", "aspx", "jshtm", "volt", "rhtml"]
645−roots = []
646language-servers = [ "vscode-html-language-server" ]
681language-servers = [ "vscode-html-language-server" ]
647auto-format = true
682auto-format = true
648indent = { tab-width = 2, unit = " " }
683indent = { tab-width = 2, unit = " " }
@@ -655,7 +690,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-html", rev = "29f53
655name = "python"
690name = "python"
656scope = "source.python"
691scope = "source.python"
657injection-regex = "python"
692injection-regex = "python"
658−file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct"]
693+file-types = ["py","pyi","py3","pyw","ptl",".pythonstartup",".pythonrc","SConstruct", "rpy", "cpy", "ipy", "pyt", "SConscript"]
659shebangs = ["python"]
694shebangs = ["python"]
660roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
695roots = ["pyproject.toml", "setup.py", "poetry.lock", "pyrightconfig.json"]
661comment-token = "#"
696comment-token = "#"
@@ -665,7 +700,7 @@ indent = { tab-width = 4, unit = " " }
665
700
666[[grammar]]
701[[grammar]]
667name = "python"
702name = "python"
668−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" }
669
704
670[[language]]
705[[language]]
671name = "nickel"
706name = "nickel"
@@ -673,7 +708,6 @@ scope = "source.nickel"
673injection-regex = "nickel"
708injection-regex = "nickel"
674file-types = ["ncl"]
709file-types = ["ncl"]
675shebangs = []
710shebangs = []
676−roots = []
677comment-token = "#"
711comment-token = "#"
678language-servers = [ "nls" ]
712language-servers = [ "nls" ]
679indent = { tab-width = 2, unit = " " }
713indent = { tab-width = 2, unit = " " }
@@ -694,7 +728,6 @@ scope = "source.nix"
694injection-regex = "nix"
728injection-regex = "nix"
695file-types = ["nix"]
729file-types = ["nix"]
696shebangs = []
730shebangs = []
697−roots = []
698comment-token = "#"
731comment-token = "#"
699language-servers = [ "nil" ]
732language-servers = [ "nil" ]
700indent = { tab-width = 2, unit = " " }
733indent = { tab-width = 2, unit = " " }
@@ -707,9 +740,43 @@ source = { git = "https://github.com/nix-community/tree-sitter-nix", rev = "1b69
707name = "ruby"
740name = "ruby"
708scope = "source.ruby"
741scope = "source.ruby"
709injection-regex = "ruby"
742injection-regex = "ruby"
710−file-types = ["rb", "rake", "rakefile", "irb", "gemfile", "gemspec", "Rakefile", "Gemfile", "rabl", "jbuilder", "jb", "Podfile", "podspec", "Vagrantfile", "Brewfile"]
743+file-types = [
744+ "rb",
745+ "rake",
746+ "rakefile",
747+ "irb",
748+ "gemfile",
749+ "gemspec",
750+ "Rakefile",
751+ "Gemfile",
752+ "rabl",
753+ "jbuilder",
754+ "jb",
755+ "Podfile",
756+ "podspec",
757+ "Vagrantfile",
758+ "Brewfile",
759+ "rjs",
760+ "rbi",
761+ "Guardfile",
762+ "Capfile",
763+ "Cheffile",
764+ "Hobofile",
765+ "Appraisals",
766+ "Rantfile",
767+ "Berksfile",
768+ "Berksfile.lock",
769+ "Thorfile",
770+ "Puppetfile",
771+ "Fastfile",
772+ "Appfile",
773+ "Deliverfile",
774+ "Matchfile",
775+ "Scanfile",
776+ "Snapfile",
777+ "Gymfile"
778+]
711shebangs = ["ruby"]
779shebangs = ["ruby"]
712−roots = []
713comment-token = "#"
780comment-token = "#"
714language-servers = [ "solargraph" ]
781language-servers = [ "solargraph" ]
715indent = { tab-width = 2, unit = " " }
782indent = { tab-width = 2, unit = " " }
@@ -722,9 +789,48 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-ruby", rev = "206c7
722name = "bash"
789name = "bash"
723scope = "source.bash"
790scope = "source.bash"
724injection-regex = "(shell|bash|zsh|sh)"
791injection-regex = "(shell|bash|zsh|sh)"
725−file-types = ["sh", "bash", "zsh", ".bash_login", ".bash_logout", ".bash_profile", ".bashrc", ".profile", ".zshenv", "zshenv", ".zlogin", "zlogin", ".zlogout", "zlogout", ".zprofile", "zprofile", ".zshrc", "zshrc", ".zimrc", "APKBUILD", "PKGBUILD", "eclass", "ebuild", "bazelrc", ".bash_aliases", "Renviron", ".Renviron"]
792+file-types = [
793+ "sh",
794+ "bash",
795+ "zsh",
796+ ".bash_login",
797+ ".bash_logout",
798+ ".bash_profile",
799+ ".bashrc",
800+ ".profile",
801+ ".zshenv",
802+ "zshenv",
803+ ".zlogin",
804+ "zlogin",
805+ ".zlogout",
806+ "zlogout",
807+ ".zprofile",
808+ "zprofile",
809+ ".zshrc",
810+ "zshrc",
811+ ".zimrc",
812+ "APKBUILD",
813+ "PKGBUILD",
814+ "eclass",
815+ "ebuild",
816+ "bazelrc",
817+ ".bash_aliases",
818+ "Renviron",
819+ ".Renviron",
820+ ".xprofile",
821+ ".xsession",
822+ ".xsessionrc",
823+ "zsh-theme",
824+ "ksh",
825+ "cshrc",
826+ "tcshrc",
827+ ".yashrc",
828+ ".yash_profile",
829+ ".hushlogin",
830+ "bashrc_Apple_Terminal",
831+ "zshrc_Apple_Terminal"
832+]
726shebangs = ["sh", "bash", "dash", "zsh"]
833shebangs = ["sh", "bash", "dash", "zsh"]
727−roots = []
728comment-token = "#"
834comment-token = "#"
729language-servers = [ "bash-language-server" ]
835language-servers = [ "bash-language-server" ]
730indent = { tab-width = 2, unit = " " }
836indent = { tab-width = 2, unit = " " }
@@ -737,7 +843,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-bash", rev = "275ef
737name = "php"
843name = "php"
738scope = "source.php"
844scope = "source.php"
739injection-regex = "php"
845injection-regex = "php"
740−file-types = ["php", "inc"]
846+file-types = ["php", "inc", "php4", "php5", "phtml", "ctp"]
741shebangs = ["php"]
847shebangs = ["php"]
742roots = ["composer.json", "index.php"]
848roots = ["composer.json", "index.php"]
743language-servers = [ "intelephense" ]
849language-servers = [ "intelephense" ]
@@ -752,7 +858,6 @@ name = "twig"
752scope = "source.twig"
858scope = "source.twig"
753injection-regex = "twig"
859injection-regex = "twig"
754file-types = ["twig"]
860file-types = ["twig"]
755−roots = []
756indent = { tab-width = 2, unit = " " }
861indent = { tab-width = 2, unit = " " }
757
862
758[[grammar]]
863[[grammar]]
@@ -763,8 +868,7 @@ source = { git = "https://github.com/gbprod/tree-sitter-twig", rev = "807b293fec
763name = "latex"
868name = "latex"
764scope = "source.tex"
869scope = "source.tex"
765injection-regex = "tex"
870injection-regex = "tex"
766−file-types = ["tex", "sty", "cls", "Rd"]
871+file-types = ["tex", "sty", "cls", "Rd", "bbx", "cbx"]
767−roots = []
768comment-token = "%"
872comment-token = "%"
769language-servers = [ "texlab" ]
873language-servers = [ "texlab" ]
770indent = { tab-width = 4, unit = "\t" }
874indent = { tab-width = 4, unit = "\t" }
@@ -778,7 +882,6 @@ name = "bibtex"
778scope = "source.bib"
882scope = "source.bib"
779injection-regex = "bib"
883injection-regex = "bib"
780file-types = ["bib"]
884file-types = ["bib"]
781−roots = []
782comment-token = "%"
885comment-token = "%"
783language-servers = [ "texlab" ]
886language-servers = [ "texlab" ]
784indent = { tab-width = 4, unit = "\t" }
887indent = { tab-width = 4, unit = "\t" }
@@ -815,11 +918,23 @@ indent = { tab-width = 2, unit = " " }
815name = "lean"
918name = "lean"
816source = { git = "https://github.com/Julian/tree-sitter-lean", rev = "d98426109258b266e1e92358c5f11716d2e8f638" }
919source = { git = "https://github.com/Julian/tree-sitter-lean", rev = "d98426109258b266e1e92358c5f11716d2e8f638" }
817
920
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+
818[[language]]
932[[language]]
819name = "julia"
933name = "julia"
820scope = "source.julia"
934scope = "source.julia"
821injection-regex = "julia"
935injection-regex = "julia"
822file-types = ["jl"]
936file-types = ["jl"]
937+shebangs = ["julia"]
823roots = ["Manifest.toml", "Project.toml"]
938roots = ["Manifest.toml", "Project.toml"]
824comment-token = "#"
939comment-token = "#"
825language-servers = [ "julia" ]
940language-servers = [ "julia" ]
@@ -833,7 +948,7 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-julia", rev = "8fb3
833name = "java"
948name = "java"
834scope = "source.java"
949scope = "source.java"
835injection-regex = "java"
950injection-regex = "java"
836−file-types = ["java"]
951+file-types = ["java", "jav"]
837roots = ["pom.xml", "build.gradle", "build.gradle.kts"]
952roots = ["pom.xml", "build.gradle", "build.gradle.kts"]
838language-servers = [ "jdtls" ]
953language-servers = [ "jdtls" ]
839indent = { tab-width = 2, unit = " " }
954indent = { tab-width = 2, unit = " " }
@@ -842,12 +957,24 @@ indent = { tab-width = 2, unit = " " }
842name = "java"
957name = "java"
843source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e" }
958source = { git = "https://github.com/tree-sitter/tree-sitter-java", rev = "09d650def6cdf7f479f4b78f595e9ef5b58ce31e" }
844
959
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+
845[[language]]
973[[language]]
846name = "ledger"
974name = "ledger"
847scope = "source.ledger"
975scope = "source.ledger"
848injection-regex = "ledger"
976injection-regex = "ledger"
849file-types = ["ldg", "ledger", "journal"]
977file-types = ["ldg", "ledger", "journal"]
850−roots = []
851comment-token = ";"
978comment-token = ";"
852indent = { tab-width = 4, unit = " " }
979indent = { tab-width = 4, unit = " " }
853
980
@@ -860,21 +987,19 @@ name = "beancount"
860scope = "source.beancount"
987scope = "source.beancount"
861injection-regex = "beancount"
988injection-regex = "beancount"
862file-types = ["beancount", "bean"]
989file-types = ["beancount", "bean"]
863−roots = []
864comment-token = ";"
990comment-token = ";"
865indent = { tab-width = 2, unit = " " }
991indent = { tab-width = 2, unit = " " }
866
992
867[[grammar]]
993[[grammar]]
868name = "beancount"
994name = "beancount"
869−source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c" }
995+source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3" }
870
996
871[[language]]
997[[language]]
872name = "ocaml"
998name = "ocaml"
873scope = "source.ocaml"
999scope = "source.ocaml"
874injection-regex = "ocaml"
1000injection-regex = "ocaml"
875file-types = ["ml"]
1001file-types = ["ml"]
876−shebangs = []
1002+shebangs = ["ocaml", "ocamlrun", "ocamlscript"]
877−roots = []
878comment-token = "(**)"
1003comment-token = "(**)"
879language-servers = [ "ocamllsp" ]
1004language-servers = [ "ocamllsp" ]
880indent = { tab-width = 2, unit = " " }
1005indent = { tab-width = 2, unit = " " }
@@ -884,7 +1009,6 @@ indent = { tab-width = 2, unit = " " }
884'{' = '}'
1009'{' = '}'
885'[' = ']'
1010'[' = ']'
886'"' = '"'
1011'"' = '"'
887−'`' = '`'
888
1012
889[[grammar]]
1013[[grammar]]
890name = "ocaml"
1014name = "ocaml"
@@ -895,7 +1019,6 @@ name = "ocaml-interface"
895scope = "source.ocaml.interface"
1019scope = "source.ocaml.interface"
896file-types = ["mli"]
1020file-types = ["mli"]
897shebangs = []
1021shebangs = []
898−roots = []
899comment-token = "(**)"
1022comment-token = "(**)"
900language-servers = [ "ocamllsp" ]
1023language-servers = [ "ocamllsp" ]
901indent = { tab-width = 2, unit = " " }
1024indent = { tab-width = 2, unit = " " }
@@ -905,7 +1028,6 @@ indent = { tab-width = 2, unit = " " }
905'{' = '}'
1028'{' = '}'
906'[' = ']'
1029'[' = ']'
907'"' = '"'
1030'"' = '"'
908−'`' = '`'
909
1031
910[[grammar]]
1032[[grammar]]
911name = "ocaml-interface"
1033name = "ocaml-interface"
@@ -931,7 +1053,6 @@ name = "svelte"
931scope = "source.svelte"
1053scope = "source.svelte"
932injection-regex = "svelte"
1054injection-regex = "svelte"
933file-types = ["svelte"]
1055file-types = ["svelte"]
934−roots = []
935indent = { tab-width = 2, unit = " " }
1056indent = { tab-width = 2, unit = " " }
936language-servers = [ "svelteserver" ]
1057language-servers = [ "svelteserver" ]
937
1058
@@ -956,10 +1077,9 @@ source = { git = "https://github.com/ikatyang/tree-sitter-vue", rev = "91fe27547
956name = "yaml"
1077name = "yaml"
957scope = "source.yaml"
1078scope = "source.yaml"
958file-types = ["yml", "yaml"]
1079file-types = ["yml", "yaml"]
959−roots = []
960comment-token = "#"
1080comment-token = "#"
961indent = { tab-width = 2, unit = " " }
1081indent = { tab-width = 2, unit = " " }
962−language-servers = [ "yaml-language-server" ]
1082+language-servers = [ "yaml-language-server", "ansible-language-server" ]
963injection-regex = "yml|yaml"
1083injection-regex = "yml|yaml"
964
1084
965[[grammar]]
1085[[grammar]]
@@ -978,13 +1098,12 @@ indent = { tab-width = 2, unit = " " }
978
1098
979[[grammar]]
1099[[grammar]]
980name = "haskell"
1100name = "haskell"
981−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" }
982
1102
983[[language]]
1103[[language]]
984name = "haskell-persistent"
1104name = "haskell-persistent"
985scope = "source.persistentmodels"
1105scope = "source.persistentmodels"
986file-types = ["persistentmodels"]
1106file-types = ["persistentmodels"]
987−roots = []
988comment-token = "--"
1107comment-token = "--"
989indent = { tab-width = 2, unit = " " }
1108indent = { tab-width = 2, unit = " " }
990
1109
@@ -1003,7 +1122,10 @@ language-servers = [ "purescript-language-server" ]
1003indent = { tab-width = 2, unit = " " }
1122indent = { tab-width = 2, unit = " " }
1004auto-format = true
1123auto-format = true
1005formatter = { command = "purs-tidy", args = ["format"] }
1124formatter = { command = "purs-tidy", args = ["format"] }
1125+
1006−grammar = "haskell"
1126+[[grammar]]
1127+name = "purescript"
1128+source = { git = "https://github.com/postsolar/tree-sitter-purescript", rev = "5ef5592674ea42de75fc2792972e4ea0b6e3da6c" }
1007
1129
1008[[language]]
1130[[language]]
1009name = "zig"
1131name = "zig"
@@ -1047,7 +1169,6 @@ source = { git = "https://github.com/maxxnino/tree-sitter-zig", rev = "0d08703e4
1047[[language]]
1169[[language]]
1048name = "prolog"
1170name = "prolog"
1049scope = "source.prolog"
1171scope = "source.prolog"
1050−roots = []
1051file-types = ["pl", "prolog"]
1172file-types = ["pl", "prolog"]
1052shebangs = ["swipl"]
1173shebangs = ["swipl"]
1053comment-token = "%"
1174comment-token = "%"
@@ -1057,7 +1178,6 @@ language-servers = [ "swipl" ]
1057name = "tsq"
1178name = "tsq"
1058scope = "source.tsq"
1179scope = "source.tsq"
1059file-types = ["tsq"]
1180file-types = ["tsq"]
1060−roots = []
1061comment-token = ";"
1181comment-token = ";"
1062injection-regex = "tsq"
1182injection-regex = "tsq"
1063indent = { tab-width = 2, unit = " " }
1183indent = { tab-width = 2, unit = " " }
@@ -1070,7 +1190,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-tsq", rev = "48b5
1070name = "cmake"
1190name = "cmake"
1071scope = "source.cmake"
1191scope = "source.cmake"
1072file-types = ["cmake", "CMakeLists.txt"]
1192file-types = ["cmake", "CMakeLists.txt"]
1073−roots = []
1074comment-token = "#"
1193comment-token = "#"
1075indent = { tab-width = 2, unit = " " }
1194indent = { tab-width = 2, unit = " " }
1076language-servers = [ "cmake-language-server" ]
1195language-servers = [ "cmake-language-server" ]
@@ -1083,9 +1202,9 @@ source = { git = "https://github.com/uyha/tree-sitter-cmake", rev = "6e51463ef30
1083[[language]]
1202[[language]]
1084name = "make"
1203name = "make"
1085scope = "source.make"
1204scope = "source.make"
1086−file-types = ["Makefile", "makefile", "make", "mk"]
1205+file-types = ["Makefile", "makefile", "make", "mk", "mak", "GNUmakefile", "OCamlMakefile"]
1206+shebangs = ["make", "gmake"]
1087injection-regex = "(make|makefile|Makefile|mk)"
1207injection-regex = "(make|makefile|Makefile|mk)"
1088−roots = []
1089comment-token = "#"
1208comment-token = "#"
1090indent = { tab-width = 4, unit = "\t" }
1209indent = { tab-width = 4, unit = "\t" }
1091
1210
@@ -1097,7 +1216,6 @@ source = { git = "https://github.com/alemuller/tree-sitter-make", rev = "a4b9187
1097name = "glsl"
1216name = "glsl"
1098scope = "source.glsl"
1217scope = "source.glsl"
1099file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
1218file-types = ["glsl", "vert", "tesc", "tese", "geom", "frag", "comp" ]
1100−roots = []
1101comment-token = "//"
1219comment-token = "//"
1102indent = { tab-width = 4, unit = " " }
1220indent = { tab-width = 4, unit = " " }
1103injection-regex = "glsl"
1221injection-regex = "glsl"
@@ -1109,22 +1227,20 @@ source = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "88408ff
1109[[language]]
1227[[language]]
1110name = "perl"
1228name = "perl"
1111scope = "source.perl"
1229scope = "source.perl"
1112−file-types = ["pl", "pm", "t"]
1230+file-types = ["pl", "pm", "t", "psgi", "raku", "rakumod", "rakutest", "rakudoc", "nqp", "p6", "pl6", "pm6"]
1113shebangs = ["perl"]
1231shebangs = ["perl"]
1114−roots = []
1115comment-token = "#"
1232comment-token = "#"
1116language-servers = [ "perlnavigator" ]
1233language-servers = [ "perlnavigator" ]
1117indent = { tab-width = 2, unit = " " }
1234indent = { tab-width = 2, unit = " " }
1118
1235
1119[[grammar]]
1236[[grammar]]
1120name = "perl"
1237name = "perl"
1121−source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "ed21ecbcc128a6688770ebafd3ef68a1c9bc1ea9" }
1238+source = { git = "https://github.com/tree-sitter-perl/tree-sitter-perl", rev = "e99bb5283805db4cb86c964722d709df21b0ac16" }
1122
1239
1123[[language]]
1240[[language]]
1124name = "pod"
1241name = "pod"
1125scope = "source.pod"
1242scope = "source.pod"
1126injection-regex = "pod"
1243injection-regex = "pod"
1127−roots = []
1128file-types = ["pod"]
1244file-types = ["pod"]
1129
1245
1130[[grammar]]
1246[[grammar]]
@@ -1134,17 +1250,16 @@ source = { git = "https://github.com/tree-sitter-perl/tree-sitter-pod", rev = "d
1134[[language]]
1250[[language]]
1135name = "racket"
1251name = "racket"
1136scope = "source.racket"
1252scope = "source.racket"
1137−roots = []
1138file-types = ["rkt", "rktd", "rktl", "scrbl"]
1253file-types = ["rkt", "rktd", "rktl", "scrbl"]
1139shebangs = ["racket"]
1254shebangs = ["racket"]
1140comment-token = ";"
1255comment-token = ";"
1256+indent = { tab-width = 2, unit = " " }
1141language-servers = [ "racket" ]
1257language-servers = [ "racket" ]
1142grammar = "scheme"
1258grammar = "scheme"
1143
1259
1144[[language]]
1260[[language]]
1145name = "common-lisp"
1261name = "common-lisp"
1146scope = "source.lisp"
1262scope = "source.lisp"
1147−roots = []
1148file-types = ["lisp", "asd", "cl", "l", "lsp", "ny", "podsl", "sexp"]
1263file-types = ["lisp", "asd", "cl", "l", "lsp", "ny", "podsl", "sexp"]
1149shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
1264shebangs = ["lisp", "sbcl", "ccl", "clisp", "ecl"]
1150comment-token = ";"
1265comment-token = ";"
@@ -1161,19 +1276,17 @@ grammar = "scheme"
1161[[language]]
1276[[language]]
1162name = "comment"
1277name = "comment"
1163scope = "scope.comment"
1278scope = "scope.comment"
1164−roots = []
1165file-types = []
1279file-types = []
1166injection-regex = "comment"
1280injection-regex = "comment"
1167
1281
1168[[grammar]]
1282[[grammar]]
1169name = "comment"
1283name = "comment"
1170−source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "5dd3c62f1bbe378b220fe16b317b85247898639e" }
1284+source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e" }
1171
1285
1172[[language]]
1286[[language]]
1173name = "wgsl"
1287name = "wgsl"
1174scope = "source.wgsl"
1288scope = "source.wgsl"
1175file-types = ["wgsl"]
1289file-types = ["wgsl"]
1176−roots = []
1177comment-token = "//"
1290comment-token = "//"
1178language-servers = [ "wgsl_analyzer" ]
1291language-servers = [ "wgsl_analyzer" ]
1179indent = { tab-width = 4, unit = " " }
1292indent = { tab-width = 4, unit = " " }
@@ -1185,7 +1298,6 @@ source = { git = "https://github.com/szebniok/tree-sitter-wgsl", rev = "272e89ef
1185[[language]]
1298[[language]]
1186name = "llvm"
1299name = "llvm"
1187scope = "source.llvm"
1300scope = "source.llvm"
1188−roots = []
1189file-types = ["ll"]
1301file-types = ["ll"]
1190comment-token = ";"
1302comment-token = ";"
1191indent = { tab-width = 2, unit = " " }
1303indent = { tab-width = 2, unit = " " }
@@ -1193,12 +1305,11 @@ injection-regex = "llvm"
1193
1305
1194[[grammar]]
1306[[grammar]]
1195name = "llvm"
1307name = "llvm"
1196−source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d" }
1308+source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6" }
1197
1309
1198[[language]]
1310[[language]]
1199name = "llvm-mir"
1311name = "llvm-mir"
1200scope = "source.llvm_mir"
1312scope = "source.llvm_mir"
1201−roots = []
1202file-types = []
1313file-types = []
1203comment-token = ";"
1314comment-token = ";"
1204indent = { tab-width = 2, unit = " " }
1315indent = { tab-width = 2, unit = " " }
@@ -1214,7 +1325,6 @@ name = "llvm-mir-yaml"
1214#
1325#
1215# grammar = "yaml"
1326# grammar = "yaml"
1216scope = "source.yaml"
1327scope = "source.yaml"
1217−roots = []
1218file-types = ["mir"]
1328file-types = ["mir"]
1219comment-token = "#"
1329comment-token = "#"
1220indent = { tab-width = 2, unit = " " }
1330indent = { tab-width = 2, unit = " " }
@@ -1222,7 +1332,6 @@ indent = { tab-width = 2, unit = " " }
1222[[language]]
1332[[language]]
1223name = "tablegen"
1333name = "tablegen"
1224scope = "source.tablegen"
1334scope = "source.tablegen"
1225−roots = []
1226file-types = ["td"]
1335file-types = ["td"]
1227comment-token = "//"
1336comment-token = "//"
1228indent = { tab-width = 2, unit = " " }
1337indent = { tab-width = 2, unit = " " }
@@ -1236,26 +1345,25 @@ source = { git = "https://github.com/Flakebi/tree-sitter-tablegen", rev = "568dd
1236name = "markdown"
1345name = "markdown"
1237scope = "source.md"
1346scope = "source.md"
1238injection-regex = "md|markdown"
1347injection-regex = "md|markdown"
1239−file-types = ["md", "markdown", "PULLREQ_EDITMSG"]
1348+file-types = ["md", "markdown", "PULLREQ_EDITMSG", "mkd", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook"]
1240roots = [".marksman.toml"]
1349roots = [".marksman.toml"]
1241language-servers = [ "marksman" ]
1350language-servers = [ "marksman" ]
1242indent = { tab-width = 2, unit = " " }
1351indent = { tab-width = 2, unit = " " }
1243
1352
1244[[grammar]]
1353[[grammar]]
1245name = "markdown"
1354name = "markdown"
1246−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" }
1247
1356
1248[[language]]
1357[[language]]
1249name = "markdown.inline"
1358name = "markdown.inline"
1250scope = "source.markdown.inline"
1359scope = "source.markdown.inline"
1251injection-regex = "markdown\\.inline"
1360injection-regex = "markdown\\.inline"
1252file-types = []
1361file-types = []
1253−roots = []
1254grammar = "markdown_inline"
1362grammar = "markdown_inline"
1255
1363
1256[[grammar]]
1364[[grammar]]
1257name = "markdown_inline"
1365name = "markdown_inline"
1258−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" }
1259
1367
1260[[language]]
1368[[language]]
1261name = "dart"
1369name = "dart"
@@ -1301,7 +1409,6 @@ source = { git = "https://github.com/camdencheek/tree-sitter-dockerfile", rev =
1301[[language]]
1409[[language]]
1302name = "git-commit"
1410name = "git-commit"
1303scope = "git.commitmsg"
1411scope = "git.commitmsg"
1304−roots = []
1305file-types = ["COMMIT_EDITMSG"]
1412file-types = ["COMMIT_EDITMSG"]
1306comment-token = "#"
1413comment-token = "#"
1307indent = { tab-width = 2, unit = " " }
1414indent = { tab-width = 2, unit = " " }
@@ -1315,8 +1422,7 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-commit", rev
1315[[language]]
1422[[language]]
1316name = "diff"
1423name = "diff"
1317scope = "source.diff"
1424scope = "source.diff"
1318−roots = []
1319−file-types = ["diff", "patch"]
1425+file-types = ["diff", "patch", "rej"]
1320injection-regex = "diff"
1426injection-regex = "diff"
1321comment-token = "#"
1427comment-token = "#"
1322indent = { tab-width = 2, unit = " " }
1428indent = { tab-width = 2, unit = " " }
@@ -1328,7 +1434,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-diff", rev = "fd7
1328[[language]]
1434[[language]]
1329name = "git-rebase"
1435name = "git-rebase"
1330scope = "source.gitrebase"
1436scope = "source.gitrebase"
1331−roots = []
1332file-types = ["git-rebase-todo"]
1437file-types = ["git-rebase-todo"]
1333injection-regex = "git-rebase"
1438injection-regex = "git-rebase"
1334comment-token = "#"
1439comment-token = "#"
@@ -1343,7 +1448,6 @@ name = "regex"
1343scope = "source.regex"
1448scope = "source.regex"
1344injection-regex = "regex"
1449injection-regex = "regex"
1345file-types = ["regex", ".Rbuildignore"]
1450file-types = ["regex", ".Rbuildignore"]
1346−roots = []
1347
1451
1348[[grammar]]
1452[[grammar]]
1349name = "regex"
1453name = "regex"
@@ -1352,7 +1456,6 @@ source = { git = "https://github.com/tree-sitter/tree-sitter-regex", rev = "e1cf
1352[[language]]
1456[[language]]
1353name = "git-config"
1457name = "git-config"
1354scope = "source.gitconfig"
1458scope = "source.gitconfig"
1355−roots = []
1356file-types = [".gitmodules", ".gitconfig", { suffix = ".git/config" }, { suffix = ".config/git/config" }]
1459file-types = [".gitmodules", ".gitconfig", { suffix = ".git/config" }, { suffix = ".config/git/config" }]
1357injection-regex = "git-config"
1460injection-regex = "git-config"
1358comment-token = "#"
1461comment-token = "#"
@@ -1365,7 +1468,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-git-config", rev
1365[[language]]
1468[[language]]
1366name = "git-attributes"
1469name = "git-attributes"
1367scope = "source.gitattributes"
1470scope = "source.gitattributes"
1368−roots = []
1369file-types = [".gitattributes"]
1471file-types = [".gitattributes"]
1370injection-regex = "git-attributes"
1472injection-regex = "git-attributes"
1371comment-token = "#"
1473comment-token = "#"
@@ -1378,8 +1480,7 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-gitattributes", rev =
1378[[language]]
1480[[language]]
1379name = "git-ignore"
1481name = "git-ignore"
1380scope = "source.gitignore"
1482scope = "source.gitignore"
1381−roots = []
1382−file-types = [".gitignore", ".gitignore_global"]
1483+file-types = [".gitignore", ".gitignore_global", ".ignore", ".prettierignore", ".eslintignore", ".npmignore", "CODEOWNERS"]
1383injection-regex = "git-ignore"
1484injection-regex = "git-ignore"
1384comment-token = "#"
1485comment-token = "#"
1385grammar = "gitignore"
1486grammar = "gitignore"
@@ -1393,7 +1494,7 @@ name = "graphql"
1393scope = "source.graphql"
1494scope = "source.graphql"
1394injection-regex = "graphql"
1495injection-regex = "graphql"
1395file-types = ["gql", "graphql", "graphqls"]
1496file-types = ["gql", "graphql", "graphqls"]
1396−roots = []
1497+language-servers = [ "graphql-language-service" ]
1397indent = { tab-width = 2, unit = " " }
1498indent = { tab-width = 2, unit = " " }
1398
1499
1399[[grammar]]
1500[[grammar]]
@@ -1420,7 +1521,6 @@ name = "iex"
1420scope = "source.iex"
1521scope = "source.iex"
1421injection-regex = "iex"
1522injection-regex = "iex"
1422file-types = ["iex"]
1523file-types = ["iex"]
1423−roots = []
1424
1524
1425[[grammar]]
1525[[grammar]]
1426name = "iex"
1526name = "iex"
@@ -1439,7 +1539,7 @@ indent = { tab-width = 2, unit = " " }
1439
1539
1440[[grammar]]
1540[[grammar]]
1441name = "rescript"
1541name = "rescript"
1442−source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "65609807c628477f3b94052e7ef895885ac51c3c" }
1542+source = { git = "https://github.com/jaredramirez/tree-sitter-rescript", rev = "467dcf99f68c47823d7b378779a6b282d7ef9782" }
1443
1543
1444[[language]]
1544[[language]]
1445name = "erlang"
1545name = "erlang"
@@ -1483,7 +1583,6 @@ scope = "source.hcl"
1483injection-regex = "(hcl|tf|nomad)"
1583injection-regex = "(hcl|tf|nomad)"
1484language-id = "terraform"
1584language-id = "terraform"
1485file-types = ["hcl", "tf", "nomad"]
1585file-types = ["hcl", "tf", "nomad"]
1486−roots = []
1487comment-token = "#"
1586comment-token = "#"
1488indent = { tab-width = 2, unit = " " }
1587indent = { tab-width = 2, unit = " " }
1489language-servers = [ "terraform-ls" ]
1588language-servers = [ "terraform-ls" ]
@@ -1498,7 +1597,6 @@ name = "tfvars"
1498scope = "source.tfvars"
1597scope = "source.tfvars"
1499language-id = "terraform-vars"
1598language-id = "terraform-vars"
1500file-types = ["tfvars"]
1599file-types = ["tfvars"]
1501−roots = []
1502comment-token = "#"
1600comment-token = "#"
1503indent = { tab-width = 2, unit = " " }
1601indent = { tab-width = 2, unit = " " }
1504language-servers = [ "terraform-ls" ]
1602language-servers = [ "terraform-ls" ]
@@ -1510,7 +1608,6 @@ name = "org"
1510scope = "source.org"
1608scope = "source.org"
1511injection-regex = "org"
1609injection-regex = "org"
1512file-types = ["org"]
1610file-types = ["org"]
1513−roots = []
1514indent = { tab-width = 2, unit = " " }
1611indent = { tab-width = 2, unit = " " }
1515
1612
1516[[grammar]]
1613[[grammar]]
@@ -1522,7 +1619,6 @@ name = "solidity"
1522scope = "source.sol"
1619scope = "source.sol"
1523injection-regex = "(sol|solidity)"
1620injection-regex = "(sol|solidity)"
1524file-types = ["sol"]
1621file-types = ["sol"]
1525−roots = []
1526comment-token = "//"
1622comment-token = "//"
1527indent = { tab-width = 4, unit = " " }
1623indent = { tab-width = 4, unit = " " }
1528language-servers = [ "solc" ]
1624language-servers = [ "solc" ]
@@ -1540,20 +1636,23 @@ roots = ["gleam.toml"]
1540comment-token = "//"
1636comment-token = "//"
1541indent = { tab-width = 2, unit = " " }
1637indent = { tab-width = 2, unit = " " }
1542language-servers = [ "gleam" ]
1638language-servers = [ "gleam" ]
1639+auto-format = true
1543
1640
1544[[grammar]]
1641[[grammar]]
1545name = "gleam"
1642name = "gleam"
1546−source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "ae79782c00656945db69641378e688cdb78d52c1" }
1643+source = { git = "https://github.com/gleam-lang/tree-sitter-gleam", rev = "b2afa4fd6bb41a7bf912b034c653c90af7ae5122" }
1547
1644
1548[[language]]
1645[[language]]
1549name = "ron"
1646name = "ron"
1550scope = "source.ron"
1647scope = "source.ron"
1551injection-regex = "ron"
1648injection-regex = "ron"
1552file-types = ["ron"]
1649file-types = ["ron"]
1553−roots = []
1554comment-token = "//"
1650comment-token = "//"
1555indent = { tab-width = 4, unit = " " }
1651indent = { tab-width = 4, unit = " " }
1652+
1556−grammar = "rust"
1653+[[grammar]]
1654+name = "ron"
1655+source = { git = "https://github.com/zee-editor/tree-sitter-ron", rev = "7762d709a0f7c1f9e269d0125a2e8a7a69006146" }
1557
1656
1558[[language]]
1657[[language]]
1559name = "robot"
1658name = "robot"
@@ -1561,7 +1660,6 @@ scope = "source.robot"
1561injection-regex = "robot"
1660injection-regex = "robot"
1562file-types = ["robot", "resource"]
1661file-types = ["robot", "resource"]
1563comment-token = "#"
1662comment-token = "#"
1564−roots = []
1565indent = { tab-width = 4, unit = " " }
1663indent = { tab-width = 4, unit = " " }
1566language-servers = [ "robotframework_ls" ]
1664language-servers = [ "robotframework_ls" ]
1567
1665
@@ -1573,9 +1671,8 @@ source = { git = "https://github.com/Hubro/tree-sitter-robot", rev = "322e4cc657
1573name = "r"
1671name = "r"
1574scope = "source.r"
1672scope = "source.r"
1575injection-regex = "(r|R)"
1673injection-regex = "(r|R)"
1576−file-types = ["r", "R", ".Rprofile", "Rprofile.site"]
1674+file-types = ["r", "R", ".Rprofile", "Rprofile.site", ".RHistory"]
1577shebangs = ["r", "R"]
1675shebangs = ["r", "R"]
1578−roots = []
1579comment-token = "#"
1676comment-token = "#"
1580indent = { tab-width = 2, unit = " " }
1677indent = { tab-width = 2, unit = " " }
1581language-servers = [ "r" ]
1678language-servers = [ "r" ]
@@ -1587,9 +1684,9 @@ source = { git = "https://github.com/r-lib/tree-sitter-r", rev = "cc04302e1bff76
1587[[language]]
1684[[language]]
1588name = "rmarkdown"
1685name = "rmarkdown"
1589scope = "source.rmd"
1686scope = "source.rmd"
1687+language-id = "rmd"
1590injection-regex = "(r|R)md"
1688injection-regex = "(r|R)md"
1591file-types = ["rmd", "Rmd"]
1689file-types = ["rmd", "Rmd"]
1592−roots = []
1593indent = { tab-width = 2, unit = " " }
1690indent = { tab-width = 2, unit = " " }
1594grammar = "markdown"
1691grammar = "markdown"
1595language-servers = [ "r" ]
1692language-servers = [ "r" ]
@@ -1613,7 +1710,6 @@ name = "erb"
1613scope = "text.html.erb"
1710scope = "text.html.erb"
1614injection-regex = "erb"
1711injection-regex = "erb"
1615file-types = ["erb"]
1712file-types = ["erb"]
1616−roots = []
1617indent = { tab-width = 2, unit = " " }
1713indent = { tab-width = 2, unit = " " }
1618grammar = "embedded-template"
1714grammar = "embedded-template"
1619
1715
@@ -1622,7 +1718,6 @@ name = "ejs"
1622scope = "text.html.ejs"
1718scope = "text.html.ejs"
1623injection-regex = "ejs"
1719injection-regex = "ejs"
1624file-types = ["ejs"]
1720file-types = ["ejs"]
1625−roots = []
1626indent = { tab-width = 2, unit = " " }
1721indent = { tab-width = 2, unit = " " }
1627grammar = "embedded-template"
1722grammar = "embedded-template"
1628
1723
@@ -1658,15 +1753,14 @@ source = { git = "https://github.com/phoenixframework/tree-sitter-heex", rev = "
1658[[language]]
1753[[language]]
1659name = "sql"
1754name = "sql"
1660scope = "source.sql"
1755scope = "source.sql"
1661−file-types = ["sql"]
1756+file-types = ["sql", "dsql"]
1662−roots = []
1663comment-token = "--"
1757comment-token = "--"
1664indent = { tab-width = 4, unit = " " }
1758indent = { tab-width = 4, unit = " " }
1665injection-regex = "sql"
1759injection-regex = "sql"
1666
1760
1667[[grammar]]
1761[[grammar]]
1668name = "sql"
1762name = "sql"
1669−source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "7cbac0472e5b8f8486ce64ffbcf1982d5cd5fc8d" }
1763+source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286" }
1670
1764
1671[[language]]
1765[[language]]
1672name = "gdscript"
1766name = "gdscript"
@@ -1705,9 +1799,9 @@ scope = "source.nu"
1705injection-regex = "nu"
1799injection-regex = "nu"
1706file-types = ["nu"]
1800file-types = ["nu"]
1707shebangs = ["nu"]
1801shebangs = ["nu"]
1708−roots = []
1709comment-token = "#"
1802comment-token = "#"
1710indent = { tab-width = 2, unit = " " }
1803indent = { tab-width = 2, unit = " " }
1804+language-servers = [ "nu-lsp" ]
1711
1805
1712[[grammar]]
1806[[grammar]]
1713name = "nu"
1807name = "nu"
@@ -1718,7 +1812,6 @@ name = "vala"
1718scope = "source.vala"
1812scope = "source.vala"
1719injection-regex = "vala"
1813injection-regex = "vala"
1720file-types = ["vala", "vapi"]
1814file-types = ["vala", "vapi"]
1721−roots = []
1722comment-token = "//"
1815comment-token = "//"
1723indent = { tab-width = 2, unit = " " }
1816indent = { tab-width = 2, unit = " " }
1724language-servers = [ "vala-language-server" ]
1817language-servers = [ "vala-language-server" ]
@@ -1732,7 +1825,6 @@ name = "hare"
1732scope = "source.hare"
1825scope = "source.hare"
1733injection-regex = "hare"
1826injection-regex = "hare"
1734file-types = ["ha"]
1827file-types = ["ha"]
1735−roots = []
1736comment-token = "//"
1828comment-token = "//"
1737indent = { tab-width = 8, unit = "\t" }
1829indent = { tab-width = 8, unit = "\t" }
1738
1830
@@ -1745,7 +1837,6 @@ name = "devicetree"
1745scope = "source.devicetree"
1837scope = "source.devicetree"
1746injection-regex = "(dtsi?|devicetree|fdt)"
1838injection-regex = "(dtsi?|devicetree|fdt)"
1747file-types = ["dts", "dtsi"]
1839file-types = ["dts", "dtsi"]
1748−roots = []
1749comment-token = "//"
1840comment-token = "//"
1750indent = { tab-width = 4, unit = "\t" }
1841indent = { tab-width = 4, unit = "\t" }
1751
1842
@@ -1758,7 +1849,6 @@ name = "cairo"
1758scope = "source.cairo"
1849scope = "source.cairo"
1759injection-regex = "cairo"
1850injection-regex = "cairo"
1760file-types = ["cairo"]
1851file-types = ["cairo"]
1761−roots = []
1762comment-token = "//"
1852comment-token = "//"
1763indent = { tab-width = 4, unit = " " }
1853indent = { tab-width = 4, unit = " " }
1764# auto-format = true
1854# auto-format = true
@@ -1770,7 +1860,6 @@ name = "cpon"
1770scope = "scope.cpon"
1860scope = "scope.cpon"
1771injection-regex = "cpon"
1861injection-regex = "cpon"
1772file-types = ["cpon", "cp"]
1862file-types = ["cpon", "cp"]
1773−roots = []
1774auto-format = true
1863auto-format = true
1775comment-token = "//"
1864comment-token = "//"
1776indent = { tab-width = 2, unit = " " }
1865indent = { tab-width = 2, unit = " " }
@@ -1797,8 +1886,7 @@ source = { git = "https://github.com/ap29600/tree-sitter-odin", rev = "b219207e4
1797name = "meson"
1886name = "meson"
1798scope = "source.meson"
1887scope = "source.meson"
1799injection-regex = "meson"
1888injection-regex = "meson"
1800−file-types = ["meson.build"]
1889+file-types = ["meson.build", "meson_options.txt"]
1801−roots = []
1802comment-token = "#"
1890comment-token = "#"
1803indent = { tab-width = 2, unit = " " }
1891indent = { tab-width = 2, unit = " " }
1804
1892
@@ -1810,7 +1898,6 @@ source = { git = "https://github.com/staysail/tree-sitter-meson", rev = "32a83e8
1810name = "sshclientconfig"
1898name = "sshclientconfig"
1811scope = "source.sshclientconfig"
1899scope = "source.sshclientconfig"
1812file-types = [{ suffix = ".ssh/config" }, { suffix = "/etc/ssh/ssh_config" }]
1900file-types = [{ suffix = ".ssh/config" }, { suffix = "/etc/ssh/ssh_config" }]
1813−roots = []
1814comment-token = "#"
1901comment-token = "#"
1815
1902
1816[[grammar]]
1903[[grammar]]
@@ -1822,7 +1909,7 @@ name = "scheme"
1822scope = "source.scheme"
1909scope = "source.scheme"
1823injection-regex = "scheme"
1910injection-regex = "scheme"
1824file-types = ["ss", "scm"]
1911file-types = ["ss", "scm"]
1825−roots = []
1912+shebangs = ["scheme", "guile", "chicken"]
1826comment-token = ";"
1913comment-token = ";"
1827indent = { tab-width = 2, unit = " " }
1914indent = { tab-width = 2, unit = " " }
1828
1915
@@ -1849,7 +1936,6 @@ source = {git = "https://github.com/v-analyzer/v-analyzer", subpath = "tree_sitt
1849name = "verilog"
1936name = "verilog"
1850scope = "source.verilog"
1937scope = "source.verilog"
1851file-types = ["v", "vh", "sv", "svh"]
1938file-types = ["v", "vh", "sv", "svh"]
1852−roots = []
1853comment-token = "//"
1939comment-token = "//"
1854language-servers = [ "svlangserver" ]
1940language-servers = [ "svlangserver" ]
1855indent = { tab-width = 2, unit = " " }
1941indent = { tab-width = 2, unit = " " }
@@ -1864,7 +1950,6 @@ name = "edoc"
1864scope = "source.edoc"
1950scope = "source.edoc"
1865file-types = ["edoc", "edoc.in"]
1951file-types = ["edoc", "edoc.in"]
1866injection-regex = "edoc"
1952injection-regex = "edoc"
1867−roots = []
1868indent = { tab-width = 4, unit = " " }
1953indent = { tab-width = 4, unit = " " }
1869
1954
1870[[grammar]]
1955[[grammar]]
@@ -1876,7 +1961,6 @@ name = "jsdoc"
1876scope = "source.jsdoc"
1961scope = "source.jsdoc"
1877injection-regex = "jsdoc"
1962injection-regex = "jsdoc"
1878file-types = ["jsdoc"]
1963file-types = ["jsdoc"]
1879−roots = []
1880indent = { tab-width = 2, unit = " " }
1964indent = { tab-width = 2, unit = " " }
1881
1965
1882[[grammar]]
1966[[grammar]]
@@ -1888,7 +1972,6 @@ name = "openscad"
1888scope = "source.openscad"
1972scope = "source.openscad"
1889injection-regex = "openscad"
1973injection-regex = "openscad"
1890file-types = ["scad"]
1974file-types = ["scad"]
1891−roots = []
1892comment-token = "//"
1975comment-token = "//"
1893language-servers = [ "openscad-lsp" ]
1976language-servers = [ "openscad-lsp" ]
1894indent = { tab-width = 2, unit = "\t" }
1977indent = { tab-width = 2, unit = "\t" }
@@ -1930,7 +2013,6 @@ name = "starlark"
1930scope = "source.starlark"
2013scope = "source.starlark"
1931injection-regex = "(starlark|bzl|bazel)"
2014injection-regex = "(starlark|bzl|bazel)"
1932file-types = ["bzl", "bazel", "BUILD", "star"]
2015file-types = ["bzl", "bazel", "BUILD", "star"]
1933−roots = []
1934comment-token = "#"
2016comment-token = "#"
1935indent = { tab-width = 4, unit = " " }
2017indent = { tab-width = 4, unit = " " }
1936grammar = "python"
2018grammar = "python"
@@ -1939,7 +2021,6 @@ grammar = "python"
1939name = "elvish"
2021name = "elvish"
1940scope = "source.elvish"
2022scope = "source.elvish"
1941file-types = ["elv"]
2023file-types = ["elv"]
1942−roots = []
1943comment-token = "#"
2024comment-token = "#"
1944indent = { tab-width = 2, unit = " " }
2025indent = { tab-width = 2, unit = " " }
1945language-servers = [ "elvish" ]
2026language-servers = [ "elvish" ]
@@ -1955,7 +2036,6 @@ scope = "source.idr"
1955injection-regex = "idr"
2036injection-regex = "idr"
1956file-types = ["idr"]
2037file-types = ["idr"]
1957shebangs = []
2038shebangs = []
1958−roots = []
1959comment-token = "--"
2039comment-token = "--"
1960indent = { tab-width = 2, unit = " " }
2040indent = { tab-width = 2, unit = " " }
1961language-servers = [ "idris2-lsp" ]
2041language-servers = [ "idris2-lsp" ]
@@ -1979,20 +2059,18 @@ name = "ungrammar"
1979scope = "source.ungrammar"
2059scope = "source.ungrammar"
1980injection-regex = "ungrammar"
2060injection-regex = "ungrammar"
1981file-types = ["ungram", "ungrammar"]
2061file-types = ["ungram", "ungrammar"]
1982−roots = []
1983comment-token = "//"
2062comment-token = "//"
1984indent = { tab-width = 2, unit = " " }
2063indent = { tab-width = 2, unit = " " }
1985
2064
1986[[grammar]]
2065[[grammar]]
1987name = "ungrammar"
2066name = "ungrammar"
1988−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" }
1989
2068
1990[[language]]
2069[[language]]
1991name = "dot"
2070name = "dot"
1992scope = "source.dot"
2071scope = "source.dot"
1993injection-regex = "dot"
2072injection-regex = "dot"
1994file-types = ["dot"]
2073file-types = ["dot"]
1995−roots = []
1996comment-token = "//"
2074comment-token = "//"
1997indent = { tab-width = 4, unit = " " }
2075indent = { tab-width = 4, unit = " " }
1998language-servers = [ "dot-language-server" ]
2076language-servers = [ "dot-language-server" ]
@@ -2022,7 +2100,6 @@ name = "slint"
2022scope = "source.slint"
2100scope = "source.slint"
2023injection-regex = "slint"
2101injection-regex = "slint"
2024file-types = ["slint"]
2102file-types = ["slint"]
2025−roots = []
2026comment-token = "//"
2103comment-token = "//"
2027indent = { tab-width = 4, unit = " " }
2104indent = { tab-width = 4, unit = " " }
2028language-servers = [ "slint-lsp" ]
2105language-servers = [ "slint-lsp" ]
@@ -2036,7 +2113,6 @@ name = "task"
2036scope = "source.task"
2113scope = "source.task"
2037injection-regex = "task"
2114injection-regex = "task"
2038file-types = ["task"]
2115file-types = ["task"]
2039−roots = []
2040comment-token = "#"
2116comment-token = "#"
2041indent = { tab-width = 2, unit = " " }
2117indent = { tab-width = 2, unit = " " }
2042
2118
@@ -2049,7 +2125,6 @@ name = "xit"
2049scope = "source.xit"
2125scope = "source.xit"
2050injection-regex = "xit"
2126injection-regex = "xit"
2051file-types = ["xit"]
2127file-types = ["xit"]
2052−roots = []
2053indent = { tab-width = 4, unit = " " }
2128indent = { tab-width = 4, unit = " " }
2054
2129
2055[[grammar]]
2130[[grammar]]
@@ -2067,14 +2142,13 @@ roots = ["edgedb.toml"]
2067
2142
2068[[grammar]]
2143[[grammar]]
2069name ="esdl"
2144name ="esdl"
2070−source = { git = "https://github.com/greym0uth/tree-sitter-esdl", rev = "b840c8a8028127e0a7c6e6c45141adade2bd75cf" }
2145+source = { git = "https://github.com/greym0uth/tree-sitter-esdl", rev = "df83acc8cacd0cfb139eecee0e718dc32c4f92e2" }
2071
2146
2072[[language]]
2147[[language]]
2073name = "pascal"
2148name = "pascal"
2074scope = "source.pascal"
2149scope = "source.pascal"
2075injection-regex = "pascal"
2150injection-regex = "pascal"
2076file-types = ["pas", "pp", "inc", "lpr", "lfm"]
2151file-types = ["pas", "pp", "inc", "lpr", "lfm"]
2077−roots = []
2078comment-token = "//"
2152comment-token = "//"
2079indent = { tab-width = 2, unit = " " }
2153indent = { tab-width = 2, unit = " " }
2080language-servers = [ "pasls" ]
2154language-servers = [ "pasls" ]
@@ -2089,7 +2163,6 @@ scope = "source.sml"
2089injection-regex = "sml"
2163injection-regex = "sml"
2090file-types = ["sml"]
2164file-types = ["sml"]
2091comment-token = "(*"
2165comment-token = "(*"
2092−roots = []
2093
2166
2094[[grammar]]
2167[[grammar]]
2095name = "sml"
2168name = "sml"
@@ -2113,19 +2186,17 @@ name = "astro"
2113scope = "source.astro"
2186scope = "source.astro"
2114injection-regex = "astro"
2187injection-regex = "astro"
2115file-types = ["astro"]
2188file-types = ["astro"]
2116−roots = []
2117indent = { tab-width = 2, unit = " " }
2189indent = { tab-width = 2, unit = " " }
2118
2190
2119[[grammar]]
2191[[grammar]]
2120name = "astro"
2192name = "astro"
2121−source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "5f5c3e73c45967df9aa42f861fad2d77cd4e0900" }
2193+source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "947e93089e60c66e681eba22283f4037841451e7" }
2122
2194
2123[[language]]
2195[[language]]
2124name = "bass"
2196name = "bass"
2125scope = "source.bass"
2197scope = "source.bass"
2126injection-regex = "bass"
2198injection-regex = "bass"
2127file-types = ["bass"]
2199file-types = ["bass"]
2128−roots = []
2129comment-token = ";"
2200comment-token = ";"
2130indent = { tab-width = 2, unit = " " }
2201indent = { tab-width = 2, unit = " " }
2131language-servers = [ "bass" ]
2202language-servers = [ "bass" ]
@@ -2139,7 +2210,6 @@ name = "wat"
2139scope = "source.wat"
2210scope = "source.wat"
2140comment-token = ";;"
2211comment-token = ";;"
2141file-types = ["wat"]
2212file-types = ["wat"]
2142−roots = []
2143
2213
2144[[grammar]]
2214[[grammar]]
2145name = "wat"
2215name = "wat"
@@ -2150,7 +2220,6 @@ name = "wast"
2150scope = "source.wast"
2220scope = "source.wast"
2151comment-token = ";;"
2221comment-token = ";;"
2152file-types = ["wast"]
2222file-types = ["wast"]
2153−roots = []
2154
2223
2155[[grammar]]
2224[[grammar]]
2156name = "wast"
2225name = "wast"
@@ -2160,7 +2229,6 @@ source = { git = "https://github.com/wasm-lsp/tree-sitter-wasm", rev = "2ca28a9f
2160name = "d"
2229name = "d"
2161scope = "source.d"
2230scope = "source.d"
2162file-types = [ "d", "dd" ]
2231file-types = [ "d", "dd" ]
2163−roots = []
2164comment-token = "//"
2232comment-token = "//"
2165injection-regex = "d"
2233injection-regex = "d"
2166indent = { tab-width = 4, unit = " "}
2234indent = { tab-width = 4, unit = " "}
@@ -2169,13 +2237,12 @@ formatter = { command = "dfmt" }
2169
2237
2170[[grammar]]
2238[[grammar]]
2171name = "d"
2239name = "d"
2172−source = { git = "https://github.com/gdamore/tree-sitter-d", rev="601c4a1e8310fb2f3c43fa8a923d0d27497f3c04" }
2240+source = { git = "https://github.com/gdamore/tree-sitter-d", rev = "5566f8ce8fc24186fad06170bbb3c8d97c935d74" }
2173
2241
2174[[language]]
2242[[language]]
2175name = "vhs"
2243name = "vhs"
2176scope = "source.vhs"
2244scope = "source.vhs"
2177file-types = ["tape"]
2245file-types = ["tape"]
2178−roots = []
2179comment-token = "#"
2246comment-token = "#"
2180indent = { tab-width = 2, unit = " " }
2247indent = { tab-width = 2, unit = " " }
2181grammar = "vhs"
2248grammar = "vhs"
@@ -2188,21 +2255,76 @@ source = { git = "https://github.com/charmbracelet/tree-sitter-vhs", rev = "c6d8
2188name = "kdl"
2255name = "kdl"
2189scope = "source.kdl"
2256scope = "source.kdl"
2190file-types = ["kdl"]
2257file-types = ["kdl"]
2191−roots = []
2192comment-token = "//"
2258comment-token = "//"
2193injection-regex = "kdl"
2259injection-regex = "kdl"
2194
2260
2195[[grammar]]
2261[[grammar]]
2196name = "kdl"
2262name = "kdl"
2197−source = { git = "https://github.com/Unoqwy/tree-sitter-kdl", rev = "e1cd292c6d15df6610484e1d4b5c987ecad52373" }
2263+source = { git = "https://github.com/amaanq/tree-sitter-kdl", rev = "3ca569b9f9af43593c24f9e7a21f02f43a13bb88" }
2198
2264
2199[[language]]
2265[[language]]
2200name = "xml"
2266name = "xml"
2201scope = "source.xml"
2267scope = "source.xml"
2202injection-regex = "xml"
2268injection-regex = "xml"
2203−file-types = ["xml", "mobileconfig", "plist", "xib", "storyboard", "svg", "xsd", "gml", "xaml", "gir"]
2269+file-types = [
2270+ "xml",
2271+ "mobileconfig",
2272+ "plist",
2273+ "xib",
2274+ "storyboard",
2275+ "svg",
2276+ "xsd",
2277+ "gml",
2278+ "xaml",
2279+ "gir",
2280+ "rss",
2281+ "atom",
2282+ "opml",
2283+ "policy",
2284+ "ascx",
2285+ "axml",
2286+ "axaml",
2287+ "bpmn",
2288+ "cpt",
2289+ "csl",
2290+ "csproj.user",
2291+ "dita",
2292+ "ditamap",
2293+ "dtml",
2294+ "fxml",
2295+ "iml",
2296+ "isml",
2297+ "jmx",
2298+ "launch",
2299+ "menu",
2300+ "mxml",
2301+ "nuspec",
2302+ "pt",
2303+ "publishsettings",
2304+ "pubxml",
2305+ "pubxml.user",
2306+ "rbxlx",
2307+ "rbxmx",
2308+ "rng",
2309+ "shproj",
2310+ "tld",
2311+ "tmx",
2312+ "vbproj.user",
2313+ "vcxproj",
2314+ "vcxproj.filters",
2315+ "wsdl",
2316+ "wxi",
2317+ "wxs",
2318+ "xbl",
2319+ "xlf",
2320+ "xliff",
2321+ "xpdl",
2322+ "xul",
2323+ "xoml",
2324+ "musicxml",
2325+ "glif"
2326+]
2204indent = { tab-width = 2, unit = " " }
2327indent = { tab-width = 2, unit = " " }
2205−roots = []
2206
2328
2207[language.auto-pairs]
2329[language.auto-pairs]
2208'(' = ')'
2330'(' = ')'
@@ -2223,7 +2345,6 @@ scope = "source.dtd"
2223injection-regex = "dtd"
2345injection-regex = "dtd"
2224file-types = ["dtd", "ent"]
2346file-types = ["dtd", "ent"]
2225indent = {tab-width = 2, unit = " "}
2347indent = {tab-width = 2, unit = " "}
2226−roots = []
2227
2348
2228[language.auto-pairs]
2349[language.auto-pairs]
2229'(' = ')'
2350'(' = ')'
@@ -2241,7 +2362,6 @@ name = "wit"
2241scope = "source.wit"
2362scope = "source.wit"
2242injection-regex = "wit"
2363injection-regex = "wit"
2243file-types = ["wit"]
2364file-types = ["wit"]
2244−roots = []
2245comment-token = "//"
2365comment-token = "//"
2246indent = { tab-width = 2, unit = " " }
2366indent = { tab-width = 2, unit = " " }
2247
2367
@@ -2260,11 +2380,10 @@ source = { git = "https://github.com/hh9527/tree-sitter-wit", rev = "c917790ab9a
2260[[language]]
2380[[language]]
2261name = "env"
2381name = "env"
2262scope = "source.env"
2382scope = "source.env"
2263−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"]
2264injection-regex = "env"
2384injection-regex = "env"
2265comment-token = "#"
2385comment-token = "#"
2266indent = { tab-width = 4, unit = "\t" }
2386indent = { tab-width = 4, unit = "\t" }
2267−roots = []
2268grammar = "bash"
2387grammar = "bash"
2269
2388
2270[[language]]
2389[[language]]
@@ -2288,12 +2407,15 @@ file-types = [
2288 "container",
2407 "container",
2289 "volume",
2408 "volume",
2290 "kube",
2409 "kube",
2291− "network"
2410+ "network",
2411+ ".editorconfig",
2412+ "properties",
2413+ "cfg",
2414+ "directory"
2292]
2415]
2293injection-regex = "ini"
2416injection-regex = "ini"
2294comment-token = "#"
2417comment-token = "#"
2295indent = { tab-width = 4, unit = "\t" }
2418indent = { tab-width = 4, unit = "\t" }
2296−roots = []
2297
2419
2298[[grammar]]
2420[[grammar]]
2299name = "ini"
2421name = "ini"
@@ -2303,7 +2425,6 @@ source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "4d247fb87
2303name = "bicep"
2425name = "bicep"
2304scope = "source.bicep"
2426scope = "source.bicep"
2305file-types = ["bicep"]
2427file-types = ["bicep"]
2306−roots = []
2307auto-format = true
2428auto-format = true
2308comment-token = "//"
2429comment-token = "//"
2309indent = { tab-width = 2, unit = " "}
2430indent = { tab-width = 2, unit = " "}
@@ -2317,7 +2438,6 @@ source = { git = "https://github.com/the-mikedavis/tree-sitter-bicep", rev = "d8
2317name = "qml"
2438name = "qml"
2318scope = "source.qml"
2439scope = "source.qml"
2319file-types = ["qml"]
2440file-types = ["qml"]
2320−roots = []
2321language-servers = [ "qmlls" ]
2441language-servers = [ "qmlls" ]
2322indent = { tab-width = 4, unit = " " }
2442indent = { tab-width = 4, unit = " " }
2323grammar = "qmljs"
2443grammar = "qmljs"
@@ -2331,7 +2451,6 @@ name = "mermaid"
2331scope = "source.mermaid"
2451scope = "source.mermaid"
2332injection-regex = "mermaid"
2452injection-regex = "mermaid"
2333file-types = ["mermaid"]
2453file-types = ["mermaid"]
2334−roots = []
2335comment-token = "%%"
2454comment-token = "%%"
2336indent = { tab-width = 4, unit = " " }
2455indent = { tab-width = 4, unit = " " }
2337
2456
@@ -2345,12 +2464,11 @@ scope = "source.m"
2345file-types = ["m"]
2464file-types = ["m"]
2346comment-token = "%"
2465comment-token = "%"
2347shebangs = ["octave-cli", "matlab"]
2466shebangs = ["octave-cli", "matlab"]
2348−roots = []
2349indent = { tab-width = 2, unit = " " }
2467indent = { tab-width = 2, unit = " " }
2350
2468
2351[[grammar]]
2469[[grammar]]
2352name = "matlab"
2470name = "matlab"
2353−source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "676117eafa64afedc8380a921a77cd9f2244bc6b" }
2471+source = { git = "https://github.com/acristoffers/tree-sitter-matlab", rev = "6071891a8c39600203eba20513666cf93b4d650a" }
2354
2472
2355[[language]]
2473[[language]]
2356name = "ponylang"
2474name = "ponylang"
@@ -2370,7 +2488,6 @@ name = "dhall"
2370scope = "source.dhall"
2488scope = "source.dhall"
2371injection-regex = "dhall"
2489injection-regex = "dhall"
2372file-types = ["dhall"]
2490file-types = ["dhall"]
2373−roots = []
2374comment-token = "--"
2491comment-token = "--"
2375indent = { tab-width = 2, unit = " " }
2492indent = { tab-width = 2, unit = " " }
2376language-servers = [ "dhall-lsp-server" ]
2493language-servers = [ "dhall-lsp-server" ]
@@ -2385,7 +2502,6 @@ name = "sage"
2385scope = "source.sage"
2502scope = "source.sage"
2386file-types = ["sage"]
2503file-types = ["sage"]
2387injection-regex = "sage"
2504injection-regex = "sage"
2388−roots = []
2389comment-token = "#"
2505comment-token = "#"
2390indent = { tab-width = 4, unit = " " }
2506indent = { tab-width = 4, unit = " " }
2391grammar = "python"
2507grammar = "python"
@@ -2396,7 +2512,6 @@ scope = "source.msbuild"
2396injection-regex = "msbuild"
2512injection-regex = "msbuild"
2397file-types = ["proj", "vbproj", "csproj", "fsproj", "targets", "props"]
2513file-types = ["proj", "vbproj", "csproj", "fsproj", "targets", "props"]
2398indent = { tab-width = 2, unit = " " }
2514indent = { tab-width = 2, unit = " " }
2399−roots = []
2400grammar = "xml"
2515grammar = "xml"
2401
2516
2402[language.auto-pairs]
2517[language.auto-pairs]
@@ -2412,7 +2527,6 @@ name = "pem"
2412scope = "source.pem"
2527scope = "source.pem"
2413file-types = ["pem", "cert", "crt"]
2528file-types = ["pem", "cert", "crt"]
2414injection-regex = "pem"
2529injection-regex = "pem"
2415−roots = []
2416grammar = "pem"
2530grammar = "pem"
2417
2531
2418[[grammar]]
2532[[grammar]]
@@ -2423,7 +2537,6 @@ source = { git = "https://github.com/mtoohey31/tree-sitter-pem", rev = "be67a433
2423name = "passwd"
2537name = "passwd"
2424scope = "source.passwd"
2538scope = "source.passwd"
2425file-types = ["passwd"]
2539file-types = ["passwd"]
2426−roots = []
2427
2540
2428[[grammar]]
2541[[grammar]]
2429name = "passwd"
2542name = "passwd"
@@ -2433,7 +2546,6 @@ source = { git = "https://github.com/ath3/tree-sitter-passwd", rev = "20239395ea
2433name = "hosts"
2546name = "hosts"
2434scope = "source.hosts"
2547scope = "source.hosts"
2435file-types = ["hosts"]
2548file-types = ["hosts"]
2436−roots = []
2437comment-token = "#"
2549comment-token = "#"
2438
2550
2439[[grammar]]
2551[[grammar]]
@@ -2445,20 +2557,18 @@ name = "uxntal"
2445scope = "source.tal"
2557scope = "source.tal"
2446injection-regex = "tal"
2558injection-regex = "tal"
2447file-types = ["tal"]
2559file-types = ["tal"]
2448−roots = []
2449auto-format = false
2560auto-format = false
2450comment-token = "("
2561comment-token = "("
2451
2562
2452[[grammar]]
2563[[grammar]]
2453name = "uxntal"
2564name = "uxntal"
2454−source = { git = "https://github.com/Jummit/tree-sitter-uxntal", rev = "9297e95ef74380b0ad84c4fd98f91e9f6e4319e6" }
2565+source = { git = "https://github.com/Jummit/tree-sitter-uxntal", rev = "d68406066648cd6db4c6a2f11ec305af02079884" }
2455
2566
2456[[language]]
2567[[language]]
2457name = "yuck"
2568name = "yuck"
2458scope = "source.yuck"
2569scope = "source.yuck"
2459injection-regex = "yuck"
2570injection-regex = "yuck"
2460file-types = ["yuck"]
2571file-types = ["yuck"]
2461−roots = []
2462comment-token = ";"
2572comment-token = ";"
2463indent = { tab-width = 2, unit = " " }
2573indent = { tab-width = 2, unit = " " }
2464
2574
@@ -2471,7 +2581,6 @@ name = "prql"
2471scope = "source.prql"
2581scope = "source.prql"
2472injection-regex = "prql"
2582injection-regex = "prql"
2473file-types = ["prql"]
2583file-types = ["prql"]
2474−roots = []
2475comment-token = "#"
2584comment-token = "#"
2476indent = { tab-width = 4, unit = " " }
2585indent = { tab-width = 4, unit = " " }
2477
2586
@@ -2483,7 +2592,6 @@ source = { git = "https://github.com/PRQL/tree-sitter-prql", rev = "09e158cd3650
2483name = "po"
2592name = "po"
2484scope = "source.po"
2593scope = "source.po"
2485file-types = ["po", "pot"]
2594file-types = ["po", "pot"]
2486−roots = []
2487comment-token = "#"
2595comment-token = "#"
2488
2596
2489[[grammar]]
2597[[grammar]]
@@ -2493,9 +2601,8 @@ source = { git = "https://github.com/erasin/tree-sitter-po", rev = "417cee9abb20
2493[[language]]
2601[[language]]
2494name = "nasm"
2602name = "nasm"
2495scope = "source.nasm"
2603scope = "source.nasm"
2496−file-types = ["asm", "s", "S", "nasm"]
2604+file-types = ["asm", "S", "nasm"]
2497injection-regex = "n?asm"
2605injection-regex = "n?asm"
2498−roots = []
2499comment-token = ";"
2606comment-token = ";"
2500indent = { tab-width = 8, unit = " " }
2607indent = { tab-width = 8, unit = " " }
2501
2608
@@ -2503,12 +2610,23 @@ indent = { tab-width = 8, unit = " " }
2503name = "nasm"
2610name = "nasm"
2504source = { git = "https://github.com/naclsn/tree-sitter-nasm", rev = "a0db15db6fcfb1bf2cc8702500e55e558825c48b" }
2611source = { git = "https://github.com/naclsn/tree-sitter-nasm", rev = "a0db15db6fcfb1bf2cc8702500e55e558825c48b" }
2505
2612
2613+[[language]]
2614+name = "gas"
2615+scope = "source.gas"
2616+file-types = ["s"]
2617+injection-regex = "gas"
2618+comment-token = "#"
2619+indent = { tab-width = 8, unit = " " }
2620+
2621+[[grammar]]
2622+name = "gas"
2623+source = { git = "https://github.com/sirius94/tree-sitter-gas", rev = "60f443646b20edee3b7bf18f3a4fb91dc214259a" }
2624+
2506[[language]]
2625[[language]]
2507name = "rst"
2626name = "rst"
2508scope = "source.rst"
2627scope = "source.rst"
2509comment-token = ".."
2628comment-token = ".."
2510file-types = ["rst"]
2629file-types = ["rst"]
2511−roots = []
2512
2630
2513[[grammar]]
2631[[grammar]]
2514name = "rst"
2632name = "rst"
@@ -2519,7 +2637,6 @@ name = "capnp"
2519scope = "source.capnp"
2637scope = "source.capnp"
2520injection-regex = "capnp"
2638injection-regex = "capnp"
2521file-types = ["capnp"]
2639file-types = ["capnp"]
2522−roots = []
2523comment-token = "#"
2640comment-token = "#"
2524indent = { tab-width = 2, unit = " " }
2641indent = { tab-width = 2, unit = " " }
2525
2642
@@ -2545,7 +2662,6 @@ source = { git = "https://github.com/indoorvivants/tree-sitter-smithy", rev = "c
2545name = "vhdl"
2662name = "vhdl"
2546scope = "source.vhdl"
2663scope = "source.vhdl"
2547file-types = ["vhd", "vhdl"]
2664file-types = ["vhd", "vhdl"]
2548−roots = []
2549comment-token = "--"
2665comment-token = "--"
2550language-servers = [ "vhdl_ls" ]
2666language-servers = [ "vhdl_ls" ]
2551indent = { tab-width = 2, unit = " " }
2667indent = { tab-width = 2, unit = " " }
@@ -2557,7 +2673,6 @@ source = { git = "https://github.com/teburd/tree-sitter-vhdl", rev = "c57313adee
2557
2673
2558[[language]]
2674[[language]]
2559name = "rego"
2675name = "rego"
2560−roots = []
2561scope = "source.rego"
2676scope = "source.rego"
2562injection-regex = "rego"
2677injection-regex = "rego"
2563file-types = ["rego"]
2678file-types = ["rego"]
@@ -2568,7 +2683,7 @@ grammar = "rego"
2568
2683
2569[[grammar]]
2684[[grammar]]
2570name = "rego"
2685name = "rego"
2571−source = { git = "https://github.com/FallenAngel97/tree-sitter-rego", rev = "b2667c975f07b33be3ceb83bea5cfbad88095866" }
2686+source = { git = "https://github.com/FallenAngel97/tree-sitter-rego", rev = "9ac75e71b2d791e0aadeef68098319d86a2a14cf" }
2572
2687
2573[[language]]
2688[[language]]
2574name = "nim"
2689name = "nim"
@@ -2576,7 +2691,6 @@ scope = "source.nim"
2576injection-regex = "nim"
2691injection-regex = "nim"
2577file-types = ["nim", "nims", "nimble"]
2692file-types = ["nim", "nims", "nimble"]
2578shebangs = []
2693shebangs = []
2579−roots = []
2580comment-token = "#"
2694comment-token = "#"
2581indent = { tab-width = 2, unit = " " }
2695indent = { tab-width = 2, unit = " " }
2582language-servers = [ "nimlangserver" ]
2696language-servers = [ "nimlangserver" ]
@@ -2600,13 +2714,13 @@ file-types = [ "cabal" ]
2600roots = ["cabal.project", "Setup.hs"]
2714roots = ["cabal.project", "Setup.hs"]
2601indent = { tab-width = 2, unit = " " }
2715indent = { tab-width = 2, unit = " " }
2602comment-token = "--"
2716comment-token = "--"
2717+language-servers = [ "haskell-language-server" ]
2603
2718
2604[[language]]
2719[[language]]
2605name = "hurl"
2720name = "hurl"
2606scope = "source.hurl"
2721scope = "source.hurl"
2607injection-regex = "hurl"
2722injection-regex = "hurl"
2608file-types = ["hurl"]
2723file-types = ["hurl"]
2609−roots = []
2610comment-token = "#"
2724comment-token = "#"
2611indent = { tab-width = 2, unit = " " }
2725indent = { tab-width = 2, unit = " " }
2612
2726
@@ -2617,7 +2731,6 @@ source = { git = "https://github.com/pfeiferj/tree-sitter-hurl", rev = "264c4206
2617[[language]]
2731[[language]]
2618name = "markdoc"
2732name = "markdoc"
2619scope = "text.markdoc"
2733scope = "text.markdoc"
2620−roots = []
2621file-types = ["mdoc"]
2734file-types = ["mdoc"]
2622language-servers = [ "markdoc-ls" ]
2735language-servers = [ "markdoc-ls" ]
2623
2736
@@ -2630,7 +2743,6 @@ name = "opencl"
2630scope = "source.cl"
2743scope = "source.cl"
2631injection-regex = "(cl|opencl)"
2744injection-regex = "(cl|opencl)"
2632file-types = ["cl"]
2745file-types = ["cl"]
2633−roots = []
2634comment-token = "//"
2746comment-token = "//"
2635language-servers = [ "clangd" ]
2747language-servers = [ "clangd" ]
2636
2748
@@ -2643,7 +2755,6 @@ name = "just"
2643scope = "source.just"
2755scope = "source.just"
2644file-types = ["justfile", "Justfile", ".justfile", ".Justfile"]
2756file-types = ["justfile", "Justfile", ".justfile", ".Justfile"]
2645injection-regex = "just"
2757injection-regex = "just"
2646−roots = []
2647comment-token = "#"
2758comment-token = "#"
2648indent = { tab-width = 4, unit = "\t" }
2759indent = { tab-width = 4, unit = "\t" }
2649
2760
@@ -2651,40 +2762,52 @@ indent = { tab-width = 4, unit = "\t" }
2651name = "just"
2762name = "just"
2652source = { git = "https://github.com/IndianBoy42/tree-sitter-just", rev = "8af0aab79854aaf25b620a52c39485849922f766" }
2763source = { git = "https://github.com/IndianBoy42/tree-sitter-just", rev = "8af0aab79854aaf25b620a52c39485849922f766" }
2653
2764
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+
2654[[language]]
2779[[language]]
2655name = "blueprint"
2780name = "blueprint"
2656scope = "source.blueprint"
2781scope = "source.blueprint"
2657injection-regex = "blueprint"
2782injection-regex = "blueprint"
2658file-types = ["blp"]
2783file-types = ["blp"]
2659−roots = []
2660comment-token = "//"
2784comment-token = "//"
2661language-servers = [ "blueprint-compiler" ]
2785language-servers = [ "blueprint-compiler" ]
2662indent = { tab-width = 4, unit = " " }
2786indent = { tab-width = 4, unit = " " }
2663
2787
2664[[grammar]]
2788[[grammar]]
2665name = "blueprint"
2789name = "blueprint"
2666−source = { git = "https://gitlab.com/gabmus/tree-sitter-blueprint", rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14" }
2790+source = { git = "https://gitlab.com/gabmus/tree-sitter-blueprint", rev = "863cea9f83ad5637300478e0559262f1e791684b" }
2667
2791
2668[[language]]
2792[[language]]
2669name = "forth"
2793name = "forth"
2670scope = "source.forth"
2794scope = "source.forth"
2671injection-regex = "forth"
2795injection-regex = "forth"
2672file-types = ["fs", "forth", "fth", "4th"]
2796file-types = ["fs", "forth", "fth", "4th"]
2673−roots = []
2674comment-token = "\\"
2797comment-token = "\\"
2675language-servers = [ "forth-lsp" ]
2798language-servers = [ "forth-lsp" ]
2676indent = { tab-width = 3, unit = " " }
2799indent = { tab-width = 3, unit = " " }
2677
2800
2678[[grammar]]
2801[[grammar]]
2679name = "forth"
2802name = "forth"
2680−source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "304ed77beb113e37af38b20ff14e3c37bf350d10" }
2803+source = { git = "https://github.com/alexanderbrevig/tree-sitter-forth", rev = "90189238385cf636b9ee99ce548b9e5b5e569d48" }
2681
2804
2682[[language]]
2805[[language]]
2683name = "fsharp"
2806name = "fsharp"
2684scope = "source.fs"
2807scope = "source.fs"
2685roots = ["sln", "fsproj"]
2808roots = ["sln", "fsproj"]
2686injection-regex = "fsharp"
2809injection-regex = "fsharp"
2687−file-types = ["fs", "fsx"]
2810+file-types = ["fs", "fsx", "fsi", "fsscript"]
2688comment-token = "//"
2811comment-token = "//"
2689indent = { tab-width = 4, unit = " " }
2812indent = { tab-width = 4, unit = " " }
2690auto-format = true
2813auto-format = true
@@ -2699,7 +2822,6 @@ name = "t32"
2699scope = "source.t32"
2822scope = "source.t32"
2700injection-regex = "t32"
2823injection-regex = "t32"
2701file-types = ["cmm", "t32"]
2824file-types = ["cmm", "t32"]
2702−roots = []
2703comment-token = ";"
2825comment-token = ";"
2704indent = { tab-width = 2, unit = " " }
2826indent = { tab-width = 2, unit = " " }
2705
2827
@@ -2712,16 +2834,34 @@ name = "webc"
2712scope = "text.html.webc"
2834scope = "text.html.webc"
2713injection-regex = "webc"
2835injection-regex = "webc"
2714file-types = ["webc"]
2836file-types = ["webc"]
2715−roots = []
2716indent = { tab-width = 2, unit = " " }
2837indent = { tab-width = 2, unit = " " }
2717grammar = "html"
2838grammar = "html"
2718
2839
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+
2719[[language]]
2860[[language]]
2720name = "nunjucks"
2861name = "nunjucks"
2721scope = "text.html.nunjucks"
2862scope = "text.html.nunjucks"
2722injection-regex = "nunjucks"
2863injection-regex = "nunjucks"
2723file-types = ["njk"]
2864file-types = ["njk"]
2724−roots = []
2725indent = { tab-width = 2, unit = " " }
2865indent = { tab-width = 2, unit = " " }
2726grammar = "jinja2"
2866grammar = "jinja2"
2727
2867
@@ -2730,7 +2870,6 @@ name = "jinja"
2730scope = "text.html.jinja"
2870scope = "text.html.jinja"
2731injection-regex = "jinja"
2871injection-regex = "jinja"
2732file-types = ["jinja", "jinja2", "j2"]
2872file-types = ["jinja", "jinja2", "j2"]
2733−roots = []
2734indent = { tab-width = 2, unit = " " }
2873indent = { tab-width = 2, unit = " " }
2735grammar = "jinja2"
2874grammar = "jinja2"
2736
2875
@@ -2747,7 +2886,6 @@ name = "wren"
2747scope = "source.wren"
2886scope = "source.wren"
2748injection-regex = "wren"
2887injection-regex = "wren"
2749file-types = ["wren"]
2888file-types = ["wren"]
2750−roots = []
2751indent = { tab-width = 2, unit = " "}
2889indent = { tab-width = 2, unit = " "}
2752
2890
2753[[language]]
2891[[language]]
@@ -2756,7 +2894,6 @@ scope = "source.unison"
2756injection-regex = "unison"
2894injection-regex = "unison"
2757file-types = ["u"]
2895file-types = ["u"]
2758shebangs = []
2896shebangs = []
2759−roots = []
2760auto-format = false
2897auto-format = false
2761comment-token = "--"
2898comment-token = "--"
2762indent = { tab-width = 4, unit = " " }
2899indent = { tab-width = 4, unit = " " }
@@ -2776,7 +2913,6 @@ source = { git = "https://github.com/kylegoetz/tree-sitter-unison", rev = "98c4e
2776name = "todotxt"
2913name = "todotxt"
2777scope = "text.todotxt"
2914scope = "text.todotxt"
2778file-types = [{ suffix = ".todo.txt" }, "todotxt"]
2915file-types = [{ suffix = ".todo.txt" }, "todotxt"]
2779−roots = []
2780formatter = { command = "sort" }
2916formatter = { command = "sort" }
2781auto-format = true
2917auto-format = true
2782
2918
@@ -2788,8 +2924,85 @@ source = { git = "https://github.com/arnarg/tree-sitter-todotxt", rev = "0207f6a
2788name = "strace"
2924name = "strace"
2789scope = "source.strace"
2925scope = "source.strace"
2790file-types = ["strace"]
2926file-types = ["strace"]
2791−roots = []
2792
2927
2793[[grammar]]
2928[[grammar]]
2794name = "strace"
2929name = "strace"
2795−source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "a0f6c50ae4087a9299f055d0f30fe94fd98189a4" }
2930+source = { git = "https://github.com/sigmaSd/tree-sitter-strace", rev = "2b18fdf9a01e7ec292cc6006724942c81beb7fd5" }
2931+
2932+[[language]]
2933+name = "gemini"
2934+scope = "source.gmi"
2935+file-types = ["gmi"]
2936+
2937+[[grammar]]
2938+name = "gemini"
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 @@
39 (identifier) @variable.parameter))
39 (identifier) @variable.parameter))
40
40
41; (p?: t)
41; (p?: t)
42−; (p?: t = 1) // Invalid but still posible to hihglight.
42+; (p?: t = 1) // Invalid but still possible to highlight.
43(optional_parameter
43(optional_parameter
44 (identifier) @variable.parameter)
44 (identifier) @variable.parameter)
45
45
46−; (...p?: t) // Invalid but still posible to hihglight.
46+; (...p?: t) // Invalid but still possible to highlight.
47(optional_parameter
47(optional_parameter
48 (rest_pattern
48 (rest_pattern
49 (identifier) @variable.parameter))
49 (identifier) @variable.parameter))
@@ -59,7 +59,7 @@
59 (pair_pattern
59 (pair_pattern
60 value: (identifier) @variable.parameter)))
60 value: (identifier) @variable.parameter)))
61
61
62−; ([ p ]?: t[]) // Invalid but still posible to hihglight.
62+; ([ p ]?: t[]) // Invalid but still possible to highlight.
63(optional_parameter
63(optional_parameter
64 (array_pattern
64 (array_pattern
65 (identifier) @variable.parameter))
65 (identifier) @variable.parameter))
@@ -107,6 +107,8 @@
107; Types
107; Types
108; -----
108; -----
109
109
110+(type_parameter
111+ name: (type_identifier) @type.parameter)
110(type_identifier) @type
112(type_identifier) @type
111(predefined_type) @type.builtin
113(predefined_type) @type.builtin
112
114
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+
1; Definitions
10; Definitions
2;------------
11;------------
3
12
13+(type_parameter
14+ name: (type_identifier) @local.definition)
15+
4; Javascript and Typescript Treesitter grammars deviate when defining the
16; Javascript and Typescript Treesitter grammars deviate when defining the
5; tree structure for parameters, so we need to address them in each specific
17; tree structure for parameters, so we need to address them in each specific
6; language instead of ecma.
18; language instead of ecma.
@@ -14,3 +26,8 @@
14; (i?: t = 1) // Invalid but still posible to hihglight.
26; (i?: t = 1) // Invalid but still posible to hihglight.
15(optional_parameter
27(optional_parameter
16 (identifier) @local.definition)
28 (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 @@
2 (function_definition)
2 (function_definition)
3 (if_statement)
3 (if_statement)
4 (for_statement)
4 (for_statement)
5+ (while_statement)
5 (case_statement)
6 (case_statement)
6 (pipeline)
7 (pipeline)
7] @indent
8] @indent
runtime/queries/blueprint/highlights.scm+5
@@ -15,6 +15,11 @@
15(decorator) @attribute
15(decorator) @attribute
16
16
17(property_definition (property_name) @variable.other.member)
17(property_definition (property_name) @variable.other.member)
18+(property_definition
19+ (property_binding
20+ "bind" @keyword
21+ (property_name) @variable.other.member
22+ ["no-sync-create" "bidirectional" "inverted"]* @keyword))
18
23
19(object) @type
24(object) @type
20
25
runtime/queries/c/indents.scm+13
@@ -36,3 +36,16 @@
36(parameter_list
36(parameter_list
37 . (parameter_declaration) @anchor
37 . (parameter_declaration) @anchor
38 (#set! "scope" "tail")) @align
38 (#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 @@
7
7
8; Hint level tags
8; Hint level tags
9((tag (name) @hint)
9((tag (name) @hint)
10− (#match? @hint "^(HINT|MARK)$"))
10+ (#match? @hint "^(HINT|MARK|PASSED|STUB|MOCK)$"))
11
11
12("text" @hint
12("text" @hint
13− (#match? @hint "^(HINT|MARK)$"))
13+ (#match? @hint "^(HINT|MARK|PASSED|STUB|MOCK)$"))
14
14
15; Info level tags
15; Info level tags
16((tag (name) @info)
16((tag (name) @info)
17− (#match? @info "^(INFO|NOTE|TODO)$"))
17+ (#match? @info "^(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK)$"))
18
18
19("text" @info
19("text" @info
20− (#match? @info "^(INFO|NOTE|TODO)$"))
20+ (#match? @info "^(INFO|NOTE|TODO|PERF|OPTIMIZE|PERFORMANCE|QUESTION|ASK)$"))
21
21
22; Warning level tags
22; Warning level tags
23((tag (name) @warning)
23((tag (name) @warning)
24− (#match? @warning "^(HACK|WARN|WARNING)$"))
24+ (#match? @warning "^(HACK|WARN|WARNING|TEST|TEMP)$"))
25
25
26("text" @warning
26("text" @warning
27− (#match? @warning "^(HACK|WARN|WARNING)$"))
27+ (#match? @warning "^(HACK|WARN|WARNING|TEST|TEMP)$"))
28
28
29; Error level tags
29; Error level tags
30((tag (name) @error)
30((tag (name) @error)
31− (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
31+ (#match? @error "^(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG)$"))
32
32
33("text" @error
33("text" @error
34− (#match? @error "^(BUG|FIXME|ISSUE|XXX)$"))
34+ (#match? @error "^(BUG|FIXME|ISSUE|XXX|FIX|SAFETY|FIXIT|FAILED|DEBUG)$"))
35
35
36(tag
36(tag
37 (name) @ui.text
37 (name) @ui.text
runtime/queries/common-lisp/indents.scmnew file+1
@@ -0,0 +1 @@
1+; inherits: scheme
runtime/queries/dart/highlights.scm+3−1
@@ -200,6 +200,7 @@
200 "async"
200 "async"
201 "async*"
201 "async*"
202 "await"
202 "await"
203+ "base"
203 "class"
204 "class"
204 "covariant"
205 "covariant"
205 "deferred"
206 "deferred"
@@ -219,6 +220,7 @@
219 "operator"
220 "operator"
220 "part"
221 "part"
221 "required"
222 "required"
223+ "sealed"
222 "set"
224 "set"
223 "show"
225 "show"
224 "static"
226 "static"
@@ -230,7 +232,7 @@
230
232
231; when used as an identifier:
233; when used as an identifier:
232((identifier) @variable.builtin
234((identifier) @variable.builtin
233− (#match? @variable.builtin "^(abstract|as|covariant|deferred|dynamic|export|external|factory|Function|get|implements|import|interface|library|operator|mixin|part|set|static|typedef)$"))
235+ (#match? @variable.builtin "^(abstract|as|base|covariant|deferred|dynamic|export|external|factory|Function|get|implements|import|interface|library|operator|mixin|part|sealed|set|static|typedef)$"))
234
236
235; Error
237; Error
236(ERROR) @error
238(ERROR) @error
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/gas/highlights.scmnew file+21
@@ -0,0 +1,21 @@
1+(comment) @comment
2+(number) @constant.numeric
3+(directive_name) @keyword.directive
4+(symbol) @variable
5+(label) @function
6+(label)
7+(instruction_prefix) @keyword
8+(instruction_name) @function.special
9+(register) @constant.builtin
10+(string) @string
11+(char) @constant.character
12+(type) @type
13+(constant "$" @constant)
14+(operand_modifier) @attribute
15+
16+(expression
17+ ["-" "+" "*" "/" "="] @operator)
18+
19+["(" ")"] @punctuation.bracket
20+
21+["," ":"] @punctuation.delimiter
runtime/queries/gas/injections.scmnew file+2
@@ -0,0 +1,2 @@
1+((comment) @injection.content
2+ (#set! injection.language "comment"))
runtime/queries/gas/textobjects.scmnew file+2
@@ -0,0 +1,2 @@
1+(comment) @comment.inside
2+(comment)+ @comment.around
runtime/queries/gemini/highlights.scmnew file+26
@@ -0,0 +1,26 @@
1+(link) @punctuation.bracket
2+(link
3+ label: (text) @markup.link.label)
4+(link
5+ uri: (uri) @markup.link.url)
6+
7+[
8+ (start_pre)
9+ (pre)
10+ (end_pre)
11+] @markup.raw.block
12+(start_pre
13+ alt: (text) @label)
14+
15+(heading1
16+ (text) @markup.heading.1) @markup.heading.marker
17+(heading2
18+ (text) @markup.heading.2) @markup.heading.marker
19+(heading3
20+ (text) @markup.heading.3) @markup.heading.marker
21+
22+(ulist
23+ (indicator) @markup.list.unnumbered)
24+(quote
25+ (indicator) @markup.quote
26+ (text) @markup.italic)
runtime/queries/gleam/highlights.scm+16−5
@@ -21,6 +21,8 @@
21
21
22; Functions
22; Functions
23(unqualified_import (identifier) @function)
23(unqualified_import (identifier) @function)
24+(unqualified_import "type" (type_identifier) @type)
25+(unqualified_import (type_identifier) @constructor)
24(function
26(function
25 name: (identifier) @function)
27 name: (identifier) @function)
26(external_function
28(external_function
@@ -43,6 +45,13 @@
43(tuple_access
45(tuple_access
44 index: (integer) @variable.other.member)
46 index: (integer) @variable.other.member)
45
47
48+; Attributes
49+(attribute
50+ "@" @attribute
51+ name: (identifier) @attribute)
52+
53+(attribute_value (identifier) @constant)
54+
46; Type names
55; Type names
47(remote_type_identifier) @type
56(remote_type_identifier) @type
48(type_identifier) @type
57(type_identifier) @type
@@ -60,10 +69,6 @@
60(identifier) @variable
69(identifier) @variable
61(discard) @comment.unused
70(discard) @comment.unused
62
71
63−; Operators
64−(binary_expression
65− operator: _ @operator)
66−
67; Keywords
72; Keywords
68[
73[
69 (visibility_modifier) ; "pub"
74 (visibility_modifier) ; "pub"
@@ -72,6 +77,7 @@
72 "assert"
77 "assert"
73 "case"
78 "case"
74 "const"
79 "const"
80+ ; DEPRECATED: 'external' was removed in v0.30.
75 "external"
81 "external"
76 "fn"
82 "fn"
77 "if"
83 "if"
@@ -79,11 +85,16 @@
79 "let"
85 "let"
80 "panic"
86 "panic"
81 "todo"
87 "todo"
82− "try"
83 "type"
88 "type"
84 "use"
89 "use"
85] @keyword
90] @keyword
86
91
92+; Operators
93+(binary_expression
94+ operator: _ @operator)
95+(boolean_negation "!" @operator)
96+(integer_negation "-" @operator)
97+
87; Punctuation
98; Punctuation
88[
99[
89 "("
100 "("
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+13−5
@@ -11,6 +11,18 @@
11 function: (selector_expression
11 function: (selector_expression
12 field: (field_identifier) @function.method))
12 field: (field_identifier) @function.method))
13
13
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+
14; Function definitions
26; Function definitions
15
27
16(function_declaration
28(function_declaration
@@ -24,20 +36,16 @@
24
36
25; Identifiers
37; Identifiers
26
38
27−((identifier) @constant (match? @constant "^[A-Z][A-Z\\d_]+$"))
28(const_spec
39(const_spec
29 name: (identifier) @constant)
40 name: (identifier) @constant)
30
41
31(parameter_declaration (identifier) @variable.parameter)
42(parameter_declaration (identifier) @variable.parameter)
32(variadic_parameter_declaration (identifier) @variable.parameter)
43(variadic_parameter_declaration (identifier) @variable.parameter)
33
44
34−((type_identifier) @type.builtin
35− (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)$"))
36−
37−(type_identifier) @type
38(type_spec
45(type_spec
39 name: (type_identifier) @constructor)
46 name: (type_identifier) @constructor)
40(field_identifier) @variable.other.member
47(field_identifier) @variable.other.member
48+(keyed_element (literal_element (identifier) @variable.other.member))
41(identifier) @variable
49(identifier) @variable
42(package_identifier) @namespace
50(package_identifier) @namespace
43
51
runtime/queries/go/locals.scm+10−2
@@ -1,9 +1,17 @@
1; Scopes
1; Scopes
2
2
3+[
4+ (function_declaration)
5+ (type_declaration)
6+ (block)
3−(block) @local.scope
7+] @local.scope
4
8
5; Definitions
9; Definitions
6
10
11+(type_parameter_list
12+ (parameter_declaration
13+ name: (identifier) @local.definition))
14+
7(parameter_declaration (identifier) @local.definition)
15(parameter_declaration (identifier) @local.definition)
8(variadic_parameter_declaration (identifier) @local.definition)
16(variadic_parameter_declaration (identifier) @local.definition)
9
17
@@ -27,4 +35,4 @@
27
35
28(identifier) @local.reference
36(identifier) @local.reference
29(field_identifier) @local.reference
37(field_identifier) @local.reference
30−
38+(type_identifier) @local.reference
runtime/queries/haskell/highlights.scm+24−11
@@ -33,6 +33,11 @@
33;; ----------------------------------------------------------------------------
33;; ----------------------------------------------------------------------------
34;; Keywords, operators, includes
34;; Keywords, operators, includes
35
35
36+[
37+ "forall"
38+ "∀"
39+] @keyword.control.repeat
40+
36(pragma) @constant.macro
41(pragma) @constant.macro
37
42
38[
43[
@@ -68,10 +73,7 @@
68 "@"
73 "@"
69] @operator
74] @operator
70
75
71−(qualified_module (module) @constructor)
72−(qualified_type (module) @namespace)
76+(module) @namespace
73−(qualified_variable (module) @namespace)
74−(import (module) @namespace)
75
77
76[
78[
77 (where)
79 (where)
@@ -92,8 +94,6 @@
92 "do"
94 "do"
93 "mdo"
95 "mdo"
94 "rec"
96 "rec"
95− "forall"
96− "∀"
97 "infix"
97 "infix"
98 "infixl"
98 "infixl"
99 "infixr"
99 "infixr"
@@ -104,22 +104,35 @@
104;; Functions and variables
104;; Functions and variables
105
105
106(signature name: (variable) @type)
106(signature name: (variable) @type)
107+(function
107−(function name: (variable) @function)
108+ name: (variable) @function
108−
109+ patterns: (patterns))
109−(variable) @variable
110+((signature (fun)) . (function (variable) @function))
110−"_" @variable.builtin
111+((signature (context (fun))) . (function (variable) @function))
112+((signature (forall (context (fun)))) . (function (variable) @function))
111
113
112(exp_infix (variable) @operator) ; consider infix functions as operators
114(exp_infix (variable) @operator) ; consider infix functions as operators
113
115
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)))
115
119
120+(variable) @variable
121+(pat_wildcard) @variable
116
122
117;; ----------------------------------------------------------------------------
123;; ----------------------------------------------------------------------------
118;; Types
124;; Types
119
125
120(type) @type
126(type) @type
127+(type_variable) @type.parameter
121
128
122(constructor) @constructor
129(constructor) @constructor
123
130
124; True or False
131; True or False
125((constructor) @_bool (#match? @_bool "(True|False)")) @constant.builtin.boolean
132((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/json5/highlights.scmnew file+11
@@ -0,0 +1,11 @@
1+(string) @string
2+
3+(identifier) @constant
4+
5+(number) @constant.numeric
6+
7+(null) @constant.builtin
8+
9+[(true) (false)] @constant.builtin.boolean
10+
11+(comment) @comment
runtime/queries/kdl/highlights.scm+4−4
@@ -1,12 +1,12 @@
1−(comment) @comment
2(single_line_comment) @comment
1(single_line_comment) @comment
2+(multi_line_comment) @comment
3
3
4(node
4(node
5− name: (identifier) @function)
5+ (identifier) @variable)
6+
6(prop (identifier) @attribute)
7(prop (identifier) @attribute)
7−(type) @type
8
8
9−(bare_identifier) @variable.other.member
9+(type (_) @type) @punctuation.bracket
10
10
11(keyword) @keyword
11(keyword) @keyword
12
12
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 @@
244 . (identifier)) @namespace
244 . (identifier)) @namespace
245
245
246((type_identifier) @type.builtin
246((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)
248
251
249(type_identifier) @type
252(type_identifier) @type
250
253
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/nix/injections.scm+14
@@ -5,6 +5,20 @@
5((((comment) @injection.language) .
5((((comment) @injection.language) .
6 (indented_string_expression (string_fragment) @injection.content))
6 (indented_string_expression (string_fragment) @injection.content))
7 (#set! injection.combined))
7 (#set! injection.combined))
8+((binding
9+ (comment) @injection.language
10+ expression: (indented_string_expression (string_fragment) @injection.content))
11+ (#set! injection.combined))
12+
13+; Common attribute keys corresponding to Python scripts,
14+; such as those for NixOS VM tests in nixpkgs/nixos/tests.
15+((binding
16+ attrpath: (attrpath (identifier) @_path)
17+ expression: (indented_string_expression
18+ (string_fragment) @injection.content))
19+ (#match? @_path "(^|\\.)testScript$")
20+ (#set! injection.language "python")
21+ (#set! injection.combined))
8
22
9; Common attribute keys corresponding to scripts,
23; Common attribute keys corresponding to scripts,
10; such as those of stdenv.mkDerivation.
24; such as those of stdenv.mkDerivation.
runtime/queries/ocaml/highlights.scm+2
@@ -8,6 +8,8 @@
8
8
9[(class_name) (class_type_name) (type_constructor)] @type
9[(class_name) (class_type_name) (type_constructor)] @type
10
10
11+(type_variable) @type.parameter
12+
11[(constructor_name) (tag)] @constructor
13[(constructor_name) (tag)] @constructor
12
14
13; Functions
15; Functions
runtime/queries/perl/indents.scmnew file+29
@@ -0,0 +1,29 @@
1+[
2+ (block)
3+ (conditional_statement)
4+ (loop_statement)
5+ (cstyle_for_statement)
6+ (for_statement)
7+ (elsif)
8+ (array_element_expression)
9+ (hash_element_expression)
10+ (coderef_call_expression)
11+ (anonymous_slice_expression)
12+ (slice_expression)
13+ (keyval_expression)
14+ (anonymous_array_expression)
15+ (anonymous_hash_expression)
16+ (stub_expression)
17+ (func0op_call_expression)
18+ (func1op_call_expression)
19+ (map_grep_expression)
20+ (function_call_expression)
21+ (method_call_expression)
22+ (attribute)
23+] @indent
24+
25+[
26+ "}"
27+ "]"
28+ ")"
29+] @outdent
runtime/queries/perl/textobjects.scmnew file+14
@@ -0,0 +1,14 @@
1+(subroutine_declaration_statement
2+ body: (_) @function.inside) @function.around
3+(anonymous_subroutine_expression
4+ body: (_) @function.inside) @function.around
5+
6+(package_statement) @class.around
7+(package_statement
8+ (block) @class.inside)
9+
10+(list_expression
11+ (_) @parameter.inside)
12+
13+(comment) @comment.around
14+(pod) @comment.around
runtime/queries/purescript/highlights.scm+164−1
@@ -1 +1,164 @@
1−; inherits: haskell
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+
17+; ----------------------------------------------------------------------------
18+; Literals and comments
19+
20+ (integer) @constant.numeric.integer
21+ (exp_negation) @constant.numeric.integer
22+ (exp_literal (number)) @constant.numeric.float
23+ (char) @constant.character
24+ [
25+ (string)
26+ (triple_quote_string)
27+ ] @string
28+
29+ (comment) @comment
30+
31+
32+; ----------------------------------------------------------------------------
33+; Punctuation
34+
35+ [
36+ "("
37+ ")"
38+ "{"
39+ "}"
40+ "["
41+ "]"
42+ ] @punctuation.bracket
43+
44+ [
45+ (comma)
46+ ";"
47+ ] @punctuation.delimiter
48+
49+
50+; ----------------------------------------------------------------------------
51+; Keywords, operators, includes
52+
53+ ; This needs to come before the other "else" in
54+ ; order to be highlighted correctly
55+ (class_instance "else" @keyword)
56+
57+ [
58+ "if"
59+ "then"
60+ "else"
61+ "case"
62+ "of"
63+ ] @keyword.control.conditional
64+
65+ [
66+ "import"
67+ "module"
68+ ] @keyword.control.import
69+
70+ [
71+ (operator)
72+ (constructor_operator)
73+ (type_operator)
74+ (qualified_module) ; grabs the `.` (dot), ex: import System.IO
75+ (all_names)
76+
77+ ; `_` wildcards in if-then-else and case-of expressions,
78+ ; as well as record updates and operator sections
79+ (wildcard)
80+ "="
81+ "|"
82+ "::"
83+ "∷"
84+ "=>"
85+ "⇒"
86+ "<="
87+ "⇐"
88+ "->"
89+ "→"
90+ "<-"
91+ "←"
92+ "\\"
93+ "`"
94+ "@"
95+ ] @operator
96+
97+ (qualified_module (module) @constructor)
98+ (module) @namespace
99+ (qualified_type (module) @namespace)
100+ (qualified_variable (module) @namespace)
101+ (import (module) @namespace)
102+
103+ [
104+ (where)
105+ "let"
106+ "in"
107+ "class"
108+ "instance"
109+ "derive"
110+ "foreign"
111+ "data"
112+ "newtype"
113+ "type"
114+ "as"
115+ "hiding"
116+ "do"
117+ "ado"
118+ "forall"
119+ "∀"
120+ "infix"
121+ "infixl"
122+ "infixr"
123+ ] @keyword
124+
125+ (type_role_declaration
126+ "role" @keyword
127+ role: (type_role) @keyword)
128+
129+ (hole) @label
130+
131+; ----------------------------------------------------------------------------
132+; Functions and variables
133+
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+
138+ (signature name: (variable) @type)
139+ (function name: (variable) @function)
140+ (class_instance (instance_name) @function)
141+ (derive_declaration (instance_name) @function)
142+
143+ ; true or false
144+ ((variable) @constant.builtin.boolean
145+ (#match? @constant.builtin.boolean "^(true|false)$"))
146+
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)))
153+
154+ (variable) @variable
155+
156+ ("@" @namespace) ; "as" pattern operator, e.g. x@Constructor
157+
158+; ----------------------------------------------------------------------------
159+; Types
160+
161+ (type) @type
162+
163+ (constructor) @constructor
164+
runtime/queries/purescript/injections.scm+2−1
@@ -1 +1,2 @@
1−; inherits: haskell
1+((comment) @injection.content
2+ (#set! injection.language "comment"))
runtime/queries/purescript/locals.scm+4−1
@@ -1 +1,4 @@
1−; inherits: haskell
1+(signature name: (variable)) @local.definition
2+(function name: (variable)) @local.definition
3+(pat_name (variable)) @local.definition
4+(exp_name (variable)) @local.reference
runtime/queries/purescript/textobjects.scmnew file+13
@@ -0,0 +1,13 @@
1+(comment) @comment.inside
2+
3+[
4+ (data)
5+ (type)
6+ (newtype)
7+] @class.around
8+
9+((signature)? (function rhs:(_) @function.inside)) @function.around
10+(exp_lambda) @function.around
11+
12+(data (type_variable) @parameter.inside)
13+(patterns (_) @parameter.inside)
runtime/queries/python/highlights.scm+6
@@ -134,14 +134,17 @@
134 "//="
134 "//="
135 "/="
135 "/="
136 "&"
136 "&"
137+ "&="
137 "%"
138 "%"
138 "%="
139 "%="
139 "^"
140 "^"
141+ "^="
140 "+"
142 "+"
141 "->"
143 "->"
142 "+="
144 "+="
143 "<"
145 "<"
144 "<<"
146 "<<"
147+ "<<="
145 "<="
148 "<="
146 "<>"
149 "<>"
147 "="
150 "="
@@ -150,8 +153,11 @@
150 ">"
153 ">"
151 ">="
154 ">="
152 ">>"
155 ">>"
156+ ">>="
153 "|"
157 "|"
158+ "|="
154 "~"
159 "~"
160+ "@="
155] @operator
161] @operator
156
162
157[
163[
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 @@
9; Types
9; Types
10; -------
10; -------
11
11
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+
12; ---
19; ---
13; Primitives
20; Primitives
14; ---
21; ---
runtime/queries/rust/injections.scm+6
@@ -1,6 +1,12 @@
1([(line_comment) (block_comment)] @injection.content
1([(line_comment) (block_comment)] @injection.content
2 (#set! injection.language "comment"))
2 (#set! injection.language "comment"))
3
3
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+
4((macro_invocation
10((macro_invocation
5 (token_tree) @injection.content)
11 (token_tree) @injection.content)
6 (#set! injection.language "rust")
12 (#set! injection.language "rust")
runtime/queries/rust/locals.scm+14−1
@@ -2,6 +2,12 @@
2
2
3[
3[
4 (function_item)
4 (function_item)
5+ (struct_item)
6+ (enum_item)
7+ (union_item)
8+ (type_item)
9+ (trait_item)
10+ (impl_item)
5 (closure_expression)
11 (closure_expression)
6 (block)
12 (block)
7] @local.scope
13] @local.scope
@@ -11,8 +17,15 @@
11(parameter
17(parameter
12 (identifier) @local.definition)
18 (identifier) @local.definition)
13
19
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+
14(closure_parameters (identifier) @local.definition)
27(closure_parameters (identifier) @local.definition)
15
28
16; References
29; References
17(identifier) @local.reference
30(identifier) @local.reference
18−
31+(type_identifier) @local.reference
runtime/queries/scheme/highlights.scm+5
@@ -97,3 +97,8 @@
97
97
98["(" ")" "[" "]" "{" "}"] @punctuation.bracket
98["(" ")" "[" "]" "{" "}"] @punctuation.bracket
99
99
100+(quote "'") @operator
101+(unquote_splicing ",@") @operator
102+(unquote ",") @operator
103+(quasiquote "`") @operator
104+
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+317−231
@@ -1,134 +1,169 @@
1+(invocation
2+ (object_reference
3+ name: (identifier) @function.method))
1
4
2[
5[
6+ (keyword_gist)
3 (keyword_btree)
7 (keyword_btree)
4 (keyword_hash)
8 (keyword_hash)
5− (keyword_gist)
6 (keyword_spgist)
9 (keyword_spgist)
7 (keyword_gin)
10 (keyword_gin)
8 (keyword_brin)
11 (keyword_brin)
9−
12+ (keyword_array)
10− (cast)
11− (group_concat)
12− (invocation)
13] @function.builtin
13] @function.builtin
14−
15−(table_reference
16− name: (identifier) @namespace)
17
14
18−(relation
15+(object_reference
19− table_alias: (identifier) @variable.parameter)
20−
21−(field
22 name: (identifier) @variable.other.member)
16 name: (identifier) @variable.other.member)
23−
17+
18+(relation
19+ alias: (identifier) @variable.parameter)
20+
24(field
21(field
25− table_alias: (identifier) @variable.parameter
26 name: (identifier) @variable.other.member)
22 name: (identifier) @variable.other.member)
27
23
28−(comment) @comment
24+(term
25+ alias: (identifier) @variable.parameter)
29
26
30−[
27+(term
31− "("
28+ value: (cast
32− ")"
29+ name: (keyword_cast) @function.builtin
33−] @punctuation.bracket
30+ parameter: [(literal)]?))
34
31
35−[
32+(literal) @string
36− ";"
33+(comment) @comment.line
37− ","
34+(marginalia) @comment.block
38− "."
39−] @punctuation.delimiter
40
35
41−(binary_expression
36+((literal) @constant.numeric.integer
42− operator: _ @operator)
37+ (#match? @constant.numeric.integer "^-?\\d+$"))
43
38
44−(unary_expression
39+((literal) @constant.numeric.float
45− operator: _ @operator)
40+ (#match? @constant.numeric.float "^-?\\d*\\.\\d*$"))
46
41
47−(all_fields) @special
42+(parameter) @variable.parameter
48
43
49[
44[
50− (keyword_null)
51− (keyword_true)
45+ (keyword_true)
52− (keyword_false)
46+ (keyword_false)
53−] @constant.builtin
47+] @constant.builtin.boolean
54
48
55−((literal) @constant.numeric
49+[
56− (#match? @constant.numeric "^-?\\d*\\.?\\d*$"))
50+ (keyword_asc)
51+ (keyword_desc)
52+ (keyword_terminated)
53+ (keyword_escaped)
54+ (keyword_unsigned)
55+ (keyword_nulls)
56+ (keyword_last)
57+ (keyword_delimited)
58+ (keyword_replication)
59+ (keyword_auto_increment)
60+ (keyword_default)
61+ (keyword_collate)
62+ (keyword_concurrently)
63+ (keyword_engine)
64+ (keyword_always)
65+ (keyword_generated)
66+ (keyword_preceding)
67+ (keyword_following)
68+ (keyword_first)
69+ (keyword_current_timestamp)
70+ (keyword_immutable)
71+ (keyword_atomic)
72+ (keyword_parallel)
73+ (keyword_leakproof)
74+ (keyword_safe)
75+ (keyword_cost)
76+ (keyword_strict)
77+] @attribute
57
78
58−(literal) @string
79+[
80+ (keyword_materialized)
81+ (keyword_recursive)
82+ (keyword_temp)
83+ (keyword_temporary)
84+ (keyword_unlogged)
85+ (keyword_external)
86+ (keyword_parquet)
87+ (keyword_csv)
88+ (keyword_rcfile)
89+ (keyword_textfile)
90+ (keyword_orc)
91+ (keyword_avro)
92+ (keyword_jsonfile)
93+ (keyword_sequencefile)
94+ (keyword_volatile)
95+] @keyword.storage.type
96+
97+[
98+ (keyword_case)
99+ (keyword_when)
100+ (keyword_then)
101+ (keyword_else)
102+] @keyword.control.conditional
59
103
60[
104[
61 (keyword_select)
105 (keyword_select)
106+ (keyword_from)
107+ (keyword_where)
108+ (keyword_index)
109+ (keyword_join)
110+ (keyword_primary)
62 (keyword_delete)
111 (keyword_delete)
112+ (keyword_create)
63 (keyword_insert)
113 (keyword_insert)
114+ (keyword_merge)
115+ (keyword_distinct)
64 (keyword_replace)
116 (keyword_replace)
65 (keyword_update)
117 (keyword_update)
66 (keyword_into)
118 (keyword_into)
67 (keyword_overwrite)
119 (keyword_overwrite)
120+ (keyword_matched)
68 (keyword_values)
121 (keyword_values)
122+ (keyword_value)
123+ (keyword_attribute)
69 (keyword_set)
124 (keyword_set)
70− (keyword_from)
71 (keyword_left)
125 (keyword_left)
72 (keyword_right)
126 (keyword_right)
127+ (keyword_outer)
73 (keyword_inner)
128 (keyword_inner)
74 (keyword_full)
129 (keyword_full)
75− (keyword_outer)
76− (keyword_cross)
77− (keyword_join)
78− (keyword_lateral)
79− (keyword_on)
80− (keyword_not)
81 (keyword_order)
130 (keyword_order)
82− (keyword_group)
83 (keyword_partition)
131 (keyword_partition)
84− (keyword_by)
132+ (keyword_group)
133+ (keyword_with)
134+ (keyword_without)
135+ (keyword_as)
85 (keyword_having)
136 (keyword_having)
86− (keyword_desc)
87− (keyword_asc)
88 (keyword_limit)
137 (keyword_limit)
89 (keyword_offset)
138 (keyword_offset)
90− (keyword_primary)
91− (keyword_create)
92− (keyword_alter)
93− (keyword_change)
94− (keyword_analyze)
95− (keyword_modify)
96− (keyword_drop)
97− (keyword_add)
98 (keyword_table)
139 (keyword_table)
99 (keyword_tables)
140 (keyword_tables)
100− (keyword_view)
101− (keyword_materialized)
102− (keyword_column)
103 (keyword_key)
141 (keyword_key)
104− (keyword_as)
142+ (keyword_references)
105− (keyword_distinct)
143+ (keyword_foreign)
106 (keyword_constraint)
144 (keyword_constraint)
107− ; (keyword_cast)
108− ; (keyword_group_concat)
109− (keyword_separator)
110− (keyword_max)
111− (keyword_min)
112− (keyword_avg)
113− (keyword_end)
114 (keyword_force)
145 (keyword_force)
115− (keyword_ignore)
116− (keyword_using)
117 (keyword_use)
146 (keyword_use)
118− (keyword_index)
119 (keyword_for)
147 (keyword_for)
120 (keyword_if)
148 (keyword_if)
121 (keyword_exists)
149 (keyword_exists)
122− (keyword_auto_increment)
150+ (keyword_max)
123− (keyword_generated)
151+ (keyword_min)
124− (keyword_always)
152+ (keyword_avg)
125− (keyword_collate)
153+ (keyword_column)
126− (keyword_character)
154+ (keyword_columns)
127− (keyword_engine)
155+ (keyword_cross)
128− (keyword_default)
156+ (keyword_lateral)
129− (keyword_cascade)
157+ (keyword_natural)
130− (keyword_restrict)
158+ (keyword_alter)
131− (keyword_with)
159+ (keyword_drop)
160+ (keyword_add)
161+ (keyword_view)
162+ (keyword_end)
163+ (keyword_is)
164+ (keyword_using)
165+ (keyword_between)
166+ (keyword_window)
132 (keyword_no)
167 (keyword_no)
133 (keyword_data)
168 (keyword_data)
134 (keyword_type)
169 (keyword_type)
@@ -136,208 +171,259 @@
136 (keyword_to)
171 (keyword_to)
137 (keyword_schema)
172 (keyword_schema)
138 (keyword_owner)
173 (keyword_owner)
139− (keyword_temp)
174+ (keyword_authorization)
140− (keyword_temporary)
141− (keyword_unlogged)
142− (keyword_union)
143 (keyword_all)
175 (keyword_all)
144 (keyword_any)
176 (keyword_any)
145 (keyword_some)
177 (keyword_some)
146− (keyword_except)
147− (keyword_intersect)
148 (keyword_returning)
178 (keyword_returning)
149 (keyword_begin)
179 (keyword_begin)
150 (keyword_commit)
180 (keyword_commit)
151 (keyword_rollback)
181 (keyword_rollback)
152 (keyword_transaction)
182 (keyword_transaction)
183+ (keyword_only)
184+ (keyword_like)
185+ (keyword_similar)
153 (keyword_over)
186 (keyword_over)
154− (keyword_nulls)
187+ (keyword_change)
155− (keyword_first)
188+ (keyword_modify)
156 (keyword_after)
189 (keyword_after)
157− (keyword_last)
190+ (keyword_before)
158− (keyword_window)
159 (keyword_range)
191 (keyword_range)
160 (keyword_rows)
192 (keyword_rows)
161 (keyword_groups)
193 (keyword_groups)
162− (keyword_between)
163− (keyword_unbounded)
164− (keyword_preceding)
165− (keyword_following)
166 (keyword_exclude)
194 (keyword_exclude)
167 (keyword_current)
195 (keyword_current)
168− (keyword_row)
169 (keyword_ties)
196 (keyword_ties)
170 (keyword_others)
197 (keyword_others)
171− (keyword_only)
172− (keyword_unique)
173− (keyword_foreign)
174− (keyword_references)
175− (keyword_concurrently)
176− ; (keyword_btree)
177− ; (keyword_hash)
178− ; (keyword_gist)
179− ; (keyword_spgist)
180− ; (keyword_gin)
181− ; (keyword_brin)
182− (keyword_like)
183− (keyword_similar)
184 (keyword_preserve)
198 (keyword_preserve)
185− (keyword_unsigned)
186 (keyword_zerofill)
199 (keyword_zerofill)
187− (keyword_conflict)
200+ (keyword_format)
188− (keyword_do)
201+ (keyword_fields)
189− (keyword_nothing)
202+ (keyword_row)
190− (keyword_high_priority)
203+ (keyword_sort)
191− (keyword_low_priority)
204+ (keyword_compute)
192− (keyword_delayed)
205+ (keyword_comment)
193− (keyword_recursive)
206+ (keyword_location)
194− (keyword_cascaded)
207+ (keyword_cached)
195− (keyword_local)
208+ (keyword_uncached)
196− (keyword_current_timestamp)
209+ (keyword_lines)
197− (keyword_check)
210+ (keyword_stored)
198− (keyword_option)
211+ (keyword_virtual)
212+ (keyword_partitioned)
213+ (keyword_analyze)
214+ (keyword_explain)
215+ (keyword_verbose)
216+ (keyword_truncate)
217+ (keyword_rewrite)
218+ (keyword_optimize)
199 (keyword_vacuum)
219 (keyword_vacuum)
200− (keyword_wait)
220+ (keyword_cache)
201− (keyword_nowait)
202−
203− (keyword_trigger)
204− (keyword_function)
205− (keyword_returns)
206− (keyword_return)
207− (keyword_setof)
208− (keyword_atomic)
209− (keyword_declare)
210− ; (keyword_language)
221+ (keyword_language)
211 (keyword_sql)
222 (keyword_sql)
223+ (keyword_called)
224+ (keyword_conflict)
225+ (keyword_declare)
226+ (keyword_filter)
227+ (keyword_function)
228+ (keyword_input)
229+ (keyword_name)
230+ (keyword_oid)
231+ (keyword_oids)
232+ (keyword_options)
212 (keyword_plpgsql)
233 (keyword_plpgsql)
213− (keyword_immutable)
234+ (keyword_precision)
214− (keyword_stable)
235+ (keyword_regclass)
215− (keyword_volatile)
236+ (keyword_regnamespace)
216− (keyword_leakproof)
237+ (keyword_regproc)
217− (keyword_parallel)
238+ (keyword_regtype)
218− (keyword_safe)
219− (keyword_unsafe)
220 (keyword_restricted)
239 (keyword_restricted)
221− (keyword_called)
240+ (keyword_return)
222 (keyword_returns)
241 (keyword_returns)
223− (keyword_input)
242+ (keyword_separator)
224− (keyword_strict)
243+ (keyword_setof)
225− (keyword_cost)
244+ (keyword_stable)
226− (keyword_rows)
227 (keyword_support)
245 (keyword_support)
228−
229− (keyword_external)
230− (keyword_stored)
231− (keyword_cached)
232− (keyword_uncached)
233− (keyword_replication)
234 (keyword_tblproperties)
246 (keyword_tblproperties)
235− (keyword_options)
247+ (keyword_trigger)
236− (keyword_compute)
248+ (keyword_unsafe)
237− (keyword_stats)
249+ (keyword_admin)
238− (keyword_statistics)
250+ (keyword_connection)
239− (keyword_optimize)
251+ (keyword_cycle)
240− (keyword_rewrite)
252+ (keyword_database)
241− (keyword_bin_pack)
253+ (keyword_encrypted)
242− (keyword_incremental)
254+ (keyword_increment)
243− (keyword_location)
255+ (keyword_logged)
244− (keyword_partitioned)
256+ (keyword_none)
245− (keyword_comment)
257+ (keyword_owned)
246− (keyword_sort)
258+ (keyword_password)
247− (keyword_format)
259+ (keyword_reset)
248− (keyword_delimited)
260+ (keyword_role)
249− (keyword_fields)
261+ (keyword_sequence)
250− (keyword_terminated)
262+ (keyword_start)
251− (keyword_escaped)
263+ (keyword_restart)
252− (keyword_lines)
264+ (keyword_tablespace)
253− (keyword_cache)
265+ (keyword_until)
254− (keyword_metadata)
266+ (keyword_user)
255− (keyword_noscan)
267+ (keyword_valid)
256−
268+ (keyword_action)
257− (keyword_parquet)
269+ (keyword_definer)
258− (keyword_rcfile)
270+ (keyword_invoker)
259− (keyword_csv)
271+ (keyword_security)
260− (keyword_textfile)
272+ (keyword_extension)
261− (keyword_avro)
273+ (keyword_version)
262− (keyword_sequencefile)
274+ (keyword_out)
263− (keyword_orc)
275+ (keyword_inout)
264− (keyword_avro)
276+ (keyword_variadic)
265− (keyword_jsonfile)
277+ (keyword_session)
266−
278+ (keyword_isolation)
267− (keyword_precision)
279+ (keyword_level)
268− (keyword_inet)
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)
269] @keyword
307] @keyword
270
308
271[
309[
272− (keyword_case)
310+ (keyword_restrict)
273− (keyword_when)
311+ (keyword_unbounded)
274− (keyword_then)
312+ (keyword_unique)
275− (keyword_else)
313+ (keyword_cascade)
276− (keyword_where)
314+ (keyword_delayed)
277−] @keyword.control.conditional
315+ (keyword_high_priority)
278−
316+ (keyword_low_priority)
279−[
317+ (keyword_ignore)
280− (keyword_in)
318+ (keyword_nothing)
281− (keyword_and)
319+ (keyword_check)
282− (keyword_or)
320+ (keyword_option)
283− (keyword_is)
321+ (keyword_local)
322+ (keyword_cascaded)
323+ (keyword_wait)
324+ (keyword_nowait)
325+ (keyword_metadata)
326+ (keyword_incremental)
327+ (keyword_bin_pack)
328+ (keyword_noscan)
329+ (keyword_stats)
330+ (keyword_statistics)
331+ (keyword_maxvalue)
332+ (keyword_minvalue)
284−] @keyword.operator
333+] @keyword
285
334
286[
335[
336+ (keyword_int)
337+ (keyword_null)
287 (keyword_boolean)
338 (keyword_boolean)
288− (bit)
289 (keyword_binary)
339 (keyword_binary)
290−
340+ (keyword_varbinary)
341+ (keyword_image)
342+ (keyword_bit)
343+ (keyword_inet)
344+ (keyword_character)
291 (keyword_smallserial)
345 (keyword_smallserial)
292 (keyword_serial)
346 (keyword_serial)
293 (keyword_bigserial)
347 (keyword_bigserial)
294−
348+ (keyword_smallint)
295− (tinyint)
349+ (keyword_mediumint)
296− (smallint)
350+ (keyword_bigint)
297− (mediumint)
351+ (keyword_tinyint)
298− (int)
352+ (keyword_decimal)
299− (bigint)
353+ (keyword_float)
300− (decimal)
354+ (keyword_double)
301− (numeric)
355+ (keyword_numeric)
302 (keyword_real)
356 (keyword_real)
303 (double)
357 (double)
304− (float)
305−
306 (keyword_money)
358 (keyword_money)
307−
359+ (keyword_smallmoney)
308− (char)
360+ (keyword_char)
309− (varchar)
361+ (keyword_nchar)
310− (numeric)
362+ (keyword_varchar)
311− (keyword_string)
363+ (keyword_nvarchar)
364+ (keyword_varying)
312 (keyword_text)
365 (keyword_text)
313−
366+ (keyword_string)
314 (keyword_uuid)
367 (keyword_uuid)
315−
316 (keyword_json)
368 (keyword_json)
317 (keyword_jsonb)
369 (keyword_jsonb)
318 (keyword_xml)
370 (keyword_xml)
319−
320 (keyword_bytea)
371 (keyword_bytea)
321− (keyword_inet)
372+ (keyword_enum)
322−
323− (enum)
324−
325 (keyword_date)
373 (keyword_date)
326 (keyword_datetime)
374 (keyword_datetime)
375+ (keyword_time)
376+ (keyword_datetime2)
377+ (keyword_datetimeoffset)
378+ (keyword_smalldatetime)
327 (keyword_timestamp)
379 (keyword_timestamp)
328 (keyword_timestamptz)
380 (keyword_timestamptz)
329−
330− (keyword_interval)
331−
332 (keyword_geometry)
381 (keyword_geometry)
333 (keyword_geography)
382 (keyword_geography)
334 (keyword_box2d)
383 (keyword_box2d)
335 (keyword_box3d)
384 (keyword_box3d)
336−
385+ (keyword_interval)
337− (keyword_oid)
338− (keyword_name)
339− (keyword_regclass)
340− (keyword_regnamespace)
341− (keyword_regproc)
342− (keyword_regtype)
343] @type.builtin
386] @type.builtin
387+
388+[
389+ (keyword_in)
390+ (keyword_and)
391+ (keyword_or)
392+ (keyword_not)
393+ (keyword_by)
394+ (keyword_on)
395+ (keyword_do)
396+ (keyword_union)
397+ (keyword_except)
398+ (keyword_intersect)
399+] @keyword.operator
400+
401+[
402+ "+"
403+ "-"
404+ "*"
405+ "/"
406+ "%"
407+ "^"
408+ ":="
409+ "="
410+ "<"
411+ "<="
412+ "!="
413+ ">="
414+ ">"
415+ "<>"
416+ (op_other)
417+ (op_unary_other)
418+] @operator
419+
420+[
421+ "("
422+ ")"
423+] @punctuation.bracket
424+
425+[
426+ ";"
427+ ","
428+ "."
429+] @punctuation.delimiter
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/unison/highlights.scm+21−6
@@ -10,14 +10,18 @@
10[
10[
11 (kw_forall)
11 (kw_forall)
12 (unique_kw)
12 (unique_kw)
13+ (structural_kw)
13 (type_kw)
14 (type_kw)
14 (kw_equals)
15 (kw_equals)
15 (do)
16 (do)
17+ (ability)
18+ (where)
16] @keyword
19] @keyword
17
20
18(kw_let) @keyword.function
21(kw_let) @keyword.function
19(type_kw) @keyword.storage.type
22(type_kw) @keyword.storage.type
20(unique) @keyword.storage.modifier
23(unique) @keyword.storage.modifier
24+(structural) @keyword.storage.modifier
21("use") @keyword.control.import
25("use") @keyword.control.import
22
26
23
27
@@ -31,6 +35,7 @@
31 (arrow_symbol)
35 (arrow_symbol)
32 (">")
36 (">")
33 (or)
37 (or)
38+ (and)
34 (bang)
39 (bang)
35] @operator
40] @operator
36
41
@@ -47,13 +52,22 @@
47
52
48;; Types
53;; Types
49(record_field name: (wordy_id) @variable.other.member type: (wordy_id) @type)
54(record_field name: (wordy_id) @variable.other.member type: (wordy_id) @type)
50−[
55+(type_constructor (type_name (wordy_id) @constructor))
51− (type_name)
56+(ability_declaration type_name: (wordy_id) @type type_arg: (wordy_id) @variable.parameter)
52− (type_signature)
57+(effect (wordy_id) @special) ;; NOTE: an effect is just like a type, but in signature we special case it
53− (effect)
58+
54−] @type
59+;; Namespaces
60+(path) @namespace
61+(namespace) @namespace
62+
63+;; Terms
64+(type_signature term_name: (path)? @variable term_name: (wordy_id) @variable)
65+(type_signature (wordy_id) @type)
66+(type_signature (delayed (wordy_id)) @type)
67+
68+(term_definition param: (wordy_id) @variable.parameter)
55
69
56−(term_definition) @variable
70+(function_application function_name: (path)? function_name: (wordy_id) @function)
57
71
58;; Punctuation
72;; Punctuation
59[
73[
@@ -70,3 +84,4 @@
70 "]"
84 "]"
71] @punctuation.bracket
85] @punctuation.bracket
72
86
87+(test_watch_expression (wordy_id) @keyword.directive)
runtime/queries/yaml/injections.scm+52
@@ -1,2 +1,54 @@
1((comment) @injection.content
1((comment) @injection.content
2 (#set! injection.language "comment"))
2 (#set! injection.language "comment"))
3+
4+; The remaining code in this file incorporates work covered by the following
5+; copyright and permission notice:
6+;
7+; Copyright 2023 the nvim-treesitter authors
8+;
9+; Licensed under the Apache License, Version 2.0 (the "License");
10+; you may not use this file except in compliance with the License.
11+; You may obtain a copy of the License at
12+;
13+; http://www.apache.org/licenses/LICENSE-2.0
14+;
15+; Unless required by applicable law or agreed to in writing, software
16+; distributed under the License is distributed on an "AS IS" BASIS,
17+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18+; See the License for the specific language governing permissions and
19+; limitations under the License.
20+
21+; Modified for Helix from https://github.com/nvim-treesitter/nvim-treesitter/blob/master/queries/yaml/injections.scm
22+
23+;; Github actions ("run") / Gitlab CI ("scripts")
24+(block_mapping_pair
25+ key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
26+ value: (flow_node
27+ (plain_scalar
28+ (string_scalar) @injection.content)
29+ (#set! injection.language "bash")))
30+
31+(block_mapping_pair
32+ key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
33+ value: (block_node
34+ (block_scalar) @injection.content
35+ (#set! injection.language "bash")))
36+
37+(block_mapping_pair
38+ key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
39+ value: (block_node
40+ (block_sequence
41+ (block_sequence_item
42+ (flow_node
43+ (plain_scalar
44+ (string_scalar) @injection.content))
45+ (#set! injection.language "bash")))))
46+
47+(block_mapping_pair
48+ key: (flow_node) @_run (#match? @_run "^(run|script|before_script|after_script)$")
49+ value: (block_node
50+ (block_sequence
51+ (block_sequence_item
52+ (block_node
53+ (block_scalar) @injection.content
54+ (#set! injection.language "bash"))))))
runtime/queries/yuck/highlights.scm+1−1
@@ -101,7 +101,7 @@
101(list
101(list
102 (symbol) @tag)
102 (symbol) @tag)
103
103
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
105
105
106(ident) @variable
106(ident) @variable
107(index) @variable
107(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
6# Author : Name <email@my.domain>
6# Author : Name <email@my.domain>
7```
7```
8
8
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+
9We have a preview page for themes on our [wiki](https://github.com/helix-editor/helix/wiki/Themes)!
17We have a preview page for themes on our [wiki](https://github.com/helix-editor/helix/wiki/Themes)!
runtime/themes/catppuccin_frappe.toml+2
@@ -34,3 +34,5 @@ crust = "#232634"
34# derived colors by blending existing palette colors
34# derived colors by blending existing palette colors
35cursorline = "#3b3f52"
35cursorline = "#3b3f52"
36secondary_cursor = "#b8a5a6"
36secondary_cursor = "#b8a5a6"
37+secondary_cursor_normal = "#9193be"
38+secondary_cursor_insert = "#83a275"
runtime/themes/catppuccin_latte.toml+2
@@ -34,3 +34,5 @@ crust = "#dce0e8"
34# derived colors by blending existing palette colors
34# derived colors by blending existing palette colors
35cursorline = "#e9ebf1"
35cursorline = "#e9ebf1"
36secondary_cursor = "#e2a99e"
36secondary_cursor = "#e2a99e"
37+secondary_cursor_normal = "#98a7fb"
38+secondary_cursor_insert = "#75b868"
runtime/themes/catppuccin_macchiato.toml+2
@@ -34,3 +34,5 @@ crust = "#181926"
34# derived colors by blending existing palette colors
34# derived colors by blending existing palette colors
35cursorline = "#303347"
35cursorline = "#303347"
36secondary_cursor = "#b6a5a7"
36secondary_cursor = "#b6a5a7"
37+secondary_cursor_normal = "#8b90bf"
38+secondary_cursor_insert = "#7fa47a"
runtime/themes/catppuccin_mocha.toml+11
@@ -83,6 +83,7 @@
83
83
84"ui.text" = "text"
84"ui.text" = "text"
85"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
85"ui.text.focus" = { fg = "text", bg = "surface0", modifiers = ["bold"] }
86+"ui.text.inactive" = { fg = "overlay1" }
86
87
87"ui.virtual" = "overlay0"
88"ui.virtual" = "overlay0"
88"ui.virtual.ruler" = { bg = "surface0" }
89"ui.virtual.ruler" = { bg = "surface0" }
@@ -95,6 +96,14 @@
95"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
96"ui.cursor.primary" = { fg = "base", bg = "rosewater" }
96"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
97"ui.cursor.match" = { fg = "peach", modifiers = ["bold"] }
97
98
99+"ui.cursor.primary.normal" = { fg = "base", bg = "lavender" }
100+"ui.cursor.primary.insert" = { fg = "base", bg = "green" }
101+"ui.cursor.primary.select" = { fg = "base", bg = "flamingo" }
102+
103+"ui.cursor.normal" = { fg = "base", bg = "secondary_cursor_normal" }
104+"ui.cursor.insert" = { fg = "base", bg = "secondary_cursor_insert" }
105+"ui.cursor.select" = { fg = "base", bg = "secondary_cursor" }
106+
98"ui.cursorline.primary" = { bg = "cursorline" }
107"ui.cursorline.primary" = { bg = "cursorline" }
99
108
100"ui.highlight" = { bg = "surface1", modifiers = ["bold"] }
109"ui.highlight" = { bg = "surface1", modifiers = ["bold"] }
@@ -146,3 +155,5 @@ crust = "#11111b"
146# derived colors by blending existing palette colors
155# derived colors by blending existing palette colors
147cursorline = "#2a2b3c"
156cursorline = "#2a2b3c"
148secondary_cursor = "#b5a6a8"
157secondary_cursor = "#b5a6a8"
158+secondary_cursor_normal = "#878ec0"
159+secondary_cursor_insert = "#7da87e"
runtime/themes/cyan_light.tomlnew file+154
@@ -0,0 +1,154 @@
1+# An approximation/port of the Cyan Light Theme from Jetbrains
2+#
3+# Original Color Scheme here https://plugins.jetbrains.com/plugin/12102-cyan-light-theme
4+
5+"attribute" = "blue"
6+"type" = "shade07"
7+"type.enum.variant" = "purple"
8+"constructor" = "shade07"
9+
10+"constant" = "darker_blue"
11+"constant.builtin.boolean" = "blue"
12+"constant.character" = "blue"
13+"constant.character.escape" = "dark_red"
14+"constant.numeric" = "blue"
15+
16+"string" = "green"
17+"string.regexp" = "blue"
18+"string.special" = { fg = "dark_red", modifiers = ["underlined"] }
19+
20+"comment" = "comment_gray"
21+
22+"variable" = "green_blue"
23+"variable.builtin" = { fg = "darker_blue" }
24+"variable.parameter" = "purple"
25+"variable.other.member" = "purple"
26+
27+"label" = { fg = "darker_blue", modifiers = ["underlined"] }
28+"punctuation" = "shade06"
29+
30+"keyword" = "darker_blue"
31+"keyword.control.exception" = "darker_blue"
32+
33+"operator" = "shade06"
34+
35+"function" = "shade07"
36+"function.macro" = "yellow"
37+"function.builtin" = { fg = "shade07", modifiers = ["italic"] }
38+"function.special" = "dark_red"
39+"function.method" = "dark_yellow"
40+
41+"tag" = "darker_blue"
42+"special" = "shade06"
43+"namespace" = "darker_blue"
44+
45+"markup.bold" = { fg = "shade06", modifiers = ["bold"] }
46+"markup.italic" = { fg = "shade06", modifiers = ["italic"] }
47+"markup.strikethrough" = { fg = "shade06", modifiers = ["crossed_out"] }
48+"markup.heading" = { fg = "purple" }
49+"markup.list" = "darker_blue"
50+"markup.list.numbered" = "darker_blue"
51+"markup.list.unnumbered" = "darker_blue"
52+"markup.link.url" = "shade06"
53+"markup.link.text" = { fg = "dark_blue", modifiers = ['underlined'] }
54+"markup.link.label" = "dark_blue"
55+"markup.quote" = "green"
56+"markup.raw" = "green"
57+"markup.raw.inline" = "green"
58+"markup.raw.block" = "green"
59+
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"
66+
67+# ui specific
68+"ui.background" = { bg = "shade00" }
69+"ui.cursor" = { bg = "shade02" }
70+"ui.cursor.primary" = { bg = "cursor_blue" }
71+"ui.cursor.match" = { fg = "shade00", bg = "shade04" }
72+"ui.cursor.primary.select" = { bg = "light_purple" }
73+"ui.cursor.primary.insert" = { bg = "light_green" }
74+
75+"ui.selection" = { bg = "lighter_blue" }
76+"ui.selection.primary" = { bg = "lighter_blue" }
77+
78+"ui.highlight" = { bg = "faint_blue" }
79+"ui.cursorline.primary" = { bg = "faint_blue" }
80+
81+"ui.linenr" = { fg = "shade03" }
82+"ui.linenr.selected" = { fg = "shade04", bg = "faint_blue", modifiers = [
83+ "bold",
84+] }
85+
86+"ui.statusline" = { fg = "shade06", bg = "shade02" }
87+"ui.statusline.inactive" = { fg = "shade04", bg = "shade01" }
88+"ui.statusline.normal" = { fg = "shade00", bg = "blue" }
89+"ui.statusline.insert" = { fg = "shade00", bg = "green" }
90+"ui.statusline.select" = { fg = "shade00", bg = "purple" }
91+
92+"ui.popup" = { bg = "shade01", fg = "shade04" }
93+"ui.window" = { bg = "shade00", fg = "shade04" }
94+"ui.help" = { fg = "shade06", bg = "shade01" }
95+"ui.text" = "shade05"
96+"ui.text.focus" = { fg = "shade07", bg = "light_blue" }
97+"ui.virtual" = "shade03"
98+"ui.virtual.ruler" = { bg = "shade04" }
99+"ui.menu" = { fg = "shade05", bg = "shade01" }
100+"ui.menu.selected" = { fg = "shade07", bg = "light_blue" }
101+
102+"hint" = "shade04"
103+"info" = "light_blue"
104+"warning" = "orange"
105+"error" = "red"
106+"diagnostic" = { modifiers = [] }
107+"diagnostic.hint" = { underline = { color = "shade04", style = "line" } }
108+"diagnostic.info" = { underline = { color = "light_blue", style = "line" } }
109+"diagnostic.warning" = { underline = { color = "orange", style = "curl" } }
110+"diagnostic.error" = { underline = { color = "red", style = "curl" } }
111+
112+[palette]
113+shade00 = "#f2f3f7"
114+shade01 = "#dadde8"
115+shade02 = "#c1c6d9"
116+shade03 = "#a9b0ca"
117+shade04 = "#525c85"
118+shade05 = "#434b6c"
119+shade06 = "#343a54"
120+shade07 = "#25293c"
121+
122+background = "#f2f3f7"
123+foreground = "#25293c"
124+
125+comment_gray = "#808080"
126+
127+gutter_blue = "#C3D6E8"
128+faint_blue = "#E8Eef1"
129+lighter_blue = "#d0eaff"
130+light_blue = "#99ccff"
131+cursor_blue = "#80bfff"
132+blue = "#0073E6"
133+dark_blue = "#185b93"
134+darker_blue = "#000080"
135+
136+
137+purple = "#660E7A"
138+light_purple = "#ED9CFF"
139+
140+gutter_green = "#C9DEC1"
141+green = "#00733B"
142+light_green = "#5DCE87"
143+green_blue = "#458383"
144+
145+
146+yellow = "#808000"
147+dark_yellow = "#7A7A43"
148+
149+light_orange = "#f9c881"
150+orange = "#F49810"
151+
152+gutter_red = "#EBBCBC"
153+red = "#d90016"
154+dark_red = "#7F0000"
runtime/themes/darcula-solid.toml+1−4
@@ -4,9 +4,8 @@ inherits = "darcula"
4
4
5"ui.background.separator" = { bg = "grey01" }
5"ui.background.separator" = { bg = "grey01" }
6"ui.menu.scroll" = { fg = "grey02", bg = "grey00" }
6"ui.menu.scroll" = { fg = "grey02", bg = "grey00" }
7−"ui.popup" = { fg = "grey03", bg = "grey02" }
7+"ui.popup" = { fg = "grey05", bg = "grey00" }
8"ui.window" = { bg = "grey00" }
8"ui.window" = { bg = "grey00" }
9−"ui.selection" = { bg = "blue" }
10"ui.cursorline.secondary" = { bg = "grey03" }
9"ui.cursorline.secondary" = { bg = "grey03" }
11
10
12[palette]
11[palette]
@@ -15,5 +14,3 @@ grey01 = "#1f1f1f"
15grey02 = "#323232"
14grey02 = "#323232"
16grey03 = "#555555"
15grey03 = "#555555"
17grey04 = "#a8a8a8"
16grey04 = "#a8a8a8"
18−
19−blue = "#104158"
runtime/themes/darcula.toml+10−4
@@ -8,13 +8,14 @@
8"ui.gutter" = { bg = "grey01" }
8"ui.gutter" = { bg = "grey01" }
9"ui.popup" = { fg = "grey05", bg = "grey00" }
9"ui.popup" = { fg = "grey05", bg = "grey00" }
10"ui.window" = { bg = "grey01" }
10"ui.window" = { bg = "grey01" }
11−"ui.selection" = { bg = "grey03" }
11+"ui.selection" = { bg = "grey02" }
12+"ui.selection.primary" = { bg = "blue" }
12"ui.statusline" = { fg = "grey04", bg = "grey02" }
13"ui.statusline" = { fg = "grey04", bg = "grey02" }
13"ui.statusline.insert" = { bg = "white", fg = "grey01" }
14"ui.statusline.insert" = { bg = "white", fg = "grey01" }
14"ui.statusline.select" = { bg = "orange", fg = "grey01" }
15"ui.statusline.select" = { bg = "orange", fg = "grey01" }
15"ui.help" = { fg = "grey04", bg = "grey01" }
16"ui.help" = { fg = "grey04", bg = "grey01" }
16"ui.cursor" = { fg = "grey04", modifiers = ["reversed"] }
17"ui.cursor" = { fg = "grey04", modifiers = ["reversed"] }
17−"ui.cursor.primary" = { fg = "grey05", modifiers = ["reversed"] }
18+"ui.cursor.primary" = { fg = "grey02", bg = "grey05" }
18"ui.cursor.match" = { fg = "white", modifiers = ["underlined"] }
19"ui.cursor.match" = { fg = "white", modifiers = ["underlined"] }
19"ui.cursorline.primary" = { bg = "grey02" }
20"ui.cursorline.primary" = { bg = "grey02" }
20"ui.cursorline.secondary" = { bg = "grey02" }
21"ui.cursorline.secondary" = { bg = "grey02" }
@@ -34,7 +35,11 @@
34"constant.numeric" = "lightblue"
35"constant.numeric" = "lightblue"
35"constant.character.escape" = "white"
36"constant.character.escape" = "white"
36"attribute" = "yellow"
37"attribute" = "yellow"
37−"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"
38"string" = "darkgreen"
43"string" = "darkgreen"
39"function" = "yellow"
44"function" = "yellow"
40"function.macro" = "green"
45"function.macro" = "green"
@@ -61,7 +66,7 @@
61"markup.link.url" = { fg = "lightblue", modifiers = ["underlined"] }
66"markup.link.url" = { fg = "lightblue", modifiers = ["underlined"] }
62"markup.link.text" = "white"
67"markup.link.text" = "white"
63"markup.quote" = "darkgreen"
68"markup.quote" = "darkgreen"
64−"markup.raw" = "white"
69+"markup.raw" = "purple"
65
70
66"diff.plus" = "green"
71"diff.plus" = "green"
67"diff.delta" = "grey"
72"diff.delta" = "grey"
@@ -97,3 +102,4 @@ green = "#32cd32"
97grey = "#808080"
102grey = "#808080"
98darkgreen = "#629755"
103darkgreen = "#629755"
99lightblue = "#6897bb"
104lightblue = "#6897bb"
105+blue = "#104158"
runtime/themes/dracula.toml+2
@@ -90,6 +90,7 @@
90"ui.virtual.whitespace" = { fg = "current_line" }
90"ui.virtual.whitespace" = { fg = "current_line" }
91"ui.virtual.wrap" = { fg = "current_line" }
91"ui.virtual.wrap" = { fg = "current_line" }
92"ui.virtual.ruler" = { bg = "black" }
92"ui.virtual.ruler" = { bg = "black" }
93+"ui.virtual.indent-guide" = { fg = "indent" }
93"ui.virtual.inlay-hint" = { fg = "cyan" }
94"ui.virtual.inlay-hint" = { fg = "cyan" }
94"ui.virtual.inlay-hint.parameter" = { fg = "cyan", modifiers = ["italic", "dim"] }
95"ui.virtual.inlay-hint.parameter" = { fg = "cyan", modifiers = ["italic", "dim"] }
95"ui.virtual.inlay-hint.type" = { fg = "cyan", modifiers = ["italic", "dim"] }
96"ui.virtual.inlay-hint.type" = { fg = "cyan", modifiers = ["italic", "dim"] }
@@ -123,6 +124,7 @@ black = "#191A21"
123grey = "#666771"
124grey = "#666771"
124comment = "#6272A4"
125comment = "#6272A4"
125current_line = "#44475a"
126current_line = "#44475a"
127+indent = "#56596a"
126selection = "#363848"
128selection = "#363848"
127red = "#ff5555"
129red = "#ff5555"
128orange = "#ffb86c"
130orange = "#ffb86c"
runtime/themes/everblush.toml+1
@@ -68,6 +68,7 @@
68"ui.virtual.whitespace" = { fg = "comment" }
68"ui.virtual.whitespace" = { fg = "comment" }
69"ui.virtual.wrap" = { fg = "comment" }
69"ui.virtual.wrap" = { fg = "comment" }
70"ui.virtual.indent-guide" = { fg = "comment" }
70"ui.virtual.indent-guide" = { fg = "comment" }
71+"ui.virtual.inlay-hint" = { fg = "comment" }
71"ui.window" = { fg = "black" }
72"ui.window" = { fg = "black" }
72
73
73"error" = { fg = "red" }
74"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/jellybeans.toml+1−1
@@ -22,7 +22,7 @@
22
22
23"constant.builtin.boolean" = "yellow"
23"constant.builtin.boolean" = "yellow"
24"constant.character" = "yellow"
24"constant.character" = "yellow"
25−"constant.characted.escape" = "red_error"
25+"constant.character.escape" = "red_error"
26"constant.numeric" = "dark_orange"
26"constant.numeric" = "dark_orange"
27"string" = "dark_green"
27"string" = "dark_green"
28"string.regexp" = "light_purple"
28"string.regexp" = "light_purple"
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/material_darker.tomlnew file+20
@@ -0,0 +1,20 @@
1+# Material Theme <https://material-theme.com/> for Helix Editor
2+
3+inherits = "material_deep_ocean"
4+
5+[palette]
6+bg = "#212121"
7+text = "#b0bec5"
8+
9+gray = "#616161"
10+error = "#ff5370"
11+
12+disabled = "#474747"
13+
14+accent = "#ff9800"
15+
16+highlight = "#3f3f3f"
17+
18+comment = "#616161"
19+
20+selection = "#404040"
runtime/themes/material_deep_ocean.tomlnew file+123
@@ -0,0 +1,123 @@
1+# Material Theme <https://material-theme.com/> for Helix Editor
2+
3+# Syntax Highlighting
4+
5+"type" = "purple"
6+
7+"constructor" = "blue"
8+
9+"constant" = "yellow"
10+
11+"string" = "green"
12+"string.regexp" = "yellow"
13+"string.special" = "blue"
14+
15+"comment" = { fg = "comment" }
16+
17+"variable" = "text"
18+"variable.parameter" = { fg = "orange" }
19+"variable.builtin" = "yellow"
20+
21+"label" = "orange"
22+
23+"punctuation" = "cyan"
24+
25+"keyword" = "purple"
26+"keyword.storage" = "cyan"
27+
28+"operator" = "cyan"
29+
30+"function" = "blue"
31+"function.macro" = "cyan"
32+
33+"tag" = "red"
34+"attribute" = "purple"
35+
36+"namespace" = { fg = "yellow" }
37+
38+"special" = "cyan"
39+
40+"markup.heading.marker" = { fg = "cyan", modifiers = ["bold"] }
41+"markup.heading.1" = "cyan"
42+"markup.heading.2" = "red"
43+"markup.heading.3" = "green"
44+"markup.heading.4" = "yellow"
45+"markup.heading.5" = "blue"
46+"markup.heading.6" = "orange"
47+"markup.list" = "purple"
48+"markup.bold" = { modifiers = ["bold"] }
49+"markup.italic" = { modifiers = ["italic"] }
50+"markup.strikethrough" = { modifiers = ["crossed_out"] }
51+"markup.link.url" = { fg = "green", modifiers = ["underlined"] }
52+"markup.link.text" = "blue"
53+"markup.raw" = "text"
54+
55+"diff.plus" = "green"
56+"diff.minus" = "red"
57+"diff.delta" = "blue"
58+
59+# User Interface
60+
61+"ui.background" = { bg = "bg", fg = "text" }
62+"ui.text" = { fg = "text" }
63+
64+"ui.statusline" = { bg = "bg", fg = "text" }
65+"ui.statusline.inactive" = { bg = "bg", fg = "disabled" }
66+"ui.statusline.normal" = { bg = "accent", fg = "text" }
67+"ui.statusline.insert" = { bg = "green", fg = "text" }
68+"ui.statusline.select" = { bg = "purple", fg = "text" }
69+
70+
71+"ui.selection" = { bg = "selection" }
72+
73+"ui.linenr" = { fg = "line-number" }
74+"ui.linenr.selected" = { fg = "accent" }
75+
76+"ui.cursor" = { bg = "highlight", fg = "white" }
77+
78+"ui.cursor.primary" = { bg = "white", fg = "gray" }
79+"ui.cursorline.primary" = { bg = "white" }
80+
81+"ui.virtual" = { fg = "gray" }
82+"ui.virtual.ruler" = { bg = "highlight" }
83+"ui.virtual.indent-guide" = { fg = "gray" }
84+
85+"ui.highlight" = { bg = "highlight" }
86+
87+"ui.menu" = { bg = "highlight", fg = "text" }
88+
89+"ui.help" = { bg = "highlight", fg = "text" }
90+
91+"ui.popup" = { bg = "highlight", fg = "text" }
92+
93+warning = "yellow"
94+error = "error"
95+info = "blue"
96+hint = "purple"
97+
98+[palette]
99+bg = "#0f111a"
100+text = "#a6accd"
101+
102+white = "#eeffff"
103+green = "#c3e88d"
104+yellow = "#ffcb6b"
105+blue = "#82aaff"
106+red = "#f07178"
107+purple = "#c792ea"
108+orange = "#f78c6c"
109+cyan = "#89ddff"
110+gray = "#717cb4"
111+error = "#ff5370"
112+
113+disabled = "#464b5d"
114+
115+accent = "#84ffff"
116+
117+highlight = "#1f2233"
118+
119+comment = "#464b5d"
120+
121+selection = "#1f2233"
122+
123+line-number = "#3b3f51"
runtime/themes/material_oceanic.tomlnew file+21
@@ -0,0 +1,21 @@
1+# Material Theme <https://material-theme.com/> for Helix Editor
2+
3+inherits = "material_deep_ocean"
4+
5+[palette]
6+bg = "#25363b"
7+text = "#b0bec5"
8+
9+gray = "#546e7a"
10+
11+disabled = "#415967"
12+
13+accent = "#009688"
14+
15+highlight = "#425b67"
16+
17+comment = "#546e7a"
18+
19+selection = "#395b65"
20+
21+line-number = "#355058"
runtime/themes/material_palenight.tomlnew file+19
@@ -0,0 +1,19 @@
1+# Material Theme <https://material-theme.com/> for Helix Editor
2+
3+inherits = "material_deep_ocean"
4+
5+[palette]
6+bg = "#292d3e"
7+text = "#a6accd"
8+
9+disabled = "#515772"
10+
11+accent = "#ab47bc"
12+
13+highlight = "#444267"
14+
15+comment = "#676e95"
16+
17+selection = "#444267"
18+
19+line-number = "#3a3f58"
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/molokai.toml+1−1
@@ -13,7 +13,7 @@ inherits = "monokai"
13"keyword.storage.modifier" = { fg = "#fd971f", modifiers = ["italic"] }
13"keyword.storage.modifier" = { fg = "#fd971f", modifiers = ["italic"] }
14"label" = "#e6db74"
14"label" = "#e6db74"
15"operator" = "keyword"
15"operator" = "keyword"
16−"punctuation.delimeter" = "#8f8f8f"
16+"punctuation.delimiter" = "#8f8f8f"
17"type" = "light-blue"
17"type" = "light-blue"
18"variable.builtin" = { fg = "#ae81ff", modifiers = ["bold"] }
18"variable.builtin" = { fg = "#ae81ff", modifiers = ["bold"] }
19"tag.builtin" = { fg = "#ae81ff", modifiers = ["bold"] }
19"tag.builtin" = { fg = "#ae81ff", modifiers = ["bold"] }
runtime/themes/naysayer.toml+2−2
@@ -20,13 +20,13 @@
20"ui.help" = { fg = "text", bg = "bg" }
20"ui.help" = { fg = "text", bg = "bg" }
21"ui.popup" = { fg = "text", bg = "bg" }
21"ui.popup" = { fg = "text", bg = "bg" }
22"ui.menu" = { fg = "text", bg = "bg" }
22"ui.menu" = { fg = "text", bg = "bg" }
23−"ui.menu.selected" = { fg = "text", bg = "bg" }
23+"ui.menu.selected" = { fg = "text", bg = "bg", modifiers = ['underlined'] }
24"ui.window" = { bg = "bg" }
24"ui.window" = { bg = "bg" }
25"diagnostic.error" = { bg = "error", fg = "text", modifiers = ["bold"] }
25"diagnostic.error" = { bg = "error", fg = "text", modifiers = ["bold"] }
26"diagnostic.warning" = { bg = "warning", fg = "text", modifiers = ["bold"] }
26"diagnostic.warning" = { bg = "warning", fg = "text", modifiers = ["bold"] }
27"diagnostic.hint" = { bg = "cyan", modifiers = ["bold"] }
27"diagnostic.hint" = { bg = "cyan", modifiers = ["bold"] }
28"ui.bufferline" = { fg = "text", bg = "bg" }
28"ui.bufferline" = { fg = "text", bg = "bg" }
29−"ui.bufferline.active" = { fg = "text", bg = "bg" }
29+"ui.bufferline.active" = { fg = "text", bg = "bg", modifiers = ['underlined'] }
30"ui.gutter.selected" = { bg = "highlight-line", modifiers = ["bold"] }
30"ui.gutter.selected" = { bg = "highlight-line", modifiers = ["bold"] }
31"ui.highlight" = { bg = "highlight-line" }
31"ui.highlight" = { bg = "highlight-line" }
32
32
runtime/themes/nightfox.toml+2−2
@@ -125,7 +125,7 @@
125"keyword.control.exception" = { fg = "magenta" } # `try`, `catch`, `raise`/`throw` and related.
125"keyword.control.exception" = { fg = "magenta" } # `try`, `catch`, `raise`/`throw` and related.
126"keyword.operator" = { fg = "fg2", modifiers = ["bold"] } # 'or', 'and', 'in'.
126"keyword.operator" = { fg = "fg2", modifiers = ["bold"] } # 'or', 'and', 'in'.
127"keyword.directive" = { fg = "pink-bright" } # Preprocessor directives (#if in C...).
127"keyword.directive" = { fg = "pink-bright" } # Preprocessor directives (#if in C...).
128−"keyword.function" = { fg = "red" } # The keyword to define a funtion: 'def', 'fun', 'fn'.
128+"keyword.function" = { fg = "red" } # The keyword to define a function: 'def', 'fun', 'fn'.
129"keyword.storage" = { fg = "magenta" } # Keywords describing how things are stored
129"keyword.storage" = { fg = "magenta" } # Keywords describing how things are stored
130"keyword.storage.type" = { fg = "magenta" } # The type of something, class, function, var, let, etc.
130"keyword.storage.type" = { fg = "magenta" } # The type of something, class, function, var, let, etc.
131"keyword.storage.modifier" = { fg = "yellow" } # Storage modifiers like static, mut, const, ref, etc.
131"keyword.storage.modifier" = { fg = "yellow" } # Storage modifiers like static, mut, const, ref, etc.
@@ -183,6 +183,6 @@ bg4 = "#39506d" # Conceal, border fg
183fg0 = "#d6d6d7" # Lighter fg
183fg0 = "#d6d6d7" # Lighter fg
184fg1 = "#cdcecf" # Default fg
184fg1 = "#cdcecf" # Default fg
185fg2 = "#aeafb0" # Darker fg (status line)
185fg2 = "#aeafb0" # Darker fg (status line)
186−fg3 = "#71839b" # Darker fg (line numbers, fold colums)
186+fg3 = "#71839b" # Darker fg (line numbers, fold columns)
187sel0 = "#2b3b51" # Popup bg, visual selection bg
187sel0 = "#2b3b51" # Popup bg, visual selection bg
188sel1 = "#3c5372" # Popup sel bg, search bg
188sel1 = "#3c5372" # Popup sel bg, search bg
runtime/themes/noctis.toml+26−26
@@ -7,8 +7,8 @@
7
7
8'property' = { fg = "red" } # Regex group names.
8'property' = { fg = "red" } # Regex group names.
9"warning" = { fg ="yellow", modifiers = ["bold"] } # Editor warnings.
9"warning" = { fg ="yellow", modifiers = ["bold"] } # Editor warnings.
10−"error" = { bg = "mid-green", fg = "red", modifiers = ["bold"] } # Editor errors, like mis-typing a command.
10+"error" = { 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).
11+"info" = { fg = "mid-blue" } # Code diagnostic info in gutter (LSP).
12# ? Difference between info and hint ?
12# ? Difference between info and hint ?
13"hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP).
13"hint" = { fg = "light-green", modifiers = ["bold"] } # Code diagnostics hint in gutter (LSP).
14
14
@@ -21,14 +21,14 @@
21# UI ==============================
21# UI ==============================
22# For styling helix itself.
22# For styling helix itself.
23
23
24−'ui.background' = { bg = "dark-green"} # Default background color.
24+'ui.background' = { fg = "autocomp-green", bg = "dark-green" } # Default background color.
25'ui.window' = { fg = "mid-green" } # Window border between splits.
25'ui.window' = { fg = "mid-green" } # Window border between splits.
26
26
27'ui.gutter' = { } # Left gutter for diagnostics and breakpoints.
27'ui.gutter' = { } # Left gutter for diagnostics and breakpoints.
28
28
29'ui.text' = { fg = "white" } # Default text color.
29'ui.text' = { fg = "white" } # Default text color.
30'ui.text.focus' = { fg = "white", bg = "mid-green", modifiers = ["bold"] } # Selection highlight in buffer-picker or file-picker.
30'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).
32
32
33'ui.cursor' = { fg = "dark-green", bg = "white" } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c).
33'ui.cursor' = { fg = "dark-green", bg = "white" } # Fallback cursor colour, non-primary cursors when there are multiple (shift-c).
34'ui.cursor.primary' = { fg = "dark-green", bg = "light-blue" } # The primary cursor when there are multiple (shift-c).
34'ui.cursor.primary' = { fg = "dark-green", bg = "light-blue" } # The primary cursor when there are multiple (shift-c).
@@ -40,8 +40,8 @@
40'ui.selection.primary' = { bg = "autocomp-green" } # The primary selection when there are multiple.
40'ui.selection.primary' = { bg = "autocomp-green" } # The primary selection when there are multiple.
41'ui.cursorline.primary' = { bg = 'mid-green' }
41'ui.cursorline.primary' = { bg = 'mid-green' }
42
42
43−'ui.linenr' = { bg = "dark-green", fg = "gray" } # Line numbers.
43+'ui.linenr' = { fg = "gray" } # Line numbers.
44−'ui.linenr.selected' = { bg = "mid-green", fg = "light-green", modifiers = [ "bold" ] } # Current line number.
44+'ui.linenr.selected' = { fg = "light-green", modifiers = [ "bold" ] } # Current line number.
45
45
46'ui.virtual' = { fg = "mid-green" } # Namespace for additions to the editing area.
46'ui.virtual' = { fg = "mid-green" } # Namespace for additions to the editing area.
47'ui.virtual.ruler' = { bg = "mid-green" } # Vertical rulers (colored columns in editing area).
47'ui.virtual.ruler' = { bg = "mid-green" } # Vertical rulers (colored columns in editing area).
@@ -75,9 +75,9 @@
75#'type.builtin' = { } # Primitive types of the language (string, int, float).
75#'type.builtin' = { } # Primitive types of the language (string, int, float).
76#'type.enum.variant' = { } # A variant of an enum.
76#'type.enum.variant' = { } # A variant of an enum.
77
77
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
79
79
80−'constant' = { fg = "light-blue" } # Constant value
80+'constant' = { fg = "light-blue", modifiers = ["bold"] } # Constant value
81'constant.builtin' = { fg = "mid-blue", modifiers = ["bold"] } # Special constants like `true`, `false`, `none`, etc.
81'constant.builtin' = { fg = "mid-blue", modifiers = ["bold"] } # Special constants like `true`, `false`, `none`, etc.
82'constant.builtin.boolean' = { } # True or False.
82'constant.builtin.boolean' = { } # True or False.
83'constant.character' = { fg = "light-green"} # Constant of character type.
83'constant.character' = { fg = "light-green"} # Constant of character type.
@@ -88,42 +88,41 @@
88
88
89'string' = { fg = "light-green" } # String literal.
89'string' = { fg = "light-green" } # String literal.
90'string.regexp' = { } # Regular expression literal.
90'string.regexp' = { } # Regular expression literal.
91−'string.special' = { fg = "light-blue" } # Strings containing a path, URL, etc.
91+'string.special' = { fg = "red" } # Strings containing a path, URL, etc.
92−'string.special.path' = { } # String containing a file path.
92+# 'string.special.path' = { } # String containing a file path.
93−'string.special.url' = { } # String containing a web URL.
93+# 'string.special.url' = { } # String containing a web URL.
94−'string.special.symbol' = { } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords.
94+# 'string.special.symbol' = { } # Erlang/Elixir atoms, Ruby symbols, Clojure keywords.
95
95
96'comment' = { fg = "gray", modifiers = ["italic"] } # This is a comment.
96'comment' = { fg = "gray", modifiers = ["italic"] } # This is a comment.
97'comment.line' = { } # Line comments, like this.
97'comment.line' = { } # Line comments, like this.
98'comment.block' = { } # Block comments, like /* this */ in some languages.
98'comment.block' = { } # Block comments, like /* this */ in some languages.
99'comment.block.documentation' = { } # Doc comments, e.g '///' in rust.
99'comment.block.documentation' = { } # Doc comments, e.g '///' in rust.
100
100
101−'variable' = { fg = "white" } # Variable names.
101+'variable' = { fg = "light-orange" } # Variable names.
102−'variable.builtin' = { } # Language reserved variables: `this`, `self`, `super`, etc.
102+# 'variable.builtin' = { } # Language reserved variables: `this`, `self`, `super`, etc.
103−'variable.parameter' = { } # Funtion parameters.
103+# 'variable.parameter' = { } # Function parameters.
104−'variable.other.member' = { } # Fields of composite data types (e.g. structs, unions).
104+'variable.other.member' = { fg = "orange" } # Fields of composite data types (e.g. structs, unions).
105−'variable.function' = { } # ?
106
105
107'label' = { fg = "purple" } # Loop labels in rust.
106'label' = { fg = "purple" } # Loop labels in rust.
108
107
109'punctuation' = { fg = "yellow", modifiers = ["bold"] } # (){}[]:;,.
108'punctuation' = { fg = "yellow", modifiers = ["bold"] } # (){}[]:;,.
110−# 'punctuation.delimeter' = { fg = "yellow" } # Commas and colons.
109+# 'punctuation.delimiter' = { fg = "yellow" } # Commas and colons.
111# 'punctuation.bracket' = { fg = "yellow" } # Parentheses, angle brackets, etc.
110# 'punctuation.bracket' = { fg = "yellow" } # Parentheses, angle brackets, etc.
112
111
113'keyword' = { fg = "pink", modifiers = ["bold"] } # Language reserved keywords.
112'keyword' = { fg = "pink", modifiers = ["bold"] } # Language reserved keywords.
114'keyword.control' = { fg = "pink", modifiers = ["bold"] } # Control keywords.
113'keyword.control' = { fg = "pink", modifiers = ["bold"] } # Control keywords.
115'keyword.control.conditional' = { fg = "pink", modifiers = ["bold"] } # 'if', 'else', 'elif'.
114'keyword.control.conditional' = { fg = "pink", modifiers = ["bold"] } # 'if', 'else', 'elif'.
116−'keyword.control.repeat' = { } # 'for', 'while', 'loop'.
115+# 'keyword.control.repeat' = { } # 'for', 'while', 'loop'.
117'keyword.control.import' = { fg = "pink", modifiers = ["italic"] } # 'import', 'export' ('use'?).
116'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.
119'keyword.control.exception' = {fg = "pink", modifiers = ["bold"] } # 'raise' in python.
118'keyword.control.exception' = {fg = "pink", modifiers = ["bold"] } # 'raise' in python.
120−'keyword.operator' = { } # 'or', 'and', 'in'.
119+'keyword.operator' = { fg = "pink" } # 'or', 'and', 'in'.
121'keyword.directive' = { fg = "purple" } # Preprocessor directives (#if in C).
120'keyword.directive' = { fg = "purple" } # Preprocessor directives (#if in C).
122−'keyword.function' = { } # The keyword to define a funtion: 'def', 'fun', 'fn'.
121+'keyword.function' = { fg= "red" } # The keyword to define a function: 'def', 'fun', 'fn'.
123
122
124'operator' = { fg = "pink", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators
123'operator' = { fg = "pink", modifiers = ["bold"] } # Logical (&&, ||) and - I assume - Mathematical (+, %) operators
125
124
126−'function' = { fg = "dark-blue"}
125+'function' = { fg = "mid-blue"}
127'function.builtin' = { fg = "dark-blue" }
126'function.builtin' = { fg = "dark-blue" }
128'function.method' = { fg = "dark-blue" } # Class / Struct methods.
127'function.method' = { fg = "dark-blue" } # Class / Struct methods.
129'function.macro' = { fg = "purple" } # Like macros in rust.
128'function.macro' = { fg = "purple" } # Like macros in rust.
@@ -181,8 +180,8 @@
181# Version control changes.
180# Version control changes.
182
181
183'diff.plus' = "light-green" # { } # Additions.
182'diff.plus' = "light-green" # { } # Additions.
184−'diff.minus' = "yellow" # { } # Deletions.
183+'diff.minus' = "red" # { } # Deletions.
185−'diff.delta' = "red" # { } # Modifications.
184+'diff.delta' = "yellow" # { } # Modifications.
186# 'diff.delta.moved' = { } # Renamed or moved files / changes.
185# 'diff.delta.moved' = { } # Renamed or moved files / changes.
187
186
188
187
@@ -197,8 +196,9 @@ yellow = "#ffd800"
197purple = "#918cff"
196purple = "#918cff"
198white = "#b1cace"
197white = "#b1cace"
199orange = "#ffa864"
198orange = "#ffa864"
199+light-orange = "#fff2c5"
200gray = "#5b858b" # mainly for comments/background text
200gray = "#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
202red = "#e34e1b"
202red = "#e34e1b"
203
203
204dark-blue = "#19a2b7"
204dark-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+22−12
@@ -15,14 +15,14 @@
15"constructor" = "nord8"
15"constructor" = "nord8"
16
16
17# Diagnostics
17# Diagnostics
18−"diagnostic" = "nord13"
18+"diagnostic" = { underline = { color = "nord13", style = "curl" } }
19−"diagnostic.error" = "nord11"
19+"diagnostic.error" = { underline = { color = "nord11", style = "curl" } }
20"error" = "nord11"
20"error" = "nord11"
21−"diagnostic.hint" = "nord10"
21+"diagnostic.hint" = { underline = { color = "nord10", style = "curl" } }
22"hint" = "nord10"
22"hint" = "nord10"
23−"diagnostic.info" = "nord8"
23+"diagnostic.info" = { underline = { color = "nord8", style = "curl" } }
24"info" = "nord8"
24"info" = "nord8"
25−"diagnostic.warning" = "nord13"
25+"diagnostic.warning" = { underline = { color = "nord13", style = "curl" } }
26"warning" = "nord13"
26"warning" = "nord13"
27
27
28# Diffs
28# Diffs
@@ -50,7 +50,7 @@
50"keyword.operator" = "nord9"
50"keyword.operator" = "nord9"
51"keyword.return" = "nord9"
51"keyword.return" = "nord9"
52"keyword.storage.modifier" = "nord9"
52"keyword.storage.modifier" = "nord9"
53−"keyword.storage.type" = "nord7"
53+"keyword.storage.type" = "nord9"
54
54
55# Punctuation
55# Punctuation
56"punctuation" = "nord6"
56"punctuation" = "nord6"
@@ -65,22 +65,22 @@
65"string.special" = "nord13"
65"string.special" = "nord13"
66
66
67# Types
67# Types
68−"type" = "nord4"
68+"type" = "nord7"
69"type.builtin" = "nord7"
69"type.builtin" = "nord7"
70
70
71# Variables
71# Variables
72"variable" = "nord4"
72"variable" = "nord4"
73−"variable.builint" = "nord9"
73+"variable.builtin" = "nord9"
74"variable.other.member" = "nord4"
74"variable.other.member" = "nord4"
75"variable.parameter" = "nord8"
75"variable.parameter" = "nord8"
76−"attribute" = "nord4"
76+"attribute" = "nord9"
77
77
78# Misc.
78# Misc.
79"label" = "nord7"
79"label" = "nord7"
80"namespace" = "nord4"
80"namespace" = "nord4"
81"operator" = "nord9"
81"operator" = "nord9"
82−"special" = "nord4"
82+"special" = "nord9"
83−"tag" = "nord4"
83+"tag" = "nord7"
84"comment" = { fg = "nord3_bright", modifiers = ["italic"] }
84"comment" = { fg = "nord3_bright", modifiers = ["italic"] }
85
85
86## EDITOR UI COLORS
86## EDITOR UI COLORS
@@ -100,6 +100,7 @@
100"ui.popup" = { bg = "nord1" }
100"ui.popup" = { bg = "nord1" }
101"ui.popup.info" = { bg = "nord1" }
101"ui.popup.info" = { bg = "nord1" }
102"ui.help" = { bg = "nord1" }
102"ui.help" = { bg = "nord1" }
103+"ui.text.focus" = { fg = "nord8", bg = "nord2" }
103
104
104# Gutter
105# Gutter
105"ui.gutter" = "nord5"
106"ui.gutter" = "nord5"
@@ -133,6 +134,15 @@
133"ui.bufferline" = { fg = "nord5", bg = "nord1" }
134"ui.bufferline" = { fg = "nord5", bg = "nord1" }
134"ui.bufferline.active" = { fg = "nord6", bg = "nord2", underline = { color = "nord8", style = "line" }, modifiers = [ "italic" ] }
135"ui.bufferline.active" = { fg = "nord6", bg = "nord2", underline = { color = "nord8", style = "line" }, modifiers = [ "italic" ] }
135
136
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+
136[palette]
146[palette]
137# 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.
147# 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.
138#
148#
@@ -164,7 +174,7 @@ nord8 = "#88C0D0"
164# A more darkened and less saturated color reminiscent of arctic waters
174# A more darkened and less saturated color reminiscent of arctic waters
165nord9 = "#81A1C1"
175nord9 = "#81A1C1"
166# A dark and intensive color reminiscent of the deep arctic ocean
176# A dark and intensive color reminiscent of the deep arctic ocean
167− nord10 = "#5E81AC"
177+nord10 = "#5E81AC"
168
178
169# Aurora consists of five colorful components reminiscent of the "Aurora borealis", sometimes referred to as polar lights or northern lights.
179# Aurora consists of five colorful components reminiscent of the "Aurora borealis", sometimes referred to as polar lights or northern lights.
170#
180#
runtime/themes/onedark.toml+1
@@ -1,5 +1,6 @@
1# Author : Gokul Soumya <gokulps15@gmail.com>
1# Author : Gokul Soumya <gokulps15@gmail.com>
2
2
3+"tag" = { fg = "red" }
3"attribute" = { fg = "yellow" }
4"attribute" = { fg = "yellow" }
4"comment" = { fg = "light-gray", modifiers = ["italic"] }
5"comment" = { fg = "light-gray", modifiers = ["italic"] }
5"constant" = { fg = "cyan" }
6"constant" = { fg = "cyan" }
runtime/themes/papercolor-dark.toml+67−116
@@ -1,124 +1,75 @@
1# Palette based on https://github.com/NLKNguyen/papercolor-theme
1# Palette based on https://github.com/NLKNguyen/papercolor-theme
2# Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
2# Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
3
3
4−"ui.linenr.selected" = { fg = "linenr_fg_selected" }
4+inherits = "papercolor-light"
5−"ui.background" = {bg="background"}
6−"ui.text" = "foreground"
7−"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]}
8−"ui.selection" = {bg="selection_background", fg="selection_foreground"}
9−"ui.cursorline" = {bg="cursorline_background"}
10−"ui.highlight" = {bg="cursorline_background"}
11−"ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
12−"ui.statusline.select" = {bg="background", fg="bright7"}
13−"ui.statusline.normal" = {bg="background", fg="bright3"}
14−"ui.statusline.inactive" = {bg="selection_foreground", fg="foreground"}
15−"ui.virtual.whitespace" = { fg = "regular5" }
16−"ui.virtual.ruler" = {bg="cursorline_background"}
17−"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
18−"ui.cursor" = {bg = "regular5", fg = "background"}
19−"ui.window" = {bg = "#303030", fg = "bright2"}
20−"ui.help" = {bg = "background", fg = "bright2"}
21−"ui.popup" = {bg = "#303030", fg = "bright6"}
22−"ui.menu" = {bg = "#303030", fg = "bright6"}
23−"ui.menu.selected" = {bg = "#C6C6C6", fg="selection_foreground"}
24
5
25−"markup.heading" = { fg = "regular4", modifiers = ["bold"] }
6+[palette]
26−"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
7+background = "#1c1c1c"
27−"markup.heading.2" = { fg = "bright5", modifiers = ["bold"] }
8+foreground = "#d0d0d0"
28−"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
29−"markup.heading.4" = { fg = "bright5", modifiers = ["bold"] }
30−"markup.heading.5" = { fg = "bright5", modifiers = ["bold"] }
31−"markup.heading.6" = { fg = "bright5", modifiers = ["bold"] }
32−"markup.list" = "bright3"
33−"markup.bold" = { fg = "foreground", modifiers = ["bold"] }
34−"markup.italic" = { fg = "bright0", modifiers = ["italic"] }
35−"markup.strikethrough" = { modifiers = ["crossed_out"] }
36−"markup.link.url" = { fg = "bright6", modifiers = ["underlined"] }
37−"markup.link.text" = "bright2"
38−"markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
39−"markup.raw" = "foreground"
40−
41−"string" = "foreground"
42−"attribute" = "bright7"
43−"keyword" = { fg = "regular4", modifiers = ["bold"]}
44−"keyword.directive" = "regular4"
45−"keyword.control.conditional" = "bright3"
46−"keyword.function" = "regular4"
47−"namespace" = "bright1"
48−"type" = "bright2"
49−"type.builtin" = { fg = "foreground", modifiers = ["bold"]}
50−"variable" = "foreground"
51−"variable.builtin" = "cyan"
52−"variable.other.member" = "cyan"
53−"variable.parameter" = "foreground"
54−
55−"special" = "#3E999F"
56−"function" = "bright6"
57−"constructor" = "regular4"
58−"function.builtin" = { fg = "foreground", modifiers = ["bold"]}
59−"function.macro" = { fg = "regular4", modifiers = ["bold"] }
60−"comment" = { fg = "#686868", modifiers = ["dim"] }
61−"ui.linenr" = { fg = "bright0" }
62−"module" = "regular4"
63−"constant" = "bright5"
64−"constant.builtin" = "bright6"
65−"constant.numeric" = "bright5"
66−"constant.character.escape" = { fg = "foreground", modifiers = ["bold"]}
67−"operator" = { fg = "regular4", modifiers = ["bold"]}
68−
69−"label" = { fg = "selection_background", modifiers = ["bold", "italic"] }
70−
71−"diff.plus" = "regular2"
72−"diff.delta" = "regular6"
73−"diff.minus" = "regular1"
74
9
75−"warning" = "bright4"
10+regular0 = "#1c1c1c" # color00 "Background"
76−"error" = "regular1"
11+regular1 = "#af005f" # color01 "Negative"
77−"info" = "bright4"
12+regular2 = "#5faf00" # color02 "Positive"
13+regular3 = "#d7af5f" # color03 "Olive"
14+regular4 = "#5fafd7" # color04 "Neutral" / Aqua
15+regular5 = "#808080" # color05 "Comment"
16+regular6 = "#d7875f" # color06 "Navy"
17+regular7 = "#d0d0d0" # color07 "Foreground"
18+bright0 = "#585858" # color08 "Nontext"
19+bright1 = "#5faf5f" # color09 "Red"
20+bright2 = "#afd700" # color10 "Pink"
21+bright3 = "#af87d7" # color11 "Purple"
22+bright4 = "#ffaf00" # color12 "Accent"
23+bright5 = "#ff5faf" # color13 "Orange"
24+bright6 = "#00afaf" # color14 "Blue"
25+bright7 = "#5f8787" # color15 "Highlight"
78
26
79−"diagnostic.warning".underline = { color = "bright4", style = "curl" }
27+selection_fg = "#000000"
80−"diagnostic.error".underline = { color = "regular1", style = "curl" }
28+selection_bg = "#8787af"
81−"diagnostic.info".underline = { color = "bright4", style = "curl" }
29+selection_secondary_fg = "#333333"
82−"diagnostic.hint".underline = { color = "bright4", style = "curl" }
30+selection_secondary_bg = "#707097"
31+special = "#3e999f"
83
32
33+cursorline_bg = "#303030"
34+cursorline_secondary_bg = "#2a2a2a"
35+cursorcolumn_bg = "#303030"
36+cursorcolumn_secondary_bg = "#2a2a2a"
37+cursorlinenr_fg = "#ffff00"
38+popupmenu_fg = "#c6c6c6"
39+popupmenu_bg = "#303030"
40+linenumber_fg = "#585858"
41+vertsplit_fg = "#5f8787"
42+statusline_active_fg = "#1c1c1c"
43+statusline_active_bg = "#5f8787"
44+statusline_inactive_fg = "#bcbcbc"
45+statusline_inactive_bg = "#3a3a3a"
46+todo_fg = "#ff8700"
47+error_fg = "#af005f"
48+error_bg = "#5f0000"
49+matchparen_bg = "#4e4e4e"
50+matchparen_fg = "#c6c6c6"
51+wildmenu_fg = "#1c1c1c"
52+wildmenu_bg = "#afd700"
53+diffadd_fg = "#87d700"
54+diffadd_bg = "#005f00"
55+diffdelete_fg = "#af005f"
56+diffdelete_bg = "#5f0000"
57+diffchange_bg = "#005f5f"
84
58
85−[palette]
59+# 16 bit ANSI color names
86−background="#1c1c1c"
87−foreground="#d0d0d0"
88−regular0="#1c1c1c"
89−regular1="#af005f"
90−regular2="#5faf00"
91−regular3="#d7af5f"
92−regular4="#5fafd7"
93−regular5="#808080"
94−regular6="#d7875f"
95−regular7="#d0d0d0"
96−bright0="#585858"
97−bright1="#5faf5f"
98−bright2="#afd700"
99−bright3="#af87d7"
100−bright4="#FFAF00"
101−bright5="#ff5faf"
102−bright6="#00afaf"
103−bright7="#5f8787"
104−selection_foreground="#585858"
105−selection_background="#8787AF"
106−cursorline_background="#303030"
107−paper_bar_bg="#5F8787"
108−black="#1c1c1c"
60+black = "#1c1c1c"
109−red="#af005f"
61+red = "#af005f"
110−green="#5faf00"
62+green = "#5faf00"
111−yellow="#d7af5f"
63+yellow = "#d7af5f"
112−blue="#5fafd7"
64+blue = "#5fafd7"
113−magenta="#808080"
65+magenta = "#808080"
114−cyan="#d7875f"
66+cyan = "#d7875f"
115−gray="#d0d0d0"
67+white = "#d0d0d0"
68+light-black = "#585858"
116−light-red="#5faf5f"
69+light-red = "#5faf5f"
117−light-green="#afd700"
70+light-green = "#afd700"
118−light-yellow="#af87d7"
71+light-yellow = "#af87d7"
119−light-blue="#FFAF00"
72+light-blue = "#ffaf00"
120−light-magenta="#ff5faf"
73+light-magenta = "#ff5faf"
121−light-cyan="#00afaf"
74+light-cyan = "#00afaf"
122−light-gray="#5f8787"
75+light-white = "#5f8787"
123−white="#808080"
124−linenr_fg_selected="#FFFF00"
runtime/themes/papercolor-light.toml+194−103
@@ -1,31 +1,128 @@
1# Palette based on https://github.com/NLKNguyen/papercolor-theme
1# Palette based on https://github.com/NLKNguyen/papercolor-theme
2# Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
2# Author: Soc Virnyl Estela <socvirnyl.estela@gmail.com>
3
3
4−"ui.linenr.selected" = { fg = "linenr_fg_selected" }
4+"ui.linenr.selected" = { fg = "cursorlinenr_fg", modifiers = ["bold"] }
5+"ui.linenr" = { fg = "linenumber_fg" }
5−"ui.background" = {bg="background"}
6+"ui.background" = { bg = "background" }
6"ui.text" = "foreground"
7"ui.text" = "foreground"
7−"ui.text.focus" = { fg = "selection_background", modifiers = ["bold"]}
8+"ui.text.focus" = { fg = "selection_bg", modifiers = ["bold"] }
8−"ui.selection" = {bg="selection_background", fg="selection_foreground"}
9+"ui.selection" = { bg = "selection_secondary_bg", fg = "selection_secondary_fg" }
10+"ui.selection.primary" = { bg = "selection_bg", fg = "selection_fg" }
9−"ui.highlight" = {bg="cursorline_background"}
11+"ui.highlight" = { bg = "cursorline_bg" }
10−"ui.cursorline" = {bg="cursorline_background"}
12+
11−"ui.statusline" = {bg="paper_bar_bg", fg="regular0"}
13+"ui.cursorline" = { bg = "cursorline_bg" }
14+"ui.cursorline.secondary" = { bg = "cursorline_secondary_bg" }
15+"ui.cursorcolumn" = { bg = "cursorline_bg" }
16+"ui.cursorcolumn.secondary" = { bg = "cursorcolumn_secondary_bg" }
17+
18+"ui.statusline" = { bg = "statusline_active_bg", fg = "statusline_active_fg" }
19+"ui.statusline.inactive" = { bg = "statusline_inactive_bg", fg = "statusline_inactive_fg" }
20+"ui.statusline.normal" = { bg = "statusline_inactive_bg", fg = "bright6" }
21+"ui.statusline.insert" = { bg = "statusline_inactive_bg", fg = "bright4" }
12−"ui.statusline.select" = {bg="background", fg="bright7"}
22+"ui.statusline.select" = { bg = "statusline_inactive_bg", fg = "regular3" }
13−"ui.statusline.normal" = {bg="background", fg="bright3"}
23+"ui.statusline.separator" = { bg = "statusline_active_bg", fg = "statusline_active_bg" }
14−"ui.statusline.inactive" = {bg="bright0", fg="foreground"}
24+
15−"ui.virtual" = "indent"
25+"ui.virtual" = { fg = "cursorlinenr_fg" }
16"ui.virtual.whitespace" = { fg = "regular5" }
26"ui.virtual.whitespace" = { fg = "regular5" }
17−"ui.virtual.ruler" = {bg="cursorline_background"}
27+"ui.virtual.indent-guide" = { fg = "bright0" }
28+"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"] }
18−"ui.cursor.match" = {bg = "regular5", fg = "regular0"}
32+"ui.cursor.match" = { bg = "matchparen_bg", fg = "matchparen_fg" }
19−"ui.cursor" = {bg = "regular5", fg = "background"}
33+"ui.cursor" = { bg = "regular5", fg = "background" }
34+"ui.cursor.primary" = { bg = "foreground", fg = "background" }
20−"ui.window" = {bg = "#D0D0D0", fg = "bright2"}
35+"ui.window" = { fg = "vertsplit_fg" }
21−"ui.help" = {bg = "background", fg = "bright2"}
36+"ui.help" = { bg = "wildmenu_bg", fg = "wildmenu_fg" }
37+"ui.popup" = { bg = "popupmenu_bg", fg = "popupmenu_fg" }
22−"ui.popup" = {bg = "#D0D0D0", fg = "bright7"}
38+"ui.popup.info" = { bg = "popupmenu_bg", fg = "bright7", modifiers = ["bold"] }
23−"ui.menu" = {bg = "#D0D0D0", fg = "bright7"}
39+"ui.menu" = { bg = "popupmenu_bg", fg = "foreground" }
24−"ui.menu.selected" = {bg = "selection_background", fg="selection_foreground"}
40+"ui.menu.selected" = { bg = "selection_bg", fg = "selection_fg" }
25−
41+
42+"warning" = "bright5"
43+"error" = { bg = "error_bg", fg = "error_fg" }
44+"info" = "todo_fg"
45+
46+"diagnostic.warning" = { fg = "bright0", modifiers = [
47+ "dim",
48+], underline = { color = "bright5", style = "curl" } }
49+"diagnostic.error".underline = { color = "bright1", style = "curl" }
50+"diagnostic.info".underline = { color = "bright4", style = "curl" }
51+"diagnostic.hint".underline = { color = "bright6", style = "curl" }
52+
53+# Tree-sitter scopes for syntax highlighting
54+"attribute" = "bright4"
55+
56+"type" = { fg = "bright2", modifiers = ["bold"] }
57+"type.builtin" = { fg = "bright2", modifiers = ["bold"] }
58+"type.parameter" = { fg = "foreground" }
59+"type.enum" = { fg = "foreground" }
60+"type.enum.variant" = { fg = "foreground" }
61+
62+"constructor" = "foreground"
63+
64+"constant" = "bright5"
65+"constant.builtin" = "regular3"
66+"constant.builtin.boolean" = { fg = "regular2", modifiers = ["bold"] }
67+"constant.character.escape" = { fg = "bright3", modifiers = ["bold"] }
68+"constant.character" = { fg = "regular3" }
69+"constant.numeric" = "bright5"
70+
71+"string" = "regular3"
72+"string.regexp" = "bright3"
73+
74+"comment" = { fg = "regular5", modifiers = ["italic"] }
75+"comment.line" = { fg = "regular5", modifiers = ["italic"] }
76+"comment.block" = { fg = "regular5", modifiers = ["italic"] }
77+"comment.block.documentation" = { fg = "regular5", modifiers = ["bold"] }
78+
79+"variable" = "foreground"
80+"variable.builtin" = "bright5"
81+"variable.other.member" = "foreground"
82+"variable.parameter" = "foreground"
83+
84+"label" = { fg = "selection_bg", modifiers = ["bold", "italic"] }
85+
86+"punctuation" = { fg = "foreground" }
87+"punctuation.delimiter" = { fg = "regular4", modifiers = ["bold"] }
88+"punctuation.bracket" = { fg = "foreground" }
89+"punctuation.special" = { fg = "bright1", modifiers = ["bold"] }
90+
91+"keyword" = { fg = "bright2" }
92+"keyword.control" = "bright1"
93+"keyword.control.conditional" = { fg = "bright3", modifiers = ["bold"] }
94+"keyword.control.repeat" = { fg = "bright3", modifiers = ["bold"] }
95+"keyword.control.import" = { fg = "bright2" }
96+"keyword.control.return" = { fg = "bright2" }
97+"keyword.control.exception" = { fg = "bright1" }
98+
99+"keyword.operator" = { fg = "regular4", modifiers = ["bold"] }
100+"keyword.directive" = "regular4"
101+"keyword.function" = "bright2"
102+"keyword.storage" = "bright2"
103+"keyword.storage.type" = { fg = "regular4", modifiers = ["bold"] }
104+"keyword.storage.modifier" = { fg = "regular6", modifiers = ["bold"] }
105+"keyword.storage.modifier.ref" = { fg = "regular4", modifiers = ["bold"] }
106+"keyword.special" = "bright1"
107+
108+"operator" = { fg = "regular4", modifiers = ["bold"] }
109+
110+"function" = { fg = "foreground" }
111+"function.builtin" = { fg = "bright6" }
112+"function.method" = { fg = "foreground" }
113+"function.macro" = { fg = "regular3", modifiers = ["bold"] }
114+"function.special" = { fg = "bright4" }
115+
116+"tag" = { fg = "regular4" }
117+
118+"namespace" = "bright6"
119+
120+"special" = "special"
121+
26−"markup.heading" = { fg = "bright7", modifiers = ["bold"] }
122+"markup.heading" = { fg = "bright4", modifiers = ["bold"] }
123+"markup.heading.marker" = { fg = "bright2", modifiers = ["bold"] }
27"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
124"markup.heading.1" = { fg = "bright2", modifiers = ["bold"] }
28−"markup.heading.2" = { fg = "bright4", modifiers = ["bold"] }
125+"markup.heading.2" = { fg = "bright5", modifiers = ["bold"] }
29"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
126"markup.heading.3" = { fg = "bright3", modifiers = ["bold"] }
30"markup.heading.4" = { fg = "bright4", modifiers = ["bold"] }
127"markup.heading.4" = { fg = "bright4", modifiers = ["bold"] }
31"markup.heading.5" = { fg = "bright4", modifiers = ["bold"] }
128"markup.heading.5" = { fg = "bright4", modifiers = ["bold"] }
@@ -34,90 +131,84 @@
34"markup.bold" = { fg = "foreground", modifiers = ["bold"] }
131"markup.bold" = { fg = "foreground", modifiers = ["bold"] }
35"markup.italic" = { modifiers = ["italic"] }
132"markup.italic" = { modifiers = ["italic"] }
36"markup.strikethrough" = { modifiers = ["crossed_out"] }
133"markup.strikethrough" = { modifiers = ["crossed_out"] }
37−"markup.link.url" = { fg = "regular4", modifiers = ["underlined"] }
134+"markup.link.url" = { fg = "bright6", underline.style = "line" }
38"markup.link.text" = "bright2"
135"markup.link.text" = "bright2"
39−"markup.link.label" = { fg = "regular7", modifiers = ["bold"] }
136+"markup.link.label" = { fg = "regular2", modifiers = ["bold"] }
40−"markup.raw" = "foreground"
137+"markup.quote" = "regular4"
41−
138+# Both inline and block code
42−"string" = "foreground"
139+"markup.raw" = "regular3"
43−"attribute" = "bright7"
44−"keyword" = { fg = "regular4", modifiers = ["bold"]}
45−"keyword.directive" = "regular1"
46−"namespace" = "regular1"
47−"type" = "bright2"
48−"type.builtin" = { fg = "regular4", modifiers = ["bold"]}
49−"variable" = "foreground"
50−"variable.builtin" = "cyan"
51−"variable.other.member" = "regular4"
52−"variable.parameter" = "foreground"
53−
54−"special" = "#3E999F"
55−"function" = "bright1"
56−"constructor" = "bright1"
57−"function.builtin" = { fg = "regular4", modifiers = ["bold"]}
58−"function.macro" = { fg = "regular1" }
59−"comment" = { fg = "bright0", modifiers = ["dim"] }
60−"ui.linenr" = { fg = "bright0" }
61−"module" = "#af0000"
62−"constant" = "#5f8700"
63−"constant.builtin" = "#5f8700"
64−"constant.numeric" = "#d75f00"
65−"constant.character.escape" = { fg = "#8700af", modifiers = ["bold"]}
66−"operator" = { fg = "regular4", modifiers = ["bold"]}
67
140
141+"diff.plus" = { bg = "diffadd_bg", fg = "diffadd_fg" }
142+"diff.delta" = { bg = "diffchange_bg" }
68−"label" = { fg = "selection_background", modifiers = ["bold", "italic"] }
143+"diff.delta.moved" = { modifiers = ["italic"] }
144+"diff.minus" = { bg = "diffdelete_bg", fg = "diffdelete_fg" }
69
145
70−"diff.plus" = "regular2"
146+[palette]
71−"diff.delta" = "bright0"
147+background = "#eeeeee"
72−"diff.minus" = "bright1"
148+foreground = "#444444"
73−
149+regular0 = "#eeeeee" # color00 "Background"
74−"warning" = "bright4"
150+regular1 = "#af0000" # color01 "Negative"
75−"error" = "regular1"
151+regular2 = "#008700" # color02 "Positive"
76−"info" = "#FFAF00"
152+regular3 = "#5f8700" # color03 "Olve"
153+regular4 = "#0087af" # color04 "Neutral" / Aqua
154+regular5 = "#878787" # color05 "Comment"
155+regular6 = "#005f87" # color06 "Navy"
156+regular7 = "#444444" # color07 "Foreground"
157+bright0 = "#bcbcbc" # color08 "Nontext"
158+bright1 = "#d70000" # color09 "Red"
159+bright2 = "#d70087" # color10 "Pink"
160+bright3 = "#8700af" # color11 "Purple"
161+bright4 = "#d75f00" # color12 "Accent"
162+bright5 = "#d75f00" # color13 "Orange"
163+bright6 = "#005faf" # color14 "Blue"
164+bright7 = "#005f87" # color15 "Highlight"
77
165
78−"diagnostic.warning".underline = { color = "bright4", style = "curl" }
166+selection_fg = "#eeeeee"
79−"diagnostic.error".underline = { color = "regular1", style = "curl" }
167+selection_bg = "#0087af"
80−"diagnostic.info".underline = { color = "#FFAF00", style = "curl" }
168+selection_secondary_fg = "#d9d7d7"
81−"diagnostic.hint".underline = { color = "#FFAF00", style = "curl" }
169+selection_secondary_bg = "#2c687a"
170+special = "#3e999f"
82
171
172+cursorline_bg = "#e4e4e4"
173+cursorline_secondary_bg = "#eaeaea"
174+cursorcolumn_bg = "#e4e4e4"
175+cursorcolumn_secondary_bg = "#eaeaea"
176+cursorlinenr_fg = "#af5f00"
177+popupmenu_fg = "#444444"
178+popupmenu_bg = "#d0d0d0"
179+linenumber_fg = "#b2b2b2"
180+vertsplit_fg = "#005f87"
181+statusline_active_fg = "#e4e4e4"
182+statusline_active_bg = "#005f87"
183+statusline_inactive_fg = "#444444"
184+statusline_inactive_bg = "#d0d0d0"
185+todo_fg = "#00af5f"
186+error_fg = "#af0000"
187+error_bg = "#ffd7ff"
188+matchparen_bg = "#c6c6c6"
189+matchparen_fg = "#005f87"
190+wildmenu_fg = "#444444"
191+wildmenu_bg = "#ffff00"
192+diffadd_fg = "#008700"
193+diffadd_bg = "#afffaf"
194+diffdelete_fg = "#af0000"
195+diffdelete_bg = "#ffd7ff"
196+diffchange_bg = "#ffd787"
83
197
84−[palette]
198+# 16 bit ANSI color names
85−background="#eeeeee"
86−foreground="#444444"
87−regular0="#eeeeee"
199+black = "#eeeeee"
88−regular1="#af0000"
200+red = "#d70000"
89−regular2="#008700"
201+green = "#008700"
90−regular3="#5f8700"
202+yellow = "#5f8700"
91−regular4="#0087af"
203+blue = "#0087af"
92−regular5="#878787"
204+magenta = "#878787"
93−regular6="#005f87"
205+cyan = "#005f87"
94−regular7="#764e37"
206+white = "#444444"
95−bright0="#bcbcbc"
207+light-black = "#bcbcbc"
96−bright1="#d70000"
97−bright2="#d70087"
98−bright3="#8700af"
99−bright4="#d75f00"
100−bright5="#d75f00"
101−bright6="#4c7a5d"
102−bright7="#005faf"
103−selection_foreground="#eeeeee"
104−selection_background="#0087af"
105−cursorline_background="#fdfdfd"
106−paper_bar_bg="#005F87"
107−black="#eeeeee"
108−red="#d70000"
109−green="#008700"
110−yellow="#5f8700"
111−blue="#0087af"
112−magenta="#878787"
113−cyan="#005f87"
114−gray="#764e37"
115−light-red="#d70000"
208+light-red = "#d70000"
116−light-green="#d70087"
209+light-green = "#d70087"
117−light-yellow="#8700af"
210+light-yellow = "#8700af"
118−light-blue="#d75f00"
211+light-blue = "#d75f00"
119−light-magenta="#d75f00"
212+light-magenta = "#d75f00"
120−light-cyan="#4c7a4d"
213+light-cyan = "#4c7a4d"
121−light-gray="#005faf"
214+light-white = "#005faf"
122−white="#444444"
123−linenr_fg_selected="#AF634D"
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+31−29
@@ -10,7 +10,7 @@
10"ui.cursor" = { fg = "text", bg = "highlight_high" }
10"ui.cursor" = { fg = "text", bg = "highlight_high" }
11# "ui.cursor.select" = {}
11# "ui.cursor.select" = {}
12"ui.cursor.match" = { fg = "text", bg = "highlight_med" }
12"ui.cursor.match" = { fg = "text", bg = "highlight_med" }
13−"ui.cursor.primary" = { fg = "text", bg = "muted"}
13+"ui.cursor.primary" = { fg = "text", bg = "muted" }
14
14
15# "ui.gutter" = {}
15# "ui.gutter" = {}
16# "ui.gutter.selected" = {}
16# "ui.gutter.selected" = {}
@@ -18,6 +18,8 @@
18"ui.linenr" = { fg = "muted" }
18"ui.linenr" = { fg = "muted" }
19"ui.linenr.selected" = { fg = "text" }
19"ui.linenr.selected" = { fg = "text" }
20
20
21+"ui.bufferline" = { fg = "muted", bg = "base" }
22+"ui.bufferline.active" = { fg = "text", bg = "overlay" }
21"ui.statusline" = { fg = "subtle", bg = "surface" }
23"ui.statusline" = { fg = "subtle", bg = "surface" }
22"ui.statusline.inactive" = { fg = "muted", bg = "surface" }
24"ui.statusline.inactive" = { fg = "muted", bg = "surface" }
23"ui.statusline.normal" = { fg = "rose", bg = "rose_10" }
25"ui.statusline.normal" = { fg = "rose", bg = "rose_10" }
@@ -71,8 +73,8 @@
71"constructor" = "foam"
73"constructor" = "foam"
72
74
73"constant" = "foam"
75"constant" = "foam"
74−"constant.builtin" = "rose"
76+"constant.builtin" = "love"
75−# "constant.builtin.boolean" = ""
77+"constant.builtin.boolean" = "rose"
76"constant.character" = "gold"
78"constant.character" = "gold"
77"constant.character.escape" = "pine"
79"constant.character.escape" = "pine"
78"constant.numeric" = "gold"
80"constant.numeric" = "gold"
@@ -86,16 +88,16 @@
86# "string.special.url" = ""
88# "string.special.url" = ""
87# "string.special.symbol" = ""
89# "string.special.symbol" = ""
88
90
89−"comment" = { fg = "muted", modifiers = ["italic"]}
91+"comment" = { fg = "muted", modifiers = ["italic"] }
90# "comment.line" = ""
92# "comment.line" = ""
91# "comment.block" = ""
93# "comment.block" = ""
92−# "comment.block.documenation" = ""
94+# "comment.block.documentation" = ""
93
95
94"variable" = "text"
96"variable" = "text"
95"variable.builtin" = "love"
97"variable.builtin" = "love"
96"variable.parameter" = "iris"
98"variable.parameter" = "iris"
97# "variable.other" = ""
99# "variable.other" = ""
98−# "variable.other.member" = ""
100+"variable.other.member" = "foam"
99
101
100"label" = "foam"
102"label" = "foam"
101
103
@@ -120,7 +122,7 @@
120
122
121"operator" = "subtle"
123"operator" = "subtle"
122
124
123−"function" = "rose" # maybe pine
125+"function" = "rose" # maybe pine
124"function.builtin" = "love"
126"function.builtin" = "love"
125# "function.method" = ""
127# "function.method" = ""
126# "function.macro" = ""
128# "function.macro" = ""
@@ -128,7 +130,7 @@
128
130
129"tag" = "foam"
131"tag" = "foam"
130
132
131−"namespace" = "iris"
133+"namespace" = "text"
132
134
133"markup.heading.marker" = "muted"
135"markup.heading.marker" = "muted"
134"markup.heading" = { fg = "iris", modifiers = ["bold"] }
136"markup.heading" = { fg = "iris", modifiers = ["bold"] }
@@ -147,7 +149,7 @@
147"markup.italic" = { modifiers = ["italic"] }
149"markup.italic" = { modifiers = ["italic"] }
148"markup.strikethrough" = { modifiers = ["crossed_out"] }
150"markup.strikethrough" = { modifiers = ["crossed_out"] }
149"markup.link" = "iris"
151"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" } }
151"markup.link.label" = "subtle"
153"markup.link.label" = "subtle"
152"markup.link.text" = "text"
154"markup.link.text" = "text"
153"markup.quote" = "subtle"
155"markup.quote" = "subtle"
@@ -167,24 +169,24 @@
167# "diff.delta.moved" = ""
169# "diff.delta.moved" = ""
168
170
169[palette]
171[palette]
170−base = "#191724"
172+base = "#191724"
171−surface = "#1f1d2e"
173+surface = "#1f1d2e"
172−overlay = "#26233a"
174+overlay = "#26233a"
173−muted = "#6e6a86"
175+muted = "#6e6a86"
174−subtle = "#908caa"
176+subtle = "#908caa"
175−text = "#e0def4"
177+text = "#e0def4"
176−love = "#eb6f92"
178+love = "#eb6f92"
177−love_10 = "#311f30"
179+love_10 = "#311f30"
178−gold = "#f6c177"
180+gold = "#f6c177"
179−gold_10 = "#30282c"
181+gold_10 = "#30282c"
180−rose = "#ebbcba"
182+rose = "#ebbcba"
181−rose_10 = "#2f2834"
183+rose_10 = "#2f2834"
182−pine = "#31748f"
184+pine = "#31748f"
183−pine_10 = "#1a2030"
185+pine_10 = "#1a2030"
184−foam = "#9ccfd8"
186+foam = "#9ccfd8"
185−foam_10 = "#252937"
187+foam_10 = "#252937"
186−iris = "#c4a7e7"
188+iris = "#c4a7e7"
187−iris_10 = "#2b2539"
189+iris_10 = "#2b2539"
188−highlight_low = "#21202e"
190+highlight_low = "#21202e"
189−highlight_med = "#403d52"
191+highlight_med = "#403d52"
190highlight_high = "#524f67"
192highlight_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/themes/zenburn.toml+1−1
@@ -9,7 +9,7 @@
9"ui.selection" = { bg = "#304a3d" }
9"ui.selection" = { bg = "#304a3d" }
10"ui.selection.primary" = { bg = "#2f2f2f" }
10"ui.selection.primary" = { bg = "#2f2f2f" }
11"comment" = { fg = "comment" }
11"comment" = { fg = "comment" }
12−"ui.virtual.inlay-hint" = { fg = "comment" }
12+"ui.virtual.inlay-hint" = { fg = "#9f9f9f" }
13"comment.block.documentation" = { fg = "black", modifiers = ["bold"] }
13"comment.block.documentation" = { fg = "black", modifiers = ["bold"] }
14"ui.statusline" = { bg = "statusbg", fg = "#ccdc90" }
14"ui.statusline" = { bg = "statusbg", fg = "#ccdc90" }
15"ui.statusline.inactive" = { fg = '#2e3330', bg = '#88b090' }
15"ui.statusline.inactive" = { fg = '#2e3330', bg = '#88b090' }
runtime/tutor+157−3
@@ -794,11 +794,11 @@ lines.
794= 7.3 INDENTING LINES =
794= 7.3 INDENTING LINES =
795=================================================================
795=================================================================
796
796
797− Type > to indent a line and < to outdent it.
797+ Type > to indent a line and < to unindent it.
798
798
799 1. Move the cursor to the line marked '-->' below.
799 1. Move the cursor to the line marked '-->' below.
800 2. Move down to the second line and type > to indent it.
800 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.
802
802
803 --> These lines
803 --> These lines
804 are indented
804 are indented
@@ -842,7 +842,7 @@ lines.
842
842
843 * Type J to join lines in selection.
843 * Type J to join lines in selection.
844
844
845− * Type < and > to indent / outdent lines.
845+ * Type > and < to indent / unindent lines.
846
846
847 * Press Ctrl-a to increment the selected number.
847 * Press Ctrl-a to increment the selected number.
848 * Press Ctrl-x to decrement the selected number.
848 * Press Ctrl-x to decrement the selected number.
@@ -1186,6 +1186,160 @@ multiple cursors, they won't be uncommented but commented again.
1186
1186
1187
1187
1188
1188
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+
1189=================================================================
1343=================================================================
1190 This tutorial is still a work-in-progress.
1344 This tutorial is still a work-in-progress.
1191 More sections are planned.
1345 More sections are planned.
rust-toolchain.toml+2−2
@@ -1,3 +1,3 @@
1[toolchain]
1[toolchain]
2−channel = "1.65.0"
2+channel = "1.70.0"
3−components = ["rustfmt", "rust-src"]
3+components = ["rustfmt", "rust-src", "clippy"]
xtask/Cargo.toml+12−6
@@ -1,13 +1,19 @@
1[package]
1[package]
2name = "xtask"
2name = "xtask"
3−version = "0.6.0"
3+version.workspace = true
4+authors.workspace = true
4−edition = "2021"
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
5
11
6# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
12# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
7
13
8[dependencies]
14[dependencies]
9−helix-term = { version = "0.6", path = "../helix-term" }
15+helix-term = { path = "../helix-term" }
10−helix-core = { version = "0.6", path = "../helix-core" }
16+helix-core = { path = "../helix-core" }
11−helix-view = { version = "0.6", path = "../helix-view" }
17+helix-view = { path = "../helix-view" }
12−helix-loader = { version = "0.6", path = "../helix-loader" }
18+helix-loader = { path = "../helix-loader" }
13toml = "0.7"
19toml = "0.7"